Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r5eda37efda2d771de4f5cfb509adf05621a290c3 -r194cc4e5fbe048bd60b137c33e68e96a1ae39dc5
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 194cc4e5fbe048bd60b137c33e68e96a1ae39dc5)
@@ -67,7 +67,7 @@
 
 /*********************************************************************//**
  * @brief
- * The execOperationModes function initializes the Operation Modes module.
+ * The initOperationModes function initializes the Operation Modes module.
  * @details
  * Inputs : none
  * Outputs : Operation Modes module initialized.
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r5eda37efda2d771de4f5cfb509adf05621a290c3 -r194cc4e5fbe048bd60b137c33e68e96a1ae39dc5
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 194cc4e5fbe048bd60b137c33e68e96a1ae39dc5)
@@ -866,7 +866,7 @@
  * write command to the FPGA.
  * @details
  * Inputs : none
- * Outputs : # of bytes for next FPGA write command is set
+ * Outputs : number of bytes for next FPGA write command is set
  * @param bytes2Transmit number of bytes to be transmitted via DMA to the FPGA
  * @return none
  *************************************************************************/
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r101bf85b0b425e919b01b4b7fabcbd15fd5bbde5 -r194cc4e5fbe048bd60b137c33e68e96a1ae39dc5
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 101bf85b0b425e919b01b4b7fabcbd15fd5bbde5)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 194cc4e5fbe048bd60b137c33e68e96a1ae39dc5)
@@ -39,10 +39,10 @@
 
 // ********** private definitions **********
 
-#define NUM_OF_CAN_OUT_BUFFERS          5       ///< # of CAN buffers for transmit
-#define NUM_OF_CAN_IN_BUFFERS           7       ///< # of CAN buffers for receiving
+#define NUM_OF_CAN_OUT_BUFFERS          5       ///< number of CAN buffers for transmit
+#define NUM_OF_CAN_IN_BUFFERS           7       ///< number of CAN buffers for receiving
 #ifndef DEBUG_ENABLED
-    #define NUM_OF_MSG_IN_BUFFERS       7       ///< # of Msg buffers for receiving
+    #define NUM_OF_MSG_IN_BUFFERS       7       ///< number of Msg buffers for receiving
 #else
     #define NUM_OF_MSG_IN_BUFFERS       8
     #define SCI1_RECEIVE_DMA_REQUEST    30
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r5eda37efda2d771de4f5cfb509adf05621a290c3 -r194cc4e5fbe048bd60b137c33e68e96a1ae39dc5
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 194cc4e5fbe048bd60b137c33e68e96a1ae39dc5)
@@ -28,28 +28,28 @@
 
 // ********** private definitions **********
 
-#define MIN_WATCHDOG_PET_INTERVAL_MS        45                                      ///< Minimum watchdog pet interval (in ms).
-#define WATCHDOG_POST_TIMEOUT_MS            100                                     ///< Watchdog POST test timeout (in ms).
-#define WATCHDOG_RECOVERY_TIME_MS           250                                     ///< After watchdog POST test, wait this long (in ms) before moving on.
+#define MIN_WATCHDOG_PET_INTERVAL_MS        45                                              ///< Minimum watchdog pet interval (in ms).
+#define WATCHDOG_POST_TIMEOUT_MS            100                                             ///< Watchdog POST test timeout (in ms).
+#define WATCHDOG_RECOVERY_TIME_MS           250                                             ///< After watchdog POST test, wait this long (in ms) before moving on.
 
 /// Enumeration of watchdog self test states.
 typedef enum Watchdog_Self_Test_States
 {
-    WATCHDOG_SELF_TEST_STATE_START = 0,                                             ///< Watchdog self test start state
-    WATCHDOG_SELF_TEST_STATE_IN_PROGRESS,                                           ///< Watchdog self test in progress state
-    WATCHDOG_SELF_TEST_STATE_RECOVER,                                               ///< Watchdog self test recovery state
-    WATCHDOG_SELF_TEST_STATE_COMPLETE,                                              ///< Watchdog self test completed state
-    NUM_OF_WATCHDOG_SELF_TEST_STATES                                                ///< Number of watchdog self test states
+    WATCHDOG_SELF_TEST_STATE_START = 0,                                                     ///< Watchdog self test start state
+    WATCHDOG_SELF_TEST_STATE_IN_PROGRESS,                                                   ///< Watchdog self test in progress state
+    WATCHDOG_SELF_TEST_STATE_RECOVER,                                                       ///< Watchdog self test recovery state
+    WATCHDOG_SELF_TEST_STATE_COMPLETE,                                                      ///< Watchdog self test completed state
+    NUM_OF_WATCHDOG_SELF_TEST_STATES                                                        ///< Number of watchdog self test states
 } WATCHDOG_SELF_TEST_STATE_T;
 
 // ********** private data **********
 
-static U32  lastWatchdogPetTime = 0;                                                ///< Timestamp (ms counter) since last watchdog pet.
+static U32  lastWatchdogPetTime = 0;                                                        ///< Timestamp (ms counter) since last watchdog pet.
 
-static OVERRIDE_U32_T watchdogTaskCheckedIn[ NUM_OF_TASKS ];                        ///< Array of flags indicating whether individual tasks have checked in with watchdog manager.
+static OVERRIDE_U32_T watchdogTaskCheckedIn[ NUM_OF_TASKS ];                                ///< Array of flags indicating whether individual tasks have checked in with watchdog manager.
 
 static WATCHDOG_SELF_TEST_STATE_T watchdogSelfTestState = WATCHDOG_SELF_TEST_STATE_START;   ///< Current watchdog self test state.
-static SELF_TEST_STATUS_T         watchdogSelfTestStatus;                           ///< Watchdog self test state timer counter.
+static SELF_TEST_STATUS_T         watchdogSelfTestStatus;                                   ///< Watchdog self test state timer counter.
 static U32 watchdogSelfTestTimerCount = 0;
 
 // ********** private function prototypes **********