Index: firmware/App/Services/SystemCommDD.c
===================================================================
diff -u -re0102a0a08c0d83bcc8e959551079063e2e60d9f -r573a26b2a0273a4983b1de1cbff5bed63e01dce0
--- firmware/App/Services/SystemCommDD.c	(.../SystemCommDD.c)	(revision e0102a0a08c0d83bcc8e959551079063e2e60d9f)
+++ firmware/App/Services/SystemCommDD.c	(.../SystemCommDD.c)	(revision 573a26b2a0273a4983b1de1cbff5bed63e01dce0)
@@ -37,7 +37,7 @@
 // ********** private definitions **********
 
 #define TD_COMM_TIMEOUT_IN_MS                   2000                                ///< TD has not sent any broadcast messages for this much time
-#define RO_COMM_TIMEOUT_IN_MS                   2000                                ///< RO has not sent any broadcast messages for this much time
+#define FP_COMM_TIMEOUT_IN_MS                   2000                                ///< FP has not sent any broadcast messages for this much time
 
 #define MAX_COMM_CRC_FAILURES                   5                                   ///< maximum number of CRC errors within window period before alarm
 #define MAX_COMM_CRC_FAILURE_WINDOW_MS          (10 * SEC_PER_MIN * MS_PER_SECOND)  ///< CRC error window
@@ -74,8 +74,8 @@
 static volatile BOOL ddIsOnlyCANNode = TRUE;                                ///< flag indicating whether DG is alone on CAN bus.
 static OVERRIDE_U32_T tdCommunicationStatus = {0, 0, 0, 0};                 ///< has TD sent a message since last check
 static volatile U32 timeOfLastTDCheckIn = 0;                                ///< last time we received an TD broadcast
-static OVERRIDE_U32_T fpCommunicationStatus = {0, 0, 0, 0};                 ///< has RO sent a message since last check
-static volatile U32 timeOfLastROCheckIn = 0;                                ///< last time we received an RO broadcast
+static OVERRIDE_U32_T fpCommunicationStatus = {0, 0, 0, 0};                 ///< has FP sent a message since last check
+static volatile U32 timeOfLastFPCheckIn = 0;                                ///< last time we received an FP broadcast
 
 // ********** private function prototypes **********
 
@@ -119,20 +119,20 @@
 
 /*********************************************************************//**
  * @brief
- * The checkInFromRO function checks in the RO with the DD - indicating that
- * the RO is communicating.
+ * The checkInFromFP function checks in the FP with the DD - indicating that
+ * the FP is communicating.
  * @details \b Inputs: none
- * @details \b Outputs: fpCommunicationStatus, timeOfLastROCheckIn
+ * @details \b Outputs: fpCommunicationStatus, timeOfLastFPCheckIn
  * @return none
  *************************************************************************/
-void checkInFromRO( void )
+void checkInFromFP( void )
 {
     fpCommunicationStatus.data = TRUE;
-    timeOfLastROCheckIn = getMSTimerCount();
+    timeOfLastFPCheckIn = getMSTimerCount();
 
-//    if ( TRUE == isAlarmActive( ALARM_ID_DD_RO_COMM_TIMEOUT ) )
+//    if ( TRUE == isAlarmActive( ALARM_ID_DD_FP_COMM_TIMEOUT ) )
 //    {
-//        clearAlarmCondition( ALARM_ID_DD_RO_COMM_TIMEOUT );
+//        clearAlarmCondition( ALARM_ID_DD_FP_COMM_TIMEOUT );
 //    }
 }
 
@@ -151,11 +151,11 @@
 
 /*********************************************************************//**
  * @brief
- * The isFPCommunicating function determines whether the RO is communicating
+ * The isFPCommunicating function determines whether the FP is communicating
  * with the DD.
  * @details \b Inputs: fpCommunicationStatus
  * @details \b Outputs: none
- * @return TRUE if RO has broadcast since last call, FALSE if not
+ * @return TRUE if FP has broadcast since last call, FALSE if not
  *************************************************************************/
 BOOL isFPCommunicating( void )
 {
@@ -208,7 +208,7 @@
 /*********************************************************************//**
  * @brief
  * The checkForCommTimeouts function checks for sub-system communication timeout errors.
- * @details \b Inputs: timeOfLastTDCheckIn, timeOfLastROCheckIn
+ * @details \b Inputs: timeOfLastTDCheckIn, timeOfLastFPCheckIn
  * @details \b Outputs: possibly a comm t/o alarm
  * @return none
  *************************************************************************/
@@ -221,10 +221,10 @@
         //stopHeater( DG_TRIMMER_HEATER ); // If TD off or not connected, ensure trimmer heater is off.
     }
 
-    if ( TRUE == didTimeout( timeOfLastROCheckIn, RO_COMM_TIMEOUT_IN_MS ) )
+    if ( TRUE == didTimeout( timeOfLastFPCheckIn, FP_COMM_TIMEOUT_IN_MS ) )
     {
         fpCommunicationStatus.data = FALSE;
-        //setROOperationMode( 0, 0 );      // If RO off or not connected, consider RO mode is fault.
+        //setFPOperationMode( 0, 0 );      // If FP off or not connected, consider FP mode is fault.
     }
 }
 
@@ -341,15 +341,15 @@
 
 /*********************************************************************//**
  * @brief
- * The testROCommunicationStatusOverride function sets the override
- * of the RO communication status.
+ * The testFPCommunicationStatusOverride function sets the override
+ * of the FP communication status.
  * @details \b Inputs: none
  * @details \b Outputs: fpCommunicationStatus
  * @param message Override message from Dialin which includes the flag
- * value to override for the RO communication status.
+ * value to override for the FP communication status.
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testROCommunicationStatusOverride( MESSAGE_T *message )
+BOOL testFPCommunicationStatusOverride( MESSAGE_T *message )
 {
     BOOL result = u32Override( message, &fpCommunicationStatus, FALSE, TRUE );