diff --git a/internal/common/omci/create_test.go b/internal/common/omci/create_test.go
index 93524b3..cbd64ff 100644
--- a/internal/common/omci/create_test.go
+++ b/internal/common/omci/create_test.go
@@ -17,11 +17,12 @@
 package omci
 
 import (
+	"testing"
+
 	"github.com/google/gopacket"
 	"github.com/opencord/omci-lib-go/v2"
 	me "github.com/opencord/omci-lib-go/v2/generated"
 	"gotest.tools/assert"
-	"testing"
 )
 
 func omciToCreateResponse(t *testing.T, omciPkt *gopacket.Packet) *omci.CreateResponse {
@@ -54,14 +55,14 @@
 			EntityInstance: 12,
 		},
 		Attributes: me.AttributeValueMap{
-			"PortId":                              0,
-			"TContPointer":                        0,
-			"Direction":                           0,
-			"TrafficManagementPointerForUpstream": 0,
-			"TrafficDescriptorProfilePointerForUpstream":   0,
-			"PriorityQueuePointerForDownStream":            0,
-			"TrafficDescriptorProfilePointerForDownstream": 0,
-			"EncryptionKeyRing":                            0,
+			me.GemPortNetworkCtp_PortId:                                       0,
+			me.GemPortNetworkCtp_TContPointer:                                 0,
+			me.GemPortNetworkCtp_Direction:                                    0,
+			me.GemPortNetworkCtp_TrafficManagementPointerForUpstream:          0,
+			me.GemPortNetworkCtp_TrafficDescriptorProfilePointerForUpstream:   0,
+			me.GemPortNetworkCtp_PriorityQueuePointerForDownStream:            0,
+			me.GemPortNetworkCtp_TrafficDescriptorProfilePointerForDownstream: 0,
+			me.GemPortNetworkCtp_EncryptionKeyRing:                            0,
 		},
 	}
 	omciPkt, err := Serialize(omci.CreateRequestType, omciReq, 66)
diff --git a/internal/common/omci/get.go b/internal/common/omci/get.go
index f8680a8..6d83495 100644
--- a/internal/common/omci/get.go
+++ b/internal/common/omci/get.go
@@ -126,21 +126,21 @@
 	managedEntity, meErr := me.NewOnu2G(me.ParamData{
 		EntityID: entityID,
 		Attributes: me.AttributeValueMap{
-			"ManagedEntityId": entityID,
-			"EquipmentId":     ToOctets("12345123451234512345", 20),
-			"OpticalNetworkUnitManagementAndControlChannelOmccVersion": 180,
-			"VendorProductCode":                           0,
-			"SecurityCapability":                          1,
-			"SecurityMode":                                1,
-			"TotalPriorityQueueNumber":                    1,
-			"TotalTrafficSchedulerNumber":                 1,
-			"Deprecated":                                  1,
-			"TotalGemPortIdNumber":                        32,
-			"Sysuptime":                                   319389947, // NOTE need to be smarter?
-			"ConnectivityCapability":                      127,
-			"CurrentConnectivityMode":                     5,
-			"QualityOfServiceQosConfigurationFlexibility": 48,
-			"PriorityQueueScaleFactor":                    1,
+			me.ManagedEntityID:   entityID,
+			me.Onu2G_EquipmentId: ToOctets("12345123451234512345", 20),
+			me.Onu2G_OpticalNetworkUnitManagementAndControlChannelOmccVersion: 180,
+			me.Onu2G_VendorProductCode:                                        0,
+			me.Onu2G_SecurityCapability:                                       1,
+			me.Onu2G_SecurityMode:                                             1,
+			me.Onu2G_TotalPriorityQueueNumber:                                 1,
+			me.Onu2G_TotalTrafficSchedulerNumber:                              1,
+			me.Onu2G_Deprecated:                                               1,
+			me.Onu2G_TotalGemPortIdNumber:                                     32,
+			me.Onu2G_Sysuptime:                                                319389947, // NOTE need to be smarter?
+			me.Onu2G_ConnectivityCapability:                                   127,
+			me.Onu2G_CurrentConnectivityMode:                                  5,
+			me.Onu2G_QualityOfServiceQosConfigurationFlexibility:              48,
+			me.Onu2G_PriorityQueueScaleFactor:                                 1,
 		},
 	})
 
@@ -164,20 +164,20 @@
 	managedEntity, meErr := me.NewOnuG(me.ParamData{
 		EntityID: entityID,
 		Attributes: me.AttributeValueMap{
-			"ManagedEntityId":         entityID,
-			"VendorId":                ToOctets("BBSM", 4),
-			"Version":                 ToOctets("v0.0.1", 14),
-			"SerialNumber":            append(onuSn.VendorId, onuSn.VendorSpecific...),
-			"TrafficManagementOption": 0,
-			"Deprecated":              0,
-			"BatteryBackup":           0,
-			"AdministrativeState":     0,
-			"OperationalState":        0,
-			"OnuSurvivalTime":         10,
-			"LogicalOnuId":            ToOctets("BBSM", 24),
-			"LogicalPassword":         ToOctets("BBSM", 12),
-			"CredentialsStatus":       0,
-			"ExtendedTcLayerOptions":  0,
+			me.ManagedEntityID:              entityID,
+			me.OnuG_VendorId:                ToOctets("BBSM", 4),
+			me.OnuG_Version:                 ToOctets("v0.0.1", 14),
+			me.OnuG_SerialNumber:            append(onuSn.VendorId, onuSn.VendorSpecific...),
+			me.OnuG_TrafficManagementOption: 0,
+			me.OnuG_Deprecated:              0,
+			me.OnuG_BatteryBackup:           0,
+			me.OnuG_AdministrativeState:     0,
+			me.OnuG_OperationalState:        0,
+			me.OnuG_OnuSurvivalTime:         10,
+			me.OnuG_LogicalOnuId:            ToOctets("BBSM", 24),
+			me.OnuG_LogicalPassword:         ToOctets("BBSM", 12),
+			me.OnuG_CredentialsStatus:       0,
+			me.OnuG_ExtendedTcLayerOptions:  0,
 		},
 	})
 
@@ -246,13 +246,13 @@
 			EntityInstance: entityInstance,
 		},
 		Attributes: me.AttributeValueMap{
-			"ManagedEntityId": 0,
-			"Version":         ToOctets(version, 14),
-			"IsCommitted":     committed,
-			"IsActive":        active,
-			"IsValid":         1,
-			"ProductCode":     ToOctets("BBSIM-ONU", 25),
-			"ImageHash":       imageHash,
+			me.ManagedEntityID:           0,
+			me.SoftwareImage_Version:     ToOctets(version, 14),
+			me.SoftwareImage_IsCommitted: committed,
+			me.SoftwareImage_IsActive:    active,
+			me.SoftwareImage_IsValid:     1,
+			me.SoftwareImage_ProductCode: ToOctets("BBSIM-ONU", 25),
+			me.SoftwareImage_ImageHash:   imageHash,
 		},
 		Result:        me.Success,
 		AttributeMask: attributeMask,
@@ -275,8 +275,8 @@
 			EntityInstance: entityInstance,
 		},
 		Attributes: me.AttributeValueMap{
-			"ManagedEntityId": 0,
-			"MacAddress":      ToOctets("aabbcc", 6),
+			me.ManagedEntityID:             0,
+			me.IpHostConfigData_MacAddress: ToOctets("aabbcc", 6),
 		},
 		Result:        me.Success,
 		AttributeMask: attributeMask,
