diff --git a/show/main.py b/show/main.py
index 0230da3ffd..971a3bc1cc 100755
--- a/show/main.py
+++ b/show/main.py
@@ -2420,8 +2420,8 @@ def bmp_neighbor_table(db):
                 values["peer_addr"],
                 values["peer_asn"],
                 values["peer_rd"],
-                values["peer_port"],
-                values["local_addr"],
+                values["remote_port"],
+                values["local_ip"],
                 values["local_asn"],
                 values["local_port"],
                 values["sent_cap"],
diff --git a/tests/show_bmp_test.py b/tests/show_bmp_test.py
index c0bc556d10..1e81966583 100644
--- a/tests/show_bmp_test.py
+++ b/tests/show_bmp_test.py
@@ -27,8 +27,8 @@ def test_show_bmp_neighbor_table(self):
                            {"peer_addr": "10.0.0.61",
                             "peer_asn": "64915",
                             "peer_rd": "300",
-                            "peer_port": "5000",
-                            "local_addr": "10.1.0.32",
+                            "remote_port": "5000",
+                            "local_ip": "10.1.0.32",
                             "local_asn": "65100",
                             "local_port": "6000",
                             "sent_cap": "supports-mpbgp,supports-graceful-restart",
@@ -38,8 +38,8 @@ def test_show_bmp_neighbor_table(self):
                            {"peer_addr": "10.0.0.62",
                             "peer_asn": "64915",
                             "peer_rd": "300",
-                            "peer_port": "5000",
-                            "local_addr": "10.1.0.32",
+                            "remote_port": "5000",
+                            "local_ip": "10.1.0.32",
                             "local_asn": "65100",
                             "local_port": "6000",
                             "sent_cap": "supports-mpbgp,supports-graceful-restart",