diff --git a/doc/examples/osmo-msc/osmo-msc.cfg b/doc/examples/osmo-msc/osmo-msc.cfg
index 2b0d98d..b086237 100644
--- a/doc/examples/osmo-msc/osmo-msc.cfg
+++ b/doc/examples/osmo-msc/osmo-msc.cfg
@@ -13,9 +13,9 @@
  rrlp mode none
  mm info 1
  mgw 0
-  mgw remote-ip 127.0.0.1
-  mgw remote-port 2427
-  mgw local-port 2728
+  remote-ip 127.0.0.1
+  remote-port 2427
+  local-port 2728
 msc
  assign-tmsi
  auth-tuple-max-reuse-count 3
diff --git a/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg b/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg
index d014edd..014fbbc 100644
--- a/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg
+++ b/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg
@@ -13,9 +13,9 @@
  rrlp mode none
  mm info 1
  mgw 0
-  mgw remote-ip 127.0.0.1
-  mgw remote-port 2427
-  mgw local-port 2728
+  remote-ip 127.0.0.1
+  remote-port 2427
+  local-port 2728
 cs7 instance 0
  point-code 0.23.1
  asp asp-clnt-OsmoMSC-A-Iu 2905 0 m3ua
diff --git a/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg b/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg
index 62c9270..b4b0761 100644
--- a/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg
+++ b/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg
@@ -13,9 +13,9 @@
  rrlp mode none
  mm info 1
  mgw 0
-  mgw remote-ip 127.0.0.1
-  mgw remote-port 2427
-  mgw local-port 2728
+  remote-ip 127.0.0.1
+  remote-port 2427
+  local-port 2728
 cs7 instance 0
  point-code 0.23.1
  asp asp-clnt-OsmoMSC-A 2905 0 m3ua
diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc
index 4556e01..fac0a9f 100644
--- a/doc/manuals/chapters/running.adoc
+++ b/doc/manuals/chapters/running.adoc
@@ -151,9 +151,9 @@
 ----
 network
  mgw 0
-  mgw remote-ip 10.9.8.7
-  mgw remote-port 2427
-  mgw reset-endpoint rtpbridge/* <1>
+  remote-ip 10.9.8.7
+  remote-port 2427
+  reset-endpoint rtpbridge/* <1>
 ----
 <1> The 'reset-endpoint' setting instructs the OsmoMGW to send a wildcarded
 DLCX to the media gateway. This helps to clear lingering calls from the