@@ -290,15 +290,15 @@
 			EntityInstance: entityInstance,
 		},
 		Attributes: me.AttributeValueMap{
-			"ManagedEntityId":                   0,
-			"AvailableSignallingProtocols":      1,
-			"SignallingProtocolUsed":            1,
-			"AvailableVoipConfigurationMethods": 1,
-			"VoipConfigurationMethodUsed":       1,
-			"VoipConfigurationAddressPointer":   0xFFFF,
-			"VoipConfigurationState":            0,
-			"RetrieveProfile":                   0,
-			"ProfileVersion":                    0,
+			me.ManagedEntityID: 0,
+			me.VoipConfigData_AvailableSignallingProtocols:      1,
+			me.VoipConfigData_SignallingProtocolUsed:            1,
+			me.VoipConfigData_AvailableVoipConfigurationMethods: 1,
+			me.VoipConfigData_VoipConfigurationMethodUsed:       1,
+			me.VoipConfigData_VoipConfigurationAddressPointer:   0xFFFF,
+			me.VoipConfigData_VoipConfigurationState:            0,
+			me.VoipConfigData_RetrieveProfile:                   0,
+			me.VoipConfigData_ProfileVersion:                    0,
 		},
 		Result:        me.Success,
 		AttributeMask: attributeMask,
@@ -314,12 +314,12 @@
 	managedEntity, meErr := me.NewUniG(me.ParamData{
 		EntityID: entityID,
 		Attributes: me.AttributeValueMap{
-			"ManagedEntityId":             entityID,
-			"Deprecated":                  0,
-			"AdministrativeState":         omciAdminState,
-			"ManagementCapability":        0,
-			"NonOmciManagementIdentifier": 1,
-			"RelayAgentOptions":           1,
+			me.ManagedEntityID:                  entityID,
+			me.UniG_Deprecated:                  0,
+			me.UniG_AdministrativeState:         omciAdminState,
+			me.UniG_ManagementCapability:        0,
+			me.UniG_NonOmciManagementIdentifier: 1,
+			me.UniG_RelayAgentOptions:           1,
 		},
 	})
 
@@ -350,22 +350,22 @@
 	managedEntity, meErr := me.NewPhysicalPathTerminationPointEthernetUni(me.ParamData{
 		EntityID: entityID,
 		Attributes: me.AttributeValueMap{
-			"ManagedEntityId":               entityID,
-			"ExpectedType":                  0,
-			"SensedType":                    0,
-			"AutoDetectionConfiguration":    0,
-			"EthernetLoopbackConfiguration": 0,
-			"AdministrativeState":           onuAdminState,
-			"OperationalState":              onuOperState,
-			"ConfigurationInd":              0,
-			"MaxFrameSize":                  0,
-			"DteOrDceInd":                   0,
-			"PauseTime":                     0,
-			"BridgedOrIpInd":                0,
-			"Arc":                           0,
-			"ArcInterval":                   0,
-			"PppoeFilter":                   0,
-			"PowerControl":                  0,
+			me.ManagedEntityID: entityID,
+			me.PhysicalPathTerminationPointEthernetUni_ExpectedType:                  0,
+			me.PhysicalPathTerminationPointEthernetUni_SensedType:                    0,
+			me.PhysicalPathTerminationPointEthernetUni_AutoDetectionConfiguration:    0,
+			me.PhysicalPathTerminationPointEthernetUni_EthernetLoopbackConfiguration: 0,
+			me.PhysicalPathTerminationPointEthernetUni_AdministrativeState:           onuAdminState,
+			me.PhysicalPathTerminationPointEthernetUni_OperationalState:              onuOperState,
+			me.PhysicalPathTerminationPointEthernetUni_ConfigurationInd:              0,
+			me.PhysicalPathTerminationPointEthernetUni_MaxFrameSize:                  0,
+			me.PhysicalPathTerminationPointEthernetUni_DteOrDceInd:                   0,
+			me.PhysicalPathTerminationPointEthernetUni_PauseTime:                     0,
+			me.PhysicalPathTerminationPointEthernetUni_BridgedOrIpInd:                0,
+			me.PhysicalPathTerminationPointEthernetUni_Arc:                           0,
+			me.PhysicalPathTerminationPointEthernetUni_ArcInterval:                   0,
+			me.PhysicalPathTerminationPointEthernetUni_PppoeFilter:                   0,
+			me.PhysicalPathTerminationPointEthernetUni_PowerControl:                  0,
 		},
 	})
 
@@ -396,20 +396,20 @@
 	managedEntity, meErr := me.NewPhysicalPathTerminationPointPotsUni(me.ParamData{
 		EntityID: entityID,
 		Attributes: me.AttributeValueMap{
-			"ManagedEntityId":     entityID,
-			"AdministrativeState": onuAdminState,
-			"Deprecated":          0,
-			"Arc":                 0,
-			"ArcInterval":         0,
-			"Impedance":           0,
-			"TransmissionPath":    0,
-			"RxGain":              0,
-			"TxGain":              0,
-			"OperationalState":    onuOperState,
-			"HookState":           0,
-			"PotsHoldoverTime":    0,
-			"NominalFeedVoltage":  0,
-			"LossOfSoftswitch":    0,
+			me.ManagedEntityID: entityID,
+			me.PhysicalPathTerminationPointPotsUni_AdministrativeState: onuAdminState,
+			me.PhysicalPathTerminationPointPotsUni_Deprecated:          0,
+			me.PhysicalPathTerminationPointPotsUni_Arc:                 0,
+			me.PhysicalPathTerminationPointPotsUni_ArcInterval:         0,
+			me.PhysicalPathTerminationPointPotsUni_Impedance:           0,
+			me.PhysicalPathTerminationPointPotsUni_TransmissionPath:    0,
+			me.PhysicalPathTerminationPointPotsUni_RxGain:              0,
+			me.PhysicalPathTerminationPointPotsUni_TxGain:              0,
+			me.PhysicalPathTerminationPointPotsUni_OperationalState:    onuOperState,
+			me.PhysicalPathTerminationPointPotsUni_HookState:           0,
+			me.PhysicalPathTerminationPointPotsUni_PotsHoldoverTime:    0,
+			me.PhysicalPathTerminationPointPotsUni_NominalFeedVoltage:  0,
+			me.PhysicalPathTerminationPointPotsUni_LossOfSoftswitch:    0,
 		},
 	})
 
