diff --git a/proto/gosdn/pnd/pnd.proto b/proto/gosdn/pnd/pnd.proto
index b68f3280334c3aec7b21e2ac73b8a5cac67b4264..f9fdb2e4b133b465d7efea7542db35c63e824c78 100644
--- a/proto/gosdn/pnd/pnd.proto
+++ b/proto/gosdn/pnd/pnd.proto
@@ -56,7 +56,7 @@ message SouthboundInterface {
 message OrchestratedNetworkingDevice {
   string id = 1;
   string name = 2;
-  gnmi.Notification device = 3;
+  repeated gnmi.Notification device = 3;
 }
 
 message SouthboundInterfaces {
@@ -64,7 +64,7 @@ message SouthboundInterfaces {
 }
 
 message OrchestratedNetworkingDevices {
-  map<string, OrchestratedNetworkingDevice> sbis = 1;
+  map<string, OrchestratedNetworkingDevice> onds = 1;
 }
 
 message Change {