diff --git a/go/common/common.pb.go b/go/common/common.pb.go
index 169cd74..ce8acf9 100644
--- a/go/common/common.pb.go
+++ b/go/common/common.pb.go
@@ -1,11 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: voltha_protos/common.proto
 
-package common // import "github.com/opencord/voltha-protos/go/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -16,7 +18,7 @@
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type TestModeKeys int32
 
@@ -27,6 +29,7 @@
 var TestModeKeys_name = map[int32]string{
 	0: "api_test",
 }
+
 var TestModeKeys_value = map[string]int32{
 	"api_test": 0,
 }
@@ -34,8 +37,9 @@
 func (x TestModeKeys) String() string {
 	return proto.EnumName(TestModeKeys_name, int32(x))
 }
+
 func (TestModeKeys) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_87dc80f46ec1fd6b, []int{0}
+	return fileDescriptor_c2e3fd231961e826, []int{0}
 }
 
 // Logging verbosity level
@@ -58,6 +62,7 @@
 	4: "CRITICAL",
 	5: "FATAL",
 }
+
 var LogLevel_LogLevel_value = map[string]int32{
 	"DEBUG":    0,
 	"INFO":     1,
@@ -70,8 +75,9 @@
 func (x LogLevel_LogLevel) String() string {
 	return proto.EnumName(LogLevel_LogLevel_name, int32(x))
 }
+
 func (LogLevel_LogLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_87dc80f46ec1fd6b, []int{2, 0}
+	return fileDescriptor_c2e3fd231961e826, []int{2, 0}
 }
 
 // Administrative State
@@ -101,6 +107,7 @@
 	4: "DOWNLOADING_IMAGE",
 	5: "DELETED",
 }
+
 var AdminState_AdminState_value = map[string]int32{
 	"UNKNOWN":           0,
 	"PREPROVISIONED":    1,
@@ -113,8 +120,9 @@
 func (x AdminState_AdminState) String() string {
 	return proto.EnumName(AdminState_AdminState_name, int32(x))
 }
+
 func (AdminState_AdminState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_87dc80f46ec1fd6b, []int{3, 0}
+	return fileDescriptor_c2e3fd231961e826, []int{3, 0}
 }
 
 // Operational Status
@@ -143,6 +151,7 @@
 	4: "ACTIVE",
 	5: "FAILED",
 }
+
 var OperStatus_OperStatus_value = map[string]int32{
 	"UNKNOWN":    0,
 	"DISCOVERED": 1,
@@ -155,8 +164,9 @@
 func (x OperStatus_OperStatus) String() string {
 	return proto.EnumName(OperStatus_OperStatus_name, int32(x))
 }
+
 func (OperStatus_OperStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_87dc80f46ec1fd6b, []int{4, 0}
+	return fileDescriptor_c2e3fd231961e826, []int{4, 0}
 }
 
 // Connectivity Status
@@ -176,6 +186,7 @@
 	1: "UNREACHABLE",
 	2: "REACHABLE",
 }
+
 var ConnectStatus_ConnectStatus_value = map[string]int32{
 	"UNKNOWN":     0,
 	"UNREACHABLE": 1,
@@ -185,8 +196,9 @@
 func (x ConnectStatus_ConnectStatus) String() string {
 	return proto.EnumName(ConnectStatus_ConnectStatus_name, int32(x))
 }
+
 func (ConnectStatus_ConnectStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_87dc80f46ec1fd6b, []int{5, 0}
+	return fileDescriptor_c2e3fd231961e826, []int{5, 0}
 }
 
 type OperationResp_OperationReturnCode int32
@@ -202,6 +214,7 @@
 	1: "OPERATION_FAILURE",
 	2: "OPERATION_UNSUPPORTED",
 }
+
 var OperationResp_OperationReturnCode_value = map[string]int32{
 	"OPERATION_SUCCESS":     0,
 	"OPERATION_FAILURE":     1,
@@ -211,8 +224,9 @@
 func (x OperationResp_OperationReturnCode) String() string {
 	return proto.EnumName(OperationResp_OperationReturnCode_name, int32(x))
 }
+
 func (OperationResp_OperationReturnCode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_common_87dc80f46ec1fd6b, []int{6, 0}
+	return fileDescriptor_c2e3fd231961e826, []int{6, 0}
 }
 
 // Convey a resource identifier
@@ -227,16 +241,17 @@
 func (m *ID) String() string { return proto.CompactTextString(m) }
 func (*ID) ProtoMessage()    {}
 func (*ID) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_87dc80f46ec1fd6b, []int{0}
+	return fileDescriptor_c2e3fd231961e826, []int{0}
 }