@@ -433,23 +433,23 @@
 	managedEntity, meErr := me.NewEthernetFramePerformanceMonitoringHistoryDataUpstream(me.ParamData{
 		EntityID: entityID,
 		Attributes: me.AttributeValueMap{
-			"ManagedEntityId":         entityID,
-			"IntervalEndTime":         0, // This ideally should increment by 1 every collection interval, but staying 0 for simulation is Ok for now.
-			"ThresholdData12Id":       0,
-			"DropEvents":              rand.Intn(100),
-			"Octets":                  rand.Intn(100),
-			"Packets":                 rand.Intn(100),
-			"BroadcastPackets":        rand.Intn(100),
-			"MulticastPackets":        rand.Intn(100),
-			"CrcErroredPackets":       rand.Intn(100),
-			"UndersizePackets":        rand.Intn(100),
-			"OversizePackets":         rand.Intn(100),
-			"Packets64Octets":         rand.Intn(100),
-			"Packets65To127Octets":    rand.Intn(100),
-			"Packets128To255Octets":   rand.Intn(100),
-			"Packets256To511Octets":   rand.Intn(100),
-			"Packets512To1023Octets":  rand.Intn(100),
-			"Packets1024To1518Octets": rand.Intn(100),
+			me.ManagedEntityID: entityID,
+			me.EthernetFramePerformanceMonitoringHistoryDataUpstream_IntervalEndTime:         0, // This ideally should increment by 1 every collection interval, but staying 0 for simulation is Ok for now.
+			me.EthernetFramePerformanceMonitoringHistoryDataUpstream_ThresholdData12Id:       0,
+			me.EthernetFramePerformanceMonitoringHistoryDataUpstream_DropEvents:              rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataUpstream_Octets:                  rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataUpstream_Packets:                 rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataUpstream_BroadcastPackets:        rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataUpstream_MulticastPackets:        rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataUpstream_CrcErroredPackets:       rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataUpstream_UndersizePackets:        rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataUpstream_OversizePackets:         rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataUpstream_Packets64Octets:         rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataUpstream_Packets65To127Octets:    rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataUpstream_Packets128To255Octets:   rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataUpstream_Packets256To511Octets:   rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataUpstream_Packets512To1023Octets:  rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataUpstream_Packets1024To1518Octets: rand.Intn(100),
 		},
 	})
 
@@ -473,23 +473,23 @@
 	managedEntity, meErr := me.NewEthernetFramePerformanceMonitoringHistoryDataDownstream(me.ParamData{
 		EntityID: entityID,
 		Attributes: me.AttributeValueMap{
-			"ManagedEntityId":         entityID,
-			"IntervalEndTime":         0, // This ideally should increment by 1 every collection interval, but staying 0 for simulation is Ok for now.
-			"ThresholdData12Id":       0,
-			"DropEvents":              rand.Intn(100),
-			"Octets":                  rand.Intn(100),
-			"Packets":                 rand.Intn(100),
-			"BroadcastPackets":        rand.Intn(100),
-			"MulticastPackets":        rand.Intn(100),
-			"CrcErroredPackets":       rand.Intn(100),
-			"UndersizePackets":        rand.Intn(100),
-			"OversizePackets":         rand.Intn(100),
-			"Packets64Octets":         rand.Intn(100),
-			"Packets65To127Octets":    rand.Intn(100),
-			"Packets128To255Octets":   rand.Intn(100),
-			"Packets256To511Octets":   rand.Intn(100),
-			"Packets512To1023Octets":  rand.Intn(100),
-			"Packets1024To1518Octets": rand.Intn(100),
+			me.ManagedEntityID: entityID,
+			me.EthernetFramePerformanceMonitoringHistoryDataDownstream_IntervalEndTime:         0, // This ideally should increment by 1 every collection interval, but staying 0 for simulation is Ok for now.
+			me.EthernetFramePerformanceMonitoringHistoryDataDownstream_ThresholdData12Id:       0,
+			me.EthernetFramePerformanceMonitoringHistoryDataDownstream_DropEvents:              rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataDownstream_Octets:                  rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataDownstream_Packets:                 rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataDownstream_BroadcastPackets:        rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataDownstream_MulticastPackets:        rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataDownstream_CrcErroredPackets:       rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataDownstream_UndersizePackets:        rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataDownstream_OversizePackets:         rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataDownstream_Packets64Octets:         rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataDownstream_Packets65To127Octets:    rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataDownstream_Packets128To255Octets:   rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataDownstream_Packets256To511Octets:   rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataDownstream_Packets512To1023Octets:  rand.Intn(100),
+			me.EthernetFramePerformanceMonitoringHistoryDataDownstream_Packets1024To1518Octets: rand.Intn(100),
 		},
 	})
 
@@ -513,23 +513,23 @@
 	managedEntity, meErr := me.NewEthernetPerformanceMonitoringHistoryData(me.ParamData{
 		EntityID: entityID,
 		Attributes: me.AttributeValueMap{
-			"ManagedEntityId":                 entityID,
-			"IntervalEndTime":                 0, // This ideally should increment by 1 every collection interval, but staying 0 for simulation is Ok for now.
-			"ThresholdData12Id":               0,
-			"FcsErrors":                       rand.Intn(100),
-			"ExcessiveCollisionCounter":       rand.Intn(100),
-			"LateCollisionCounter":            rand.Intn(100),
-			"FramesTooLong":                   rand.Intn(100),
-			"BufferOverflowsOnReceive":        rand.Intn(100),
-			"BufferOverflowsOnTransmit":       rand.Intn(100),
-			"SingleCollisionFrameCounter":     rand.Intn(100),
-			"MultipleCollisionsFrameCounter":  rand.Intn(100),
-			"SqeCounter":                      rand.Intn(100),
-			"DeferredTransmissionCounter":     rand.Intn(100),
-			"InternalMacTransmitErrorCounter": rand.Intn(100),
-			"CarrierSenseErrorCounter":        rand.Intn(100),
-			"AlignmentErrorCounter":           rand.Intn(100),
-			"InternalMacReceiveErrorCounter":  rand.Intn(100),
+			me.ManagedEntityID: entityID,
+			me.EthernetPerformanceMonitoringHistoryData_IntervalEndTime:                 0, // This ideally should increment by 1 every collection interval, but staying 0 for simulation is Ok for now.
+			me.EthernetPerformanceMonitoringHistoryData_ThresholdData12Id:               0,
+			me.EthernetPerformanceMonitoringHistoryData_FcsErrors:                       rand.Intn(100),
+			me.EthernetPerformanceMonitoringHistoryData_ExcessiveCollisionCounter:       rand.Intn(100),
+			me.EthernetPerformanceMonitoringHistoryData_LateCollisionCounter:            rand.Intn(100),
+			me.EthernetPerformanceMonitoringHistoryData_FramesTooLong:                   rand.Intn(100),
+			me.EthernetPerformanceMonitoringHistoryData_BufferOverflowsOnReceive:        rand.Intn(100),
+			me.EthernetPerformanceMonitoringHistoryData_BufferOverflowsOnTransmit:       rand.Intn(100),
+			me.EthernetPerformanceMonitoringHistoryData_SingleCollisionFrameCounter:     rand.Intn(100),
+			me.EthernetPerformanceMonitoringHistoryData_MultipleCollisionsFrameCounter:  rand.Intn(100),
+			me.EthernetPerformanceMonitoringHistoryData_SqeCounter:                      rand.Intn(100),
+			me.EthernetPerformanceMonitoringHistoryData_DeferredTransmissionCounter:     rand.Intn(100),
+			me.EthernetPerformanceMonitoringHistoryData_InternalMacTransmitErrorCounter: rand.Intn(100),
+			me.EthernetPerformanceMonitoringHistoryData_CarrierSenseErrorCounter:        rand.Intn(100),
+			me.EthernetPerformanceMonitoringHistoryData_AlignmentErrorCounter:           rand.Intn(100),
+			me.EthernetPerformanceMonitoringHistoryData_InternalMacReceiveErrorCounter:  rand.Intn(100),
 		},
 	})
 
