diff --git a/README.md b/README.md
index 7a6c65aaf885069ca6cf012f182876a848c3ee7f..16fa6576b2843a7f0ae0e497d94cef7ddee2986a 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ A simple showcase how the controller can be adressed after
 - The `cli` is the CLI to manage the `controller`.
 - `csbi` is the implementation of Containerised-Southbound-Interfaces (based on
   the idea and the proof of concept of Manuel Kieweg). Allowing to request
-  capabilities of ONDs and generate a containerised Southbound-Interface based
+  capabilities of MNEs and generate a containerised Southbound-Interface based
   on them.
 - `controller` represents the `goSDN-controller`.
 
@@ -58,10 +58,10 @@ In addition we provide a simple Northbound-API for the controller ()
 ## Principal Networking Domain (PND)
 
 The PND is the single source of truth within a network. Its state is held and
-maintained by the controller. Any configuration of an OND has to be applied by
+maintained by the controller. Any configuration of an MNE has to be applied by
 the PND.
 
-## Orchestrated Networking Device (OND)
+## Managed Network Element (MNE)
 
 Any device directly configured by `goSDN`
 
diff --git a/api/go/gosdn/pnd/pnd.pb.go b/api/go/gosdn/pnd/pnd.pb.go
index 56805359cdf83b9bc3b586f74396ef899a8ed18b..e8244a25bb1ba7432750d863bb18ff43177dd5a7 100644
--- a/api/go/gosdn/pnd/pnd.pb.go
+++ b/api/go/gosdn/pnd/pnd.pb.go
@@ -390,7 +390,7 @@ func (StreamMode) EnumDescriptor() ([]byte, []int) {
 	return file_gosdn_pnd_pnd_proto_rawDescGZIP(), []int{6}
 }
 
