Index: dialin/dg/calibration_record.py
===================================================================
diff -u -r26c7b6057f11680681e0a25399b5e5be9b92818d -r3dc9da1e63253ed663bc3f585ca985711c9b514d
--- dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision 26c7b6057f11680681e0a25399b5e5be9b92818d)
+++ dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision 3dc9da1e63253ed663bc3f585ca985711c9b514d)
@@ -21,7 +21,7 @@
 from ..common.msg_defs import MsgIds, MsgFieldPositions
 from ..protocols.CAN import DenaliMessage, DenaliChannels
 from ..utils.base import AbstractSubSystem, publish
-from ..utils.nv_ops_utils import NVOpsUtils, NVUtilsObserver, NVRecords
+from ..utils.nv_ops_utils import NVOpsUtils, NVUtilsObserver, NVRecordsDG
 from ..utils.conversions import integer_to_bytearray
 
 
@@ -169,7 +169,7 @@
         # so the payload length is the same when it is received in the firmware.
         reset_byte_array = integer_to_bytearray(0)
         crc_value = integer_to_bytearray(crc)
-        dg_record = integer_to_bytearray(NVRecords.NVDATAMGMT_CALIBRATION_RECORD.value)
+        dg_record = integer_to_bytearray(NVRecordsDG.NVDATAMGMT_CALIBRATION_RECORD.value)
         payload = reset_byte_array + crc_value + dg_record
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
Index: dialin/dg/service_record.py
===================================================================
diff -u -r9bc00e997e91dab8b404aa877b02ae3d4100d417 -r3dc9da1e63253ed663bc3f585ca985711c9b514d
--- dialin/dg/service_record.py	(.../service_record.py)	(revision 9bc00e997e91dab8b404aa877b02ae3d4100d417)
+++ dialin/dg/service_record.py	(.../service_record.py)	(revision 3dc9da1e63253ed663bc3f585ca985711c9b514d)
@@ -22,7 +22,7 @@
 from ..common.msg_defs import MsgIds, MsgFieldPositions
 from ..protocols.CAN import DenaliMessage, DenaliChannels
 from ..utils.base import AbstractSubSystem, DialinEnum, publish
-from ..utils.nv_ops_utils import NVOpsUtils, NVUtilsObserver, NVRecords
+from ..utils.nv_ops_utils import NVOpsUtils, NVUtilsObserver, NVRecordsDG
 from ..utils.conversions import integer_to_bytearray
 
 
@@ -130,7 +130,7 @@
         # so the payload length is the same when it is received in the firmware.
         reset_byte_array = integer_to_bytearray(0)
         crc_value = integer_to_bytearray(crc)
-        dg_record = integer_to_bytearray(NVRecords.NVDATAMGMT_SERVICE_RECORD.value)
+        dg_record = integer_to_bytearray(NVRecordsDG.NVDATAMGMT_SERVICE_RECORD.value)
         payload = reset_byte_array + crc_value + dg_record
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
Index: dialin/dg/system_record.py
===================================================================
diff -u -r9bc00e997e91dab8b404aa877b02ae3d4100d417 -r3dc9da1e63253ed663bc3f585ca985711c9b514d
--- dialin/dg/system_record.py	(.../system_record.py)	(revision 9bc00e997e91dab8b404aa877b02ae3d4100d417)
+++ dialin/dg/system_record.py	(.../system_record.py)	(revision 3dc9da1e63253ed663bc3f585ca985711c9b514d)
@@ -22,7 +22,7 @@
 from ..common.msg_defs import MsgIds, MsgFieldPositions
 from ..protocols.CAN import DenaliMessage, DenaliChannels
 from ..utils.base import AbstractSubSystem, DialinEnum, publish
-from ..utils.nv_ops_utils import NVOpsUtils, NVUtilsObserver, NVRecords
+from ..utils.nv_ops_utils import NVOpsUtils, NVUtilsObserver, NVRecordsDG
 from ..utils.conversions import integer_to_bytearray
 
 
@@ -168,7 +168,7 @@
         # so the payload length is the same when it is received in the firmware.
         reset_byte_array = integer_to_bytearray(0)
         crc_value = integer_to_bytearray(crc)