@@ -553,14 +553,14 @@
 	managedEntity, meErr := me.NewFecPerformanceMonitoringHistoryData(me.ParamData{
 		EntityID: entityID,
 		Attributes: me.AttributeValueMap{
-			"ManagedEntityId":        entityID,
-			"IntervalEndTime":        0, // This ideally should increment by 1 every collection interval, but staying 0 for simulation is Ok for now.
-			"ThresholdData12Id":      0,
-			"CorrectedBytes":         rand.Intn(100),
-			"CorrectedCodeWords":     rand.Intn(100),
-			"UncorrectableCodeWords": rand.Intn(100),
-			"TotalCodeWords":         rand.Intn(100),
-			"FecSeconds":             rand.Intn(100),
+			me.ManagedEntityID: entityID,
+			me.FecPerformanceMonitoringHistoryData_IntervalEndTime:        0, // This ideally should increment by 1 every collection interval, but staying 0 for simulation is Ok for now.
+			me.FecPerformanceMonitoringHistoryData_ThresholdData12Id:      0,
+			me.FecPerformanceMonitoringHistoryData_CorrectedBytes:         rand.Intn(100),
+			me.FecPerformanceMonitoringHistoryData_CorrectedCodeWords:     rand.Intn(100),
+			me.FecPerformanceMonitoringHistoryData_UncorrectableCodeWords: rand.Intn(100),
+			me.FecPerformanceMonitoringHistoryData_TotalCodeWords:         rand.Intn(100),
+			me.FecPerformanceMonitoringHistoryData_FecSeconds:             rand.Intn(100),
 		},
 	})
 
@@ -587,14 +587,14 @@
 	managedEntity, meErr := me.NewGemPortNetworkCtpPerformanceMonitoringHistoryData(me.ParamData{
 		EntityID: entityID,
 		Attributes: me.AttributeValueMap{
-			"ManagedEntityId":         entityID,
-			"IntervalEndTime":         0, // This ideally should increment by 1 every collection interval, but staying 0 for simulation is Ok for now.
-			"ThresholdData12Id":       0,
-			"TransmittedGemFrames":    rand.Intn(100),
-			"ReceivedGemFrames":       rand.Intn(100),
-			"ReceivedPayloadBytes":    rand.Intn(100),
-			"TransmittedPayloadBytes": rand.Intn(100),
-			"EncryptionKeyErrors":     rand.Intn(100),
+			me.ManagedEntityID: entityID,
+			me.GemPortNetworkCtpPerformanceMonitoringHistoryData_IntervalEndTime:         0, // This ideally should increment by 1 every collection interval, but staying 0 for simulation is Ok for now.
+			me.GemPortNetworkCtpPerformanceMonitoringHistoryData_ThresholdData12Id:       0,
+			me.GemPortNetworkCtpPerformanceMonitoringHistoryData_TransmittedGemFrames:    rand.Intn(100),
+			me.GemPortNetworkCtpPerformanceMonitoringHistoryData_ReceivedGemFrames:       rand.Intn(100),
+			me.GemPortNetworkCtpPerformanceMonitoringHistoryData_ReceivedPayloadBytes:    rand.Intn(100),
+			me.GemPortNetworkCtpPerformanceMonitoringHistoryData_TransmittedPayloadBytes: rand.Intn(100),
+			me.GemPortNetworkCtpPerformanceMonitoringHistoryData_EncryptionKeyErrors:     rand.Intn(100),
 		},
 	})
 
@@ -618,8 +618,8 @@
 	managedEntity, meErr := me.NewOnuData(me.ParamData{
 		EntityID: entityID,
 		Attributes: me.AttributeValueMap{
-			"ManagedEntityId": entityID,
-			"MibDataSync":     mds,
+			me.ManagedEntityID:     entityID,
+			me.OnuData_MibDataSync: mds,
 		},
 	})
 
@@ -643,23 +643,23 @@
 	managedEntity, meErr := me.NewAniG(me.ParamData{
 		EntityID: entityID,
 		Attributes: me.AttributeValueMap{
-			"ManagedEntityId":             entityID,
-			"SrIndication":                0,
-			"TotalTcontNumber":            0,
-			"GemBlockLength":              0,
-			"PiggybackDbaReporting":       0,
-			"Deprecated":                  0,
-			"SignalFailThreshold":         0,
-			"SignalDegradeThreshold":      0,
-			"Arc":                         0,
-			"ArcInterval":                 0,
-			"OpticalSignalLevel":          rand.Intn(16000), // generate some random power level than defaulting to 0
-			"LowerOpticalThreshold":       0,
-			"UpperOpticalThreshold":       0,
-			"OnuResponseTime":             0,
-			"TransmitOpticalLevel":        rand.Intn(16000), // generate some random power level than defaulting to 0
-			"LowerTransmitPowerThreshold": 0,
-			"UpperTransmitPowerThreshold": 0,
+			me.ManagedEntityID:                  entityID,
+			me.AniG_SrIndication:                0,
+			me.AniG_TotalTcontNumber:            0,
+			me.AniG_GemBlockLength:              0,
+			me.AniG_PiggybackDbaReporting:       0,
+			me.AniG_Deprecated:                  0,
+			me.AniG_SignalFailThreshold:         0,
+			me.AniG_SignalDegradeThreshold:      0,
+			me.AniG_Arc:                         0,
+			me.AniG_ArcInterval:                 0,
+			me.AniG_OpticalSignalLevel:          rand.Intn(16000), // generate some random power level than defaulting to 0
+			me.AniG_LowerOpticalThreshold:       0,
+			me.AniG_UpperOpticalThreshold:       0,
+			me.AniG_OnuResponseTime:             0,
+			me.AniG_TransmitOpticalLevel:        rand.Intn(16000), // generate some random power level than defaulting to 0
+			me.AniG_LowerTransmitPowerThreshold: 0,
+			me.AniG_UpperTransmitPowerThreshold: 0,
 		},
 	})
 
@@ -685,8 +685,12 @@
 	if meClass != me.EthernetFrameExtendedPmClassID {
 		callback = me.NewEthernetFrameExtendedPm64Bit
 	}
