diff --git a/suites/aoip_encryption/register_a5_0_authopt.py b/suites/aoip_encryption/register_a5_0_authopt.py
index 6a06078..acbbb1f 100755
--- a/suites/aoip_encryption/register_a5_0_authopt.py
+++ b/suites/aoip_encryption/register_a5_0_authopt.py
@@ -3,10 +3,10 @@
 
 hlr = suite.hlr()
 bts = suite.bts()
-mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
+mgw_msc = suite.mgw()
 mgw_bsc = suite.mgw()
 stp = suite.stp()
-msc = suite.msc(hlr, mgcpgw, stp)
+msc = suite.msc(hlr, mgw_msc, stp)
 bsc = suite.bsc(msc, mgw_bsc, stp)
 ms = suite.modem()
 
@@ -17,7 +17,7 @@
 hlr.start()
 stp.start()
 msc.start()
-mgcpgw.start()
+mgw_msc.start()
 mgw_bsc.start()
 bsc.bts_add(bts)
 bsc.start()
diff --git a/suites/aoip_encryption/register_a5_0_authreq.py b/suites/aoip_encryption/register_a5_0_authreq.py
index d6c67ea..789ace5 100755
--- a/suites/aoip_encryption/register_a5_0_authreq.py
+++ b/suites/aoip_encryption/register_a5_0_authreq.py
@@ -3,10 +3,10 @@
 
 hlr = suite.hlr()
 bts = suite.bts()
-mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
+mgw_msc = suite.mgw()
 mgw_bsc = suite.mgw()
 stp = suite.stp()
-msc = suite.msc(hlr, mgcpgw, stp)
+msc = suite.msc(hlr, mgw_msc, stp)
 bsc = suite.bsc(msc, mgw_bsc, stp)
 ms = suite.modem()
 
@@ -17,7 +17,7 @@
 hlr.start()
 stp.start()
 msc.start()
-mgcpgw.start()
+mgw_msc.start()
 mgw_bsc.start()
 bsc.bts_add(bts)
 bsc.start()
diff --git a/suites/aoip_encryption/register_a5_1_authreq.py b/suites/aoip_encryption/register_a5_1_authreq.py
index b2c446f..e7aa76c 100755
--- a/suites/aoip_encryption/register_a5_1_authreq.py
+++ b/suites/aoip_encryption/register_a5_1_authreq.py
@@ -3,10 +3,10 @@
 
 hlr = suite.hlr()
 bts = suite.bts()
-mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr())
+mgw_msc = suite.mgw()
 mgw_bsc = suite.mgw()
 stp = suite.stp()
-msc = suite.msc(hlr, mgcpgw, stp)
+msc = suite.msc(hlr, mgw_msc, stp)
 bsc = suite.bsc(msc, mgw_bsc, stp)
 ms = suite.modem()
 
@@ -17,7 +17,7 @@
 hlr.start()
 stp.start()
 msc.start()
-mgcpgw.start()
+mgw_msc.start()
 mgw_bsc.start()
 bsc.bts_add(bts)
 bsc.start()