-        dg_record = integer_to_bytearray(NVRecords.NVDATAMGMT_SYSTEM_RECORD.value)
+        dg_record = integer_to_bytearray(NVRecordsDG.NVDATAMGMT_SYSTEM_RECORD.value)
         payload = reset_byte_array + crc_value + dg_record
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
Index: dialin/hd/calibration_record.py
===================================================================
diff -u -r9bc00e997e91dab8b404aa877b02ae3d4100d417 -r3dc9da1e63253ed663bc3f585ca985711c9b514d
--- dialin/hd/calibration_record.py	(.../calibration_record.py)	(revision 9bc00e997e91dab8b404aa877b02ae3d4100d417)
+++ dialin/hd/calibration_record.py	(.../calibration_record.py)	(revision 3dc9da1e63253ed663bc3f585ca985711c9b514d)
@@ -21,7 +21,7 @@
 from ..common.msg_defs import MsgIds, MsgFieldPositions
 from ..protocols.CAN import DenaliMessage, DenaliChannels
 from ..utils.base import AbstractSubSystem, publish
-from ..utils.nv_ops_utils import NVOpsUtils, NVUtilsObserver, NVRecords
+from ..utils.nv_ops_utils import NVOpsUtils, NVUtilsObserver, NVRecordsHD
 from ..utils.conversions import integer_to_bytearray
 
 
@@ -157,7 +157,7 @@
         # so the payload length is the same when it is received in the firmware.
         reset_byte_array = integer_to_bytearray(0)
         crc_value = integer_to_bytearray(crc)
-        hd_record = integer_to_bytearray(NVRecords.NVDATAMGMT_CALIBRATION_RECORD.value)
+        hd_record = integer_to_bytearray(NVRecordsHD.NVDATAMGMT_CALIBRATION_RECORD.value)
         payload = reset_byte_array + crc_value + hd_record
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
Index: dialin/hd/service_record.py
===================================================================
diff -u -r9bc00e997e91dab8b404aa877b02ae3d4100d417 -r3dc9da1e63253ed663bc3f585ca985711c9b514d
--- dialin/hd/service_record.py	(.../service_record.py)	(revision 9bc00e997e91dab8b404aa877b02ae3d4100d417)
+++ dialin/hd/service_record.py	(.../service_record.py)	(revision 3dc9da1e63253ed663bc3f585ca985711c9b514d)
@@ -22,7 +22,7 @@
 from ..common.msg_defs import MsgIds, MsgFieldPositions
 from ..protocols.CAN import DenaliMessage, DenaliChannels
 from ..utils.base import AbstractSubSystem, publish, DialinEnum
-from ..utils.nv_ops_utils import NVOpsUtils, NVUtilsObserver, NVRecords
+from ..utils.nv_ops_utils import NVOpsUtils, NVUtilsObserver, NVRecordsHD
 from ..utils.conversions import integer_to_bytearray
 
 
@@ -133,7 +133,7 @@
         # so the payload length is the same when it is received in the firmware.
         reset_byte_array = integer_to_bytearray(0)
         crc_value = integer_to_bytearray(crc)
-        hd_record = integer_to_bytearray(NVRecords.NVDATAMGMT_SERVICE_RECORD.value)
+        hd_record = integer_to_bytearray(NVRecordsHD.NVDATAMGMT_SERVICE_RECORD.value)
         payload = reset_byte_array + crc_value + hd_record
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
Index: dialin/hd/system_record.py
===================================================================
diff -u -r9bc00e997e91dab8b404aa877b02ae3d4100d417 -r3dc9da1e63253ed663bc3f585ca985711c9b514d
--- dialin/hd/system_record.py	(.../system_record.py)	(revision 9bc00e997e91dab8b404aa877b02ae3d4100d417)
+++ dialin/hd/system_record.py	(.../system_record.py)	(revision 3dc9da1e63253ed663bc3f585ca985711c9b514d)
@@ -23,7 +23,7 @@
 from ..common.msg_defs import MsgIds, MsgFieldPositions
 from ..protocols.CAN import DenaliMessage, DenaliChannels
 from ..utils.base import AbstractSubSystem, DialinEnum, publish
-from ..utils.nv_ops_utils import NVOpsUtils, NVUtilsObserver, NVRecords
+from ..utils.nv_ops_utils import NVOpsUtils, NVUtilsObserver, NVRecordsHD
 from ..utils.conversions import integer_to_bytearray
 
 
@@ -169,7 +169,7 @@
         # so the payload length is the same when it is received in the firmware.
         reset_byte_array = integer_to_bytearray(0)
         crc_value = integer_to_bytearray(crc)
-        hd_record = integer_to_bytearray(NVRecords.NVDATAMGMT_SYSTEM_RECORD.value)
+        hd_record = integer_to_bytearray(NVRecordsHD.NVDATAMGMT_SYSTEM_RECORD.value)
         payload = reset_byte_array + crc_value + hd_record
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,