+
+	//The names of these attributes are left as strings
+	//rather than constants of a particular ME because
+	//they can be used with both the MEs in the lines above
 	attr := me.AttributeValueMap{
-		"ManagedEntityId":        entityID,
+		me.ManagedEntityID:       entityID,
 		"DropEvents":             100,
 		"Octets":                 101,
 		"Frames":                 102,
diff --git a/internal/common/omci/get_test.go b/internal/common/omci/get_test.go
index 6fde0dc..60fd5ae 100644
--- a/internal/common/omci/get_test.go
+++ b/internal/common/omci/get_test.go
@@ -19,13 +19,14 @@
 import (
 	"encoding/hex"
 	"fmt"
+	"reflect"
+	"testing"
+
 	"github.com/google/gopacket"
 	"github.com/opencord/omci-lib-go/v2"
 	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/opencord/voltha-protos/v5/go/openolt"
 	"gotest.tools/assert"
-	"reflect"
-	"testing"
 )
 
 func omciBytesToMsg(t *testing.T, data []byte) (*omci.OMCI, *gopacket.Packet) {
@@ -203,7 +204,7 @@
 	getResponseLayer := omciToGetResponse(t, omciPkt)
 
 	assert.Equal(t, getResponseLayer.Result, me.Success)
-	snBytes := (getResponseLayer.Attributes["SerialNumber"]).([]byte)
+	snBytes := (getResponseLayer.Attributes[me.OnuG_SerialNumber]).([]byte)
 	snVendorPart := fmt.Sprintf("%s", snBytes[:4])
 	snNumberPart := hex.EncodeToString(snBytes[4:])
 	serialNumber := snVendorPart + snNumberPart
diff --git a/internal/common/omci/mib_test.go b/internal/common/omci/mib_test.go
index 5c0cfc8..9578416 100644
--- a/internal/common/omci/mib_test.go
+++ b/internal/common/omci/mib_test.go
@@ -17,11 +17,12 @@
 package omci
 
 import (
+	"testing"
+
 	"github.com/google/gopacket"
 	"github.com/opencord/omci-lib-go/v2"
 	me "github.com/opencord/omci-lib-go/v2/generated"
 	"gotest.tools/assert"
-	"testing"
 )
 
 // used to verify that the first message in the MIB Sync (OnuData)
@@ -90,17 +91,17 @@
 	mibDb.items = append(mibDb.items, MibDbEntry{
 		me.OnuDataClassID,
 		onuDataEntityId,
-		me.AttributeValueMap{"MibDataSync": 0},
+		me.AttributeValueMap{me.OnuData_MibDataSync: 0},
 	})
 
 	mibDb.items = append(mibDb.items, MibDbEntry{
 		me.CircuitPackClassID,
 		circuitPackEntityID,
 		me.AttributeValueMap{
-			"Type":          ethernetUnitType,
-			"NumberOfPorts": uniPortCount,
-			"SerialNumber":  ToOctets("BBSM-Circuit-Pack", 20),
-			"Version":       ToOctets("v0.0.1", 20),
+			me.CircuitPack_Type:          ethernetUnitType,
+			me.CircuitPack_NumberOfPorts: uniPortCount,
+			me.CircuitPack_SerialNumber:  ToOctets("BBSM-Circuit-Pack", 20),
+			me.CircuitPack_Version:       ToOctets("v0.0.1", 20),
 		},
 	})
 
@@ -108,22 +109,22 @@
 		me.AniGClassID,
 		anigEntityId,
 		me.AttributeValueMap{
-			"Arc":                         0,
-			"ArcInterval":                 0,
-			"Deprecated":                  0,
-			"GemBlockLength":              48,
-			"LowerOpticalThreshold":       255,
-			"LowerTransmitPowerThreshold": 129,
-			"OnuResponseTime":             0,
-			"OpticalSignalLevel":          57428,
-			"PiggybackDbaReporting":       0,
-			"SignalDegradeThreshold":      9,
-			"SignalFailThreshold":         5,
-			"SrIndication":                1,
-			"TotalTcontNumber":            8,
-			"TransmitOpticalLevel":        3171,
-			"UpperOpticalThreshold":       255,
-			"UpperTransmitPowerThreshold": 129,
+			me.AniG_Arc:                         0,
+			me.AniG_ArcInterval:                 0,
+			me.AniG_Deprecated:                  0,
+			me.AniG_GemBlockLength:              48,
+			me.AniG_LowerOpticalThreshold:       255,
+			me.AniG_LowerTransmitPowerThreshold: 129,
+			me.AniG_OnuResponseTime:             0,
+			me.AniG_OpticalSignalLevel:          57428,
+			me.AniG_PiggybackDbaReporting:       0,
+			me.AniG_SignalDegradeThreshold:      9,
+			me.AniG_SignalFailThreshold:         5,
+			me.AniG_SrIndication:                1,
+			me.AniG_TotalTcontNumber:            8,
+			me.AniG_TransmitOpticalLevel:        3171,
+			me.AniG_UpperOpticalThreshold:       255,
+			me.AniG_UpperTransmitPowerThreshold: 129,
 		},
 	})
 
@@ -131,15 +132,15 @@
 		me.Onu2GClassID,
 		onu2gEntityId,
 		me.AttributeValueMap{
-			"ConnectivityCapability":                      127,
-			"CurrentConnectivityMode":                     0,
-			"Deprecated":                                  1,
-			"PriorityQueueScaleFactor":                    1,
-			"QualityOfServiceQosConfigurationFlexibility": 63,
-			"Sysuptime":                                   0,
-			"TotalGemPortIdNumber":                        8,
-			"TotalPriorityQueueNumber":                    64,
-			"TotalTrafficSchedulerNumber":                 8,
+			me.Onu2G_ConnectivityCapability:                      127,
+			me.Onu2G_CurrentConnectivityMode:                     0,
+			me.Onu2G_Deprecated:                                  1,
+			me.Onu2G_PriorityQueueScaleFactor:                    1,
+			me.Onu2G_QualityOfServiceQosConfigurationFlexibility: 63,
+			me.Onu2G_Sysuptime:                                   0,
+			me.Onu2G_TotalGemPortIdNumber:                        8,
+			me.Onu2G_TotalPriorityQueueNumber:                    64,
+			me.Onu2G_TotalTrafficSchedulerNumber:                 8,
 		},
 	})
 
