diff --git a/suites/aoip_debug/interactive.py b/suites/aoip_debug/interactive.py
index b08bac1..98bf174 100755
--- a/suites/aoip_debug/interactive.py
+++ b/suites/aoip_debug/interactive.py
@@ -3,12 +3,12 @@
 hlr = suite.hlr()
 bts = suite.bts()
 pcu = bts.pcu()
-mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
+mgw_msc = suite.mgw()
 mgw_bsc = suite.mgw()
 stp = suite.stp()
 ggsn = suite.ggsn()
 sgsn = suite.sgsn(hlr, ggsn)
-msc = suite.msc(hlr, mgcpgw, stp)
+msc = suite.msc(hlr, mgw_msc, stp)
 bsc = suite.bsc(msc, mgw_bsc, stp)
 
 modems = suite.modems(int(prompt('How many modems?')))
@@ -21,7 +21,7 @@
 ggsn.start()
 sgsn.start()
 msc.start()
-mgcpgw.start()
+mgw_msc.start()
 mgw_bsc.start()
 bsc.start()