[NISTC_G1_HW_SAVE_REG]          = { 0x114, 4 },
        [NISTC_G0_SAVE_REG]             = { 0x118, 4 },
        [NISTC_G1_SAVE_REG]             = { 0x11c, 4 },
-       [AO_UI_Save_Registers]          = { 0x120, 4 },
-       [AO_BC_Save_Registers]          = { 0x124, 4 },
-       [AO_UC_Save_Registers]          = { 0x128, 4 },
+       [NISTC_AO_UI_SAVE_REG]          = { 0x120, 4 },
+       [NISTC_AO_BC_SAVE_REG]          = { 0x124, 4 },
+       [NISTC_AO_UC_SAVE_REG]          = { 0x128, 4 },
        [Joint_Status_1_Register]       = { 0x136, 2 },
        [DIO_Serial_Input_Register]     = { 0x009, 1 },
        [Joint_Status_2_Register]       = { 0x13a, 2 },
 
 #define NISTC_G0_SAVE_REG              12
 #define NISTC_G1_SAVE_REG              14
 
+#define NISTC_AO_UI_SAVE_REG           16
+#define NISTC_AO_BC_SAVE_REG           18
+#define NISTC_AO_UC_SAVE_REG           20
+
 #define AI_SI_Save_Registers           64
 #define AI_SC_Save_Registers           66
 
        AO_TMRDACWRs_In_Progress_St = 0x20,
 };
 
-#define AO_UI_Save_Registers           16
-#define AO_BC_Save_Registers           18
-#define AO_UC_Save_Registers           20
-
 /* command register */
 #define G_Disarm_Copy                  _bit15  /* strobe */
 #define G_Save_Trace_Copy              _bit14