-type GetOndListRequest struct {
+type GetMneListRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -399,8 +399,8 @@ type GetOndListRequest struct {
 	Pid       string `protobuf:"bytes,2,opt,name=pid,proto3" json:"pid,omitempty"`
 }
 
-func (x *GetOndListRequest) Reset() {
-	*x = GetOndListRequest{}
+func (x *GetMneListRequest) Reset() {
+	*x = GetMneListRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_gosdn_pnd_pnd_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -408,13 +408,13 @@ func (x *GetOndListRequest) Reset() {
 	}
 }
 
-func (x *GetOndListRequest) String() string {
+func (x *GetMneListRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*GetOndListRequest) ProtoMessage() {}
+func (*GetMneListRequest) ProtoMessage() {}
 
-func (x *GetOndListRequest) ProtoReflect() protoreflect.Message {
+func (x *GetMneListRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_gosdn_pnd_pnd_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -426,26 +426,26 @@ func (x *GetOndListRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GetOndListRequest.ProtoReflect.Descriptor instead.
-func (*GetOndListRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use GetMneListRequest.ProtoReflect.Descriptor instead.
+func (*GetMneListRequest) Descriptor() ([]byte, []int) {
 	return file_gosdn_pnd_pnd_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *GetOndListRequest) GetTimestamp() int64 {
+func (x *GetMneListRequest) GetTimestamp() int64 {
 	if x != nil {
 		return x.Timestamp
 	}
 	return 0
 }
 
-func (x *GetOndListRequest) GetPid() string {
+func (x *GetMneListRequest) GetPid() string {
 	if x != nil {
 		return x.Pid
 	}
 	return ""
 }
 
-type GetOndRequest struct {
+type GetMneRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -455,8 +455,8 @@ type GetOndRequest struct {
 	Pid       string `protobuf:"bytes,3,opt,name=pid,proto3" json:"pid,omitempty"`
 }
 
-func (x *GetOndRequest) Reset() {
-	*x = GetOndRequest{}
+func (x *GetMneRequest) Reset() {
+	*x = GetMneRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_gosdn_pnd_pnd_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -464,13 +464,13 @@ func (x *GetOndRequest) Reset() {
 	}
 }
 
-func (x *GetOndRequest) String() string {
+func (x *GetMneRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*GetOndRequest) ProtoMessage() {}
+func (*GetMneRequest) ProtoMessage() {}
 
-func (x *GetOndRequest) ProtoReflect() protoreflect.Message {
+func (x *GetMneRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_gosdn_pnd_pnd_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -482,26 +482,26 @@ func (x *GetOndRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GetOndRequest.ProtoReflect.Descriptor instead.
-func (*GetOndRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use GetMneRequest.ProtoReflect.Descriptor instead.
+func (*GetMneRequest) Descriptor() ([]byte, []int) {
 	return file_gosdn_pnd_pnd_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *GetOndRequest) GetTimestamp() int64 {
+func (x *GetMneRequest) GetTimestamp() int64 {
 	if x != nil {
 		return x.Timestamp
 	}
 	return 0
 }
 
-func (x *GetOndRequest) GetDid() string {
+func (x *GetMneRequest) GetDid() string {
 	if x != nil {
 		return x.Did
 	}
 	return ""
 }
 
-func (x *GetOndRequest) GetPid() string {
+func (x *GetMneRequest) GetPid() string {
 	if x != nil {
 		return x.Pid
 	}
@@ -815,7 +815,7 @@ func (x *GetPathRequest) GetPid() string {
 	return ""
 }
 
-type GetOndResponse struct {
+type GetMneResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -824,11 +824,11 @@ type GetOndResponse struct {
 	// TODO: Check if this is really needed. Perhaps a reference to the PND's ID
 	// is also sufficient.
 	Pnd *PrincipalNetworkDomain       `protobuf:"bytes,2,opt,name=pnd,proto3" json:"pnd,omitempty"`
-	Ond *OrchestratedNetworkingDevice `protobuf:"bytes,3,opt,name=ond,proto3" json:"ond,omitempty"`
+	Mne *OrchestratedNetworkingDevice `protobuf:"bytes,3,opt,name=mne,proto3" json:"mne,omitempty"`
 }
 
-func (x *GetOndResponse) Reset() {
-	*x = GetOndResponse{}
+func (x *GetMneResponse) Reset() {
+	*x = GetMneResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_gosdn_pnd_pnd_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -836,13 +836,13 @@ func (x *GetOndResponse) Reset() {
 	}
 }
 
-func (x *GetOndResponse) String() string {
+func (x *GetMneResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*GetOndResponse) ProtoMessage() {}
+func (*GetMneResponse) ProtoMessage() {}
 
-func (x *GetOndResponse) ProtoReflect() protoreflect.Message {
+func (x *GetMneResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_gosdn_pnd_pnd_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -854,33 +854,33 @@ func (x *GetOndResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GetOndResponse.ProtoReflect.Descriptor instead.
-func (*GetOndResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use GetMneResponse.ProtoReflect.Descriptor instead.
+func (*GetMneResponse) Descriptor() ([]byte, []int) {
 	return file_gosdn_pnd_pnd_proto_rawDescGZIP(), []int{7}
 }
 
-func (x *GetOndResponse) GetTimestamp() int64 {
+func (x *GetMneResponse) GetTimestamp() int64 {
 	if x != nil {
 		return x.Timestamp
 	}
 	return 0
 }
 
-func (x *GetOndResponse) GetPnd() *PrincipalNetworkDomain {
+func (x *GetMneResponse) GetPnd() *PrincipalNetworkDomain {
 	if x != nil {
 		return x.Pnd
 	}
 	return nil
 }
 
-func (x *GetOndResponse) GetOnd() *OrchestratedNetworkingDevice {
+func (x *GetMneResponse) GetMne() *OrchestratedNetworkingDevice {
 	if x != nil {
-		return x.Ond
+		return x.Mne
 	}
 	return nil
 }
 
-type GetOndListResponse struct {
+type GetMneListResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -889,11 +889,11 @@ type GetOndListResponse struct {
 	// TODO: Check if this is really needed. Perhaps a reference to the PND's ID
 	// is also sufficient.
 	Pnd *PrincipalNetworkDomain         `protobuf:"bytes,2,opt,name=pnd,proto3" json:"pnd,omitempty"`
-	Ond []*OrchestratedNetworkingDevice `protobuf:"bytes,3,rep,name=ond,proto3" json:"ond,omitempty"`
+	Mne []*OrchestratedNetworkingDevice `protobuf:"bytes,3,rep,name=mne,proto3" json:"mne,omitempty"`
 }
 
-func (x *GetOndListResponse) Reset() {
-	*x = GetOndListResponse{}
+func (x *GetMneListResponse) Reset() {
+	*x = GetMneListResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_gosdn_pnd_pnd_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -901,13 +901,13 @@ func (x *GetOndListResponse) Reset() {
 	}
 }
 
-func (x *GetOndListResponse) String() string {
+func (x *GetMneListResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*GetOndListResponse) ProtoMessage() {}
+func (*GetMneListResponse) ProtoMessage() {}
 
-func (x *GetOndListResponse) ProtoReflect() protoreflect.Message {
+func (x *GetMneListResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_gosdn_pnd_pnd_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -919,33 +919,33 @@ func (x *GetOndListResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GetOndListResponse.ProtoReflect.Descriptor instead.
-func (*GetOndListResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use GetMneListResponse.ProtoReflect.Descriptor instead.
+func (*GetMneListResponse) Descriptor() ([]byte, []int) {
 	return file_gosdn_pnd_pnd_proto_rawDescGZIP(), []int{8}
 }
 
-func (x *GetOndListResponse) GetTimestamp() int64 {
+func (x *GetMneListResponse) GetTimestamp() int64 {
 	if x != nil {
 		return x.Timestamp
 	}
 	return 0
 }
 
-func (x *GetOndListResponse) GetPnd() *PrincipalNetworkDomain {
+func (x *GetMneListResponse) GetPnd() *PrincipalNetworkDomain {
 	if x != nil {
 		return x.Pnd
 	}
 	return nil
 }
 
-func (x *GetOndListResponse) GetOnd() []*OrchestratedNetworkingDevice {
+func (x *GetMneListResponse) GetMne() []*OrchestratedNetworkingDevice {
 	if x != nil {
-		return x.Ond
+		return x.Mne
 	}
 	return nil
 }
 
-type GetFlattenedOndListResponse struct {
+type GetFlattenedMneListResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -954,11 +954,11 @@ type GetFlattenedOndListResponse struct {
 	// TODO: Check if this is really needed. Perhaps a reference to the PND's ID
 	// is also sufficient.
 	Pnd *PrincipalNetworkDomain                  `protobuf:"bytes,2,opt,name=pnd,proto3" json:"pnd,omitempty"`
-	Ond []*FlattenedOrchestratedNetworkingDevice `protobuf:"bytes,3,rep,name=ond,proto3" json:"ond,omitempty"`
+	Mne []*FlattenedOrchestratedNetworkingDevice `protobuf:"bytes,3,rep,name=mne,proto3" json:"mne,omitempty"`
 }
 
-func (x *GetFlattenedOndListResponse) Reset() {
-	*x = GetFlattenedOndListResponse{}
+func (x *GetFlattenedMneListResponse) Reset() {
+	*x = GetFlattenedMneListResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_gosdn_pnd_pnd_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -966,13 +966,13 @@ func (x *GetFlattenedOndListResponse) Reset() {
 	}
 }
 
-func (x *GetFlattenedOndListResponse) String() string {
+func (x *GetFlattenedMneListResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*GetFlattenedOndListResponse) ProtoMessage() {}
+func (*GetFlattenedMneListResponse) ProtoMessage() {}
 
-func (x *GetFlattenedOndListResponse) ProtoReflect() protoreflect.Message {
+func (x *GetFlattenedMneListResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_gosdn_pnd_pnd_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -984,28 +984,28 @@ func (x *GetFlattenedOndListResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GetFlattenedOndListResponse.ProtoReflect.Descriptor instead.
-func (*GetFlattenedOndListResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use GetFlattenedMneListResponse.ProtoReflect.Descriptor instead.
+func (*GetFlattenedMneListResponse) Descriptor() ([]byte, []int) {
 	return file_gosdn_pnd_pnd_proto_rawDescGZIP(), []int{9}
 }
 
-func (x *GetFlattenedOndListResponse) GetTimestamp() int64 {
+func (x *GetFlattenedMneListResponse) GetTimestamp() int64 {
 	if x != nil {
 		return x.Timestamp
 	}
 	return 0
 }
 
-func (x *GetFlattenedOndListResponse) GetPnd() *PrincipalNetworkDomain {
+func (x *GetFlattenedMneListResponse) GetPnd() *PrincipalNetworkDomain {
 	if x != nil {
 		return x.Pnd
 	}
 	return nil
 }
 
-func (x *GetFlattenedOndListResponse) GetOnd() []*FlattenedOrchestratedNetworkingDevice {
+func (x *GetFlattenedMneListResponse) GetMne() []*FlattenedOrchestratedNetworkingDevice {
 	if x != nil {
-		return x.Ond
+		return x.Mne
 	}
 	return nil
 }
@@ -1603,18 +1603,18 @@ func (x *Change) GetDiff() *gnmi.Notification {
 	return nil
 }
 
-type SetOndListRequest struct {
+type SetMneListRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
 	Timestamp int64     `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` // Timestamp in nanoseconds since Epoch.
-	Ond       []*SetOnd `protobuf:"bytes,2,rep,name=ond,proto3" json:"ond,omitempty"`
+	Mne       []*SetMne `protobuf:"bytes,2,rep,name=mne,proto3" json:"mne,omitempty"`
 	Pid       string    `protobuf:"bytes,3,opt,name=pid,proto3" json:"pid,omitempty"`
 }
 
-func (x *SetOndListRequest) Reset() {
-	*x = SetOndListRequest{}
+func (x *SetMneListRequest) Reset() {
+	*x = SetMneListRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_gosdn_pnd_pnd_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1622,13 +1622,13 @@ func (x *SetOndListRequest) Reset() {
 	}
 }
 
-func (x *SetOndListRequest) String() string {
+func (x *SetMneListRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*SetOndListRequest) ProtoMessage() {}
+func (*SetMneListRequest) ProtoMessage() {}
 
-func (x *SetOndListRequest) ProtoReflect() protoreflect.Message {
+func (x *SetMneListRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_gosdn_pnd_pnd_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1640,26 +1640,26 @@ func (x *SetOndListRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use SetOndListRequest.ProtoReflect.Descriptor instead.
-func (*SetOndListRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use SetMneListRequest.ProtoReflect.Descriptor instead.
+func (*SetMneListRequest) Descriptor() ([]byte, []int) {
 	return file_gosdn_pnd_pnd_proto_rawDescGZIP(), []int{19}
 }
 
-func (x *SetOndListRequest) GetTimestamp() int64 {
+func (x *SetMneListRequest) GetTimestamp() int64 {
 	if x != nil {
 		return x.Timestamp
 	}
 	return 0
 }
 
-func (x *SetOndListRequest) GetOnd() []*SetOnd {
+func (x *SetMneListRequest) GetMne() []*SetMne {
 	if x != nil {
-		return x.Ond
+		return x.Mne
 	}
 	return nil
 }
 
-func (x *SetOndListRequest) GetPid() string {
+func (x *SetMneListRequest) GetPid() string {
 	if x != nil {
 		return x.Pid
 	}
@@ -1927,7 +1927,7 @@ func (x *ChangeRequest) GetApiOp() ApiOperation {
 	return ApiOperation_API_OPERATION_UNSPECIFIED
 }
 
-type SetOnd struct {
+type SetMne struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -1938,8 +1938,8 @@ type SetOnd struct {
 	TransportOption *transport.TransportOption      `protobuf:"bytes,4,opt,name=transport_option,json=transportOption,proto3" json:"transport_option,omitempty"`
 }
 
-func (x *SetOnd) Reset() {
-	*x = SetOnd{}
+func (x *SetMne) Reset() {
+	*x = SetMne{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_gosdn_pnd_pnd_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1947,13 +1947,13 @@ func (x *SetOnd) Reset() {
 	}
 }
 
-func (x *SetOnd) String() string {
+func (x *SetMne) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*SetOnd) ProtoMessage() {}
+func (*SetMne) ProtoMessage() {}
 
-func (x *SetOnd) ProtoReflect() protoreflect.Message {
+func (x *SetMne) ProtoReflect() protoreflect.Message {
 	mi := &file_gosdn_pnd_pnd_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1965,33 +1965,33 @@ func (x *SetOnd) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use SetOnd.ProtoReflect.Descriptor instead.
-func (*SetOnd) Descriptor() ([]byte, []int) {
+// Deprecated: Use SetMne.ProtoReflect.Descriptor instead.
+func (*SetMne) Descriptor() ([]byte, []int) {
 	return file_gosdn_pnd_pnd_proto_rawDescGZIP(), []int{24}
 }
 
-func (x *SetOnd) GetAddress() string {
+func (x *SetMne) GetAddress() string {
 	if x != nil {
 		return x.Address
 	}
 	return ""
 }
 
-func (x *SetOnd) GetSbi() *southbound.SouthboundInterface {
+func (x *SetMne) GetSbi() *southbound.SouthboundInterface {
 	if x != nil {
 		return x.Sbi
 	}
 	return nil
 }
 
-func (x *SetOnd) GetDeviceName() string {
+func (x *SetMne) GetDeviceName() string {
 	if x != nil {
 		return x.DeviceName
 	}
 	return ""
 }
 
-func (x *SetOnd) GetTransportOption() *transport.TransportOption {
+func (x *SetMne) GetTransportOption() *transport.TransportOption {
 	if x != nil {
 		return x.TransportOption
 	}
@@ -2163,7 +2163,7 @@ func (x *SetResponse) GetStatus() Status {
 	return Status_STATUS_UNSPECIFIED
 }
 
-type SetOndListResponse struct {
+type SetMneListResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -2173,8 +2173,8 @@ type SetOndListResponse struct {
 	Responses []*SetResponse `protobuf:"bytes,3,rep,name=responses,proto3" json:"responses,omitempty"`
 }
 
-func (x *SetOndListResponse) Reset() {
-	*x = SetOndListResponse{}
+func (x *SetMneListResponse) Reset() {
+	*x = SetMneListResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_gosdn_pnd_pnd_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2182,13 +2182,13 @@ func (x *SetOndListResponse) Reset() {
 	}
 }
 
-func (x *SetOndListResponse) String() string {
+func (x *SetMneListResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*SetOndListResponse) ProtoMessage() {}
+func (*SetMneListResponse) ProtoMessage() {}
 
-func (x *SetOndListResponse) ProtoReflect() protoreflect.Message {
+func (x *SetMneListResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_gosdn_pnd_pnd_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2200,26 +2200,26 @@ func (x *SetOndListResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use SetOndListResponse.ProtoReflect.Descriptor instead.
-func (*SetOndListResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use SetMneListResponse.ProtoReflect.Descriptor instead.
+func (*SetMneListResponse) Descriptor() ([]byte, []int) {
 	return file_gosdn_pnd_pnd_proto_rawDescGZIP(), []int{28}
 }
 
-func (x *SetOndListResponse) GetTimestamp() int64 {
+func (x *SetMneListResponse) GetTimestamp() int64 {
 	if x != nil {
 		return x.Timestamp
 	}
 	return 0
 }
 
-func (x *SetOndListResponse) GetStatus() Status {
+func (x *SetMneListResponse) GetStatus() Status {
 	if x != nil {
 		return x.Status
 	}
 	return Status_STATUS_UNSPECIFIED
 }
 
-func (x *SetOndListResponse) GetResponses() []*SetResponse {
+func (x *SetMneListResponse) GetResponses() []*SetResponse {
 	if x != nil {
 		return x.Responses
 	}
@@ -2470,7 +2470,7 @@ func (x *SetPathListResponse) GetResponses() []*SetResponse {
 	return nil
 }
 
-type DeleteOndRequest struct {
+type DeleteMneRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -2480,8 +2480,8 @@ type DeleteOndRequest struct {
 	Did       string `protobuf:"bytes,3,opt,name=did,proto3" json:"did,omitempty"`
 }
 
-func (x *DeleteOndRequest) Reset() {
-	*x = DeleteOndRequest{}
+func (x *DeleteMneRequest) Reset() {
+	*x = DeleteMneRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_gosdn_pnd_pnd_proto_msgTypes[33]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2489,13 +2489,13 @@ func (x *DeleteOndRequest) Reset() {
 	}
 }
 
-func (x *DeleteOndRequest) String() string {
+func (x *DeleteMneRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*DeleteOndRequest) ProtoMessage() {}
+func (*DeleteMneRequest) ProtoMessage() {}
 
-func (x *DeleteOndRequest) ProtoReflect() protoreflect.Message {
+func (x *DeleteMneRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_gosdn_pnd_pnd_proto_msgTypes[33]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2507,33 +2507,33 @@ func (x *DeleteOndRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use DeleteOndRequest.ProtoReflect.Descriptor instead.
-func (*DeleteOndRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use DeleteMneRequest.ProtoReflect.Descriptor instead.
+func (*DeleteMneRequest) Descriptor() ([]byte, []int) {
 	return file_gosdn_pnd_pnd_proto_rawDescGZIP(), []int{33}
 }
 
-func (x *DeleteOndRequest) GetTimestamp() int64 {
+func (x *DeleteMneRequest) GetTimestamp() int64 {
 	if x != nil {
 		return x.Timestamp
 	}
 	return 0
 }
 
-func (x *DeleteOndRequest) GetPid() string {
+func (x *DeleteMneRequest) GetPid() string {
 	if x != nil {
 		return x.Pid
 	}
 	return ""
 }
 
-func (x *DeleteOndRequest) GetDid() string {
+func (x *DeleteMneRequest) GetDid() string {
 	if x != nil {
 		return x.Did
 	}
 	return ""
 }
 
-type DeleteOndResponse struct {
+type DeleteMneResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -2542,8 +2542,8 @@ type DeleteOndResponse struct {
 	Status    Status `protobuf:"varint,2,opt,name=status,proto3,enum=gosdn.pnd.Status" json:"status,omitempty"`
 }
 
-func (x *DeleteOndResponse) Reset() {
-	*x = DeleteOndResponse{}
+func (x *DeleteMneResponse) Reset() {
+	*x = DeleteMneResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_gosdn_pnd_pnd_proto_msgTypes[34]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2551,13 +2551,13 @@ func (x *DeleteOndResponse) Reset() {
 	}
 }
 
-func (x *DeleteOndResponse) String() string {
+func (x *DeleteMneResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*DeleteOndResponse) ProtoMessage() {}
+func (*DeleteMneResponse) ProtoMessage() {}
 
-func (x *DeleteOndResponse) ProtoReflect() protoreflect.Message {
+func (x *DeleteMneResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_gosdn_pnd_pnd_proto_msgTypes[34]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2569,19 +2569,19 @@ func (x *DeleteOndResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use DeleteOndResponse.ProtoReflect.Descriptor instead.
-func (*DeleteOndResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use DeleteMneResponse.ProtoReflect.Descriptor instead.
+func (*DeleteMneResponse) Descriptor() ([]byte, []int) {
 	return file_gosdn_pnd_pnd_proto_rawDescGZIP(), []int{34}
 }
 
-func (x *DeleteOndResponse) GetTimestamp() int64 {
+func (x *DeleteMneResponse) GetTimestamp() int64 {
 	if x != nil {
 		return x.Timestamp
 	}
 	return 0
 }
 
-func (x *DeleteOndResponse) GetStatus() Status {
+func (x *DeleteMneResponse) GetStatus() Status {
 	if x != nil {
 		return x.Status
 	}
@@ -2723,7 +2723,7 @@ type Subscription struct {
 
 	Path           string     `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
 	StreamMode     StreamMode `protobuf:"varint,2,opt,name=stream_mode,json=streamMode,proto3,enum=gosdn.pnd.StreamMode" json:"stream_mode,omitempty"`
-	SampleInterval uint64     `protobuf:"varint,3,opt,name=sample_interval,json=sampleInterval,proto3" json:"sample_interval,omitempty"` // ns between samples in SAMPLE mode.
+	SampleInterval uint64     `protobuf:"varint,3,opt,name=sample_interval,json=sampleInterval,proto3" json:"sample_interval,omitempty"` // time in ns between samples in SAMPLE mode.
 }
 
 func (x *Subscription) Reset() {
@@ -2861,12 +2861,12 @@ var file_gosdn_pnd_pnd_proto_rawDesc = []byte{
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67,
 	0x65, 0x6e, 0x2d, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x2f, 0x6f, 0x70, 0x74,
 	0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x43, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x4f, 0x6e, 0x64,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x43, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x4d, 0x6e, 0x65,
 	0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74,
 	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09,
 	0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64,
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x70, 0x69, 0x64, 0x22, 0x51, 0x0a, 0x0d, 0x47,
-	0x65, 0x74, 0x4f, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09,
+	0x65, 0x74, 0x4d, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09,
 	0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
 	0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x69,
 	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
@@ -2897,38 +2897,38 @@ var file_gosdn_pnd_pnd_proto_rawDesc = []byte{
 	0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68,
 	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x10, 0x0a, 0x03,
 	0x70, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x70, 0x69, 0x64, 0x22, 0x9e,
-	0x01, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x4f, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x01, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x4d, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
 	0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12,
 	0x33, 0x0a, 0x03, 0x70, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x67,
 	0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x50, 0x72, 0x69, 0x6e, 0x63, 0x69, 0x70,
 	0x61, 0x6c, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52,
-	0x03, 0x70, 0x6e, 0x64, 0x12, 0x39, 0x0a, 0x03, 0x6f, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x03, 0x70, 0x6e, 0x64, 0x12, 0x39, 0x0a, 0x03, 0x6d, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x27, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x4f, 0x72,
 	0x63, 0x68, 0x65, 0x73, 0x74, 0x72, 0x61, 0x74, 0x65, 0x64, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72,
-	0x6b, 0x69, 0x6e, 0x67, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x03, 0x6f, 0x6e, 0x64, 0x22,
-	0xa2, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x4f, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
+	0x6b, 0x69, 0x6e, 0x67, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x03, 0x6d, 0x6e, 0x65, 0x22,
+	0xa2, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x4d, 0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
 	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74,
 	0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73,
 	0x74, 0x61, 0x6d, 0x70, 0x12, 0x33, 0x0a, 0x03, 0x70, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x21, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x50, 0x72,
 	0x69, 0x6e, 0x63, 0x69, 0x70, 0x61, 0x6c, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x44, 0x6f,
-	0x6d, 0x61, 0x69, 0x6e, 0x52, 0x03, 0x70, 0x6e, 0x64, 0x12, 0x39, 0x0a, 0x03, 0x6f, 0x6e, 0x64,
+	0x6d, 0x61, 0x69, 0x6e, 0x52, 0x03, 0x70, 0x6e, 0x64, 0x12, 0x39, 0x0a, 0x03, 0x6d, 0x6e, 0x65,
 	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70,
 	0x6e, 0x64, 0x2e, 0x4f, 0x72, 0x63, 0x68, 0x65, 0x73, 0x74, 0x72, 0x61, 0x74, 0x65, 0x64, 0x4e,
 	0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52,
-	0x03, 0x6f, 0x6e, 0x64, 0x22, 0xb4, 0x01, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x46, 0x6c, 0x61, 0x74,
-	0x74, 0x65, 0x6e, 0x65, 0x64, 0x4f, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70,
+	0x03, 0x6d, 0x6e, 0x65, 0x22, 0xb4, 0x01, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x46, 0x6c, 0x61, 0x74,
+	0x74, 0x65, 0x6e, 0x65, 0x64, 0x4d, 0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70,
 	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
 	0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
 	0x6d, 0x70, 0x12, 0x33, 0x0a, 0x03, 0x70, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x21, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x50, 0x72, 0x69, 0x6e,
 	0x63, 0x69, 0x70, 0x61, 0x6c, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x44, 0x6f, 0x6d, 0x61,
-	0x69, 0x6e, 0x52, 0x03, 0x70, 0x6e, 0x64, 0x12, 0x42, 0x0a, 0x03, 0x6f, 0x6e, 0x64, 0x18, 0x03,
+	0x69, 0x6e, 0x52, 0x03, 0x70, 0x6e, 0x64, 0x12, 0x42, 0x0a, 0x03, 0x6d, 0x6e, 0x65, 0x18, 0x03,
 	0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64,
 	0x2e, 0x46, 0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x65, 0x64, 0x4f, 0x72, 0x63, 0x68, 0x65, 0x73,
 	0x74, 0x72, 0x61, 0x74, 0x65, 0x64, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67,
-	0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x03, 0x6f, 0x6e, 0x64, 0x22, 0x9c, 0x01, 0x0a, 0x0e,
+	0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x03, 0x6d, 0x6e, 0x65, 0x22, 0x9c, 0x01, 0x0a, 0x0e,
 	0x47, 0x65, 0x74, 0x53, 0x62, 0x69, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c,
 	0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x33, 0x0a, 0x03,
@@ -3007,12 +3007,12 @@ var file_gosdn_pnd_pnd_proto_rawDesc = []byte{
 	0x61, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65,
 	0x12, 0x26, 0x0a, 0x04, 0x64, 0x69, 0x66, 0x66, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12,
 	0x2e, 0x67, 0x6e, 0x6d, 0x69, 0x2e, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x04, 0x64, 0x69, 0x66, 0x66, 0x22, 0x68, 0x0a, 0x11, 0x53, 0x65, 0x74, 0x4f,
-	0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a,
+	0x6f, 0x6e, 0x52, 0x04, 0x64, 0x69, 0x66, 0x66, 0x22, 0x68, 0x0a, 0x11, 0x53, 0x65, 0x74, 0x4d,
+	0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a,
 	0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x23, 0x0a, 0x03, 0x6f,
-	0x6e, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e,
-	0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x53, 0x65, 0x74, 0x4f, 0x6e, 0x64, 0x52, 0x03, 0x6f, 0x6e, 0x64,
+	0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x23, 0x0a, 0x03, 0x6d,
+	0x6e, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e,
+	0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x53, 0x65, 0x74, 0x4d, 0x6e, 0x65, 0x52, 0x03, 0x6d, 0x6e, 0x65,
 	0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x70,
 	0x69, 0x64, 0x22, 0x68, 0x0a, 0x11, 0x53, 0x65, 0x74, 0x53, 0x62, 0x69, 0x4c, 0x69, 0x73, 0x74,
 	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73,
@@ -3044,8 +3044,8 @@ var file_gosdn_pnd_pnd_proto_rawDesc = []byte{
 	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2e, 0x0a, 0x06, 0x61, 0x70, 0x69, 0x5f, 0x6f,
 	0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e,
 	0x70, 0x6e, 0x64, 0x2e, 0x41, 0x70, 0x69, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x05, 0x61, 0x70, 0x69, 0x4f, 0x70, 0x22, 0xc9, 0x01, 0x0a, 0x06, 0x53, 0x65, 0x74, 0x4f,
-	0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20,
+	0x52, 0x05, 0x61, 0x70, 0x69, 0x4f, 0x70, 0x22, 0xc9, 0x01, 0x0a, 0x06, 0x53, 0x65, 0x74, 0x4d,
+	0x6e, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x37, 0x0a, 0x03,
 	0x73, 0x62, 0x69, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67, 0x6f, 0x73, 0x64,
 	0x6e, 0x2e, 0x73, 0x6f, 0x75, 0x74, 0x68, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x2e, 0x53, 0x6f, 0x75,
@@ -3072,7 +3072,7 @@ var file_gosdn_pnd_pnd_proto_rawDesc = []byte{
 	0x12, 0x29, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e,
 	0x32, 0x11, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x53, 0x74, 0x61,
 	0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x93, 0x01, 0x0a, 0x12,
-	0x53, 0x65, 0x74, 0x4f, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x53, 0x65, 0x74, 0x4d, 0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
 	0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
 	0x12, 0x29, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e,
@@ -3115,13 +3115,13 @@ var file_gosdn_pnd_pnd_proto_rawDesc = []byte{
 	0x34, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03,
 	0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x53,
 	0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x73, 0x22, 0x54, 0x0a, 0x10, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f,
-	0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d,
+	0x6f, 0x6e, 0x73, 0x65, 0x73, 0x22, 0x54, 0x0a, 0x10, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d,
+	0x6e, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d,
 	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69,
 	0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x02,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x70, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x69, 0x64,
 	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x69, 0x64, 0x22, 0x5c, 0x0a, 0x11, 0x44,
-	0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
 	0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x29,
 	0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11,
@@ -3214,31 +3214,31 @@ var file_gosdn_pnd_pnd_proto_rawDesc = []byte{
 	0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x4f, 0x4e, 0x5f, 0x43, 0x48, 0x41, 0x4e, 0x47, 0x45, 0x10,
 	0x02, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d, 0x5f, 0x4d, 0x4f, 0x44, 0x45,
 	0x5f, 0x53, 0x41, 0x4d, 0x50, 0x4c, 0x45, 0x10, 0x03, 0x32, 0xb1, 0x0b, 0x0a, 0x0a, 0x50, 0x6e,
-	0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x49, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x4f,
-	0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1c, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70,
-	0x6e, 0x64, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71,
+	0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x49, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x4d,
+	0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1c, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70,
+	0x6e, 0x64, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71,
 	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64,
-	0x2e, 0x47, 0x65, 0x74, 0x4f, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x2e, 0x47, 0x65, 0x74, 0x4d, 0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
 	0x6e, 0x73, 0x65, 0x12, 0x75, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x46, 0x6c, 0x61, 0x74, 0x74, 0x65,
-	0x6e, 0x65, 0x64, 0x4f, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1c, 0x2e, 0x67, 0x6f, 0x73,
-	0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x6e, 0x64, 0x4c, 0x69, 0x73,
+	0x6e, 0x65, 0x64, 0x4d, 0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1c, 0x2e, 0x67, 0x6f, 0x73,
+	0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x6e, 0x65, 0x4c, 0x69, 0x73,
 	0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e,
 	0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x47, 0x65, 0x74, 0x46, 0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x65,
-	0x64, 0x4f, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x64, 0x4d, 0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
 	0x22, 0x18, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x12, 0x10, 0x2f, 0x70, 0x6e, 0x64, 0x73, 0x2f,
-	0x7b, 0x70, 0x69, 0x64, 0x7d, 0x2f, 0x6f, 0x6e, 0x64, 0x73, 0x12, 0x5c, 0x0a, 0x06, 0x47, 0x65,
-	0x74, 0x4f, 0x6e, 0x64, 0x12, 0x18, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64,
-	0x2e, 0x47, 0x65, 0x74, 0x4f, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19,
-	0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x6e,
-	0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1d, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x17, 0x12, 0x15, 0x2f, 0x70, 0x6e, 0x64, 0x73, 0x2f, 0x7b, 0x70, 0x69, 0x64, 0x7d, 0x2f, 0x6f,
-	0x6e, 0x64, 0x2f, 0x7b, 0x64, 0x69, 0x64, 0x7d, 0x12, 0x66, 0x0a, 0x0a, 0x53, 0x65, 0x74, 0x4f,
-	0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1c, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70,
-	0x6e, 0x64, 0x2e, 0x53, 0x65, 0x74, 0x4f, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71,
+	0x7b, 0x70, 0x69, 0x64, 0x7d, 0x2f, 0x6d, 0x6e, 0x65, 0x73, 0x12, 0x5c, 0x0a, 0x06, 0x47, 0x65,
+	0x74, 0x4d, 0x6e, 0x65, 0x12, 0x18, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64,
+	0x2e, 0x47, 0x65, 0x74, 0x4d, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19,
+	0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x6e,
+	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1d, 0x82, 0xd3, 0xe4, 0x93, 0x02,
+	0x17, 0x12, 0x15, 0x2f, 0x70, 0x6e, 0x64, 0x73, 0x2f, 0x7b, 0x70, 0x69, 0x64, 0x7d, 0x2f, 0x6d,
+	0x6e, 0x65, 0x2f, 0x7b, 0x64, 0x69, 0x64, 0x7d, 0x12, 0x66, 0x0a, 0x0a, 0x53, 0x65, 0x74, 0x4d,
+	0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1c, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70,
+	0x6e, 0x64, 0x2e, 0x53, 0x65, 0x74, 0x4d, 0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71,
 	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64,
-	0x2e, 0x53, 0x65, 0x74, 0x4f, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x2e, 0x53, 0x65, 0x74, 0x4d, 0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
 	0x6e, 0x73, 0x65, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x3a, 0x01, 0x2a, 0x22, 0x10,
-	0x2f, 0x70, 0x6e, 0x64, 0x73, 0x2f, 0x7b, 0x70, 0x69, 0x64, 0x7d, 0x2f, 0x6f, 0x6e, 0x64, 0x73,
+	0x2f, 0x70, 0x6e, 0x64, 0x73, 0x2f, 0x7b, 0x70, 0x69, 0x64, 0x7d, 0x2f, 0x6d, 0x6e, 0x65, 0x73,
 	0x12, 0x63, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x53, 0x62, 0x69, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1c,
 	0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x62,
 	0x69, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x67,
@@ -3284,7 +3284,7 @@ var file_gosdn_pnd_pnd_proto_rawDesc = []byte{
 	0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e,
 	0x47, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
 	0x2b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x12, 0x23, 0x2f, 0x70, 0x6e, 0x64, 0x73, 0x2f, 0x7b,
-	0x70, 0x69, 0x64, 0x7d, 0x2f, 0x6f, 0x6e, 0x64, 0x73, 0x2f, 0x7b, 0x64, 0x69, 0x64, 0x7d, 0x2f,
+	0x70, 0x69, 0x64, 0x7d, 0x2f, 0x6d, 0x6e, 0x65, 0x73, 0x2f, 0x7b, 0x64, 0x69, 0x64, 0x7d, 0x2f,
 	0x70, 0x61, 0x74, 0x68, 0x73, 0x2f, 0x7b, 0x70, 0x61, 0x74, 0x68, 0x7d, 0x12, 0x6f, 0x0a, 0x0b,
 	0x53, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1d, 0x2e, 0x67, 0x6f,
 	0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x53, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x4c,
@@ -3292,13 +3292,13 @@ var file_gosdn_pnd_pnd_proto_rawDesc = []byte{
 	0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x53, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x4c, 0x69,
 	0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93,
 	0x02, 0x1b, 0x3a, 0x01, 0x2a, 0x22, 0x16, 0x2f, 0x70, 0x6e, 0x64, 0x73, 0x2f, 0x7b, 0x70, 0x69,
-	0x64, 0x7d, 0x2f, 0x6f, 0x6e, 0x64, 0x73, 0x2f, 0x70, 0x61, 0x74, 0x68, 0x73, 0x12, 0x66, 0x0a,
-	0x09, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x6e, 0x64, 0x12, 0x1b, 0x2e, 0x67, 0x6f, 0x73,
-	0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x6e, 0x64,
+	0x64, 0x7d, 0x2f, 0x6d, 0x6e, 0x65, 0x73, 0x2f, 0x70, 0x61, 0x74, 0x68, 0x73, 0x12, 0x66, 0x0a,
+	0x09, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x6e, 0x65, 0x12, 0x1b, 0x2e, 0x67, 0x6f, 0x73,
+	0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x6e, 0x65,
 	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e,
-	0x70, 0x6e, 0x64, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x6e, 0x64, 0x52, 0x65, 0x73,
+	0x70, 0x6e, 0x64, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x6e, 0x65, 0x52, 0x65, 0x73,
 	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x2a, 0x16, 0x2f,
-	0x70, 0x6e, 0x64, 0x73, 0x2f, 0x7b, 0x70, 0x69, 0x64, 0x7d, 0x2f, 0x6f, 0x6e, 0x64, 0x73, 0x2f,
+	0x70, 0x6e, 0x64, 0x73, 0x2f, 0x7b, 0x70, 0x69, 0x64, 0x7d, 0x2f, 0x6d, 0x6e, 0x65, 0x73, 0x2f,
 	0x7b, 0x64, 0x69, 0x64, 0x7d, 0x12, 0x56, 0x0a, 0x0d, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69,
 	0x62, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70,
 	0x6e, 0x64, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x50, 0x61, 0x74, 0x68,
@@ -3349,16 +3349,16 @@ var file_gosdn_pnd_pnd_proto_goTypes = []interface{}{
 	(Status)(0),                                   // 4: gosdn.pnd.Status
 	(SubscriptionMode)(0),                         // 5: gosdn.pnd.SubscriptionMode
 	(StreamMode)(0),                               // 6: gosdn.pnd.StreamMode
-	(*GetOndListRequest)(nil),                     // 7: gosdn.pnd.GetOndListRequest
-	(*GetOndRequest)(nil),                         // 8: gosdn.pnd.GetOndRequest
+	(*GetMneListRequest)(nil),                     // 7: gosdn.pnd.GetMneListRequest
+	(*GetMneRequest)(nil),                         // 8: gosdn.pnd.GetMneRequest
 	(*GetSbiListRequest)(nil),                     // 9: gosdn.pnd.GetSbiListRequest
 	(*GetSbiRequest)(nil),                         // 10: gosdn.pnd.GetSbiRequest
 	(*GetChangeListRequest)(nil),                  // 11: gosdn.pnd.GetChangeListRequest
 	(*GetChangeRequest)(nil),                      // 12: gosdn.pnd.GetChangeRequest
 	(*GetPathRequest)(nil),                        // 13: gosdn.pnd.GetPathRequest
-	(*GetOndResponse)(nil),                        // 14: gosdn.pnd.GetOndResponse
-	(*GetOndListResponse)(nil),                    // 15: gosdn.pnd.GetOndListResponse
-	(*GetFlattenedOndListResponse)(nil),           // 16: gosdn.pnd.GetFlattenedOndListResponse
+	(*GetMneResponse)(nil),                        // 14: gosdn.pnd.GetMneResponse
+	(*GetMneListResponse)(nil),                    // 15: gosdn.pnd.GetMneListResponse
+	(*GetFlattenedMneListResponse)(nil),           // 16: gosdn.pnd.GetFlattenedMneListResponse
 	(*GetSbiResponse)(nil),                        // 17: gosdn.pnd.GetSbiResponse
 	(*GetSbiListResponse)(nil),                    // 18: gosdn.pnd.GetSbiListResponse
 	(*GetPathResponse)(nil),                       // 19: gosdn.pnd.GetPathResponse
@@ -3368,22 +3368,22 @@ var file_gosdn_pnd_pnd_proto_goTypes = []interface{}{
 	(*OrchestratedNetworkingDevice)(nil),          // 23: gosdn.pnd.OrchestratedNetworkingDevice
 	(*FlattenedOrchestratedNetworkingDevice)(nil), // 24: gosdn.pnd.FlattenedOrchestratedNetworkingDevice
 	(*Change)(nil),                                // 25: gosdn.pnd.Change
-	(*SetOndListRequest)(nil),                     // 26: gosdn.pnd.SetOndListRequest
+	(*SetMneListRequest)(nil),                     // 26: gosdn.pnd.SetMneListRequest
 	(*SetSbiListRequest)(nil),                     // 27: gosdn.pnd.SetSbiListRequest
 	(*SetChangeListRequest)(nil),                  // 28: gosdn.pnd.SetChangeListRequest
 	(*SetPathListRequest)(nil),                    // 29: gosdn.pnd.SetPathListRequest
 	(*ChangeRequest)(nil),                         // 30: gosdn.pnd.ChangeRequest
-	(*SetOnd)(nil),                                // 31: gosdn.pnd.SetOnd
+	(*SetMne)(nil),                                // 31: gosdn.pnd.SetMne
 	(*SetSbi)(nil),                                // 32: gosdn.pnd.SetSbi
 	(*SetChange)(nil),                             // 33: gosdn.pnd.SetChange
 	(*SetResponse)(nil),                           // 34: gosdn.pnd.SetResponse
-	(*SetOndListResponse)(nil),                    // 35: gosdn.pnd.SetOndListResponse
+	(*SetMneListResponse)(nil),                    // 35: gosdn.pnd.SetMneListResponse
 	(*SetChangeListResponse)(nil),                 // 36: gosdn.pnd.SetChangeListResponse
 	(*SetChangeResponse)(nil),                     // 37: gosdn.pnd.SetChangeResponse
 	(*SetSbiListResponse)(nil),                    // 38: gosdn.pnd.SetSbiListResponse
 	(*SetPathListResponse)(nil),                   // 39: gosdn.pnd.SetPathListResponse
-	(*DeleteOndRequest)(nil),                      // 40: gosdn.pnd.DeleteOndRequest
-	(*DeleteOndResponse)(nil),                     // 41: gosdn.pnd.DeleteOndResponse
+	(*DeleteMneRequest)(nil),                      // 40: gosdn.pnd.DeleteMneRequest
+	(*DeleteMneResponse)(nil),                     // 41: gosdn.pnd.DeleteMneResponse
 	(*SubscribePathRequest)(nil),                  // 42: gosdn.pnd.SubscribePathRequest
 	(*SubscriptionList)(nil),                      // 43: gosdn.pnd.SubscriptionList
 	(*Subscription)(nil),                          // 44: gosdn.pnd.Subscription
@@ -3393,12 +3393,12 @@ var file_gosdn_pnd_pnd_proto_goTypes = []interface{}{
 	(*transport.TransportOption)(nil),             // 48: gosdn.transport.TransportOption
 }
 var file_gosdn_pnd_pnd_proto_depIdxs = []int32{
-	22, // 0: gosdn.pnd.GetOndResponse.pnd:type_name -> gosdn.pnd.PrincipalNetworkDomain
-	23, // 1: gosdn.pnd.GetOndResponse.ond:type_name -> gosdn.pnd.OrchestratedNetworkingDevice
-	22, // 2: gosdn.pnd.GetOndListResponse.pnd:type_name -> gosdn.pnd.PrincipalNetworkDomain
-	23, // 3: gosdn.pnd.GetOndListResponse.ond:type_name -> gosdn.pnd.OrchestratedNetworkingDevice
-	22, // 4: gosdn.pnd.GetFlattenedOndListResponse.pnd:type_name -> gosdn.pnd.PrincipalNetworkDomain
-	24, // 5: gosdn.pnd.GetFlattenedOndListResponse.ond:type_name -> gosdn.pnd.FlattenedOrchestratedNetworkingDevice
+	22, // 0: gosdn.pnd.GetMneResponse.pnd:type_name -> gosdn.pnd.PrincipalNetworkDomain
+	23, // 1: gosdn.pnd.GetMneResponse.mne:type_name -> gosdn.pnd.OrchestratedNetworkingDevice
+	22, // 2: gosdn.pnd.GetMneListResponse.pnd:type_name -> gosdn.pnd.PrincipalNetworkDomain
+	23, // 3: gosdn.pnd.GetMneListResponse.mne:type_name -> gosdn.pnd.OrchestratedNetworkingDevice
+	22, // 4: gosdn.pnd.GetFlattenedMneListResponse.pnd:type_name -> gosdn.pnd.PrincipalNetworkDomain
+	24, // 5: gosdn.pnd.GetFlattenedMneListResponse.mne:type_name -> gosdn.pnd.FlattenedOrchestratedNetworkingDevice
 	22, // 6: gosdn.pnd.GetSbiResponse.pnd:type_name -> gosdn.pnd.PrincipalNetworkDomain
 	46, // 7: gosdn.pnd.GetSbiResponse.sbi:type_name -> gosdn.southbound.SouthboundInterface
 	22, // 8: gosdn.pnd.GetSbiListResponse.pnd:type_name -> gosdn.pnd.PrincipalNetworkDomain
@@ -3413,18 +3413,18 @@ var file_gosdn_pnd_pnd_proto_depIdxs = []int32{
 	46, // 17: gosdn.pnd.OrchestratedNetworkingDevice.sbi:type_name -> gosdn.southbound.SouthboundInterface
 	0,  // 18: gosdn.pnd.Change.state:type_name -> gosdn.pnd.ChangeState
 	47, // 19: gosdn.pnd.Change.diff:type_name -> gnmi.Notification
-	31, // 20: gosdn.pnd.SetOndListRequest.ond:type_name -> gosdn.pnd.SetOnd
+	31, // 20: gosdn.pnd.SetMneListRequest.mne:type_name -> gosdn.pnd.SetMne
 	32, // 21: gosdn.pnd.SetSbiListRequest.sbi:type_name -> gosdn.pnd.SetSbi
 	33, // 22: gosdn.pnd.SetChangeListRequest.change:type_name -> gosdn.pnd.SetChange
 	30, // 23: gosdn.pnd.SetPathListRequest.change_request:type_name -> gosdn.pnd.ChangeRequest
 	1,  // 24: gosdn.pnd.ChangeRequest.api_op:type_name -> gosdn.pnd.ApiOperation
-	46, // 25: gosdn.pnd.SetOnd.sbi:type_name -> gosdn.southbound.SouthboundInterface
-	48, // 26: gosdn.pnd.SetOnd.transport_option:type_name -> gosdn.transport.TransportOption
+	46, // 25: gosdn.pnd.SetMne.sbi:type_name -> gosdn.southbound.SouthboundInterface
+	48, // 26: gosdn.pnd.SetMne.transport_option:type_name -> gosdn.transport.TransportOption
 	2,  // 27: gosdn.pnd.SetSbi.sbi_type:type_name -> gosdn.pnd.SbiType
 	3,  // 28: gosdn.pnd.SetChange.op:type_name -> gosdn.pnd.Operation
 	4,  // 29: gosdn.pnd.SetResponse.status:type_name -> gosdn.pnd.Status
-	4,  // 30: gosdn.pnd.SetOndListResponse.status:type_name -> gosdn.pnd.Status
-	34, // 31: gosdn.pnd.SetOndListResponse.responses:type_name -> gosdn.pnd.SetResponse
+	4,  // 30: gosdn.pnd.SetMneListResponse.status:type_name -> gosdn.pnd.Status
+	34, // 31: gosdn.pnd.SetMneListResponse.responses:type_name -> gosdn.pnd.SetResponse
 	4,  // 32: gosdn.pnd.SetChangeListResponse.status:type_name -> gosdn.pnd.Status
 	34, // 33: gosdn.pnd.SetChangeListResponse.responses:type_name -> gosdn.pnd.SetResponse
 	4,  // 34: gosdn.pnd.SetChangeResponse.status:type_name -> gosdn.pnd.Status
@@ -3432,17 +3432,17 @@ var file_gosdn_pnd_pnd_proto_depIdxs = []int32{
 	34, // 36: gosdn.pnd.SetSbiListResponse.responses:type_name -> gosdn.pnd.SetResponse
 	4,  // 37: gosdn.pnd.SetPathListResponse.status:type_name -> gosdn.pnd.Status
 	34, // 38: gosdn.pnd.SetPathListResponse.responses:type_name -> gosdn.pnd.SetResponse
-	4,  // 39: gosdn.pnd.DeleteOndResponse.status:type_name -> gosdn.pnd.Status
+	4,  // 39: gosdn.pnd.DeleteMneResponse.status:type_name -> gosdn.pnd.Status
 	43, // 40: gosdn.pnd.SubscribePathRequest.sublist:type_name -> gosdn.pnd.SubscriptionList
 	44, // 41: gosdn.pnd.SubscriptionList.subscription:type_name -> gosdn.pnd.Subscription
 	5,  // 42: gosdn.pnd.SubscriptionList.mode:type_name -> gosdn.pnd.SubscriptionMode
 	6,  // 43: gosdn.pnd.Subscription.stream_mode:type_name -> gosdn.pnd.StreamMode
 	4,  // 44: gosdn.pnd.SubscribePathResponse.status:type_name -> gosdn.pnd.Status
 	47, // 45: gosdn.pnd.SubscribePathResponse.device:type_name -> gnmi.Notification
-	7,  // 46: gosdn.pnd.PndService.GetOndList:input_type -> gosdn.pnd.GetOndListRequest
-	7,  // 47: gosdn.pnd.PndService.GetFlattenedOndList:input_type -> gosdn.pnd.GetOndListRequest
-	8,  // 48: gosdn.pnd.PndService.GetOnd:input_type -> gosdn.pnd.GetOndRequest
-	26, // 49: gosdn.pnd.PndService.SetOndList:input_type -> gosdn.pnd.SetOndListRequest
+	7,  // 46: gosdn.pnd.PndService.GetMneList:input_type -> gosdn.pnd.GetMneListRequest
+	7,  // 47: gosdn.pnd.PndService.GetFlattenedMneList:input_type -> gosdn.pnd.GetMneListRequest
+	8,  // 48: gosdn.pnd.PndService.GetMne:input_type -> gosdn.pnd.GetMneRequest
+	26, // 49: gosdn.pnd.PndService.SetMneList:input_type -> gosdn.pnd.SetMneListRequest
 	9,  // 50: gosdn.pnd.PndService.GetSbiList:input_type -> gosdn.pnd.GetSbiListRequest
 	10, // 51: gosdn.pnd.PndService.GetSbi:input_type -> gosdn.pnd.GetSbiRequest
 	27, // 52: gosdn.pnd.PndService.SetSbiList:input_type -> gosdn.pnd.SetSbiListRequest
@@ -3451,12 +3451,12 @@ var file_gosdn_pnd_pnd_proto_depIdxs = []int32{
 	28, // 55: gosdn.pnd.PndService.SetChangeList:input_type -> gosdn.pnd.SetChangeListRequest
 	13, // 56: gosdn.pnd.PndService.GetPath:input_type -> gosdn.pnd.GetPathRequest
 	29, // 57: gosdn.pnd.PndService.SetPathList:input_type -> gosdn.pnd.SetPathListRequest
-	40, // 58: gosdn.pnd.PndService.DeleteOnd:input_type -> gosdn.pnd.DeleteOndRequest
+	40, // 58: gosdn.pnd.PndService.DeleteMne:input_type -> gosdn.pnd.DeleteMneRequest
 	42, // 59: gosdn.pnd.PndService.SubscribePath:input_type -> gosdn.pnd.SubscribePathRequest
-	15, // 60: gosdn.pnd.PndService.GetOndList:output_type -> gosdn.pnd.GetOndListResponse
-	16, // 61: gosdn.pnd.PndService.GetFlattenedOndList:output_type -> gosdn.pnd.GetFlattenedOndListResponse
-	14, // 62: gosdn.pnd.PndService.GetOnd:output_type -> gosdn.pnd.GetOndResponse
-	35, // 63: gosdn.pnd.PndService.SetOndList:output_type -> gosdn.pnd.SetOndListResponse
+	15, // 60: gosdn.pnd.PndService.GetMneList:output_type -> gosdn.pnd.GetMneListResponse
+	16, // 61: gosdn.pnd.PndService.GetFlattenedMneList:output_type -> gosdn.pnd.GetFlattenedMneListResponse
+	14, // 62: gosdn.pnd.PndService.GetMne:output_type -> gosdn.pnd.GetMneResponse
+	35, // 63: gosdn.pnd.PndService.SetMneList:output_type -> gosdn.pnd.SetMneListResponse
 	18, // 64: gosdn.pnd.PndService.GetSbiList:output_type -> gosdn.pnd.GetSbiListResponse
 	17, // 65: gosdn.pnd.PndService.GetSbi:output_type -> gosdn.pnd.GetSbiResponse
 	38, // 66: gosdn.pnd.PndService.SetSbiList:output_type -> gosdn.pnd.SetSbiListResponse
@@ -3465,7 +3465,7 @@ var file_gosdn_pnd_pnd_proto_depIdxs = []int32{
 	36, // 69: gosdn.pnd.PndService.SetChangeList:output_type -> gosdn.pnd.SetChangeListResponse
 	19, // 70: gosdn.pnd.PndService.GetPath:output_type -> gosdn.pnd.GetPathResponse
 	39, // 71: gosdn.pnd.PndService.SetPathList:output_type -> gosdn.pnd.SetPathListResponse
-	41, // 72: gosdn.pnd.PndService.DeleteOnd:output_type -> gosdn.pnd.DeleteOndResponse
+	41, // 72: gosdn.pnd.PndService.DeleteMne:output_type -> gosdn.pnd.DeleteMneResponse
 	45, // 73: gosdn.pnd.PndService.SubscribePath:output_type -> gosdn.pnd.SubscribePathResponse
 	60, // [60:74] is the sub-list for method output_type
 	46, // [46:60] is the sub-list for method input_type
@@ -3481,7 +3481,7 @@ func file_gosdn_pnd_pnd_proto_init() {
 	}
 	if !protoimpl.UnsafeEnabled {
 		file_gosdn_pnd_pnd_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetOndListRequest); i {
+			switch v := v.(*GetMneListRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3493,7 +3493,7 @@ func file_gosdn_pnd_pnd_proto_init() {
 			}
 		}
 		file_gosdn_pnd_pnd_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetOndRequest); i {
+			switch v := v.(*GetMneRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3565,7 +3565,7 @@ func file_gosdn_pnd_pnd_proto_init() {
 			}
 		}
 		file_gosdn_pnd_pnd_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetOndResponse); i {
+			switch v := v.(*GetMneResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3577,7 +3577,7 @@ func file_gosdn_pnd_pnd_proto_init() {
 			}
 		}
 		file_gosdn_pnd_pnd_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetOndListResponse); i {
+			switch v := v.(*GetMneListResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3589,7 +3589,7 @@ func file_gosdn_pnd_pnd_proto_init() {
 			}
 		}
 		file_gosdn_pnd_pnd_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetFlattenedOndListResponse); i {
+			switch v := v.(*GetFlattenedMneListResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3709,7 +3709,7 @@ func file_gosdn_pnd_pnd_proto_init() {
 			}
 		}
 		file_gosdn_pnd_pnd_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SetOndListRequest); i {
+			switch v := v.(*SetMneListRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3769,7 +3769,7 @@ func file_gosdn_pnd_pnd_proto_init() {
 			}
 		}
 		file_gosdn_pnd_pnd_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SetOnd); i {
+			switch v := v.(*SetMne); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3817,7 +3817,7 @@ func file_gosdn_pnd_pnd_proto_init() {
 			}
 		}
 		file_gosdn_pnd_pnd_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SetOndListResponse); i {
+			switch v := v.(*SetMneListResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3877,7 +3877,7 @@ func file_gosdn_pnd_pnd_proto_init() {
 			}
 		}
 		file_gosdn_pnd_pnd_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeleteOndRequest); i {
+			switch v := v.(*DeleteMneRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3889,7 +3889,7 @@ func file_gosdn_pnd_pnd_proto_init() {
 			}
 		}
 		file_gosdn_pnd_pnd_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeleteOndResponse); i {
+			switch v := v.(*DeleteMneResponse); i {
 			case 0:
 				return &v.state
 			case 1:
diff --git a/api/go/gosdn/pnd/pnd.pb.gw.go b/api/go/gosdn/pnd/pnd.pb.gw.go
index 9695a17b9ecf15cd6c83991039ae36bf4fd12f53..72ba3a55b8ba322128931c36b5306c5742347595 100644
--- a/api/go/gosdn/pnd/pnd.pb.gw.go
+++ b/api/go/gosdn/pnd/pnd.pb.gw.go
@@ -32,11 +32,11 @@ var _ = utilities.NewDoubleArray
 var _ = metadata.Join
 
 var (
-	filter_PndService_GetFlattenedOndList_0 = &utilities.DoubleArray{Encoding: map[string]int{"pid": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
+	filter_PndService_GetFlattenedMneList_0 = &utilities.DoubleArray{Encoding: map[string]int{"pid": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
 )
 
-func request_PndService_GetFlattenedOndList_0(ctx context.Context, marshaler runtime.Marshaler, client PndServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GetOndListRequest
+func request_PndService_GetFlattenedMneList_0(ctx context.Context, marshaler runtime.Marshaler, client PndServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq GetMneListRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -59,17 +59,17 @@ func request_PndService_GetFlattenedOndList_0(ctx context.Context, marshaler run
 	if err := req.ParseForm(); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_PndService_GetFlattenedOndList_0); err != nil {
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_PndService_GetFlattenedMneList_0); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
-	msg, err := client.GetFlattenedOndList(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	msg, err := client.GetFlattenedMneList(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
 }
 
-func local_request_PndService_GetFlattenedOndList_0(ctx context.Context, marshaler runtime.Marshaler, server PndServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GetOndListRequest
+func local_request_PndService_GetFlattenedMneList_0(ctx context.Context, marshaler runtime.Marshaler, server PndServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq GetMneListRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -92,21 +92,21 @@ func local_request_PndService_GetFlattenedOndList_0(ctx context.Context, marshal
 	if err := req.ParseForm(); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_PndService_GetFlattenedOndList_0); err != nil {
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_PndService_GetFlattenedMneList_0); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
-	msg, err := server.GetFlattenedOndList(ctx, &protoReq)
+	msg, err := server.GetFlattenedMneList(ctx, &protoReq)
 	return msg, metadata, err
 
 }
 
 var (
-	filter_PndService_GetOnd_0 = &utilities.DoubleArray{Encoding: map[string]int{"pid": 0, "did": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+	filter_PndService_GetMne_0 = &utilities.DoubleArray{Encoding: map[string]int{"pid": 0, "did": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
 )
 
-func request_PndService_GetOnd_0(ctx context.Context, marshaler runtime.Marshaler, client PndServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GetOndRequest
+func request_PndService_GetMne_0(ctx context.Context, marshaler runtime.Marshaler, client PndServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq GetMneRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -139,17 +139,17 @@ func request_PndService_GetOnd_0(ctx context.Context, marshaler runtime.Marshale
 	if err := req.ParseForm(); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_PndService_GetOnd_0); err != nil {
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_PndService_GetMne_0); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
-	msg, err := client.GetOnd(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	msg, err := client.GetMne(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
 }
 
-func local_request_PndService_GetOnd_0(ctx context.Context, marshaler runtime.Marshaler, server PndServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GetOndRequest
+func local_request_PndService_GetMne_0(ctx context.Context, marshaler runtime.Marshaler, server PndServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq GetMneRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -182,17 +182,17 @@ func local_request_PndService_GetOnd_0(ctx context.Context, marshaler runtime.Ma
 	if err := req.ParseForm(); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_PndService_GetOnd_0); err != nil {
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_PndService_GetMne_0); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
-	msg, err := server.GetOnd(ctx, &protoReq)
+	msg, err := server.GetMne(ctx, &protoReq)
 	return msg, metadata, err
 
 }
 
-func request_PndService_SetOndList_0(ctx context.Context, marshaler runtime.Marshaler, client PndServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq SetOndListRequest
+func request_PndService_SetMneList_0(ctx context.Context, marshaler runtime.Marshaler, client PndServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq SetMneListRequest
 	var metadata runtime.ServerMetadata
 
 	newReader, berr := utilities.IOReaderFactory(req.Body)
@@ -220,13 +220,13 @@ func request_PndService_SetOndList_0(ctx context.Context, marshaler runtime.Mars
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pid", err)
 	}
 
-	msg, err := client.SetOndList(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	msg, err := client.SetMneList(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
 }
 
-func local_request_PndService_SetOndList_0(ctx context.Context, marshaler runtime.Marshaler, server PndServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq SetOndListRequest
+func local_request_PndService_SetMneList_0(ctx context.Context, marshaler runtime.Marshaler, server PndServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq SetMneListRequest
 	var metadata runtime.ServerMetadata
 
 	newReader, berr := utilities.IOReaderFactory(req.Body)
@@ -254,7 +254,7 @@ func local_request_PndService_SetOndList_0(ctx context.Context, marshaler runtim
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "pid", err)
 	}
 
-	msg, err := server.SetOndList(ctx, &protoReq)
+	msg, err := server.SetMneList(ctx, &protoReq)
 	return msg, metadata, err
 
 }
@@ -894,11 +894,11 @@ func local_request_PndService_SetPathList_0(ctx context.Context, marshaler runti
 }
 
 var (
-	filter_PndService_DeleteOnd_0 = &utilities.DoubleArray{Encoding: map[string]int{"pid": 0, "did": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+	filter_PndService_DeleteMne_0 = &utilities.DoubleArray{Encoding: map[string]int{"pid": 0, "did": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
 )
 
-func request_PndService_DeleteOnd_0(ctx context.Context, marshaler runtime.Marshaler, client PndServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq DeleteOndRequest
+func request_PndService_DeleteMne_0(ctx context.Context, marshaler runtime.Marshaler, client PndServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq DeleteMneRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -931,17 +931,17 @@ func request_PndService_DeleteOnd_0(ctx context.Context, marshaler runtime.Marsh
 	if err := req.ParseForm(); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_PndService_DeleteOnd_0); err != nil {
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_PndService_DeleteMne_0); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
-	msg, err := client.DeleteOnd(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	msg, err := client.DeleteMne(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
 }
 
-func local_request_PndService_DeleteOnd_0(ctx context.Context, marshaler runtime.Marshaler, server PndServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq DeleteOndRequest
+func local_request_PndService_DeleteMne_0(ctx context.Context, marshaler runtime.Marshaler, server PndServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq DeleteMneRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -974,11 +974,11 @@ func local_request_PndService_DeleteOnd_0(ctx context.Context, marshaler runtime
 	if err := req.ParseForm(); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_PndService_DeleteOnd_0); err != nil {
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_PndService_DeleteMne_0); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
-	msg, err := server.DeleteOnd(ctx, &protoReq)
+	msg, err := server.DeleteMne(ctx, &protoReq)
 	return msg, metadata, err
 
 }
@@ -989,18 +989,18 @@ func local_request_PndService_DeleteOnd_0(ctx context.Context, marshaler runtime
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterPndServiceHandlerFromEndpoint instead.
 func RegisterPndServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server PndServiceServer) error {
 
-	mux.Handle("GET", pattern_PndService_GetFlattenedOndList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("GET", pattern_PndService_GetFlattenedMneList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gosdn.pnd.PndService/GetFlattenedOndList", runtime.WithHTTPPathPattern("/pnds/{pid}/onds"))
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gosdn.pnd.PndService/GetFlattenedMneList", runtime.WithHTTPPathPattern("/pnds/{pid}/mnes"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := local_request_PndService_GetFlattenedOndList_0(rctx, inboundMarshaler, server, req, pathParams)
+		resp, md, err := local_request_PndService_GetFlattenedMneList_0(rctx, inboundMarshaler, server, req, pathParams)
 		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
@@ -1008,22 +1008,22 @@ func RegisterPndServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 			return
 		}
 
-		forward_PndService_GetFlattenedOndList_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_PndService_GetFlattenedMneList_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
-	mux.Handle("GET", pattern_PndService_GetOnd_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("GET", pattern_PndService_GetMne_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gosdn.pnd.PndService/GetOnd", runtime.WithHTTPPathPattern("/pnds/{pid}/ond/{did}"))
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gosdn.pnd.PndService/GetMne", runtime.WithHTTPPathPattern("/pnds/{pid}/mne/{did}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := local_request_PndService_GetOnd_0(rctx, inboundMarshaler, server, req, pathParams)
+		resp, md, err := local_request_PndService_GetMne_0(rctx, inboundMarshaler, server, req, pathParams)
 		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
@@ -1031,22 +1031,22 @@ func RegisterPndServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 			return
 		}
 
-		forward_PndService_GetOnd_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_PndService_GetMne_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
-	mux.Handle("POST", pattern_PndService_SetOndList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("POST", pattern_PndService_SetMneList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gosdn.pnd.PndService/SetOndList", runtime.WithHTTPPathPattern("/pnds/{pid}/onds"))
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gosdn.pnd.PndService/SetMneList", runtime.WithHTTPPathPattern("/pnds/{pid}/mnes"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := local_request_PndService_SetOndList_0(rctx, inboundMarshaler, server, req, pathParams)
+		resp, md, err := local_request_PndService_SetMneList_0(rctx, inboundMarshaler, server, req, pathParams)
 		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
@@ -1054,7 +1054,7 @@ func RegisterPndServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 			return
 		}
 
-		forward_PndService_SetOndList_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_PndService_SetMneList_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
@@ -1202,7 +1202,7 @@ func RegisterPndServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gosdn.pnd.PndService/GetPath", runtime.WithHTTPPathPattern("/pnds/{pid}/onds/{did}/paths/{path}"))
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gosdn.pnd.PndService/GetPath", runtime.WithHTTPPathPattern("/pnds/{pid}/mnes/{did}/paths/{path}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -1225,7 +1225,7 @@ func RegisterPndServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gosdn.pnd.PndService/SetPathList", runtime.WithHTTPPathPattern("/pnds/{pid}/onds/paths"))
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gosdn.pnd.PndService/SetPathList", runtime.WithHTTPPathPattern("/pnds/{pid}/mnes/paths"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -1242,18 +1242,18 @@ func RegisterPndServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 
 	})
 
-	mux.Handle("DELETE", pattern_PndService_DeleteOnd_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("DELETE", pattern_PndService_DeleteMne_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gosdn.pnd.PndService/DeleteOnd", runtime.WithHTTPPathPattern("/pnds/{pid}/onds/{did}"))
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gosdn.pnd.PndService/DeleteMne", runtime.WithHTTPPathPattern("/pnds/{pid}/mnes/{did}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := local_request_PndService_DeleteOnd_0(rctx, inboundMarshaler, server, req, pathParams)
+		resp, md, err := local_request_PndService_DeleteMne_0(rctx, inboundMarshaler, server, req, pathParams)
 		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
@@ -1261,7 +1261,7 @@ func RegisterPndServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 			return
 		}
 
-		forward_PndService_DeleteOnd_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_PndService_DeleteMne_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
@@ -1306,63 +1306,63 @@ func RegisterPndServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn
 // "PndServiceClient" to call the correct interceptors.
 func RegisterPndServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client PndServiceClient) error {
 
-	mux.Handle("GET", pattern_PndService_GetFlattenedOndList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("GET", pattern_PndService_GetFlattenedMneList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/gosdn.pnd.PndService/GetFlattenedOndList", runtime.WithHTTPPathPattern("/pnds/{pid}/onds"))
+		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/gosdn.pnd.PndService/GetFlattenedMneList", runtime.WithHTTPPathPattern("/pnds/{pid}/mnes"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_PndService_GetFlattenedOndList_0(rctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_PndService_GetFlattenedMneList_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
 
-		forward_PndService_GetFlattenedOndList_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_PndService_GetFlattenedMneList_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
-	mux.Handle("GET", pattern_PndService_GetOnd_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("GET", pattern_PndService_GetMne_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/gosdn.pnd.PndService/GetOnd", runtime.WithHTTPPathPattern("/pnds/{pid}/ond/{did}"))
+		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/gosdn.pnd.PndService/GetMne", runtime.WithHTTPPathPattern("/pnds/{pid}/mne/{did}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_PndService_GetOnd_0(rctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_PndService_GetMne_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
 
-		forward_PndService_GetOnd_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_PndService_GetMne_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
-	mux.Handle("POST", pattern_PndService_SetOndList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("POST", pattern_PndService_SetMneList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/gosdn.pnd.PndService/SetOndList", runtime.WithHTTPPathPattern("/pnds/{pid}/onds"))
+		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/gosdn.pnd.PndService/SetMneList", runtime.WithHTTPPathPattern("/pnds/{pid}/mnes"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_PndService_SetOndList_0(rctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_PndService_SetMneList_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
 
-		forward_PndService_SetOndList_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_PndService_SetMneList_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
@@ -1490,7 +1490,7 @@ func RegisterPndServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/gosdn.pnd.PndService/GetPath", runtime.WithHTTPPathPattern("/pnds/{pid}/onds/{did}/paths/{path}"))
+		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/gosdn.pnd.PndService/GetPath", runtime.WithHTTPPathPattern("/pnds/{pid}/mnes/{did}/paths/{path}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -1510,7 +1510,7 @@ func RegisterPndServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/gosdn.pnd.PndService/SetPathList", runtime.WithHTTPPathPattern("/pnds/{pid}/onds/paths"))
+		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/gosdn.pnd.PndService/SetPathList", runtime.WithHTTPPathPattern("/pnds/{pid}/mnes/paths"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -1526,23 +1526,23 @@ func RegisterPndServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
 
 	})
 
-	mux.Handle("DELETE", pattern_PndService_DeleteOnd_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("DELETE", pattern_PndService_DeleteMne_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/gosdn.pnd.PndService/DeleteOnd", runtime.WithHTTPPathPattern("/pnds/{pid}/onds/{did}"))
+		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/gosdn.pnd.PndService/DeleteMne", runtime.WithHTTPPathPattern("/pnds/{pid}/mnes/{did}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_PndService_DeleteOnd_0(rctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_PndService_DeleteMne_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
 
-		forward_PndService_DeleteOnd_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_PndService_DeleteMne_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
@@ -1550,11 +1550,11 @@ func RegisterPndServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
 }
 
 var (
-	pattern_PndService_GetFlattenedOndList_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"pnds", "pid", "onds"}, ""))
+	pattern_PndService_GetFlattenedMneList_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"pnds", "pid", "mnes"}, ""))
 
-	pattern_PndService_GetOnd_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"pnds", "pid", "ond", "did"}, ""))
+	pattern_PndService_GetMne_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"pnds", "pid", "mne", "did"}, ""))
 
-	pattern_PndService_SetOndList_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"pnds", "pid", "onds"}, ""))
+	pattern_PndService_SetMneList_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"pnds", "pid", "mnes"}, ""))
 
 	pattern_PndService_GetSbiList_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"pnds", "pid", "sbis"}, ""))
 
@@ -1568,19 +1568,19 @@ var (
 
 	pattern_PndService_SetChangeList_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"pnds", "pid", "changes"}, ""))
 
-	pattern_PndService_GetPath_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"pnds", "pid", "onds", "did", "paths", "path"}, ""))
+	pattern_PndService_GetPath_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"pnds", "pid", "mnes", "did", "paths", "path"}, ""))
 
-	pattern_PndService_SetPathList_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2, 2, 3}, []string{"pnds", "pid", "onds", "paths"}, ""))
+	pattern_PndService_SetPathList_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2, 2, 3}, []string{"pnds", "pid", "mnes", "paths"}, ""))
 
-	pattern_PndService_DeleteOnd_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"pnds", "pid", "onds", "did"}, ""))
+	pattern_PndService_DeleteMne_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"pnds", "pid", "mnes", "did"}, ""))
 )
 
 var (
-	forward_PndService_GetFlattenedOndList_0 = runtime.ForwardResponseMessage
+	forward_PndService_GetFlattenedMneList_0 = runtime.ForwardResponseMessage
 
-	forward_PndService_GetOnd_0 = runtime.ForwardResponseMessage
+	forward_PndService_GetMne_0 = runtime.ForwardResponseMessage
 
-	forward_PndService_SetOndList_0 = runtime.ForwardResponseMessage
+	forward_PndService_SetMneList_0 = runtime.ForwardResponseMessage
 
 	forward_PndService_GetSbiList_0 = runtime.ForwardResponseMessage
 
@@ -1598,5 +1598,5 @@ var (
 
 	forward_PndService_SetPathList_0 = runtime.ForwardResponseMessage
 
-	forward_PndService_DeleteOnd_0 = runtime.ForwardResponseMessage
+	forward_PndService_DeleteMne_0 = runtime.ForwardResponseMessage
 )
diff --git a/api/go/gosdn/pnd/pnd_grpc.pb.go b/api/go/gosdn/pnd/pnd_grpc.pb.go
index 977456c2a3623a5bb813d926f967e811e0298add..0a76d4fe506274046a276c84e8089fda2df85d47 100644
--- a/api/go/gosdn/pnd/pnd_grpc.pb.go
+++ b/api/go/gosdn/pnd/pnd_grpc.pb.go
@@ -18,22 +18,22 @@ const _ = grpc.SupportPackageIsVersion7
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type PndServiceClient interface {
-	// Allows to request all Orchestrated Networking Devices (OND) which are
+	// Allows to request all Managed Network Elements (MNE) which are
 	// managed by a specific Principal Network Domain.
-	// Full ONDs are provided, which also includes the OND config as gNMI
+	// Full MNEs are provided, which also includes the MNE config as gNMI
 	// notification.
-	GetOndList(ctx context.Context, in *GetOndListRequest, opts ...grpc.CallOption) (*GetOndListResponse, error)
-	// Allows to request all Orchestrated Networking Devices (OND) which are
+	GetMneList(ctx context.Context, in *GetMneListRequest, opts ...grpc.CallOption) (*GetMneListResponse, error)
+	// Allows to request all Managed Network Elements (MNE) which are
 	// managed by a specific Principal Network Domain.
-	// Flattened ONDs are provided, which does not include the OND config as gNMI
+	// Flattened MNEs are provided, which does not include the MNE config as gNMI
 	// notification.
-	GetFlattenedOndList(ctx context.Context, in *GetOndListRequest, opts ...grpc.CallOption) (*GetFlattenedOndListResponse, error)
-	// Allows to request a specific Orchestrated Networking Device which is managed by a
+	GetFlattenedMneList(ctx context.Context, in *GetMneListRequest, opts ...grpc.CallOption) (*GetFlattenedMneListResponse, error)
+	// Allows to request a specific Managed Network Element which is managed by a
 	// specific Principal Network Domain.
-	GetOnd(ctx context.Context, in *GetOndRequest, opts ...grpc.CallOption) (*GetOndResponse, error)
-	// Allows add multiple Orchestrated Networking Devices to be managed by a
+	GetMne(ctx context.Context, in *GetMneRequest, opts ...grpc.CallOption) (*GetMneResponse, error)
+	// Allows to add multiple Managed Network Elements to be managed by a
 	// specific Principal Network Domain.
-	SetOndList(ctx context.Context, in *SetOndListRequest, opts ...grpc.CallOption) (*SetOndListResponse, error)
+	SetMneList(ctx context.Context, in *SetMneListRequest, opts ...grpc.CallOption) (*SetMneListResponse, error)
 	// Allows to request all Southbound Interfaces a specific Principal Network
 	// Domain supports.
 	GetSbiList(ctx context.Context, in *GetSbiListRequest, opts ...grpc.CallOption) (*GetSbiListResponse, error)
@@ -49,16 +49,16 @@ type PndServiceClient interface {
 	GetChange(ctx context.Context, in *GetChangeRequest, opts ...grpc.CallOption) (*GetChangeResponse, error)
 	// Allows to operate on multiple Changes registered for a specific Principal Network Domain.
 	SetChangeList(ctx context.Context, in *SetChangeListRequest, opts ...grpc.CallOption) (*SetChangeListResponse, error)
-	// Allows to request a specific Path of a Orchestrated Networking Device,
+	// Allows to request a specific Path of a Managed Network Element,
 	// managed by a specific Principal Network Domain.
 	GetPath(ctx context.Context, in *GetPathRequest, opts ...grpc.CallOption) (*GetPathResponse, error)
-	// Allows to set a specific Path of a Orchestrated Networking Device,
+	// Allows to set a specific Path of a Managed Network Element,
 	// managed by a specific Principal Network Domain.
 	SetPathList(ctx context.Context, in *SetPathListRequest, opts ...grpc.CallOption) (*SetPathListResponse, error)
-	// Allows to delete a specific Orchestrated Networking Device which is managed by a
+	// Allows to delete a specific Managed Network Element which is managed by a
 	// specific Principal Network Domain.
-	DeleteOnd(ctx context.Context, in *DeleteOndRequest, opts ...grpc.CallOption) (*DeleteOndResponse, error)
-	// Allows to subscribe to multiple paths of an Orchestrated Networking Device which is
+	DeleteMne(ctx context.Context, in *DeleteMneRequest, opts ...grpc.CallOption) (*DeleteMneResponse, error)
+	// Allows to subscribe to multiple paths of a Managed Network Element which is
 	// managed by a specific Principal Network Domain and streams data depending on the subscribe
 	// method.
 	SubscribePath(ctx context.Context, in *SubscribePathRequest, opts ...grpc.CallOption) (PndService_SubscribePathClient, error)
@@ -72,36 +72,36 @@ func NewPndServiceClient(cc grpc.ClientConnInterface) PndServiceClient {
 	return &pndServiceClient{cc}
 }
 
-func (c *pndServiceClient) GetOndList(ctx context.Context, in *GetOndListRequest, opts ...grpc.CallOption) (*GetOndListResponse, error) {
-	out := new(GetOndListResponse)
-	err := c.cc.Invoke(ctx, "/gosdn.pnd.PndService/GetOndList", in, out, opts...)
+func (c *pndServiceClient) GetMneList(ctx context.Context, in *GetMneListRequest, opts ...grpc.CallOption) (*GetMneListResponse, error) {
+	out := new(GetMneListResponse)
+	err := c.cc.Invoke(ctx, "/gosdn.pnd.PndService/GetMneList", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *pndServiceClient) GetFlattenedOndList(ctx context.Context, in *GetOndListRequest, opts ...grpc.CallOption) (*GetFlattenedOndListResponse, error) {
-	out := new(GetFlattenedOndListResponse)
-	err := c.cc.Invoke(ctx, "/gosdn.pnd.PndService/GetFlattenedOndList", in, out, opts...)
+func (c *pndServiceClient) GetFlattenedMneList(ctx context.Context, in *GetMneListRequest, opts ...grpc.CallOption) (*GetFlattenedMneListResponse, error) {
+	out := new(GetFlattenedMneListResponse)
+	err := c.cc.Invoke(ctx, "/gosdn.pnd.PndService/GetFlattenedMneList", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *pndServiceClient) GetOnd(ctx context.Context, in *GetOndRequest, opts ...grpc.CallOption) (*GetOndResponse, error) {
-	out := new(GetOndResponse)
-	err := c.cc.Invoke(ctx, "/gosdn.pnd.PndService/GetOnd", in, out, opts...)
+func (c *pndServiceClient) GetMne(ctx context.Context, in *GetMneRequest, opts ...grpc.CallOption) (*GetMneResponse, error) {
+	out := new(GetMneResponse)
+	err := c.cc.Invoke(ctx, "/gosdn.pnd.PndService/GetMne", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *pndServiceClient) SetOndList(ctx context.Context, in *SetOndListRequest, opts ...grpc.CallOption) (*SetOndListResponse, error) {
-	out := new(SetOndListResponse)
-	err := c.cc.Invoke(ctx, "/gosdn.pnd.PndService/SetOndList", in, out, opts...)
+func (c *pndServiceClient) SetMneList(ctx context.Context, in *SetMneListRequest, opts ...grpc.CallOption) (*SetMneListResponse, error) {
+	out := new(SetMneListResponse)
+	err := c.cc.Invoke(ctx, "/gosdn.pnd.PndService/SetMneList", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -180,9 +180,9 @@ func (c *pndServiceClient) SetPathList(ctx context.Context, in *SetPathListReque
 	return out, nil
 }
 
-func (c *pndServiceClient) DeleteOnd(ctx context.Context, in *DeleteOndRequest, opts ...grpc.CallOption) (*DeleteOndResponse, error) {
-	out := new(DeleteOndResponse)
-	err := c.cc.Invoke(ctx, "/gosdn.pnd.PndService/DeleteOnd", in, out, opts...)
+func (c *pndServiceClient) DeleteMne(ctx context.Context, in *DeleteMneRequest, opts ...grpc.CallOption) (*DeleteMneResponse, error) {
+	out := new(DeleteMneResponse)
+	err := c.cc.Invoke(ctx, "/gosdn.pnd.PndService/DeleteMne", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -225,22 +225,22 @@ func (x *pndServiceSubscribePathClient) Recv() (*SubscribePathResponse, error) {
 // All implementations must embed UnimplementedPndServiceServer
 // for forward compatibility
 type PndServiceServer interface {
-	// Allows to request all Orchestrated Networking Devices (OND) which are
+	// Allows to request all Managed Network Elements (MNE) which are
 	// managed by a specific Principal Network Domain.
-	// Full ONDs are provided, which also includes the OND config as gNMI
+	// Full MNEs are provided, which also includes the MNE config as gNMI
 	// notification.
-	GetOndList(context.Context, *GetOndListRequest) (*GetOndListResponse, error)
-	// Allows to request all Orchestrated Networking Devices (OND) which are
+	GetMneList(context.Context, *GetMneListRequest) (*GetMneListResponse, error)
+	// Allows to request all Managed Network Elements (MNE) which are
 	// managed by a specific Principal Network Domain.
-	// Flattened ONDs are provided, which does not include the OND config as gNMI
+	// Flattened MNEs are provided, which does not include the MNE config as gNMI
 	// notification.
-	GetFlattenedOndList(context.Context, *GetOndListRequest) (*GetFlattenedOndListResponse, error)
-	// Allows to request a specific Orchestrated Networking Device which is managed by a
+	GetFlattenedMneList(context.Context, *GetMneListRequest) (*GetFlattenedMneListResponse, error)
+	// Allows to request a specific Managed Network Element which is managed by a
 	// specific Principal Network Domain.
-	GetOnd(context.Context, *GetOndRequest) (*GetOndResponse, error)
-	// Allows add multiple Orchestrated Networking Devices to be managed by a
+	GetMne(context.Context, *GetMneRequest) (*GetMneResponse, error)
+	// Allows to add multiple Managed Network Elements to be managed by a
 	// specific Principal Network Domain.
-	SetOndList(context.Context, *SetOndListRequest) (*SetOndListResponse, error)
+	SetMneList(context.Context, *SetMneListRequest) (*SetMneListResponse, error)
 	// Allows to request all Southbound Interfaces a specific Principal Network
 	// Domain supports.
 	GetSbiList(context.Context, *GetSbiListRequest) (*GetSbiListResponse, error)
@@ -256,16 +256,16 @@ type PndServiceServer interface {
 	GetChange(context.Context, *GetChangeRequest) (*GetChangeResponse, error)
 	// Allows to operate on multiple Changes registered for a specific Principal Network Domain.
 	SetChangeList(context.Context, *SetChangeListRequest) (*SetChangeListResponse, error)
-	// Allows to request a specific Path of a Orchestrated Networking Device,
+	// Allows to request a specific Path of a Managed Network Element,
 	// managed by a specific Principal Network Domain.
 	GetPath(context.Context, *GetPathRequest) (*GetPathResponse, error)
-	// Allows to set a specific Path of a Orchestrated Networking Device,
+	// Allows to set a specific Path of a Managed Network Element,
 	// managed by a specific Principal Network Domain.
 	SetPathList(context.Context, *SetPathListRequest) (*SetPathListResponse, error)
-	// Allows to delete a specific Orchestrated Networking Device which is managed by a
+	// Allows to delete a specific Managed Network Element which is managed by a
 	// specific Principal Network Domain.
-	DeleteOnd(context.Context, *DeleteOndRequest) (*DeleteOndResponse, error)
-	// Allows to subscribe to multiple paths of an Orchestrated Networking Device which is
+	DeleteMne(context.Context, *DeleteMneRequest) (*DeleteMneResponse, error)
+	// Allows to subscribe to multiple paths of a Managed Network Element which is
 	// managed by a specific Principal Network Domain and streams data depending on the subscribe
 	// method.
 	SubscribePath(*SubscribePathRequest, PndService_SubscribePathServer) error
@@ -276,17 +276,17 @@ type PndServiceServer interface {
 type UnimplementedPndServiceServer struct {
 }
 
-func (UnimplementedPndServiceServer) GetOndList(context.Context, *GetOndListRequest) (*GetOndListResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetOndList not implemented")
+func (UnimplementedPndServiceServer) GetMneList(context.Context, *GetMneListRequest) (*GetMneListResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetMneList not implemented")
 }
-func (UnimplementedPndServiceServer) GetFlattenedOndList(context.Context, *GetOndListRequest) (*GetFlattenedOndListResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetFlattenedOndList not implemented")
+func (UnimplementedPndServiceServer) GetFlattenedMneList(context.Context, *GetMneListRequest) (*GetFlattenedMneListResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetFlattenedMneList not implemented")
 }
-func (UnimplementedPndServiceServer) GetOnd(context.Context, *GetOndRequest) (*GetOndResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetOnd not implemented")
+func (UnimplementedPndServiceServer) GetMne(context.Context, *GetMneRequest) (*GetMneResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetMne not implemented")
 }
-func (UnimplementedPndServiceServer) SetOndList(context.Context, *SetOndListRequest) (*SetOndListResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SetOndList not implemented")
+func (UnimplementedPndServiceServer) SetMneList(context.Context, *SetMneListRequest) (*SetMneListResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SetMneList not implemented")
 }
 func (UnimplementedPndServiceServer) GetSbiList(context.Context, *GetSbiListRequest) (*GetSbiListResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetSbiList not implemented")
@@ -312,8 +312,8 @@ func (UnimplementedPndServiceServer) GetPath(context.Context, *GetPathRequest) (
 func (UnimplementedPndServiceServer) SetPathList(context.Context, *SetPathListRequest) (*SetPathListResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetPathList not implemented")
 }
-func (UnimplementedPndServiceServer) DeleteOnd(context.Context, *DeleteOndRequest) (*DeleteOndResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method DeleteOnd not implemented")
+func (UnimplementedPndServiceServer) DeleteMne(context.Context, *DeleteMneRequest) (*DeleteMneResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method DeleteMne not implemented")
 }
 func (UnimplementedPndServiceServer) SubscribePath(*SubscribePathRequest, PndService_SubscribePathServer) error {
 	return status.Errorf(codes.Unimplemented, "method SubscribePath not implemented")
@@ -331,74 +331,74 @@ func RegisterPndServiceServer(s grpc.ServiceRegistrar, srv PndServiceServer) {
 	s.RegisterService(&PndService_ServiceDesc, srv)
 }
 
-func _PndService_GetOndList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetOndListRequest)
+func _PndService_GetMneList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetMneListRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(PndServiceServer).GetOndList(ctx, in)
+		return srv.(PndServiceServer).GetMneList(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/gosdn.pnd.PndService/GetOndList",
+		FullMethod: "/gosdn.pnd.PndService/GetMneList",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PndServiceServer).GetOndList(ctx, req.(*GetOndListRequest))
+		return srv.(PndServiceServer).GetMneList(ctx, req.(*GetMneListRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _PndService_GetFlattenedOndList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetOndListRequest)
+func _PndService_GetFlattenedMneList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetMneListRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(PndServiceServer).GetFlattenedOndList(ctx, in)
+		return srv.(PndServiceServer).GetFlattenedMneList(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/gosdn.pnd.PndService/GetFlattenedOndList",
+		FullMethod: "/gosdn.pnd.PndService/GetFlattenedMneList",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PndServiceServer).GetFlattenedOndList(ctx, req.(*GetOndListRequest))
+		return srv.(PndServiceServer).GetFlattenedMneList(ctx, req.(*GetMneListRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _PndService_GetOnd_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetOndRequest)
+func _PndService_GetMne_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetMneRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(PndServiceServer).GetOnd(ctx, in)
+		return srv.(PndServiceServer).GetMne(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/gosdn.pnd.PndService/GetOnd",
+		FullMethod: "/gosdn.pnd.PndService/GetMne",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PndServiceServer).GetOnd(ctx, req.(*GetOndRequest))
+		return srv.(PndServiceServer).GetMne(ctx, req.(*GetMneRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _PndService_SetOndList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetOndListRequest)
+func _PndService_SetMneList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetMneListRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(PndServiceServer).SetOndList(ctx, in)
+		return srv.(PndServiceServer).SetMneList(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/gosdn.pnd.PndService/SetOndList",
+		FullMethod: "/gosdn.pnd.PndService/SetMneList",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PndServiceServer).SetOndList(ctx, req.(*SetOndListRequest))
+		return srv.(PndServiceServer).SetMneList(ctx, req.(*SetMneListRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -547,20 +547,20 @@ func _PndService_SetPathList_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }
 
-func _PndService_DeleteOnd_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteOndRequest)
+func _PndService_DeleteMne_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteMneRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(PndServiceServer).DeleteOnd(ctx, in)
+		return srv.(PndServiceServer).DeleteMne(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/gosdn.pnd.PndService/DeleteOnd",
+		FullMethod: "/gosdn.pnd.PndService/DeleteMne",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PndServiceServer).DeleteOnd(ctx, req.(*DeleteOndRequest))
+		return srv.(PndServiceServer).DeleteMne(ctx, req.(*DeleteMneRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -594,20 +594,20 @@ var PndService_ServiceDesc = grpc.ServiceDesc{
 	HandlerType: (*PndServiceServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
-			MethodName: "GetOndList",
-			Handler:    _PndService_GetOndList_Handler,
+			MethodName: "GetMneList",
+			Handler:    _PndService_GetMneList_Handler,
 		},
 		{
-			MethodName: "GetFlattenedOndList",
-			Handler:    _PndService_GetFlattenedOndList_Handler,
+			MethodName: "GetFlattenedMneList",
+			Handler:    _PndService_GetFlattenedMneList_Handler,
 		},
 		{
-			MethodName: "GetOnd",
-			Handler:    _PndService_GetOnd_Handler,
+			MethodName: "GetMne",
+			Handler:    _PndService_GetMne_Handler,
 		},
 		{
-			MethodName: "SetOndList",
-			Handler:    _PndService_SetOndList_Handler,
+			MethodName: "SetMneList",
+			Handler:    _PndService_SetMneList_Handler,
 		},
 		{
 			MethodName: "GetSbiList",
@@ -642,8 +642,8 @@ var PndService_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _PndService_SetPathList_Handler,
 		},
 		{
-			MethodName: "DeleteOnd",
-			Handler:    _PndService_DeleteOnd_Handler,
+			MethodName: "DeleteMne",
+			Handler:    _PndService_DeleteMne_Handler,
 		},
 	},
 	Streams: []grpc.StreamDesc{
diff --git a/api/openapiv2/gosdn_northbound.swagger.json b/api/openapiv2/gosdn_northbound.swagger.json
index 495860b55ae168ab21b7a500a3f23dbe6c39f0d3..b36342fea5d3487eee43ce1decf2e7fddbc5105d 100644
--- a/api/openapiv2/gosdn_northbound.swagger.json
+++ b/api/openapiv2/gosdn_northbound.swagger.json
@@ -536,15 +536,15 @@
         ]
       }
     },
-    "/pnds/{pid}/ond/{did}": {
+    "/pnds/{pid}/mne/{did}": {
       "get": {
-        "summary": "Allows to request a specific Orchestrated Networking Device which is managed by a\nspecific Principal Network Domain.",
-        "operationId": "PndService_GetOnd",
+        "summary": "Allows to request a specific Managed Network Element which is managed by a\nspecific Principal Network Domain.",
+        "operationId": "PndService_GetMne",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/pndGetOndResponse"
+              "$ref": "#/definitions/pndGetMneResponse"
             }
           },
           "default": {
@@ -580,15 +580,15 @@
         ]
       }
     },
-    "/pnds/{pid}/onds": {
+    "/pnds/{pid}/mnes": {
       "get": {
-        "summary": "Allows to request all Orchestrated Networking Devices (OND) which are\nmanaged by a specific Principal Network Domain.\nFlattened ONDs are provided, which does not include the OND config as gNMI\nnotification.",
-        "operationId": "PndService_GetFlattenedOndList",
+        "summary": "Allows to request all Managed Network Elements (MNE) which are\nmanaged by a specific Principal Network Domain.\nFlattened MNEs are provided, which does not include the MNE config as gNMI\nnotification.",
+        "operationId": "PndService_GetFlattenedMneList",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/pndGetFlattenedOndListResponse"
+              "$ref": "#/definitions/pndGetFlattenedMneListResponse"
             }
           },
           "default": {
@@ -618,13 +618,13 @@
         ]
       },
       "post": {
-        "summary": "Allows add multiple Orchestrated Networking Devices to be managed by a\nspecific Principal Network Domain.",
-        "operationId": "PndService_SetOndList",
+        "summary": "Allows to add multiple Managed Network Elements to be managed by a\nspecific Principal Network Domain.",
+        "operationId": "PndService_SetMneList",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/pndSetOndListResponse"
+              "$ref": "#/definitions/pndSetMneListResponse"
             }
           },
           "default": {
@@ -652,10 +652,10 @@
                   "type": "string",
                   "format": "int64"
                 },
-                "ond": {
+                "mne": {
                   "type": "array",
                   "items": {
-                    "$ref": "#/definitions/pndSetOnd"
+                    "$ref": "#/definitions/pndSetMne"
                   }
                 }
               }
@@ -667,9 +667,9 @@
         ]
       }
     },
-    "/pnds/{pid}/onds/paths": {
+    "/pnds/{pid}/mnes/paths": {
       "post": {
-        "summary": "Allows to set a specific Path of a Orchestrated Networking Device,\nmanaged by a specific Principal Network Domain.",
+        "summary": "Allows to set a specific Path of a Managed Network Element,\nmanaged by a specific Principal Network Domain.",
         "operationId": "PndService_SetPathList",
         "responses": {
           "200": {
@@ -718,15 +718,15 @@
         ]
       }
     },
-    "/pnds/{pid}/onds/{did}": {
+    "/pnds/{pid}/mnes/{did}": {
       "delete": {
-        "summary": "Allows to delete a specific Orchestrated Networking Device which is managed by a\nspecific Principal Network Domain.",
-        "operationId": "PndService_DeleteOnd",
+        "summary": "Allows to delete a specific Managed Network Element which is managed by a\nspecific Principal Network Domain.",
+        "operationId": "PndService_DeleteMne",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/pndDeleteOndResponse"
+              "$ref": "#/definitions/pndDeleteMneResponse"
             }
           },
           "default": {
@@ -762,9 +762,9 @@
         ]
       }
     },
-    "/pnds/{pid}/onds/{did}/paths/{path}": {
+    "/pnds/{pid}/mnes/{did}/paths/{path}": {
       "get": {
-        "summary": "Allows to request a specific Path of a Orchestrated Networking Device,\nmanaged by a specific Principal Network Domain.",
+        "summary": "Allows to request a specific Path of a Managed Network Element,\nmanaged by a specific Principal Network Domain.",
         "operationId": "PndService_GetPath",
         "responses": {
           "200": {
@@ -3062,7 +3062,7 @@
       ],
       "default": "CHANGE_STATE_UNSPECIFIED"
     },
-    "pndDeleteOndResponse": {
+    "pndDeleteMneResponse": {
       "type": "object",
       "properties": {
         "timestamp": {
@@ -3126,7 +3126,7 @@
         }
       }
     },
-    "pndGetFlattenedOndListResponse": {
+    "pndGetFlattenedMneListResponse": {
       "type": "object",
       "properties": {
         "timestamp": {
@@ -3137,7 +3137,7 @@
           "$ref": "#/definitions/pndPrincipalNetworkDomain",
           "description": "TODO: Check if this is really needed. Perhaps a reference to the PND's ID\nis also sufficient."
         },
-        "ond": {
+        "mne": {
           "type": "array",
           "items": {
             "$ref": "#/definitions/pndFlattenedOrchestratedNetworkingDevice"
@@ -3145,7 +3145,7 @@
         }
       }
     },
-    "pndGetOndListResponse": {
+    "pndGetMneListResponse": {
       "type": "object",
       "properties": {
         "timestamp": {
@@ -3156,7 +3156,7 @@
           "$ref": "#/definitions/pndPrincipalNetworkDomain",
           "description": "TODO: Check if this is really needed. Perhaps a reference to the PND's ID\nis also sufficient."
         },
-        "ond": {
+        "mne": {
           "type": "array",
           "items": {
             "$ref": "#/definitions/pndOrchestratedNetworkingDevice"
@@ -3164,7 +3164,7 @@
         }
       }
     },
-    "pndGetOndResponse": {
+    "pndGetMneResponse": {
       "type": "object",
       "properties": {
         "timestamp": {
@@ -3175,7 +3175,7 @@
           "$ref": "#/definitions/pndPrincipalNetworkDomain",
           "description": "TODO: Check if this is really needed. Perhaps a reference to the PND's ID\nis also sufficient."
         },
-        "ond": {
+        "mne": {
           "$ref": "#/definitions/pndOrchestratedNetworkingDevice"
         }
       }
@@ -3307,7 +3307,7 @@
         }
       }
     },
-    "pndSetOnd": {
+    "pndSetMne": {
       "type": "object",
       "properties": {
         "address": {
@@ -3324,7 +3324,7 @@
         }
       }
     },
-    "pndSetOndListResponse": {
+    "pndSetMneListResponse": {
       "type": "object",
       "properties": {
         "timestamp": {
diff --git a/api/proto/buf.lock b/api/proto/buf.lock
index f2c6b32b763108033f9799d4cd4e26d0e718ba71..2465567c883f4786345200473e6eb5fae9f36f1e 100644
--- a/api/proto/buf.lock
+++ b/api/proto/buf.lock
@@ -4,7 +4,7 @@ deps:
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: 8d7204855ec14631a499bd7393ce1970
+    commit: e9fcfb66f77242e5b8fd4564d7a01033
   - remote: buf.build
     owner: grpc-ecosystem
     repository: grpc-gateway
diff --git a/api/proto/gosdn/pnd/pnd.proto b/api/proto/gosdn/pnd/pnd.proto
index eda964a0ca610b825f9c82ddf4e7d704cbcbd1a5..e88dcfa202874ba6a6c45f87bacf02a168a4f756 100644
--- a/api/proto/gosdn/pnd/pnd.proto
+++ b/api/proto/gosdn/pnd/pnd.proto
@@ -29,33 +29,33 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
 };
 
 service PndService {
-  // Allows to request all Orchestrated Networking Devices (OND) which are
+  // Allows to request all Managed Network Elements (MNE) which are
   // managed by a specific Principal Network Domain.
-  // Full ONDs are provided, which also includes the OND config as gNMI
+  // Full MNEs are provided, which also includes the MNE config as gNMI
   // notification.
-  rpc GetOndList(GetOndListRequest) returns (GetOndListResponse);
+  rpc GetMneList(GetMneListRequest) returns (GetMneListResponse);
 
-  // Allows to request all Orchestrated Networking Devices (OND) which are
+  // Allows to request all Managed Network Elements (MNE) which are
   // managed by a specific Principal Network Domain.
-  // Flattened ONDs are provided, which does not include the OND config as gNMI
+  // Flattened MNEs are provided, which does not include the MNE config as gNMI
   // notification.
-  rpc GetFlattenedOndList(GetOndListRequest) returns (GetFlattenedOndListResponse) {
+  rpc GetFlattenedMneList(GetMneListRequest) returns (GetFlattenedMneListResponse) {
     option (google.api.http) = {
-      get: "/pnds/{pid}/onds"
+      get: "/pnds/{pid}/mnes"
     };
   }
-  // Allows to request a specific Orchestrated Networking Device which is managed by a
+  // Allows to request a specific Managed Network Element which is managed by a
   // specific Principal Network Domain.
-  rpc GetOnd(GetOndRequest) returns (GetOndResponse) {
+  rpc GetMne(GetMneRequest) returns (GetMneResponse) {
     option (google.api.http) = {
-      get: "/pnds/{pid}/ond/{did}"
+      get: "/pnds/{pid}/mne/{did}"
     };
   }
-  // Allows add multiple Orchestrated Networking Devices to be managed by a
+  // Allows to add multiple Managed Network Elements to be managed by a
   // specific Principal Network Domain.
-  rpc SetOndList(SetOndListRequest) returns (SetOndListResponse) {
+  rpc SetMneList(SetMneListRequest) returns (SetMneListResponse) {
     option (google.api.http) = {
-      post: "/pnds/{pid}/onds"
+      post: "/pnds/{pid}/mnes"
       body: "*"
     };
   }
@@ -100,40 +100,40 @@ service PndService {
       body: "*"
     };
   }
-  // Allows to request a specific Path of a Orchestrated Networking Device,
+  // Allows to request a specific Path of a Managed Network Element,
   // managed by a specific Principal Network Domain.
   rpc GetPath(GetPathRequest) returns (GetPathResponse) {
     option (google.api.http) = {
-      get: "/pnds/{pid}/onds/{did}/paths/{path}"
+      get: "/pnds/{pid}/mnes/{did}/paths/{path}"
     };
   }
-  // Allows to set a specific Path of a Orchestrated Networking Device,
+  // Allows to set a specific Path of a Managed Network Element,
   // managed by a specific Principal Network Domain.
   rpc SetPathList(SetPathListRequest) returns (SetPathListResponse) {
     option (google.api.http) = {
-      post: "/pnds/{pid}/onds/paths"
+      post: "/pnds/{pid}/mnes/paths"
       body: "*"
     };
   }
-  // Allows to delete a specific Orchestrated Networking Device which is managed by a
+  // Allows to delete a specific Managed Network Element which is managed by a
   // specific Principal Network Domain.
-  rpc DeleteOnd(DeleteOndRequest) returns (DeleteOndResponse) {
+  rpc DeleteMne(DeleteMneRequest) returns (DeleteMneResponse) {
     option (google.api.http) = {
-      delete: "/pnds/{pid}/onds/{did}"
+      delete: "/pnds/{pid}/mnes/{did}"
     };
   }
-  // Allows to subscribe to multiple paths of an Orchestrated Networking Device which is
+  // Allows to subscribe to multiple paths of a Managed Network Element which is
   // managed by a specific Principal Network Domain and streams data depending on the subscribe
   // method.
   rpc SubscribePath(SubscribePathRequest) returns (stream SubscribePathResponse) {};
 }
 
-message GetOndListRequest {
+message GetMneListRequest {
   int64 timestamp = 1;          // Timestamp in nanoseconds since Epoch.
   string pid = 2;
 }
 
-message GetOndRequest {
+message GetMneRequest {
   int64 timestamp = 1;          // Timestamp in nanoseconds since Epoch.
   string did = 2;
   string pid = 3;
@@ -168,28 +168,28 @@ message GetPathRequest {
   string pid = 4;
 }
 
-message GetOndResponse {
+message GetMneResponse {
   int64 timestamp = 1;          // Timestamp in nanoseconds since Epoch.
   // TODO: Check if this is really needed. Perhaps a reference to the PND's ID
   // is also sufficient.
   PrincipalNetworkDomain pnd = 2;
-  OrchestratedNetworkingDevice ond = 3;
+  OrchestratedNetworkingDevice mne = 3;
 }
 
-message GetOndListResponse {
+message GetMneListResponse {
   int64 timestamp = 1;          // Timestamp in nanoseconds since Epoch.
   // TODO: Check if this is really needed. Perhaps a reference to the PND's ID
   // is also sufficient.
   PrincipalNetworkDomain pnd = 2;
-  repeated OrchestratedNetworkingDevice ond = 3;
+  repeated OrchestratedNetworkingDevice mne = 3;
 }
 
-message GetFlattenedOndListResponse {
+message GetFlattenedMneListResponse {
   int64 timestamp = 1;          // Timestamp in nanoseconds since Epoch.
   // TODO: Check if this is really needed. Perhaps a reference to the PND's ID
   // is also sufficient.
   PrincipalNetworkDomain pnd = 2;
-  repeated FlattenedOrchestratedNetworkingDevice ond = 3;
+  repeated FlattenedOrchestratedNetworkingDevice mne = 3;
 }
 
 message GetSbiResponse {
@@ -266,9 +266,9 @@ message Change {
   gnmi.Notification diff = 4;
 }
 
-message SetOndListRequest {
+message SetMneListRequest {
   int64 timestamp = 1;          // Timestamp in nanoseconds since Epoch.
-  repeated SetOnd ond = 2;
+  repeated SetMne mne = 2;
   string pid = 3;
 }
 
@@ -305,7 +305,7 @@ enum ApiOperation {
   API_OPERATION_DELETE = 3;
 }
 
-message SetOnd {
+message SetMne {
   string address = 1;
   .gosdn.southbound.SouthboundInterface sbi = 2;
   string device_name = 3;
@@ -341,7 +341,7 @@ message SetResponse{
   Status status = 3;
 }
 
-message SetOndListResponse{
+message SetMneListResponse{
   int64 timestamp = 1;          // Timestamp in nanoseconds since Epoch.
   Status status = 2;
   repeated SetResponse responses = 3;
@@ -370,13 +370,13 @@ message SetPathListResponse{
   repeated SetResponse responses = 3;
 }
 
-message DeleteOndRequest {
+message DeleteMneRequest {
   int64 timestamp = 1;          // Timestamp in nanoseconds since Epoch.
   string pid = 2;
   string did = 3;
 }
 
-message DeleteOndResponse {
+message DeleteMneResponse {
   int64 timestamp = 1;          // Timestamp in nanoseconds since Epoch.
   Status status = 2;
 }
@@ -411,7 +411,7 @@ enum SubscriptionMode {
 message Subscription {
     string path = 1;
     StreamMode stream_mode = 2;
-    uint64 sample_interval = 3;       // ns between samples in SAMPLE mode.
+    uint64 sample_interval = 3;       // time in ns between samples in SAMPLE mode.
 }
 
 enum StreamMode {
diff --git a/cli/adapter/PndAdapter.go b/cli/adapter/PndAdapter.go
index 89947898b994059b0027254a918de78b737b4511..4b5e771ccbb42d1f68637ebc7cfeb001596c2c10 100644
--- a/cli/adapter/PndAdapter.go
+++ b/cli/adapter/PndAdapter.go
@@ -47,7 +47,7 @@ func (p *PndAdapter) RemoveSbi(uuid.UUID) error {
 
 // AddDevice adds a new device to the controller. The device name is optional.
 // If no name is provided a name will be generated upon device creation.
-func (p *PndAdapter) AddDevice(ctx context.Context, name string, opts *tpb.TransportOption, sid uuid.UUID) (*ppb.SetOndListResponse, error) {
+func (p *PndAdapter) AddDevice(ctx context.Context, name string, opts *tpb.TransportOption, sid uuid.UUID) (*ppb.SetMneListResponse, error) {
 	resp, err := api.AddDevice(ctx, p.endpoint, name, opts, sid, p.ID())
 	if err != nil {
 		return nil, err
@@ -66,7 +66,7 @@ func (p *PndAdapter) GetSbiSchemaTree(ctx context.Context, sid uuid.UUID) (map[s
 
 // GetDevice requests one or multiple devices belonging to a given
 // PrincipalNetworkDomain from the controller.
-func (p *PndAdapter) GetDevice(ctx context.Context, identifier string) (*ppb.GetOndResponse, error) {
+func (p *PndAdapter) GetDevice(ctx context.Context, identifier string) (*ppb.GetMneResponse, error) {
 	resp, err := api.GetDevice(ctx, p.endpoint, p.id.String(), identifier)
 	if err != nil {
 		return nil, err
@@ -77,7 +77,7 @@ func (p *PndAdapter) GetDevice(ctx context.Context, identifier string) (*ppb.Get
 // GetFlattenedDevices requests all devices belonging to the PrincipalNetworkDomain
 // attached to this adapter. The requested devices also contain their config
 // information as gNMI notifications.
-func (p *PndAdapter) GetFlattenedDevices(ctx context.Context) (*ppb.GetFlattenedOndListResponse, error) {
+func (p *PndAdapter) GetFlattenedDevices(ctx context.Context) (*ppb.GetFlattenedMneListResponse, error) {
 	resp, err := api.GetFlattenedDevices(ctx, p.endpoint, p.id.String())
 	if err != nil {
 		return nil, err
@@ -86,7 +86,7 @@ func (p *PndAdapter) GetFlattenedDevices(ctx context.Context) (*ppb.GetFlattened
 }
 
 // RemoveDevice removes a device from the controller.
-func (p *PndAdapter) RemoveDevice(ctx context.Context, did uuid.UUID) (*ppb.DeleteOndResponse, error) {
+func (p *PndAdapter) RemoveDevice(ctx context.Context, did uuid.UUID) (*ppb.DeleteMneResponse, error) {
 	resp, err := api.DeleteDevice(ctx, p.endpoint, p.id.String(), did.String())
 	if err != nil {
 		return nil, err
@@ -103,10 +103,10 @@ func (p *PndAdapter) RemovePnd(ctx context.Context, pid uuid.UUID) (*core.Delete
 	return resp, nil
 }
 
-// ChangeOND sends an API call to the controller requesting the creation of
+// ChangeMNE sends an API call to the controller requesting the creation of
 // a change from the provided Operation, path and value. The Change is marked
 // as Pending and times out after the specified timeout period.
-func (p *PndAdapter) ChangeOND(ctx context.Context, duid uuid.UUID, operation ppb.ApiOperation, path string, value ...string) (*ppb.SetPathListResponse, error) {
+func (p *PndAdapter) ChangeMNE(ctx context.Context, duid uuid.UUID, operation ppb.ApiOperation, path string, value ...string) (*ppb.SetPathListResponse, error) {
 	var v string
 	if len(value) != 0 {
 		v = value[0]
@@ -128,9 +128,9 @@ func (p *PndAdapter) Request(ctx context.Context, did uuid.UUID, path string) (*
 	return resp, nil
 }
 
-// SubscribeONDPath sends an API call to the controller requesting to subscribe
+// SubscribeMNEPath sends an API call to the controller requesting to subscribe
 // to a specific path of a specifc device.
-func (p *PndAdapter) SubscribeONDPath(ctx context.Context, did uuid.UUID, slist *ppb.SubscriptionList) (ppb.PndService_SubscribePathClient, error) {
+func (p *PndAdapter) SubscribeMNEPath(ctx context.Context, did uuid.UUID, slist *ppb.SubscriptionList) (ppb.PndService_SubscribePathClient, error) {
 	resp, err := api.SubscribePath(ctx, p.endpoint, p.id.String(), did.String(), slist)
 	if err != nil {
 		return nil, err
@@ -145,14 +145,14 @@ func (p *PndAdapter) RequestAll(ctx context.Context, path string) ([]proto.Messa
 	if err != nil {
 		return []proto.Message{}, err
 	}
-	reqResult := make([]proto.Message, len(resp.Ond))
+	reqResult := make([]proto.Message, len(resp.Mne))
 	g := new(errgroup.Group)
-	for i, ond := range resp.Ond {
-		i, ond := i, ond
+	for i, mne := range resp.Mne {
+		i, mne := i, mne
 		// TODO: probably the controller should do this; this would result in a
 		// single request from CLI side.
 		g.Go(func() error {
-			resp, err := api.GetPath(ctx, p.endpoint, p.id.String(), ond.GetId(), path)
+			resp, err := api.GetPath(ctx, p.endpoint, p.id.String(), mne.GetId(), path)
 			if err != nil {
 				return err
 			}
diff --git a/cli/adapter/PndAdapter_test.go b/cli/adapter/PndAdapter_test.go
index 2c49e7804c452cab296fbd9ff5405042213deff0..096a881458e9ac0da89937f41eec0352ba98d6ff 100644
--- a/cli/adapter/PndAdapter_test.go
+++ b/cli/adapter/PndAdapter_test.go
@@ -195,7 +195,7 @@ func TestPndAdapter_RemoveDevice(t *testing.T) {
 	}
 }
 
-func TestPndAdapter_ChangeOND(t *testing.T) {
+func TestPndAdapter_ChangeMNE(t *testing.T) {
 	type fields struct {
 		id       uuid.UUID
 		endpoint string
@@ -220,9 +220,9 @@ func TestPndAdapter_ChangeOND(t *testing.T) {
 				id:       tt.fields.id,
 				endpoint: tt.fields.endpoint,
 			}
-			_, err := p.ChangeOND(context.TODO(), tt.args.uuid, tt.args.operation, tt.args.path, tt.args.value...)
+			_, err := p.ChangeMNE(context.TODO(), tt.args.uuid, tt.args.operation, tt.args.path, tt.args.value...)
 			if (err != nil) != tt.wantErr {
-				t.Errorf("PndAdapter.ChangeOND() error = %v, wantErr %v", err, tt.wantErr)
+				t.Errorf("PndAdapter.ChangeMNE() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})
 	}
diff --git a/cli/cmd/deviceDelete.go b/cli/cmd/deviceDelete.go
index fce779b73711e8e9d210ddf96e360c5e8800894b..a2a4d6096a2553bbc7b186d879210bd6473cbe9f 100644
--- a/cli/cmd/deviceDelete.go
+++ b/cli/cmd/deviceDelete.go
@@ -54,7 +54,7 @@ The device UUID and request path must be specified as a positional arguments.`,
 			return err
 		}
 
-		resp, err := pndAdapter.ChangeOND(
+		resp, err := pndAdapter.ChangeMNE(
 			createContextWithAuthorization(),
 			did,
 			ppb.ApiOperation_API_OPERATION_DELETE,
diff --git a/cli/cmd/deviceList.go b/cli/cmd/deviceList.go
index 870332ecb6ed37e15ac4de0bb05113d39e93c893..cb3357a062b0bcc1198c0ed425761ab26c573f82 100644
--- a/cli/cmd/deviceList.go
+++ b/cli/cmd/deviceList.go
@@ -54,7 +54,7 @@ var deviceListCmd = &cobra.Command{
 		}
 
 		data := pterm.TableData{[]string{"UUID", "Name", "SBI-UUID"}}
-		for _, dev := range resp.GetOnd() {
+		for _, dev := range resp.GetMne() {
 			data = append(data, []string{dev.GetId(), dev.GetName(), dev.GetSbi()})
 		}
 
diff --git a/cli/cmd/deviceSet.go b/cli/cmd/deviceSet.go
index 60a7fccb9865d7376c1b5b6f187a782c2d755895..03d9bf5d8e8926085b724f3ff4b64d91cfbab83f 100644
--- a/cli/cmd/deviceSet.go
+++ b/cli/cmd/deviceSet.go
@@ -83,7 +83,7 @@ To enable replacing behaviour (destructive!), set the --replace flag."`,
 
 		}
 
-		resp, err := pndAdapter.ChangeOND(
+		resp, err := pndAdapter.ChangeMNE(
 			createContextWithAuthorization(),
 			did,
 			operation,
diff --git a/cli/cmd/deviceShow.go b/cli/cmd/deviceShow.go
index 51be7acf7736292f3ed737b002a7f98d24118780..c6df2b4b7dc487ce05ab108e0ecc721fbf9ff659 100644
--- a/cli/cmd/deviceShow.go
+++ b/cli/cmd/deviceShow.go
@@ -53,7 +53,7 @@ The actual device is not queried directly.`,
 			return err
 		}
 
-		dev := resp.GetOnd()
+		dev := resp.GetMne()
 
 		panel1 := pterm.DefaultBox.WithTitle("UUID:").Sprint(dev.Id)
 		panel2 := pterm.DefaultBox.WithTitle("Name:").Sprint(dev.Name)
diff --git a/cli/cmd/deviceSubscribe.go b/cli/cmd/deviceSubscribe.go
index 1297891fee8ccc93a7521e49522b8d1eb5839e40..d4ab6cf7de1d60cf9d00b5993e7bd34aa423b4fd 100644
--- a/cli/cmd/deviceSubscribe.go
+++ b/cli/cmd/deviceSubscribe.go
@@ -57,7 +57,7 @@ The device UUID and requested paths must be specified as a positional arguments.
 			return err
 		}
 
-		subClient, err := pndAdapter.SubscribeONDPath(
+		subClient, err := pndAdapter.SubscribeMNEPath(
 			createContextWithAuthorization(),
 			did,
 			&pnd.SubscriptionList{
diff --git a/cli/cmd/list.go b/cli/cmd/list.go
index 52f916d5dd6fbc632f90a9a90f31f2ab111d6f69..41aa9e0113a63decf33fb207f2557488546cc8d1 100644
--- a/cli/cmd/list.go
+++ b/cli/cmd/list.go
@@ -44,8 +44,8 @@ import (
 var listCmd = &cobra.Command{
 	Use:     "list",
 	Aliases: []string{"ls"},
-	Short:   "List all PNDs, SBIs and ONDs on the controller",
-	Long:    `List all PNDs, SBIs and ONDs on the controller.`,
+	Short:   "List all PNDs, SBIs and MNEs on the controller",
+	Long:    `List all PNDs, SBIs and MNEs on the controller.`,
 
 	RunE: func(cmd *cobra.Command, args []string) error {
 		addr := viper.GetString("controllerApiEndpoint")
@@ -54,14 +54,14 @@ var listCmd = &cobra.Command{
 			return err
 		}
 		for i, pnd := range resp {
-			ondResp, err := api.GetFlattenedDevices(createContextWithAuthorization(), addr, pnd.GetId())
+			mneResp, err := api.GetFlattenedDevices(createContextWithAuthorization(), addr, pnd.GetId())
 			if err != nil {
 				return err
 			}
 			log.Infof("PND %v: name: %v, uuid: %v", i+1, pnd.Name, pnd.Id)
-			for k, ond := range ondResp.GetOnd() {
-				log.Infof("    OND %v: name: %v, uuid: %v", k+1, ond.Name, ond.Id)
-				log.Infof("    SBI %v: uuid: %v", k+1, ond.GetSbi())
+			for k, mne := range mneResp.GetMne() {
+				log.Infof("    MNE %v: name: %v, uuid: %v", k+1, mne.Name, mne.Id)
+				log.Infof("    SBI %v: uuid: %v", k+1, mne.GetSbi())
 			}
 		}
 		return nil
diff --git a/cli/cmd/prompt.go b/cli/cmd/prompt.go
index ffc0dd8ca84820667808593ee8d102c75e570b71..cb1d69c6dd79b4541d55096c4056ab00f6373ea8 100644
--- a/cli/cmd/prompt.go
+++ b/cli/cmd/prompt.go
@@ -198,7 +198,7 @@ func cobraCommandCompletion(currCmd *cobra.Command, d prompt.Document, inputFlag
 	return prompt.FilterHasPrefix(loaded, d.GetWordBeforeCursor(), true)
 }
 
-//nolint
+// nolint
 func completionBasedOnCmd(c *PromptCompleter, cmd *cobra.Command, inputSplit []string, inputFlags []string, d prompt.Document) []prompt.Suggest {
 	switch cmd {
 	case pndUseCmd, pndGetCmd, pndRemoveCmd:
@@ -248,8 +248,8 @@ func getDevices() ([]prompt.Suggest, error) {
 	}
 
 	s := []prompt.Suggest{}
-	for _, ond := range resp.Ond {
-		s = append(s, prompt.Suggest{Text: ond.GetId(), Description: ond.GetName()})
+	for _, mne := range resp.Mne {
+		s = append(s, prompt.Suggest{Text: mne.GetId(), Description: mne.GetName()})
 	}
 	spinner.Success()
 	return completer.SortSuggestionByText(s), nil
@@ -265,7 +265,7 @@ func getSchemaTreeForDeviceID(id string) (map[string]*yang.Entry, error) {
 		spinner.Fail(err)
 		return nil, err
 	}
-	sid, err := uuid.Parse(dev.GetOnd().GetSbi().GetId())
+	sid, err := uuid.Parse(dev.GetMne().GetSbi().GetId())
 	if err != nil {
 		spinner.Fail(err)
 		return nil, err
diff --git a/cli/cmd/root.go b/cli/cmd/root.go
index 8e2e8a30f5b1b47eed00af10f75a9a1d9f813d22..dc14591b3ddd048a967b9638461751004b92992b 100644
--- a/cli/cmd/root.go
+++ b/cli/cmd/root.go
@@ -85,7 +85,7 @@ func init() {
 	// add CLI global parameters
 	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (./.gosdnc.toml)")
 	rootCmd.PersistentFlags().StringVarP(&loglevel, "log-level", "l", "", "log level 'debug' or 'trace'")
-	rootCmd.PersistentFlags().BoolVar(&verbose, "verbose", false, "show ond and sbi info")
+	rootCmd.PersistentFlags().BoolVar(&verbose, "verbose", false, "show mne and sbi info")
 
 	rootCmd.Flags().StringVar(&grpcPort, "grpc-port", "55055", "port for gRPC NBI")
 }
diff --git a/controller/ARCHITECTURE.md b/controller/ARCHITECTURE.md
index dcd0d814bd56c70088e075aab00a801b32c1eab5..162998c7ab36bb9a0f92f2bc09cf108c22270b87 100644
--- a/controller/ARCHITECTURE.md
+++ b/controller/ARCHITECTURE.md
@@ -8,7 +8,7 @@ This document describes the the high-level architecture of the goSDN project. Al
 
 On the highest level goSDn provides a gRPC northbound-interface and two types of southbound-interfaces: RESTCONF and gRPC-based. The northbound interface allows the interaction with a running goSDN daemon and may allow the stacking of multiple controllers in the future. The southbound interface (SBI) capabilities are split in `nucleus` models and plugins. The supported `nucleus` models are OpenConfig yang [openconfig-yang](https://github.com/openconfig/yang)  and TAPI. Third party models and more SBI-transports can be attached using the go plugin architecture.
 
-The internal data representation uses [ygot](https://github.com/openconfig/ygot) generated go-structs. 
+The internal data representation uses [ygot](https://github.com/openconfig/ygot) generated go-structs.
 It is important to note that these go-structs are generated from yang models and thus are not generic data structures. This means that the `nucleus` code is organized in silos, i.e., one particular southbound-interface is visible in the `nucleus`, as the internal data representation depend on the used yang modes in the southbound-interface.
 
 ## Code Map
@@ -29,13 +29,13 @@ Forks of `google/gnxi/gnmi` and `arista/goarista/gnmi` for gNMI server and clien
 
 ### `nucleus/principalNetworkDomain`
 
-`nucleus` is the core package of goSDN. The main data structure is the `principalNetworkDomain` (PND). It reflects one administrative entity, i.e., as set of connected network devices,  and is the source of truth for network state and configuration. A PND is SBI agnostic and supports multiple SBI implementations simultaneously. 
+`nucleus` is the core package of goSDN. The main data structure is the `principalNetworkDomain` (PND). It reflects one administrative entity, i.e., as set of connected network devices,  and is the source of truth for network state and configuration. A PND is SBI agnostic and supports multiple SBI implementations simultaneously.
 
-**API boundary:** The PND' is the only way to interact with an `orchestratedNetworkingDevice`
+**API boundary:** The PND' is the only way to interact with an `managedNetworkElement`
 
 ### `nucleus/device`
 
-This is the representation of an `orchestratedNetworkingDevice` (OND). An `orchestratedNetworkingDevice` is the network device that is directly managed by goSDN. It holds a reference to the device's `transport` and `southboundInterface` implementation. It contains a fakeroot device based on its attached SBI.
+This is the representation of an `managedNetworkElement` (MNE). An `managedNetworkElement` is the network device that is directly managed by goSDN. It holds a reference to the device's `transport` and `southboundInterface` implementation. It contains a fakeroot device based on its attached SBI.
 
 **Architecture invariant:** The device is does not provide any functionality to upper API layers.
 
@@ -47,7 +47,7 @@ Implementation of SBI specifics. Provides SBI models to other callers and SBI sp
 
 ### `nucleus/transport` `nucleus/gnmi_transport` `nucleus/restconf_transport`
 
-Transport between goSDN and ONDs. Current core implementations are gNMI and RESTCONF. Additionally to implementing the transports the packages also provide a mapping from general purpose goSDN API calls to diverging SBI API calls.
+Transport between goSDN and MNEs. Current core implementations are gNMI and RESTCONF. Additionally to implementing the transports the packages also provide a mapping from general purpose goSDN API calls to diverging SBI API calls.
 
 For example `gNMI::Subscribe` and `RESTCONF::Push` are mapped to `gosdn::Subscribe`.
 
diff --git a/controller/README.md b/controller/README.md
index 0835d28c90b8eaa7b033343d1d4a753e7a77824b..0bd449e43133d3fad4e9aec0cf8e1392143709bc 100644
--- a/controller/README.md
+++ b/controller/README.md
@@ -27,13 +27,13 @@
 
 # Concepts
 
-The `goSDN` core - also called `nucleus` - is a lightweight library that manages principal network domains and provides southbound interface operations for orchestrated networking devices.
+The `goSDN` core - also called `nucleus` - is a lightweight library that manages principal network domains and provides southbound interface operations for managed network elements.
 
 ## Principal Networking Domain (PND)
 
-The PND is the single source of truth within a network. Its state is held and maintained by the controller. Any configuration of an OND has to be applied by the PND.
+The PND is the single source of truth within a network. Its state is held and maintained by the controller. Any configuration of an MNE has to be applied by the PND.
 
-## Orchestrated Networking Device (OND)
+## Managed Network Element (MNE)
 
 Any device directly configured by `goSDN`
 
diff --git a/controller/api/apiIntegration_test.go b/controller/api/apiIntegration_test.go
index 39829243fb344712ce5f020a007939d77bea196a..295c1afc8ae2000405822f75b5f14092ebf51380 100644
--- a/controller/api/apiIntegration_test.go
+++ b/controller/api/apiIntegration_test.go
@@ -116,7 +116,7 @@ func TestApiIntegration(t *testing.T) {
 			}
 			var got string
 			if resp != nil {
-				got = resp.Ond.Name
+				got = resp.Mne.Name
 			} else {
 				t.Errorf("integration test failed got cannot be nil")
 			}
diff --git a/controller/api/api_test.go b/controller/api/api_test.go
index f6e8e29a6f129aa2f7a33214da15e6bd40b783b0..cac043617fbed7e08bfb3d41cf120b08ad73ff00 100644
--- a/controller/api/api_test.go
+++ b/controller/api/api_test.go
@@ -126,19 +126,19 @@ func Test_AddDevice(t *testing.T) {
 }
 
 func Test_GetDevice(t *testing.T) {
-	resp, err := GetDevice(context.TODO(), bufnet, pndID, ondID)
+	resp, err := GetDevice(context.TODO(), bufnet, pndID, mneID)
 	if err != nil {
 		t.Error(err)
 		return
 	}
-	got := resp.Ond.Id
-	if got != ondID {
-		t.Errorf("PND ID is %v, expected %v", got, ondID)
+	got := resp.Mne.Id
+	if got != mneID {
+		t.Errorf("PND ID is %v, expected %v", got, mneID)
 	}
 }
 
 func Test_Update(t *testing.T) {
-	resp, err := ChangeRequest(context.TODO(), bufnet, ondID, pndID, "", "", ppb.ApiOperation_API_OPERATION_UPDATE)
+	resp, err := ChangeRequest(context.TODO(), bufnet, mneID, pndID, "", "", ppb.ApiOperation_API_OPERATION_UPDATE)
 	if err != nil {
 		t.Error(err)
 		return
@@ -147,7 +147,7 @@ func Test_Update(t *testing.T) {
 }
 
 func Test_Replace(t *testing.T) {
-	resp, err := ChangeRequest(context.TODO(), bufnet, ondID, pndID, "", "", ppb.ApiOperation_API_OPERATION_REPLACE)
+	resp, err := ChangeRequest(context.TODO(), bufnet, mneID, pndID, "", "", ppb.ApiOperation_API_OPERATION_REPLACE)
 	if err != nil {
 		t.Error(err)
 		return
@@ -156,7 +156,7 @@ func Test_Replace(t *testing.T) {
 }
 
 func Test_Delete(t *testing.T) {
-	resp, err := ChangeRequest(context.TODO(), bufnet, ondID, pndID, "", "", ppb.ApiOperation_API_OPERATION_DELETE)
+	resp, err := ChangeRequest(context.TODO(), bufnet, mneID, pndID, "", "", ppb.ApiOperation_API_OPERATION_DELETE)
 	if err != nil {
 		t.Error(err)
 		return
diff --git a/controller/api/change.go b/controller/api/change.go
index 2d5ad6e2ef8a024ed05d018fbb408c5d8599ded9..856ce89c2d320ae98a5deffb33a277dfe08536be 100644
--- a/controller/api/change.go
+++ b/controller/api/change.go
@@ -79,7 +79,7 @@ func CommitConfirm(ctx context.Context, addr, pnd string, changes []*ppb.SetChan
 	return client.SetChangeList(ctx, req)
 }
 
-// ChangeRequest creates a ChangeRequest for the specified OND. ApiOperations
+// ChangeRequest creates a ChangeRequest for the specified MNE. ApiOperations
 // are used to specify the type of the change (update, replace, delete as
 // specified in
 // https://github.com/openconfig/reference/blob/master/rpc/gnmi/gnmi-specification.md#34-modifying-state)
diff --git a/controller/api/device.go b/controller/api/device.go
index 27db2d3dff64d9b226a225c62db336f843d9be7c..e3a80af8060428f5680d46a3a641eb1c14ecc107 100644
--- a/controller/api/device.go
+++ b/controller/api/device.go
@@ -19,15 +19,15 @@ import (
 
 // AddDevice adds a new device to the controller. The device name is optional.
 // If no name is provided a name will be generated upon device creation.
-func AddDevice(ctx context.Context, addr, deviceName string, opt *tpb.TransportOption, sid, pid uuid.UUID) (*ppb.SetOndListResponse, error) {
+func AddDevice(ctx context.Context, addr, deviceName string, opt *tpb.TransportOption, sid, pid uuid.UUID) (*ppb.SetMneListResponse, error) {
 	pndClient, err := nbi.PndClient(addr, dialOptions...)
 	if err != nil {
 		return nil, err
 	}
 
-	req := &ppb.SetOndListRequest{
+	req := &ppb.SetMneListRequest{
 		Timestamp: time.Now().UnixNano(),
-		Ond: []*ppb.SetOnd{
+		Mne: []*ppb.SetMne{
 			{
 				Address: opt.GetAddress(),
 				Sbi: &spb.SouthboundInterface{
@@ -41,19 +41,19 @@ func AddDevice(ctx context.Context, addr, deviceName string, opt *tpb.TransportO
 	}
 	switch t := opt.Type; t {
 	case spb.Type_TYPE_CONTAINERISED, spb.Type_TYPE_PLUGIN:
-		req.Ond[0].Sbi.Id = uuid.Nil.String()
-		req.Ond[0].Sbi.Type = t
-		req.Ond[0].TransportOption.Type = t
+		req.Mne[0].Sbi.Id = uuid.Nil.String()
+		req.Mne[0].Sbi.Type = t
+		req.Mne[0].TransportOption.Type = t
 	default:
 	}
 
-	return pndClient.SetOndList(ctx, req)
+	return pndClient.SetMneList(ctx, req)
 }
 
 // GetDevice requests one device belonging to a given
 // PrincipalNetworkDomain from the controller. If no device identifier
 // is provided, an error is thrown.
-func GetDevice(ctx context.Context, addr, pid string, did string) (*ppb.GetOndResponse, error) {
+func GetDevice(ctx context.Context, addr, pid string, did string) (*ppb.GetMneResponse, error) {
 	pndClient, err := nbi.PndClient(addr, dialOptions...)
 	if err != nil {
 		return nil, err
@@ -63,13 +63,13 @@ func GetDevice(ctx context.Context, addr, pid string, did string) (*ppb.GetOndRe
 		return nil, err
 	}
 
-	req := &ppb.GetOndRequest{
+	req := &ppb.GetMneRequest{
 		Timestamp: time.Now().UnixNano(),
 		Did:       did,
 		Pid:       pid,
 	}
 
-	return pndClient.GetOnd(ctx, req)
+	return pndClient.GetMne(ctx, req)
 }
 
 // GetSbiSchemaTree gets the sbi tree for a sbi.
@@ -122,18 +122,18 @@ func GetSbiSchemaTree(ctx context.Context, addr string, pid, sid uuid.UUID) (map
 
 // GetFlattenedDevices requests all devices belonging to a given
 // PrincipalNetworkDomain from the controller.
-func GetFlattenedDevices(ctx context.Context, addr, pid string) (*ppb.GetFlattenedOndListResponse, error) {
+func GetFlattenedDevices(ctx context.Context, addr, pid string) (*ppb.GetFlattenedMneListResponse, error) {
 	pndClient, err := nbi.PndClient(addr, dialOptions...)
 	if err != nil {
 		return nil, err
 	}
 
-	req := &ppb.GetOndListRequest{
+	req := &ppb.GetMneListRequest{
 		Timestamp: time.Now().UnixNano(),
 		Pid:       pid,
 	}
 
-	return pndClient.GetFlattenedOndList(ctx, req)
+	return pndClient.GetFlattenedMneList(ctx, req)
 }
 
 // GetPath requests a specific path.
@@ -172,17 +172,17 @@ func SubscribePath(ctx context.Context, addr, pid, did string, slist *ppb.Subscr
 }
 
 // DeleteDevice deletes a device.
-func DeleteDevice(ctx context.Context, addr, pid, did string) (*ppb.DeleteOndResponse, error) {
+func DeleteDevice(ctx context.Context, addr, pid, did string) (*ppb.DeleteMneResponse, error) {
 	pndClient, err := nbi.PndClient(addr, dialOptions...)
 	if err != nil {
 		return nil, err
 	}
 
-	req := &ppb.DeleteOndRequest{
+	req := &ppb.DeleteMneRequest{
 		Timestamp: time.Now().UnixNano(),
 		Did:       did,
 		Pid:       pid,
 	}
 
-	return pndClient.DeleteOnd(ctx, req)
+	return pndClient.DeleteMne(ctx, req)
 }
diff --git a/controller/api/initialise_test.go b/controller/api/initialise_test.go
index c876f8d2269cbb3cfda87a9de73ad43d39b7ee7f..04dbb1c5da7135b5aacfe79652c5a57894aeb729 100644
--- a/controller/api/initialise_test.go
+++ b/controller/api/initialise_test.go
@@ -49,7 +49,7 @@ const bufnet = "bufnet"
 const pndID = "2043519e-46d1-4963-9a8e-d99007e104b8"
 const changeID = "0992d600-f7d4-4906-9559-409b04d59a5f"
 const sbiID = "f6fd4b35-f039-4111-9156-5e4501bb8a5a"
-const ondID = "7e0ed8cc-ebf5-46fa-9794-741494914883"
+const mneID = "7e0ed8cc-ebf5-46fa-9794-741494914883"
 
 var pndStore networkdomain.PndStore
 var userService rbac.UserService
@@ -82,7 +82,7 @@ func bootstrapUnitTest() {
 		log.Fatal(err)
 	}
 
-	deviceUUID, err := uuid.Parse(ondID)
+	deviceUUID, err := uuid.Parse(mneID)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -145,7 +145,7 @@ func bootstrapUnitTest() {
 		},
 	})
 	mockPnd.On("GetSBIs").Return([]mocks.SouthboundInterface{})
-	mockPnd.On("ChangeOND", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(uuid.Nil, nil)
+	mockPnd.On("ChangeMNE", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(uuid.Nil, nil)
 
 	if err := pndStore.Add(&mockPnd); err != nil {
 		log.Fatal(err)
diff --git a/controller/controller.go b/controller/controller.go
index 822c8439a8c0732deab6b6595e02de9561d13844..25d4f92ede4d3c6928010850400956ee70a31bd9 100644
--- a/controller/controller.go
+++ b/controller/controller.go
@@ -239,18 +239,18 @@ func ensureDefaultRoleExists() error {
 			"/gosdn.rbac.RoleService/UpdateRoles",
 			"/gosdn.rbac.RoleService/DeletePermissionsForRole",
 			"/gosdn.rbac.RoleService/DeleteRoles",
-			"/gosdn.pnd.PndService/GetOnd",
-			"/gosdn.pnd.PndService/GetFlattenedOndList",
+			"/gosdn.pnd.PndService/GetMne",
+			"/gosdn.pnd.PndService/GetFlattenedMneList",
 			"/gosdn.pnd.PndService/GetSbi",
 			"/gosdn.pnd.PndService/GetSbiList",
 			"/gosdn.pnd.PndService/GetPath",
 			"/gosdn.pnd.PndService/GetChange",
 			"/gosdn.pnd.PndService/GetChangeList",
-			"/gosdn.pnd.PndService/SetOndList",
+			"/gosdn.pnd.PndService/SetMneList",
 			"/gosdn.pnd.PndService/SetChangeList",
 			"/gosdn.pnd.PndService/SetPathList",
 			"/gosdn.pnd.PndService/SetSbiList",
-			"/gosdn.pnd.PndService/DeleteOnd",
+			"/gosdn.pnd.PndService/DeleteMne",
 			"/gosdn.pnd.PndService/SubscribePath",
 			"/gosdn.southbound.SbiService/GetSchema",
 		}))
diff --git a/controller/interfaces/change/change.go b/controller/interfaces/change/change.go
index 72dd99905a2aeabe15bad22649ef3ca53e3f3fe3..92d0b0f4e58a2f2b35c9f1266ba3619c83090b68 100644
--- a/controller/interfaces/change/change.go
+++ b/controller/interfaces/change/change.go
@@ -8,10 +8,10 @@ import (
 	"github.com/openconfig/ygot/ygot"
 )
 
-// Change is an intended change to an OND. It is unique and immutable.
+// Change is an intended change to an MNE. It is unique and immutable.
 // It has a cuid, a timestamp, and holds both the previous and the new
 // state. It keeps track if the state is committed and confirmed. A callback
-// exists to acess the proper transport for the changed OND.
+// exists to acess the proper transport for the changed MNE.
 type Change interface {
 	ID() uuid.UUID
 	Commit() error
diff --git a/controller/interfaces/device/device.go b/controller/interfaces/device/device.go
index 9a0d94afe6784cf6e2bb9175b1825f7979a5da24..719a8522af452db947cee3e9fa08ad3fc4a43a1b 100644
--- a/controller/interfaces/device/device.go
+++ b/controller/interfaces/device/device.go
@@ -10,7 +10,7 @@ import (
 	tpb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/transport"
 )
 
-// Device represents an Orchestrated Network Device (OND) which is managed by
+// Device represents an Managed Network Element (MNE) which is managed by
 // nucleus.
 type Device interface {
 	ID() uuid.UUID
diff --git a/controller/interfaces/networkdomain/pnd.go b/controller/interfaces/networkdomain/pnd.go
index 12aff19d34ab3bb26c4cf6d42f497ff71272cad9..3f3edac73101c7e9387c219853aab4f51305063e 100644
--- a/controller/interfaces/networkdomain/pnd.go
+++ b/controller/interfaces/networkdomain/pnd.go
@@ -22,7 +22,7 @@ type NetworkDomain interface {
 	UpdateDevice(device.Device, string) error
 	Devices() []device.Device
 	FlattenedDevices() []device.LoadedDevice
-	ChangeOND(uuid uuid.UUID, operation ppb.ApiOperation, path string, value ...string) (uuid.UUID, error)
+	ChangeMNE(uuid uuid.UUID, operation ppb.ApiOperation, path string, value ...string) (uuid.UUID, error)
 	Request(uuid.UUID, string) (proto.Message, error)
 	RequestAll(string) error
 	GetName() string
diff --git a/controller/mocks/NetworkDomain.go b/controller/mocks/NetworkDomain.go
index 6a770ba4bdb70b1d1da38d970671715e31c5d0c1..c9066ddb50df4515318f73906631545c336f313f 100644
--- a/controller/mocks/NetworkDomain.go
+++ b/controller/mocks/NetworkDomain.go
@@ -61,8 +61,8 @@ func (_m *NetworkDomain) AddSbi(s southbound.SouthboundInterface) error {
 	return r0
 }
 
-// ChangeOND provides a mock function with given fields: _a0, operation, path, value
-func (_m *NetworkDomain) ChangeOND(_a0 uuid.UUID, operation pnd.ApiOperation, path string, value ...string) (uuid.UUID, error) {
+// ChangeMNE provides a mock function with given fields: _a0, operation, path, value
+func (_m *NetworkDomain) ChangeMNE(_a0 uuid.UUID, operation pnd.ApiOperation, path string, value ...string) (uuid.UUID, error) {
 	_va := make([]interface{}, len(value))
 	for _i := range value {
 		_va[_i] = value[_i]
diff --git a/controller/northbound/server/auth_interceptor_test.go b/controller/northbound/server/auth_interceptor_test.go
index 023f9e0e48f0083f7a73964eb559453b88ff0b61..89d8169b545b6a06bff182d49dae5cc9210592dc 100644
--- a/controller/northbound/server/auth_interceptor_test.go
+++ b/controller/northbound/server/auth_interceptor_test.go
@@ -280,7 +280,7 @@ func TestAuthInterceptor_authorize(t *testing.T) {
 			name: "error no permission for request",
 			args: args{
 				ctx:    metadata.NewIncomingContext(context.Background(), metadata.Pairs("authorize", validToken)),
-				method: "/gosdn.pnd.PndService/DeleteOnd",
+				method: "/gosdn.pnd.PndService/DeleteMne",
 			},
 			wantErr: true,
 		},
diff --git a/controller/northbound/server/core_test.go b/controller/northbound/server/core_test.go
index 78941a2bccb49357ce9a277ff997311391b452f7..307a9591796ffcd91d30397811cbb1d9c8ec1a16 100644
--- a/controller/northbound/server/core_test.go
+++ b/controller/northbound/server/core_test.go
@@ -38,7 +38,7 @@ func getTestCoreServer(t *testing.T) *CoreServer {
 		t.Fatal(err)
 	}
 
-	deviceUUID, err = uuid.Parse(ondID)
+	deviceUUID, err = uuid.Parse(mneID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -85,7 +85,7 @@ func getTestCoreServer(t *testing.T) *CoreServer {
 	mockPnd.On("GetDevice", mock.Anything).Return(mockDevice, nil)
 	mockPnd.On("Commit", mock.Anything).Return(nil)
 	mockPnd.On("Confirm", mock.Anything).Return(nil)
-	mockPnd.On("ChangeOND", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(uuid.Nil, nil)
+	mockPnd.On("ChangeMNE", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(uuid.Nil, nil)
 	mockPnd.On("Request", mock.Anything, mock.Anything).Return(nil, nil)
 
 	pndStore := nucleus.NewMemoryPndStore()
diff --git a/controller/northbound/server/device.go b/controller/northbound/server/device.go
index 0a283456f10d7f94e239d86d820bf2af04449c48..258d431a3ff15de5c3f6905dcd2e07f332c469e3 100644
--- a/controller/northbound/server/device.go
+++ b/controller/northbound/server/device.go
@@ -87,7 +87,7 @@ func (d *DeviceServer) Get(ctx context.Context, request *dpb.GetDeviceRequest) (
 		return nil, status.Errorf(codes.Aborted, "%v", err)
 	}
 
-	ond := &dpb.Device{
+	mne := &dpb.Device{
 		Id:               device.ID().String(),
 		Name:             device.Name(),
 		Model:            ygotStructAsJSON,
@@ -97,7 +97,7 @@ func (d *DeviceServer) Get(ctx context.Context, request *dpb.GetDeviceRequest) (
 	return &dpb.GetDeviceResponse{
 		Timestamp: time.Now().UnixNano(),
 		Status:    dpb.Status_STATUS_OK,
-		Device:    ond,
+		Device:    mne,
 	}, nil
 }
 
diff --git a/controller/northbound/server/pnd.go b/controller/northbound/server/pnd.go
index 8020c8b5e740ce25bfe543e4089152c20128aaa6..847c2e251178bf610f5695edbba29e480ddac902 100644
--- a/controller/northbound/server/pnd.go
+++ b/controller/northbound/server/pnd.go
@@ -36,8 +36,8 @@ func NewPndServer(pndStore networkdomain.PndStore) *PndServer {
 	}
 }
 
-// GetOnd gets a specific ond.
-func (p PndServer) GetOnd(ctx context.Context, request *ppb.GetOndRequest) (*ppb.GetOndResponse, error) {
+// GetMne gets a specific mne.
+func (p PndServer) GetMne(ctx context.Context, request *ppb.GetMneRequest) (*ppb.GetMneResponse, error) {
 	labels := prometheus.Labels{"service": "pnd", "rpc": "get"}
 	start := metrics.StartHook(labels, grpcRequestsTotal)
 	defer metrics.FinishHook(labels, start, grpcRequestDurationSecondsTotal, grpcRequestDurationSeconds)
@@ -58,25 +58,25 @@ func (p PndServer) GetOnd(ctx context.Context, request *ppb.GetOndRequest) (*ppb
 		return nil, status.Errorf(codes.Aborted, "%v", err)
 	}
 
-	ond, err := fillOndBySpecificPath(device, "/")
+	mne, err := fillMneBySpecificPath(device, "/")
 	if err != nil {
 		log.Error(err)
 		return nil, status.Errorf(codes.Aborted, "%v", err)
 	}
 
-	return &ppb.GetOndResponse{
+	return &ppb.GetMneResponse{
 		Timestamp: time.Now().UnixNano(),
 		Pnd: &ppb.PrincipalNetworkDomain{
 			Id:          pnd.ID().String(),
 			Name:        pnd.GetName(),
 			Description: pnd.GetDescription(),
 		},
-		Ond: ond,
+		Mne: mne,
 	}, nil
 }
 
-// GetOndList returns a list of existing onds.
-func (p PndServer) GetOndList(ctx context.Context, request *ppb.GetOndListRequest) (*ppb.GetOndListResponse, error) {
+// GetMneList returns a list of existing onds.
+func (p PndServer) GetMneList(ctx context.Context, request *ppb.GetMneListRequest) (*ppb.GetMneListResponse, error) {
 	labels := prometheus.Labels{"service": "pnd", "rpc": "get"}
 	start := metrics.StartHook(labels, grpcRequestsTotal)
 	defer metrics.FinishHook(labels, start, grpcRequestDurationSecondsTotal, grpcRequestDurationSeconds)
@@ -93,27 +93,27 @@ func (p PndServer) GetOndList(ctx context.Context, request *ppb.GetOndListReques
 
 	onds := make([]*ppb.OrchestratedNetworkingDevice, len(pnd.Devices()))
 	for i, device := range pnd.Devices() {
-		ond, err := fillOndBySpecificPath(device, "/")
+		mne, err := fillMneBySpecificPath(device, "/")
 		if err != nil {
 			log.Error(err)
 			return nil, status.Errorf(codes.Aborted, "%v", err)
 		}
-		onds[i] = ond
+		onds[i] = mne
 	}
 
-	return &ppb.GetOndListResponse{
+	return &ppb.GetMneListResponse{
 		Timestamp: time.Now().UnixNano(),
 		Pnd: &ppb.PrincipalNetworkDomain{
 			Id:          pnd.ID().String(),
 			Name:        pnd.GetName(),
 			Description: pnd.GetDescription(),
 		},
-		Ond: onds,
+		Mne: onds,
 	}, nil
 }
 
-// GetFlattenedOndList returns a list of existing onds.
-func (p PndServer) GetFlattenedOndList(ctx context.Context, request *ppb.GetOndListRequest) (*ppb.GetFlattenedOndListResponse, error) {
+// GetFlattenedMneList returns a list of existing onds.
+func (p PndServer) GetFlattenedMneList(ctx context.Context, request *ppb.GetMneListRequest) (*ppb.GetFlattenedMneListResponse, error) {
 	labels := prometheus.Labels{"service": "pnd", "rpc": "get"}
 	start := metrics.StartHook(labels, grpcRequestsTotal)
 	defer metrics.FinishHook(labels, start, grpcRequestDurationSecondsTotal, grpcRequestDurationSeconds)
@@ -129,29 +129,29 @@ func (p PndServer) GetFlattenedOndList(ctx context.Context, request *ppb.GetOndL
 	}
 
 	onds := pnd.FlattenedDevices()
-	flattenedOnds := make([]*ppb.FlattenedOrchestratedNetworkingDevice, len(onds))
-	for i, ond := range onds {
-		ond := &ppb.FlattenedOrchestratedNetworkingDevice{
+	flattenedMnes := make([]*ppb.FlattenedOrchestratedNetworkingDevice, len(onds))
+	for i, mne := range onds {
+		mne := &ppb.FlattenedOrchestratedNetworkingDevice{
 
-			Id:   ond.ID,
-			Name: ond.Name,
-			Sbi:  ond.SBI,
+			Id:   mne.ID,
+			Name: mne.Name,
+			Sbi:  mne.SBI,
 		}
-		flattenedOnds[i] = ond
+		flattenedMnes[i] = mne
 	}
 
-	return &ppb.GetFlattenedOndListResponse{
+	return &ppb.GetFlattenedMneListResponse{
 		Timestamp: time.Now().UnixNano(),
 		Pnd: &ppb.PrincipalNetworkDomain{
 			Id:          pnd.ID().String(),
 			Name:        pnd.GetName(),
 			Description: pnd.GetDescription(),
 		},
-		Ond: flattenedOnds,
+		Mne: flattenedMnes,
 	}, nil
 }
 
-func fillOndBySpecificPath(d device.Device, path string) (*ppb.OrchestratedNetworkingDevice, error) {
+func fillMneBySpecificPath(d device.Device, path string) (*ppb.OrchestratedNetworkingDevice, error) {
 	gnmiPath, err := ygot.StringToStructuredPath(path)
 	if err != nil {
 		log.Error(err)
@@ -185,14 +185,14 @@ func fillOndBySpecificPath(d device.Device, path string) (*ppb.OrchestratedNetwo
 		sbi.Type = d.SBI().Type()
 	}
 
-	ond := &ppb.OrchestratedNetworkingDevice{
+	mne := &ppb.OrchestratedNetworkingDevice{
 		Id:     d.ID().String(),
 		Name:   d.Name(),
 		Device: devices,
 		Sbi:    &sbi,
 	}
 
-	return ond, nil
+	return mne, nil
 }
 
 func genGnmiNotification(path *gnmi.Path, val any) (*gnmi.Notification, error) {
@@ -314,7 +314,7 @@ func stringArrayToUUIDs(sid []string) ([]uuid.UUID, error) {
 	return UUIDs, nil
 }
 
-// GetPath gets a path on a ond.
+// GetPath gets a path on a mne.
 func (p PndServer) GetPath(ctx context.Context, request *ppb.GetPathRequest) (*ppb.GetPathResponse, error) {
 	labels := prometheus.Labels{"service": "pnd", "rpc": "get"}
 	start := metrics.StartHook(labels, grpcRequestsTotal)
@@ -350,7 +350,7 @@ func (p PndServer) GetPath(ctx context.Context, request *ppb.GetPathRequest) (*p
 		return nil, status.Errorf(codes.Aborted, "%v", err)
 	}
 
-	ond, err := fillOndBySpecificPath(device, path)
+	mne, err := fillMneBySpecificPath(device, path)
 	if err != nil {
 		log.Error(err)
 		return nil, status.Errorf(codes.Aborted, "%v", err)
@@ -363,11 +363,11 @@ func (p PndServer) GetPath(ctx context.Context, request *ppb.GetPathRequest) (*p
 			Name:        pnd.GetName(),
 			Description: pnd.GetDescription(),
 		},
-		Device: ond.Device,
+		Device: mne.Device,
 	}, nil
 }
 
-// GetChange gets a specific change of a ond.
+// GetChange gets a specific change of a mne.
 func (p PndServer) GetChange(ctx context.Context, request *ppb.GetChangeRequest) (*ppb.GetChangeResponse, error) {
 	labels := prometheus.Labels{"service": "pnd", "rpc": "get"}
 	start := metrics.StartHook(labels, grpcRequestsTotal)
@@ -475,8 +475,8 @@ func fillChanges(pnd networkdomain.NetworkDomain, all bool, cuid ...string) ([]*
 	return changes, nil
 }
 
-// SetOndList updates the list of onds.
-func (p PndServer) SetOndList(ctx context.Context, request *ppb.SetOndListRequest) (*ppb.SetOndListResponse, error) {
+// SetMneList updates the list of onds.
+func (p PndServer) SetMneList(ctx context.Context, request *ppb.SetMneListRequest) (*ppb.SetMneListResponse, error) {
 	labels := prometheus.Labels{"service": "pnd", "rpc": "set"}
 	start := metrics.StartHook(labels, grpcRequestsTotal)
 	defer metrics.FinishHook(labels, start, grpcRequestDurationSecondsTotal, grpcRequestDurationSeconds)
@@ -490,8 +490,8 @@ func (p PndServer) SetOndList(ctx context.Context, request *ppb.SetOndListReques
 		return nil, handleRPCError(labels, err)
 	}
 
-	deviceIDs := make([]uuid.UUID, 0, len(request.Ond))
-	for _, r := range request.Ond {
+	deviceIDs := make([]uuid.UUID, 0, len(request.Mne))
+	for _, r := range request.Mne {
 		sid, err := uuid.Parse(r.Sbi.Id)
 		if err != nil {
 			log.Error(err)
@@ -510,7 +510,7 @@ func (p PndServer) SetOndList(ctx context.Context, request *ppb.SetOndListReques
 		r[i] = &ppb.SetResponse{Id: did.String(), Status: ppb.Status_STATUS_OK}
 	}
 
-	return &ppb.SetOndListResponse{
+	return &ppb.SetMneListResponse{
 		Timestamp: time.Now().UnixNano(),
 		Status:    ppb.Status_STATUS_OK,
 		Responses: r,
@@ -592,7 +592,7 @@ func (p PndServer) SetPathList(ctx context.Context, request *ppb.SetPathListRequ
 			log.Error(err)
 			return nil, status.Errorf(codes.Aborted, "%v", err)
 		}
-		cid, err := pnd.ChangeOND(did, r.ApiOp, r.Path, r.Value)
+		cid, err := pnd.ChangeMNE(did, r.ApiOp, r.Path, r.Value)
 		if err != nil {
 			log.Error(err)
 			return nil, status.Errorf(codes.Aborted, "%v", err)
@@ -666,8 +666,8 @@ func filterSbiType(sbiType ppb.SbiType) spb.Type {
 	return spbType
 }
 
-// DeleteOnd deletes a ond.
-func (p PndServer) DeleteOnd(ctx context.Context, request *ppb.DeleteOndRequest) (*ppb.DeleteOndResponse, error) {
+// DeleteMne deletes a mne.
+func (p PndServer) DeleteMne(ctx context.Context, request *ppb.DeleteMneRequest) (*ppb.DeleteMneResponse, error) {
 	pid, err := uuid.Parse(request.Pid)
 	if err != nil {
 		log.Error(err)
@@ -688,13 +688,13 @@ func (p PndServer) DeleteOnd(ctx context.Context, request *ppb.DeleteOndRequest)
 		log.Error(err)
 		return nil, status.Errorf(codes.Aborted, "%v", err)
 	}
-	return &ppb.DeleteOndResponse{
+	return &ppb.DeleteMneResponse{
 		Timestamp: time.Now().UnixNano(),
 		Status:    ppb.Status_STATUS_OK,
 	}, nil
 }
 
-// SubscribePath subscribes to specifc paths of an ond.
+// SubscribePath subscribes to specifc paths of an mne.
 func (p PndServer) SubscribePath(request *ppb.SubscribePathRequest, stream ppb.PndService_SubscribePathServer) error {
 	pid, err := uuid.Parse(request.Pid)
 	if err != nil {
diff --git a/controller/northbound/server/pnd_test.go b/controller/northbound/server/pnd_test.go
index 523753b15d9ddcd404661f63668831e0d1d621bc..1067bc5d3a470a3ca6c57ebeb71b8d94fbea57b9 100644
--- a/controller/northbound/server/pnd_test.go
+++ b/controller/northbound/server/pnd_test.go
@@ -40,7 +40,7 @@ func getTestPndServer(t *testing.T) *PndServer {
 		t.Fatal(err)
 	}
 
-	deviceUUID, err = uuid.Parse(ondID)
+	deviceUUID, err = uuid.Parse(mneID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -87,7 +87,7 @@ func getTestPndServer(t *testing.T) *PndServer {
 	mockPnd.On("GetDevice", mock.Anything).Return(mockDevice, nil)
 	mockPnd.On("Commit", mock.Anything).Return(nil)
 	mockPnd.On("Confirm", mock.Anything).Return(nil)
-	mockPnd.On("ChangeOND", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(uuid.Nil, nil)
+	mockPnd.On("ChangeMNE", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(uuid.Nil, nil)
 	mockPnd.On("Request", mock.Anything, mock.Anything).Return(nil, nil)
 
 	pndStore := nucleus.NewMemoryPndStore()
@@ -239,11 +239,11 @@ func Test_pnd_Set(t *testing.T) {
 	// 	wantErr bool
 	// }{
 	// 	{
-	// 		name: "set ond",
+	// 		name: "set mne",
 	// 		args: args{
 	// 			ctx: context.Background(),
 	// 			request: &ppb.SetRequest{
-	// 				Ond: []*ppb.SetOnd{
+	// 				Mne: []*ppb.SetMne{
 	// 					{
 	// 						Sbi: &spb.SouthboundInterface{
 	// 							Id:   sbiID,
@@ -293,19 +293,19 @@ func Test_pnd_Set(t *testing.T) {
 	// 	// 				Pid: pndID,
 	// 	// 				ChangeRequest: []*ppb.ChangeRequest{
 	// 	// 					{
-	// 	// 						Id:    ondID,
+	// 	// 						Id:    mneID,
 	// 	// 						Path:  "/system/config/hostname",
 	// 	// 						Value: "herbert",
 	// 	// 						ApiOp: ppb.ApiOperation_UPDATE,
 	// 	// 					},
 	// 	// 					{
-	// 	// 						Id:    ondID,
+	// 	// 						Id:    mneID,
 	// 	// 						Path:  "/system/config/hostname",
 	// 	// 						Value: "fridolin",
 	// 	// 						ApiOp: ppb.ApiOperation_REPLACE,
 	// 	// 					},
 	// 	// 					{
-	// 	// 						Id:    ondID,
+	// 	// 						Id:    mneID,
 	// 	// 						Path:  "/system/config/hostname",
 	// 	// 						ApiOp: ppb.ApiOperation_DELETE,
 	// 	// 					},
diff --git a/controller/northbound/server/test_util_test.go b/controller/northbound/server/test_util_test.go
index fea44b5cfb7239515eaa897930355aaa62e30019..0e72f8646882f576c3a39c858878857d6116cbca 100644
--- a/controller/northbound/server/test_util_test.go
+++ b/controller/northbound/server/test_util_test.go
@@ -27,7 +27,7 @@ const pndID = "2043519e-46d1-4963-9a8e-d99007e104b8"
 const pendingChangeID = "0992d600-f7d4-4906-9559-409b04d59a5f"
 const committedChangeID = "804787d6-e5a8-4dba-a1e6-e73f96b0119e"
 const sbiID = "f6fd4b35-f039-4111-9156-5e4501bb8a5a"
-const ondID = "7e0ed8cc-ebf5-46fa-9794-741494914883"
+const mneID = "7e0ed8cc-ebf5-46fa-9794-741494914883"
 
 var hostname = "manfred"
 var domainname = "uwe"
@@ -243,7 +243,7 @@ func getMockPnd(t *testing.T) networkdomain.NetworkDomain {
 	mockPnd.On("GetDevice", mock.Anything).Return(mockDevice, nil)
 	mockPnd.On("Commit", mock.Anything).Return(nil)
 	mockPnd.On("Confirm", mock.Anything).Return(nil)
-	mockPnd.On("ChangeOND", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(uuid.Nil, nil)
+	mockPnd.On("ChangeMNE", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(uuid.Nil, nil)
 	mockPnd.On("Request", mock.Anything, mock.Anything).Return(nil, nil)
 
 	return mockPnd
@@ -271,7 +271,7 @@ func initUUIDs(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	deviceUUID, err = uuid.Parse(ondID)
+	deviceUUID, err = uuid.Parse(mneID)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/controller/nucleus/change.go b/controller/nucleus/change.go
index feae600c8cbfd8b5e5b951e625f1ee1f0d9d3f64..a01117a4696afb9734b2fa2f27f35900429b44ba 100644
--- a/controller/nucleus/change.go
+++ b/controller/nucleus/change.go
@@ -53,10 +53,10 @@ func NewChange(device uuid.UUID, currentState ygot.GoStruct, change ygot.GoStruc
 	return c
 }
 
-// Change is an intended change to an OND. It is unique and immutable.
+// Change is an intended change to an MNE. It is unique and immutable.
 // It has a cuid, a timestamp, and holds both the previous and the new
 // state. It keeps track if the state is committed and confirmed. A callback
-// exists to acess the proper transport for the changed OND.
+// exists to acess the proper transport for the changed MNE.
 type Change struct {
 	cuid               uuid.UUID
 	duid               uuid.UUID
@@ -77,7 +77,7 @@ func (c *Change) ID() uuid.UUID {
 	return c.cuid
 }
 
-// Commit pushes the change to the OND using the callback() function
+// Commit pushes the change to the MNE using the callback() function
 // and starts the timeout-timer for the Change. If the timer expires
 // the change is rolled back.
 func (c *Change) Commit() error {
diff --git a/controller/nucleus/device.go b/controller/nucleus/device.go
index 8846b2ba75aeefaa9e5b72d5e505bad43f7f6271..400d5fdb6bdd11d78a473d5793b9c7365962a0cf 100644
--- a/controller/nucleus/device.go
+++ b/controller/nucleus/device.go
@@ -33,7 +33,7 @@ func NewDevice(name string, uuidInput uuid.UUID, opt *tpb.TransportOption, sbi s
 		name = namesgenerator.GetRandomName(0)
 	}
 
-	// We want a representation of the OND's config (the SBI-schema's root created through ygot),
+	// We want a representation of the MNE's config (the SBI-schema's root created through ygot),
 	// but do not want to work on the sbi.Schema() directly.
 	// So the root of sbi.Schema() is never changed when a set or get on a device will be called.
 	root, err := ygot.DeepCopy(sbi.Schema().Root)
@@ -71,7 +71,7 @@ func NewDevice(name string, uuidInput uuid.UUID, opt *tpb.TransportOption, sbi s
 	}, nil
 }
 
-// CommonDevice represents an OND.
+// CommonDevice represents an MNE.
 type CommonDevice struct {
 	// UUID represents the Devices UUID
 	UUID uuid.UUID
diff --git a/controller/nucleus/principalNetworkDomain.go b/controller/nucleus/principalNetworkDomain.go
index fe4b0f9ac6373339d5a5cf3c1599478811e3a88c..e694549174d8b389927b8ac32d75483d12d25a7a 100644
--- a/controller/nucleus/principalNetworkDomain.go
+++ b/controller/nucleus/principalNetworkDomain.go
@@ -501,11 +501,11 @@ func (pnd *pndImplementation) ensureIntendedConfigurationIsAppliedOnDevice(devic
 	return nil
 }
 
-// ChangeOND creates a change from the provided Operation, path and value.
+// ChangeMNE creates a change from the provided Operation, path and value.
 // The Change is Pending and times out after the specified timeout period.
 //
 // nolint:gocyclo
-func (pnd *pndImplementation) ChangeOND(duid uuid.UUID, operation ppb.ApiOperation, path string, value ...string) (uuid.UUID, error) {
+func (pnd *pndImplementation) ChangeMNE(duid uuid.UUID, operation ppb.ApiOperation, path string, value ...string) (uuid.UUID, error) {
 	//TODO: check if we can get cyclomatic complexity from 16 to at least 15
 	d, err := pnd.deviceService.Get(store.Query{
 		ID: duid,
@@ -526,7 +526,7 @@ func (pnd *pndImplementation) ChangeOND(duid uuid.UUID, operation ppb.ApiOperati
 
 	if operation != ppb.ApiOperation_API_OPERATION_DELETE && len(value) != 1 {
 		return uuid.Nil, &customerrs.InvalidParametersError{
-			Func:  pnd.ChangeOND,
+			Func:  pnd.ChangeMNE,
 			Param: value,
 		}
 	}
@@ -949,7 +949,7 @@ func (pnd *pndImplementation) MarshalBSON() ([]byte, error) {
 	})
 }
 
-// UpdateONDAfterSubscribeResponse takes a device and forwards it to the device service to handle the update.
+// UpdateMNEAfterSubscribeResponse takes a device and forwards it to the device service to handle the update.
 func (pnd *pndImplementation) UpdateDeviceAfterSubscribeResponse(device device.Device) error {
 	if err := pnd.deviceService.Update(device); err != nil {
 		return err
diff --git a/controller/nucleus/principalNetworkDomain_test.go b/controller/nucleus/principalNetworkDomain_test.go
index 214d3e767dfb93424cb1ccec586cfb7415dd30dc..185c91c68b8422e62208cea8df8f504752b4e619 100644
--- a/controller/nucleus/principalNetworkDomain_test.go
+++ b/controller/nucleus/principalNetworkDomain_test.go
@@ -678,7 +678,7 @@ func Test_pndImplementation_RequestAll(t *testing.T) {
 	}
 }
 
-func Test_pndImplementation_ChangeOND(t *testing.T) {
+func Test_pndImplementation_ChangeMNE(t *testing.T) {
 	opts := &tpb.TransportOption{
 		TransportOption: &tpb.TransportOption_GnmiTransportOption{
 			GnmiTransportOption: &tpb.GnmiTransportOption{},
@@ -799,14 +799,14 @@ func Test_pndImplementation_ChangeOND(t *testing.T) {
 				return
 			}
 
-			_, err = pnd.ChangeOND(deviceUUID, tt.args.operation, tt.args.path, tt.args.value...)
+			_, err = pnd.ChangeMNE(deviceUUID, tt.args.operation, tt.args.path, tt.args.value...)
 			if (err != nil) != tt.wantErr {
-				t.Errorf("ChangeOND() error = %v, wantErr %v", err, tt.wantErr)
+				t.Errorf("ChangeMNE() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
 			if !tt.wantErr {
 				if len(pnd.changes.Store) != 1 {
-					t.Errorf("ChangeOND() unexpected change count. got %v, want 1", len(pnd.changes.Store))
+					t.Errorf("ChangeMNE() unexpected change count. got %v, want 1", len(pnd.changes.Store))
 				}
 			}
 		})
@@ -999,7 +999,7 @@ func Test_pndImplementation_Confirm(t *testing.T) {
 				t.Error(err)
 				return
 			}
-			_, err = pnd.ChangeOND(d.ID(), ppb.ApiOperation_API_OPERATION_UPDATE, "system/config/hostname", "ceos3000")
+			_, err = pnd.ChangeMNE(d.ID(), ppb.ApiOperation_API_OPERATION_UPDATE, "system/config/hostname", "ceos3000")
 			if err != nil {
 				t.Error(err)
 				return
diff --git a/controller/test/integration/nucleusIntegration_test.go b/controller/test/integration/nucleusIntegration_test.go
index 5cf80f4c2ea16e2a7c5076e87b99e729d81cb190..5938658f49a0720bd90fe0ba96f65fb0bef6345f 100644
--- a/controller/test/integration/nucleusIntegration_test.go
+++ b/controller/test/integration/nucleusIntegration_test.go
@@ -228,7 +228,7 @@ func TestGnmi_SetValidIntegration(t *testing.T) {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			cuid, err := pnd.ChangeOND(device.ID(), tt.apiOp, tt.path, tt.value)
+			cuid, err := pnd.ChangeMNE(device.ID(), tt.apiOp, tt.path, tt.value)
 			if err != nil {
 				t.Error(err)
 				return