diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
index 9eab574..72a6801 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
@@ -152,7 +152,7 @@
 	llist_for_each_entry(pgroup, &_nat->paging_groups, entry)
 		write_pgroup_lst(vty, pgroup);
 	if (_nat->mgcp_ipa)
-		vty_out(vty, " mgcp-through-msc-ipa%s", VTY_NEWLINE);
+		vty_out(vty, " use-msc-ipa-for-mgcp%s", VTY_NEWLINE);
 
 	return CMD_SUCCESS;
 }
@@ -754,9 +754,9 @@
 	return CMD_SUCCESS;
 }
 
-DEFUN(cfg_nat_mgcp_ipa,
-      cfg_nat_mgcp_ipa_cmd,
-      "mgcp-through-msc-ipa",
+DEFUN(cfg_nat_use_ipa_for_mgcp,
+      cfg_nat_use_ipa_for_mgcp_cmd,
+      "use-msc-ipa-for-mgcp",
       "This needs to be set at start. Handle MGCP messages through "
       "the IPA protocol and not through the UDP socket.\n")
 {
@@ -1209,7 +1209,7 @@
 	install_element(NAT_NODE, &cfg_nat_ussd_query_cmd);
 	install_element(NAT_NODE, &cfg_nat_ussd_token_cmd);
 	install_element(NAT_NODE, &cfg_nat_ussd_local_cmd);
-	install_element(NAT_NODE, &cfg_nat_mgcp_ipa_cmd);
+	install_element(NAT_NODE, &cfg_nat_use_ipa_for_mgcp_cmd);
 
 	/* access-list */
 	install_element(NAT_NODE, &cfg_lst_imsi_allow_cmd);
diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py
index 5af59a9..15a73ce 100644
--- a/openbsc/tests/vty_test_runner.py
+++ b/openbsc/tests/vty_test_runner.py
@@ -264,13 +264,13 @@
         self.vty.command('mgcp')
         self.vty.command('nat')
         self.assertEquals(self.vty.node(), 'config-nat')
-        self.vty.command('line vty')
-        self.assertEquals(self.vty.node(), 'config-line')
+        self.vty.command('mgcp')
+        self.assertEquals(self.vty.node(), 'config-mgcp')
         self.vty.command('nat')
         self.assertEquals(self.vty.node(), 'config-nat')
         self.vty.command('bsc 0')
-        self.vty.command('line vty')
-        self.assertEquals(self.vty.node(), 'config-line')
+        self.vty.command('mgcp')
+        self.assertEquals(self.vty.node(), 'config-mgcp')
 
     def testRewriteNoRewrite(self):
         self.vty.enable()