@@ -149,13 +150,13 @@
 		want mibExpected
 	}{
 		{"mibUploadNext-0", createTestMibUploadNextArgs(t, 1, 0),
-			mibExpected{messageType: omci.MibUploadNextResponseType, transactionId: 1, entityID: onuDataEntityId.ToUint16(), entityClass: me.OnuDataClassID, attributes: map[string]interface{}{"MibDataSync": MDS}}},
+			mibExpected{messageType: omci.MibUploadNextResponseType, transactionId: 1, entityID: onuDataEntityId.ToUint16(), entityClass: me.OnuDataClassID, attributes: map[string]interface{}{me.OnuData_MibDataSync: MDS}}},
 		{"mibUploadNext-1", createTestMibUploadNextArgs(t, 2, 1),
-			mibExpected{messageType: omci.MibUploadNextResponseType, transactionId: 2, entityID: circuitPackEntityID.ToUint16(), entityClass: me.CircuitPackClassID, attributes: map[string]interface{}{"Type": uint8(47), "NumberOfPorts": uint8(4)}}},
+			mibExpected{messageType: omci.MibUploadNextResponseType, transactionId: 2, entityID: circuitPackEntityID.ToUint16(), entityClass: me.CircuitPackClassID, attributes: map[string]interface{}{me.CircuitPack_Type: uint8(47), me.CircuitPack_NumberOfPorts: uint8(4)}}},
 		{"mibUploadNext-2", createTestMibUploadNextArgs(t, 3, 2),
-			mibExpected{messageType: omci.MibUploadNextResponseType, transactionId: 3, entityID: anigEntityId.ToUint16(), entityClass: me.AniGClassID, attributes: map[string]interface{}{"GemBlockLength": uint16(48)}}},
+			mibExpected{messageType: omci.MibUploadNextResponseType, transactionId: 3, entityID: anigEntityId.ToUint16(), entityClass: me.AniGClassID, attributes: map[string]interface{}{me.AniG_GemBlockLength: uint16(48)}}},
 		{"mibUploadNext-3", createTestMibUploadNextArgs(t, 4, 3),
-			mibExpected{messageType: omci.MibUploadNextResponseType, transactionId: 4, entityID: onuDataEntityId.ToUint16(), entityClass: me.Onu2GClassID, attributes: map[string]interface{}{"TotalPriorityQueueNumber": uint16(64)}}},
+			mibExpected{messageType: omci.MibUploadNextResponseType, transactionId: 4, entityID: onuDataEntityId.ToUint16(), entityClass: me.Onu2GClassID, attributes: map[string]interface{}{me.Onu2G_TotalPriorityQueueNumber: uint16(64)}}},
 	}
 
 	for _, tt := range tests {
diff --git a/internal/common/omci/onu_mib_db.go b/internal/common/omci/onu_mib_db.go
index 79ba3a5..e9fabed 100644
--- a/internal/common/omci/onu_mib_db.go
+++ b/internal/common/omci/onu_mib_db.go
@@ -102,7 +102,7 @@
 	mibDb.items = append(mibDb.items, MibDbEntry{
 		me.OnuDataClassID,
 		EntityID{0x00, 0x00},
-		me.AttributeValueMap{"MibDataSync": 0}, // FIXME this needs to be parametrized before sending the response
+		me.AttributeValueMap{me.OnuData_MibDataSync: 0}, // FIXME this needs to be parametrized before sending the response
 	})
 
 	// then we report the CardHolder
@@ -121,38 +121,38 @@
 		me.CircuitPackClassID,
 		circuitPackEntityID,
 		me.AttributeValueMap{
-			"Type":          xgsPonUnitType,
-			"NumberOfPorts": 1, // NOTE is this the ANI port? must be
-			"SerialNumber":  ToOctets("BBSM-Circuit-Pack-ani", 20),
-			"Version":       ToOctets("v0.0.1", 20),
+			me.CircuitPack_Type:          xgsPonUnitType,
+			me.CircuitPack_NumberOfPorts: 1, // NOTE is this the ANI port? must be
+			me.CircuitPack_SerialNumber:  ToOctets("BBSM-Circuit-Pack-ani", 20),
+			me.CircuitPack_Version:       ToOctets("v0.0.1", 20),
 		},
 	})
 	mibDb.items = append(mibDb.items, MibDbEntry{
 		me.CircuitPackClassID,
 		circuitPackEntityID,
 		me.AttributeValueMap{
-			"VendorId":            ToOctets("ONF", 4),
-			"AdministrativeState": 0,
-			"OperationalState":    0,
-			"BridgedOrIpInd":      0,
+			me.CircuitPack_VendorId:            ToOctets("ONF", 4),
+			me.CircuitPack_AdministrativeState: 0,
+			me.CircuitPack_OperationalState:    0,
+			me.CircuitPack_BridgedOrIpInd:      0,
 		},
 	})
 	mibDb.items = append(mibDb.items, MibDbEntry{
 		me.CircuitPackClassID,
 		circuitPackEntityID,
 		me.AttributeValueMap{
-			"EquipmentId":                 ToOctets("BBSM-Circuit-Pack", 20),
-			"CardConfiguration":           0,
-			"TotalTContBufferNumber":      8,
-			"TotalPriorityQueueNumber":    8,
-			"TotalTrafficSchedulerNumber": 0,
+			me.CircuitPack_EquipmentId:                 ToOctets("BBSM-Circuit-Pack", 20),
+			me.CircuitPack_CardConfiguration:           0,
+			me.CircuitPack_TotalTContBufferNumber:      8,
+			me.CircuitPack_TotalPriorityQueueNumber:    8,
+			me.CircuitPack_TotalTrafficSchedulerNumber: 0,
 		},
 	})
 	mibDb.items = append(mibDb.items, MibDbEntry{
 		me.CircuitPackClassID,
 		circuitPackEntityID,
 		me.AttributeValueMap{
-			"PowerShedOverride": uint32(0),
+			me.CircuitPack_PowerShedOverride: uint32(0),
 		},
 	})
 
@@ -161,22 +161,22 @@
 		me.AniGClassID,
 		EntityID{tcontSlotId, aniGId},
 		me.AttributeValueMap{
-			"Arc":                         0,
-			"ArcInterval":                 0,
-			"Deprecated":                  0,
-			"GemBlockLength":              48,
-			"LowerOpticalThreshold":       255,
-			"LowerTransmitPowerThreshold": 129,
-			"OnuResponseTime":             0,
-			"OpticalSignalLevel":          57428,
-			"PiggybackDbaReporting":       0,
-			"SignalDegradeThreshold":      9,
-			"SignalFailThreshold":         5,
-			"SrIndication":                1,
-			"TotalTcontNumber":            8,
-			"TransmitOpticalLevel":        3171,
-			"UpperOpticalThreshold":       255,
-			"UpperTransmitPowerThreshold": 129,
+			me.AniG_Arc:                         0,
+			me.AniG_ArcInterval:                 0,
+			me.AniG_Deprecated:                  0,
+			me.AniG_GemBlockLength:              48,
+			me.AniG_LowerOpticalThreshold:       255,
+			me.AniG_LowerTransmitPowerThreshold: 129,
+			me.AniG_OnuResponseTime:             0,
+			me.AniG_OpticalSignalLevel:          57428,
+			me.AniG_PiggybackDbaReporting:       0,
+			me.AniG_SignalDegradeThreshold:      9,
+			me.AniG_SignalFailThreshold:         5,
+			me.AniG_SrIndication:                1,
+			me.AniG_TotalTcontNumber:            8,
+			me.AniG_TransmitOpticalLevel:        3171,
+			me.AniG_UpperOpticalThreshold:       255,
+			me.AniG_UpperTransmitPowerThreshold: 129,
 		},
 	})
 
@@ -186,38 +186,38 @@
 		me.CircuitPackClassID,
 		circuitPackEntityID,
 		me.AttributeValueMap{
-			"Type":          ethernetUnitType,
-			"NumberOfPorts": ethUniPortCount,
-			"SerialNumber":  ToOctets("BBSM-Circuit-Pack", 20),
-			"Version":       ToOctets("v0.0.1", 20),
+			me.CircuitPack_Type:          ethernetUnitType,
+			me.CircuitPack_NumberOfPorts: ethUniPortCount,
+			me.CircuitPack_SerialNumber:  ToOctets("BBSM-Circuit-Pack", 20),
+			me.CircuitPack_Version:       ToOctets("v0.0.1", 20),
 		},
 	})
 	mibDb.items = append(mibDb.items, MibDbEntry{
 		me.CircuitPackClassID,
 		circuitPackEntityID,
 		me.AttributeValueMap{
-			"VendorId":            ToOctets("ONF", 4),
-			"AdministrativeState": 0,
-			"OperationalState":    0,
-			"BridgedOrIpInd":      0,
+			me.CircuitPack_VendorId:            ToOctets("ONF", 4),
+			me.CircuitPack_AdministrativeState: 0,
+			me.CircuitPack_OperationalState:    0,
+			me.CircuitPack_BridgedOrIpInd:      0,
 		},
 	})
 	mibDb.items = append(mibDb.items, MibDbEntry{
 		me.CircuitPackClassID,
 		circuitPackEntityID,
 		me.AttributeValueMap{
-			"EquipmentId":                 ToOctets("BBSM-Circuit-Pack", 20),
-			"CardConfiguration":           0,
-			"TotalTContBufferNumber":      8,
-			"TotalPriorityQueueNumber":    8,
-			"TotalTrafficSchedulerNumber": 16,
+			me.CircuitPack_EquipmentId:                 ToOctets("BBSM-Circuit-Pack", 20),
+			me.CircuitPack_CardConfiguration:           0,
+			me.CircuitPack_TotalTContBufferNumber:      8,
+			me.CircuitPack_TotalPriorityQueueNumber:    8,
+			me.CircuitPack_TotalTrafficSchedulerNumber: 16,
 		},
 	})
 	mibDb.items = append(mibDb.items, MibDbEntry{
 		me.CircuitPackClassID,
 		circuitPackEntityID,
 		me.AttributeValueMap{
-			"PowerShedOverride": uint32(0),
+			me.CircuitPack_PowerShedOverride: uint32(0),
 		},
 	})
 
