Index: HDDefs.h
===================================================================
diff -u -r3eaf7859f0757d7fb22d71b019cb0d11085ed484 -rf25b0475a73dc85068e7c743d9aec75c14c2926e
--- HDDefs.h	(.../HDDefs.h)	(revision 3eaf7859f0757d7fb22d71b019cb0d11085ed484)
+++ HDDefs.h	(.../HDDefs.h)	(revision f25b0475a73dc85068e7c743d9aec75c14c2926e)
@@ -795,6 +795,4 @@
     NUM_OF_CONFIRMATION_REQUEST_STATUS                 ///< Number of confirmation status
 } CONFIRMATION_REQUEST_STATUS_T;
 
-/**@}*/
-
 #endif
Index: MsgDefs.h
===================================================================
diff -u -rf3d4792eb7f7ce409845c5c08b94d4b2610bc282 -rf25b0475a73dc85068e7c743d9aec75c14c2926e
--- MsgDefs.h	(.../MsgDefs.h)	(revision f3d4792eb7f7ce409845c5c08b94d4b2610bc282)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision f25b0475a73dc85068e7c743d9aec75c14c2926e)
@@ -204,7 +204,7 @@
     MSG_ID_DG_SET_SERVICE_TIME = 0xAC,                                  ///< DG set service time
     MSG_ID_UI_INSTALLATION_CONFIRM_RESPONSE = 0xAD,                     ///< HD Confirm installation response
     MSG_ID_DG_FILL_MODE_DATA = 0xAE,                                    ///< DG broadcast of fill mode data such as used acid & bicarb volume
-    MSG_ID_DG_BAD_FILL_SUB_STATE = 0xAF,                                ///< DG broadcast of idle mode bad fill sub-state
+    MSG_ID_DG_GEN_IDLE_DATA = 0xAF,                                     ///< DG broadcast of Gen idle mode sub-state
     MSG_ID_UI_REQUEST_SERVICE_MODE = 0xB0,                              ///< UI request to HD to go to service mode
     MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST = 0xB1,                     ///< HD response to UI request to go to service mode
     MSG_ID_HD_REQUEST_UI_FINAL_POST_RESULT = 0xB2,                      ///< HD request to UI for final POST result
@@ -455,7 +455,7 @@
     MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET = 0xA04F,            ///< DG set fans RPM alarm start time offset
     MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE = 0xA050,                  ///< DG used bicarb volume override in mL
     MSG_ID_FILL_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA051,           ///< DG used fill publish interval override request
-    MSG_ID_BAD_FILL_STATES_PUBLISH_INTERVAL_OVERRIDE = 0xA052,          ///< DG bad fill sub-states publish interval override request
+    MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE = 0xA052,              ///< DG gen idle sub-states publish interval override request
     MSG_ID_DG_GET_USAGE_INFO_RECORD = 0xA053,                           ///< DG get usage information record
     MSG_ID_DG_SET_USAGE_INFO_RECORD = 0xA054,                           ///< DG set usage information record
     MSG_ID_DG_SEND_USAGE_INFO_RECORD = 0xA055,                          ///< DG send usage information record