diff --git a/gnmi_server/management_interface_address_cli_test.go b/gnmi_server/management_interface_address_cli_test.go
index b05b52f2..1d06efa0 100644
--- a/gnmi_server/management_interface_address_cli_test.go
+++ b/gnmi_server/management_interface_address_cli_test.go
@@ -34,7 +34,7 @@ func TestGetManagementInterfaceAddress(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), QueryTimeout*time.Second)
 	defer cancel()
 
-	expectedManagementInterface := `[{"Management IP address":"10.0.0.5/8","Management Network Default Gateway":"10.0.0.1"},{"Management IP address":"192.168.1.100/24","Management Network Default Gateway":"192.168.1.1"}]`
+	expectedManagementInterface := `[{"management_ip_address":"10.0.0.5/8","management_network_default_gateway":"10.0.0.1"},{"management_ip_address":"192.168.1.100/24","management_network_default_gateway":"192.168.1.1"}]`
 
 	tests := []struct {
 		desc        string
@@ -96,7 +96,7 @@ func TestGetManagementInterfaceAddress(t *testing.T) {
 				elem: <name: "address" >
 			`,
 			wantRetCode: codes.OK,
-			wantRespVal: []byte(`[{"Management IP address":"192.168.1.100/24","Management Network Default Gateway":""}]`),
+			wantRespVal: []byte(`[{"management_ip_address":"192.168.1.100/24","management_network_default_gateway":""}]`),
 			valTest:     true,
 			testInit: func() *gomonkey.Patches {
 				patches := gomonkey.NewPatches()
diff --git a/show_client/management_interface_address_cli.go b/show_client/management_interface_address_cli.go
index 4601c406..16c30115 100644
--- a/show_client/management_interface_address_cli.go
+++ b/show_client/management_interface_address_cli.go
@@ -12,8 +12,8 @@ import (
 
 // ManagementInterfaceAddress represents a single management interface address entry
 type ManagementInterfaceAddress struct {
-	ManagementIPAddress             string `json:"Management IP address"`
-	ManagementNetworkDefaultGateway string `json:"Management Network Default Gateway"`
+	ManagementIPAddress             string `json:"management_ip_address"`
+	ManagementNetworkDefaultGateway string `json:"management_network_default_gateway"`
 }
 
 const (
diff --git a/show_client/show_paths.go b/show_client/show_paths.go
index 73bad77d..cc349667 100644
--- a/show_client/show_paths.go
+++ b/show_client/show_paths.go
@@ -861,7 +861,7 @@ func init() {
 		getARP,
 		"SHOW/arp/{ipaddress}[OPTIONS]: Show IP ARP table",
 		0,
-		2,
+		1,
 		nil,
 		showCmdOptionSonicCliIfaceMode,
 		showCmdOptionIface,