@@ -228,38 +228,38 @@
 			me.CircuitPackClassID,
 			circuitPackEntityID,
 			me.AttributeValueMap{
-				"Type":          potsUnitType,
-				"NumberOfPorts": potsUniPortCount,
-				"SerialNumber":  ToOctets("BBSM-Circuit-Pack", 20),
-				"Version":       ToOctets("v0.0.1", 20),
+				me.CircuitPack_Type:          potsUnitType,
+				me.CircuitPack_NumberOfPorts: potsUniPortCount,
+				me.CircuitPack_SerialNumber:  ToOctets("BBSM-Circuit-Pack", 20),
+				me.CircuitPack_Version:       ToOctets("v0.0.1", 20),
 			},
 		})
 		mibDb.items = append(mibDb.items, MibDbEntry{
 			me.CircuitPackClassID,
 			circuitPackEntityID,
 			me.AttributeValueMap{
-				"VendorId":            ToOctets("ONF", 4),
-				"AdministrativeState": 0,
-				"OperationalState":    0,
-				"BridgedOrIpInd":      0,
+				me.CircuitPack_VendorId:            ToOctets("ONF", 4),
+				me.CircuitPack_AdministrativeState: 0,
+				me.CircuitPack_OperationalState:    0,
+				me.CircuitPack_BridgedOrIpInd:      0,
 			},
 		})
 		mibDb.items = append(mibDb.items, MibDbEntry{
 			me.CircuitPackClassID,
 			circuitPackEntityID,
 			me.AttributeValueMap{
-				"EquipmentId":                 ToOctets("BBSM-Circuit-Pack", 20),
-				"CardConfiguration":           0,
-				"TotalTContBufferNumber":      8,
-				"TotalPriorityQueueNumber":    8,
-				"TotalTrafficSchedulerNumber": 16,
+				me.CircuitPack_EquipmentId:                 ToOctets("BBSM-Circuit-Pack", 20),
+				me.CircuitPack_CardConfiguration:           0,
+				me.CircuitPack_TotalTContBufferNumber:      8,
+				me.CircuitPack_TotalPriorityQueueNumber:    8,
+				me.CircuitPack_TotalTrafficSchedulerNumber: 16,
 			},
 		})
 		mibDb.items = append(mibDb.items, MibDbEntry{
 			me.CircuitPackClassID,
 			circuitPackEntityID,
 			me.AttributeValueMap{
-				"PowerShedOverride": uint32(0),
+				me.CircuitPack_PowerShedOverride: uint32(0),
 			},
 		})
 	}
@@ -277,21 +277,21 @@
 				me.PhysicalPathTerminationPointEthernetUniClassID,
 				uniEntityId,
 				me.AttributeValueMap{
-					"ExpectedType":                  0,
-					"SensedType":                    ethernetUnitType,
-					"AutoDetectionConfiguration":    0,
-					"EthernetLoopbackConfiguration": 0,
-					"AdministrativeState":           0,
-					"OperationalState":              0,
-					"ConfigurationInd":              3,
-					"MaxFrameSize":                  1518,
-					"DteOrDceInd":                   0,
-					"PauseTime":                     0,
-					"BridgedOrIpInd":                2,
-					"Arc":                           0,
-					"ArcInterval":                   0,
-					"PppoeFilter":                   0,
-					"PowerControl":                  0,
+					me.PhysicalPathTerminationPointEthernetUni_ExpectedType:                  0,
+					me.PhysicalPathTerminationPointEthernetUni_SensedType:                    ethernetUnitType,
+					me.PhysicalPathTerminationPointEthernetUni_AutoDetectionConfiguration:    0,
+					me.PhysicalPathTerminationPointEthernetUni_EthernetLoopbackConfiguration: 0,
+					me.PhysicalPathTerminationPointEthernetUni_AdministrativeState:           0,
+					me.PhysicalPathTerminationPointEthernetUni_OperationalState:              0,
+					me.PhysicalPathTerminationPointEthernetUni_ConfigurationInd:              3,
+					me.PhysicalPathTerminationPointEthernetUni_MaxFrameSize:                  1518,
+					me.PhysicalPathTerminationPointEthernetUni_DteOrDceInd:                   0,
+					me.PhysicalPathTerminationPointEthernetUni_PauseTime:                     0,
+					me.PhysicalPathTerminationPointEthernetUni_BridgedOrIpInd:                2,
+					me.PhysicalPathTerminationPointEthernetUni_Arc:                           0,
+					me.PhysicalPathTerminationPointEthernetUni_ArcInterval:                   0,
+					me.PhysicalPathTerminationPointEthernetUni_PppoeFilter:                   0,
+					me.PhysicalPathTerminationPointEthernetUni_PowerControl:                  0,
 				},
 			})
 		} else {
@@ -300,19 +300,19 @@
 				me.PhysicalPathTerminationPointPotsUniClassID,
 				uniEntityId,
 				me.AttributeValueMap{
-					"AdministrativeState": 0,
-					"Deprecated":          0,
-					"Arc":                 0,
-					"ArcInterval":         0,
-					"Impedance":           0,
-					"TransmissionPath":    0,
-					"RxGain":              0,
-					"TxGain":              0,
-					"OperationalState":    0,
-					"HookState":           0,
-					"PotsHoldoverTime":    0,
-					"NominalFeedVoltage":  0,
-					"LossOfSoftswitch":    0,
+					me.PhysicalPathTerminationPointPotsUni_AdministrativeState: 0,
+					me.PhysicalPathTerminationPointPotsUni_Deprecated:          0,
+					me.PhysicalPathTerminationPointPotsUni_Arc:                 0,
+					me.PhysicalPathTerminationPointPotsUni_ArcInterval:         0,
+					me.PhysicalPathTerminationPointPotsUni_Impedance:           0,
+					me.PhysicalPathTerminationPointPotsUni_TransmissionPath:    0,
+					me.PhysicalPathTerminationPointPotsUni_RxGain:              0,
+					me.PhysicalPathTerminationPointPotsUni_TxGain:              0,
+					me.PhysicalPathTerminationPointPotsUni_OperationalState:    0,
+					me.PhysicalPathTerminationPointPotsUni_HookState:           0,
+					me.PhysicalPathTerminationPointPotsUni_PotsHoldoverTime:    0,
+					me.PhysicalPathTerminationPointPotsUni_NominalFeedVoltage:  0,
+					me.PhysicalPathTerminationPointPotsUni_LossOfSoftswitch:    0,
 				},
 			})
 		}
@@ -321,11 +321,11 @@
 			me.UniGClassID,
 			uniEntityId,
 			me.AttributeValueMap{
-				"AdministrativeState":         0,
-				"Deprecated":                  0,
-				"ManagementCapability":        0,
-				"NonOmciManagementIdentifier": 0,
-				"RelayAgentOptions":           0,
+				me.UniG_AdministrativeState:         0,
+				me.UniG_Deprecated:                  0,
+				me.UniG_ManagementCapability:        0,
+				me.UniG_NonOmciManagementIdentifier: 0,
+				me.UniG_RelayAgentOptions:           0,
 			},
 		})
 
