Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -r0e32e846b8dffc708918cd4c9e6176e9e7378133
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 830213bc6dcc1a684610caf78c79d55f2cb41e93)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 0e32e846b8dffc708918cd4c9e6176e9e7378133)
@@ -421,8 +421,8 @@
     {
         OP_MODES_DATA_T data;
 
-        data.currentMode    = (U32)currentMode;
-        data.currentSubMode = currentSubMode;
+        data.opMode    = (U32)currentMode;
+        data.subMode   = currentSubMode;
 
         broadcastData( MSG_ID_DD_OP_MODE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( OP_MODES_DATA_T ) );
 
Index: firmware/App/Modes/OperationModes.h
===================================================================
diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -r0e32e846b8dffc708918cd4c9e6176e9e7378133
--- firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision 830213bc6dcc1a684610caf78c79d55f2cb41e93)
+++ firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision 0e32e846b8dffc708918cd4c9e6176e9e7378133)
@@ -37,8 +37,8 @@
 /// Operation modes data structure
 typedef struct
 {
-    U32 currentMode;                        ///< Current Mode.
-    U32 currentSubMode;                     ///< Current Submode.
+    U32 opMode;                             ///< Operation Mode.
+    U32 subMode;                            ///< Submode.
 } OP_MODES_DATA_T;
 
 /// TD mode and TD submode