+
 func (m *ID) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ID.Unmarshal(m, b)
 }
 func (m *ID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ID.Marshal(b, m, deterministic)
 }
-func (dst *ID) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ID.Merge(dst, src)
+func (m *ID) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ID.Merge(m, src)
 }
 func (m *ID) XXX_Size() int {
 	return xxx_messageInfo_ID.Size(m)
@@ -266,16 +281,17 @@
 func (m *IDs) String() string { return proto.CompactTextString(m) }
 func (*IDs) ProtoMessage()    {}
 func (*IDs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_87dc80f46ec1fd6b, []int{1}
+	return fileDescriptor_c2e3fd231961e826, []int{1}
 }
+
 func (m *IDs) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IDs.Unmarshal(m, b)
 }
 func (m *IDs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_IDs.Marshal(b, m, deterministic)
 }
-func (dst *IDs) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IDs.Merge(dst, src)
+func (m *IDs) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_IDs.Merge(m, src)
 }
 func (m *IDs) XXX_Size() int {
 	return xxx_messageInfo_IDs.Size(m)
@@ -303,16 +319,17 @@
 func (m *LogLevel) String() string { return proto.CompactTextString(m) }
 func (*LogLevel) ProtoMessage()    {}
 func (*LogLevel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_87dc80f46ec1fd6b, []int{2}
+	return fileDescriptor_c2e3fd231961e826, []int{2}
 }
+
 func (m *LogLevel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_LogLevel.Unmarshal(m, b)
 }
 func (m *LogLevel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_LogLevel.Marshal(b, m, deterministic)
 }
-func (dst *LogLevel) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LogLevel.Merge(dst, src)
+func (m *LogLevel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogLevel.Merge(m, src)
 }
 func (m *LogLevel) XXX_Size() int {
 	return xxx_messageInfo_LogLevel.Size(m)
@@ -333,16 +350,17 @@
 func (m *AdminState) String() string { return proto.CompactTextString(m) }
 func (*AdminState) ProtoMessage()    {}
 func (*AdminState) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_87dc80f46ec1fd6b, []int{3}
+	return fileDescriptor_c2e3fd231961e826, []int{3}
 }
+
 func (m *AdminState) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AdminState.Unmarshal(m, b)
 }
 func (m *AdminState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_AdminState.Marshal(b, m, deterministic)
 }
