diff --git a/go/gosdn/southbound/southbound.pb.go b/go/gosdn/southbound/southbound.pb.go
index d4b7a0a08e740b12c97b0b4ebf84fe1b6c23c1c3..76d5d99787bfa2c5c057485b9a45a92b677fe275 100644
--- a/go/gosdn/southbound/southbound.pb.go
+++ b/go/gosdn/southbound/southbound.pb.go
@@ -24,25 +24,25 @@ const (
 type Type int32
 
 const (
-	Type_TYPE_UNSPECIFIED   Type = 0
-	Type_TYPE_OPENCONFIG    Type = 1
-	Type_TYPE_CONTAINERISED Type = 2
-	Type_TYPE_PLUGIN        Type = 3
+	Type_UNSPECIFIED   Type = 0
+	Type_OPENCONFIG    Type = 1
+	Type_CONTAINERISED Type = 2
+	Type_PLUGIN        Type = 3
 )
 
 // Enum value maps for Type.
 var (
 	Type_name = map[int32]string{
-		0: "TYPE_UNSPECIFIED",
-		1: "TYPE_OPENCONFIG",
-		2: "TYPE_CONTAINERISED",
-		3: "TYPE_PLUGIN",
+		0: "UNSPECIFIED",
+		1: "OPENCONFIG",
+		2: "CONTAINERISED",
+		3: "PLUGIN",
 	}
 	Type_value = map[string]int32{
-		"TYPE_UNSPECIFIED":   0,
-		"TYPE_OPENCONFIG":    1,
-		"TYPE_CONTAINERISED": 2,
-		"TYPE_PLUGIN":        3,
+		"UNSPECIFIED":   0,
+		"OPENCONFIG":    1,
+		"CONTAINERISED": 2,
+		"PLUGIN":        3,
 	}
 )
 
@@ -125,7 +125,7 @@ func (x *SouthboundInterface) GetType() Type {
 	if x != nil {
 		return x.Type
 	}
-	return Type_TYPE_UNSPECIFIED
+	return Type_UNSPECIFIED
 }
 
 var File_gosdn_southbound_southbound_proto protoreflect.FileDescriptor
@@ -141,16 +141,15 @@ var file_gosdn_southbound_southbound_proto_rawDesc = []byte{
 	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2a,
 	0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x67,
 	0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x73, 0x6f, 0x75, 0x74, 0x68, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x2e,
-	0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x2a, 0x5a, 0x0a, 0x04, 0x54, 0x79,
-	0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45,
-	0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x54, 0x59, 0x50, 0x45,
-	0x5f, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x10, 0x01, 0x12, 0x16, 0x0a,
-	0x12, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x41, 0x49, 0x4e, 0x45, 0x52, 0x49,
-	0x53, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x4c,
-	0x55, 0x47, 0x49, 0x4e, 0x10, 0x03, 0x42, 0x30, 0x5a, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x66,
-	0x62, 0x69, 0x2e, 0x68, 0x2d, 0x64, 0x61, 0x2e, 0x64, 0x65, 0x2f, 0x64, 0x61, 0x6e, 0x65, 0x74,
-	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2f, 0x73, 0x6f,
-	0x75, 0x74, 0x68, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x2a, 0x46, 0x0a, 0x04, 0x54, 0x79,
+	0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
+	0x44, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49,
+	0x47, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x43, 0x4f, 0x4e, 0x54, 0x41, 0x49, 0x4e, 0x45, 0x52,
+	0x49, 0x53, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x4c, 0x55, 0x47, 0x49, 0x4e,
+	0x10, 0x03, 0x42, 0x30, 0x5a, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x66, 0x62, 0x69, 0x2e, 0x68,
+	0x2d, 0x64, 0x61, 0x2e, 0x64, 0x65, 0x2f, 0x64, 0x61, 0x6e, 0x65, 0x74, 0x2f, 0x61, 0x70, 0x69,
+	0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2f, 0x73, 0x6f, 0x75, 0x74, 0x68, 0x62,
+	0x6f, 0x75, 0x6e, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/openapiv2/gosdn_northbound.swagger.json b/openapiv2/gosdn_northbound.swagger.json
index 894789102e6888fec83de5f47f3a545dfb50f0dd..b85cea12dfa4a4100e10712b7cc29e1c3818eb5a 100644
--- a/openapiv2/gosdn_northbound.swagger.json
+++ b/openapiv2/gosdn_northbound.swagger.json
@@ -21,16 +21,16 @@
       "name": "gNMI"
     },
     {
-      "name": "Collector"
+      "name": "CsbiService"
     },
     {
-      "name": "AgentManager"
+      "name": "CoreService"
     },
     {
-      "name": "CoreService"
+      "name": "AgentManager"
     },
     {
-      "name": "CsbiService"
+      "name": "Collector"
     }
   ],
   "consumes": [
@@ -2009,12 +2009,12 @@
     "gosdnsouthboundType": {
       "type": "string",
       "enum": [
-        "TYPE_UNSPECIFIED",
-        "TYPE_OPENCONFIG",
-        "TYPE_CONTAINERISED",
-        "TYPE_PLUGIN"
+        "UNSPECIFIED",
+        "OPENCONFIG",
+        "CONTAINERISED",
+        "PLUGIN"
       ],
-      "default": "TYPE_UNSPECIFIED"
+      "default": "UNSPECIFIED"
     },
     "pndApiOperation": {
       "type": "string",