@@ -349,18 +349,18 @@
 				me.PriorityQueueClassID,
 				queueEntityId, //was not reported in the original implementation
 				me.AttributeValueMap{
-					"QueueConfigurationOption":                            0,
-					"MaximumQueueSize":                                    100,
-					"AllocatedQueueSize":                                  100,
-					"DiscardBlockCounterResetInterval":                    0,
-					"ThresholdValueForDiscardedBlocksDueToBufferOverflow": 0,
-					"RelatedPort":                                         relatedPort.ToUint32(),
-					"TrafficSchedulerPointer":                             0, //it was hardcoded to 0x0108 in the current implementation
-					"Weight":                                              1,
-					"BackPressureOperation":                               1,
-					"BackPressureTime":                                    0,
-					"BackPressureOccurQueueThreshold":                     0,
-					"BackPressureClearQueueThreshold":                     0,
+					me.PriorityQueue_QueueConfigurationOption:                            0,
+					me.PriorityQueue_MaximumQueueSize:                                    100,
+					me.PriorityQueue_AllocatedQueueSize:                                  100,
+					me.PriorityQueue_DiscardBlockCounterResetInterval:                    0,
+					me.PriorityQueue_ThresholdValueForDiscardedBlocksDueToBufferOverflow: 0,
+					me.PriorityQueue_RelatedPort:                                         relatedPort.ToUint32(),
+					me.PriorityQueue_TrafficSchedulerPointer:                             0, //it was hardcoded to 0x0108 in the current implementation
+					me.PriorityQueue_Weight:                                              1,
+					me.PriorityQueue_BackPressureOperation:                               1,
+					me.PriorityQueue_BackPressureTime:                                    0,
+					me.PriorityQueue_BackPressureOccurQueueThreshold:                     0,
+					me.PriorityQueue_BackPressureClearQueueThreshold:                     0,
 				},
 			})
 		}
@@ -374,7 +374,7 @@
 			me.TContClassID,
 			tcontEntityId,
 			me.AttributeValueMap{
-				"AllocId": 65535,
+				me.TCont_AllocId: 65535,
 			},
 		})
 
@@ -383,10 +383,10 @@
 			me.TrafficSchedulerClassID,
 			tsEntityId, //was not reported in the original implementation
 			me.AttributeValueMap{
-				"TContPointer":            tcontEntityId.ToUint16(), // was hardcoded to a non-existing t-cont
-				"TrafficSchedulerPointer": 0,
-				"Policy":                  02,
-				"PriorityWeight":          0,
+				me.TrafficScheduler_TContPointer:            tcontEntityId.ToUint16(), // was hardcoded to a non-existing t-cont
+				me.TrafficScheduler_TrafficSchedulerPointer: 0,
+				me.TrafficScheduler_Policy:                  02,
+				me.TrafficScheduler_PriorityWeight:          0,
 			},
 		})
 
@@ -410,18 +410,18 @@
 				me.PriorityQueueClassID,
 				queueEntityId, //was not reported in the original implementation
 				me.AttributeValueMap{
-					"QueueConfigurationOption":                            0,
-					"MaximumQueueSize":                                    100,
-					"AllocatedQueueSize":                                  100,
-					"DiscardBlockCounterResetInterval":                    0,
-					"ThresholdValueForDiscardedBlocksDueToBufferOverflow": 0,
-					"RelatedPort":                                         relatedPort.ToUint32(),
-					"TrafficSchedulerPointer":                             tsEntityId.ToUint16(), //it was hardcoded to 0x0108 in the current implementation
-					"Weight":                                              1,
-					"BackPressureOperation":                               1,
-					"BackPressureTime":                                    0,
-					"BackPressureOccurQueueThreshold":                     0,
-					"BackPressureClearQueueThreshold":                     0,
+					me.PriorityQueue_QueueConfigurationOption:                            0,
+					me.PriorityQueue_MaximumQueueSize:                                    100,
+					me.PriorityQueue_AllocatedQueueSize:                                  100,
+					me.PriorityQueue_DiscardBlockCounterResetInterval:                    0,
+					me.PriorityQueue_ThresholdValueForDiscardedBlocksDueToBufferOverflow: 0,
+					me.PriorityQueue_RelatedPort:                                         relatedPort.ToUint32(),
+					me.PriorityQueue_TrafficSchedulerPointer:                             tsEntityId.ToUint16(), //it was hardcoded to 0x0108 in the current implementation
+					me.PriorityQueue_Weight:                                              1,
+					me.PriorityQueue_BackPressureOperation:                               1,
+					me.PriorityQueue_BackPressureTime:                                    0,
+					me.PriorityQueue_BackPressureOccurQueueThreshold:                     0,
+					me.PriorityQueue_BackPressureClearQueueThreshold:                     0,
 				},
 			})
 		}
@@ -432,15 +432,15 @@
 		me.Onu2GClassID,
 		EntityID{0x00, 0x00},
 		me.AttributeValueMap{
-			"ConnectivityCapability":                      127,
-			"CurrentConnectivityMode":                     0,
-			"Deprecated":                                  1,
-			"PriorityQueueScaleFactor":                    1,
-			"QualityOfServiceQosConfigurationFlexibility": 63,
-			"Sysuptime":                                   0,
-			"TotalGemPortIdNumber":                        8,
-			"TotalPriorityQueueNumber":                    64,
-			"TotalTrafficSchedulerNumber":                 8,
+			me.Onu2G_ConnectivityCapability:                      127,
+			me.Onu2G_CurrentConnectivityMode:                     0,
+			me.Onu2G_Deprecated:                                  1,
+			me.Onu2G_PriorityQueueScaleFactor:                    1,
+			me.Onu2G_QualityOfServiceQosConfigurationFlexibility: 63,
+			me.Onu2G_Sysuptime:                                   0,
+			me.Onu2G_TotalGemPortIdNumber:                        8,
+			me.Onu2G_TotalPriorityQueueNumber:                    64,
+			me.Onu2G_TotalTrafficSchedulerNumber:                 8,
 		},
 	})
 
diff --git a/internal/common/omci/set.go b/internal/common/omci/set.go
index 3313767..5713bf5 100644
--- a/internal/common/omci/set.go
+++ b/internal/common/omci/set.go
@@ -18,6 +18,7 @@
 
 import (
 	"errors"
+
 	"github.com/google/gopacket"
 	"github.com/opencord/omci-lib-go/v2"
 	me "github.com/opencord/omci-lib-go/v2/generated"
diff --git a/internal/common/omci/set_test.go b/internal/common/omci/set_test.go
index d896e53..ac0b85d 100644
--- a/internal/common/omci/set_test.go
+++ b/internal/common/omci/set_test.go
@@ -17,10 +17,11 @@
 package omci
 
 import (
+	"testing"
+
 	"github.com/opencord/omci-lib-go/v2"
 	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestSetRequest(t *testing.T) {
@@ -30,7 +31,7 @@
 	meParams := me.ParamData{
 		EntityID: meId.ToUint16(),
 		Attributes: me.AttributeValueMap{
-			"AdministrativeState": 1,
+			me.UniG_AdministrativeState: 1,
 		},
 	}
 	meInstance, omciError := me.NewPhysicalPathTerminationPointEthernetUni(meParams)
@@ -48,6 +49,6 @@
 	msgObj, _ := ParseSetRequest(omciPkt)
 
 	assert.Equal(t, meId.ToUint16(), msgObj.EntityInstance)
-	assert.Equal(t, uint8(1), msgObj.Attributes["AdministrativeState"])
+	assert.Equal(t, uint8(1), msgObj.Attributes[me.UniG_AdministrativeState])
 
 }