-func (dst *AdminState) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AdminState.Merge(dst, src)
+func (m *AdminState) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AdminState.Merge(m, src)
 }
 func (m *AdminState) XXX_Size() int {
 	return xxx_messageInfo_AdminState.Size(m)
@@ -363,16 +381,17 @@
 func (m *OperStatus) String() string { return proto.CompactTextString(m) }
 func (*OperStatus) ProtoMessage()    {}
 func (*OperStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_87dc80f46ec1fd6b, []int{4}
+	return fileDescriptor_c2e3fd231961e826, []int{4}
 }
+
 func (m *OperStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperStatus.Unmarshal(m, b)
 }
 func (m *OperStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperStatus.Marshal(b, m, deterministic)
 }
-func (dst *OperStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperStatus.Merge(dst, src)
+func (m *OperStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperStatus.Merge(m, src)
 }
 func (m *OperStatus) XXX_Size() int {
 	return xxx_messageInfo_OperStatus.Size(m)
@@ -393,16 +412,17 @@
 func (m *ConnectStatus) String() string { return proto.CompactTextString(m) }
 func (*ConnectStatus) ProtoMessage()    {}
 func (*ConnectStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_87dc80f46ec1fd6b, []int{5}
+	return fileDescriptor_c2e3fd231961e826, []int{5}
 }
+
 func (m *ConnectStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConnectStatus.Unmarshal(m, b)
 }
 func (m *ConnectStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConnectStatus.Marshal(b, m, deterministic)
 }
-func (dst *ConnectStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConnectStatus.Merge(dst, src)
+func (m *ConnectStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConnectStatus.Merge(m, src)
 }
 func (m *ConnectStatus) XXX_Size() int {
 	return xxx_messageInfo_ConnectStatus.Size(m)
@@ -427,16 +447,17 @@
 func (m *OperationResp) String() string { return proto.CompactTextString(m) }
 func (*OperationResp) ProtoMessage()    {}
 func (*OperationResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_common_87dc80f46ec1fd6b, []int{6}
+	return fileDescriptor_c2e3fd231961e826, []int{6}
 }
+
 func (m *OperationResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OperationResp.Unmarshal(m, b)
 }
 func (m *OperationResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_OperationResp.Marshal(b, m, deterministic)
 }
-func (dst *OperationResp) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OperationResp.Merge(dst, src)
+func (m *OperationResp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OperationResp.Merge(m, src)
 }
 func (m *OperationResp) XXX_Size() int {
 	return xxx_messageInfo_OperationResp.Size(m)
@@ -462,6 +483,12 @@
 }
 
 func init() {
+	proto.RegisterEnum("voltha.TestModeKeys", TestModeKeys_name, TestModeKeys_value)
+	proto.RegisterEnum("voltha.LogLevel_LogLevel", LogLevel_LogLevel_name, LogLevel_LogLevel_value)
+	proto.RegisterEnum("voltha.AdminState_AdminState", AdminState_AdminState_name, AdminState_AdminState_value)
+	proto.RegisterEnum("voltha.OperStatus_OperStatus", OperStatus_OperStatus_name, OperStatus_OperStatus_value)
+	proto.RegisterEnum("voltha.ConnectStatus_ConnectStatus", ConnectStatus_ConnectStatus_name, ConnectStatus_ConnectStatus_value)
+	proto.RegisterEnum("voltha.OperationResp_OperationReturnCode", OperationResp_OperationReturnCode_name, OperationResp_OperationReturnCode_value)
 	proto.RegisterType((*ID)(nil), "voltha.ID")
 	proto.RegisterType((*IDs)(nil), "voltha.IDs")
 	proto.RegisterType((*LogLevel)(nil), "voltha.LogLevel")
@@ -469,17 +496,11 @@
 	proto.RegisterType((*OperStatus)(nil), "voltha.OperStatus")
 	proto.RegisterType((*ConnectStatus)(nil), "voltha.ConnectStatus")
 	proto.RegisterType((*OperationResp)(nil), "voltha.OperationResp")
-	proto.RegisterEnum("voltha.TestModeKeys", TestModeKeys_name, TestModeKeys_value)
-	proto.RegisterEnum("voltha.LogLevel_LogLevel", LogLevel_LogLevel_name, LogLevel_LogLevel_value)
-	proto.RegisterEnum("voltha.AdminState_AdminState", AdminState_AdminState_name, AdminState_AdminState_value)
-	proto.RegisterEnum("voltha.OperStatus_OperStatus", OperStatus_OperStatus_name, OperStatus_OperStatus_value)
-	proto.RegisterEnum("voltha.ConnectStatus_ConnectStatus", ConnectStatus_ConnectStatus_name, ConnectStatus_ConnectStatus_value)
-	proto.RegisterEnum("voltha.OperationResp_OperationReturnCode", OperationResp_OperationReturnCode_name, OperationResp_OperationReturnCode_value)
 }
 
-func init() { proto.RegisterFile("voltha_protos/common.proto", fileDescriptor_common_87dc80f46ec1fd6b) }
+func init() { proto.RegisterFile("voltha_protos/common.proto", fileDescriptor_c2e3fd231961e826) }
 
-var fileDescriptor_common_87dc80f46ec1fd6b = []byte{
+var fileDescriptor_c2e3fd231961e826 = []byte{
 	// 564 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0x5f, 0x4f, 0xdb, 0x3e,
 	0x14, 0x6d, 0xd2, 0x3f, 0xc0, 0x2d, 0x94, 0xfc, 0xfc, 0x1b, 0x12, 0x43, 0x9b, 0x54, 0xe5, 0x05,
diff --git a/go/common/meta.pb.go b/go/common/meta.pb.go
index b8b9181..181f3dd 100644
--- a/go/common/meta.pb.go
+++ b/go/common/meta.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: voltha_protos/meta.proto
 
-package common // import "github.com/opencord/voltha-protos/go/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +19,7 @@
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Access int32
 
@@ -36,6 +38,7 @@
 	1: "READ_ONLY",
 	2: "REAL_TIME",
 }
+
 var Access_value = map[string]int32{
 	"CONFIG":    0,
 	"READ_ONLY": 1,
@@ -45,8 +48,9 @@
 func (x Access) String() string {
 	return proto.EnumName(Access_name, int32(x))
 }
+
 func (Access) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_meta_7d0d80d5e7f91838, []int{0}
+	return fileDescriptor_96b320e8a67781f3, []int{0}
 }
 
 type ChildNode struct {
@@ -60,16 +64,17 @@
 func (m *ChildNode) String() string { return proto.CompactTextString(m) }
 func (*ChildNode) ProtoMessage()    {}
 func (*ChildNode) Descriptor() ([]byte, []int) {
-	return fileDescriptor_meta_7d0d80d5e7f91838, []int{0}
+	return fileDescriptor_96b320e8a67781f3, []int{0}
 }
+
 func (m *ChildNode) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ChildNode.Unmarshal(m, b)
 }
 func (m *ChildNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ChildNode.Marshal(b, m, deterministic)
 }
-func (dst *ChildNode) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ChildNode.Merge(dst, src)
+func (m *ChildNode) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChildNode.Merge(m, src)
 }
 func (m *ChildNode) XXX_Size() int {
 	return xxx_messageInfo_ChildNode.Size(m)
@@ -92,7 +97,7 @@
 	ExtensionType: (*ChildNode)(nil),
 	Field:         7761772,
 	Name:          "voltha.child_node",
-	Tag:           "bytes,7761772,opt,name=child_node,json=childNode",
+	Tag:           "bytes,7761772,opt,name=child_node",
 	Filename:      "voltha_protos/meta.proto",
 }
 
@@ -106,15 +111,15 @@
 }
 
 func init() {
-	proto.RegisterType((*ChildNode)(nil), "voltha.ChildNode")
 	proto.RegisterEnum("voltha.Access", Access_name, Access_value)
+	proto.RegisterType((*ChildNode)(nil), "voltha.ChildNode")
 	proto.RegisterExtension(E_ChildNode)
 	proto.RegisterExtension(E_Access)
 }
 
-func init() { proto.RegisterFile("voltha_protos/meta.proto", fileDescriptor_meta_7d0d80d5e7f91838) }
+func init() { proto.RegisterFile("voltha_protos/meta.proto", fileDescriptor_96b320e8a67781f3) }
 
-var fileDescriptor_meta_7d0d80d5e7f91838 = []byte{
+var fileDescriptor_96b320e8a67781f3 = []byte{
 	// 271 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0x41, 0x4b, 0x84, 0x40,
 	0x18, 0x86, 0xb3, 0x05, 0xc1, 0x2f, 0x5a, 0xcc, 0x93, 0x04, 0x0b, 0xd2, 0x69, 0x29, 0x76, 0x06,
diff --git a/go/common/yang_options.pb.go b/go/common/yang_options.pb.go
index dcd1e35..9d6ee66 100644
--- a/go/common/yang_options.pb.go
+++ b/go/common/yang_options.pb.go
@@ -1,12 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: voltha_protos/yang_options.proto
 
-package common // import "github.com/opencord/voltha-protos/go/common"
+package common
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -17,7 +19,7 @@
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type MessageParserOption int32
 
@@ -35,6 +37,7 @@
 	0: "MOVE_TO_PARENT_LEVEL",
 	1: "CREATE_BOTH_GROUPING_AND_CONTAINER",
 }
+
 var MessageParserOption_value = map[string]int32{
 	"MOVE_TO_PARENT_LEVEL":               0,
 	"CREATE_BOTH_GROUPING_AND_CONTAINER": 1,
@@ -43,8 +46,9 @@
 func (x MessageParserOption) String() string {
 	return proto.EnumName(MessageParserOption_name, int32(x))
 }
+
 func (MessageParserOption) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_yang_options_40f3be6d35d15307, []int{0}
+	return fileDescriptor_e6be2fba65eb89fb, []int{0}
 }
 
 type InlineNode struct {
@@ -59,16 +63,17 @@
 func (m *InlineNode) String() string { return proto.CompactTextString(m) }
 func (*InlineNode) ProtoMessage()    {}
 func (*InlineNode) Descriptor() ([]byte, []int) {
-	return fileDescriptor_yang_options_40f3be6d35d15307, []int{0}
+	return fileDescriptor_e6be2fba65eb89fb, []int{0}
 }
+
 func (m *InlineNode) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InlineNode.Unmarshal(m, b)
 }
 func (m *InlineNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InlineNode.Marshal(b, m, deterministic)
 }
-func (dst *InlineNode) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InlineNode.Merge(dst, src)
+func (m *InlineNode) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InlineNode.Merge(m, src)
 }
 func (m *InlineNode) XXX_Size() int {
 	return xxx_messageInfo_InlineNode.Size(m)
@@ -115,16 +120,17 @@
 func (m *RpcReturnDef) String() string { return proto.CompactTextString(m) }
 func (*RpcReturnDef) ProtoMessage()    {}
 func (*RpcReturnDef) Descriptor() ([]byte, []int) {
-	return fileDescriptor_yang_options_40f3be6d35d15307, []int{1}
+	return fileDescriptor_e6be2fba65eb89fb, []int{1}
 }
+
 func (m *RpcReturnDef) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RpcReturnDef.Unmarshal(m, b)
 }
 func (m *RpcReturnDef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RpcReturnDef.Marshal(b, m, deterministic)
 }
-func (dst *RpcReturnDef) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RpcReturnDef.Merge(dst, src)
+func (m *RpcReturnDef) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RpcReturnDef.Merge(m, src)
 }
 func (m *RpcReturnDef) XXX_Size() int {
 	return xxx_messageInfo_RpcReturnDef.Size(m)
@@ -154,7 +160,7 @@
 	ExtensionType: (*MessageParserOption)(nil),
 	Field:         7761774,
 	Name:          "voltha.yang_child_rule",
-	Tag:           "varint,7761774,opt,name=yang_child_rule,json=yangChildRule,enum=voltha.MessageParserOption",
+	Tag:           "varint,7761774,opt,name=yang_child_rule,enum=voltha.MessageParserOption",
 	Filename:      "voltha_protos/yang_options.proto",
 }
 
@@ -163,7 +169,7 @@
 	ExtensionType: (*MessageParserOption)(nil),
 	Field:         7761775,
 	Name:          "voltha.yang_message_rule",
-	Tag:           "varint,7761775,opt,name=yang_message_rule,json=yangMessageRule,enum=voltha.MessageParserOption",
+	Tag:           "varint,7761775,opt,name=yang_message_rule,enum=voltha.MessageParserOption",
 	Filename:      "voltha_protos/yang_options.proto",
 }
 
@@ -172,7 +178,7 @@
 	ExtensionType: (*InlineNode)(nil),
 	Field:         7761776,
 	Name:          "voltha.yang_inline_node",
-	Tag:           "bytes,7761776,opt,name=yang_inline_node,json=yangInlineNode",
+	Tag:           "bytes,7761776,opt,name=yang_inline_node",
 	Filename:      "voltha_protos/yang_options.proto",
 }
 
@@ -181,25 +187,23 @@
 	ExtensionType: (*RpcReturnDef)(nil),
 	Field:         7761777,
 	Name:          "voltha.yang_xml_tag",
-	Tag:           "bytes,7761777,opt,name=yang_xml_tag,json=yangXmlTag",
+	Tag:           "bytes,7761777,opt,name=yang_xml_tag",
 	Filename:      "voltha_protos/yang_options.proto",
 }
 
 func init() {
+	proto.RegisterEnum("voltha.MessageParserOption", MessageParserOption_name, MessageParserOption_value)
 	proto.RegisterType((*InlineNode)(nil), "voltha.InlineNode")
 	proto.RegisterType((*RpcReturnDef)(nil), "voltha.RpcReturnDef")
-	proto.RegisterEnum("voltha.MessageParserOption", MessageParserOption_name, MessageParserOption_value)
 	proto.RegisterExtension(E_YangChildRule)
 	proto.RegisterExtension(E_YangMessageRule)
 	proto.RegisterExtension(E_YangInlineNode)
 	proto.RegisterExtension(E_YangXmlTag)
 }
 
-func init() {
-	proto.RegisterFile("voltha_protos/yang_options.proto", fileDescriptor_yang_options_40f3be6d35d15307)
-}
+func init() { proto.RegisterFile("voltha_protos/yang_options.proto", fileDescriptor_e6be2fba65eb89fb) }
 
-var fileDescriptor_yang_options_40f3be6d35d15307 = []byte{
+var fileDescriptor_e6be2fba65eb89fb = []byte{
 	// 452 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x4d, 0x6f, 0xd3, 0x30,
 	0x18, 0xc7, 0x69, 0x41, 0x45, 0x98, 0xad, 0x2b, 0x66, 0x12, 0x15, 0x08, 0xa8, 0x7a, 0x98, 0x26,