Index: firmware/App/Modes/OperationModes.h
===================================================================
diff -u -r38355442b06187fe5d57deca647b3adf2fa26b89 -r60c102696e521ff82452aaad30e1db9f240eef58
--- firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision 38355442b06187fe5d57deca647b3adf2fa26b89)
+++ firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision 60c102696e521ff82452aaad30e1db9f240eef58)
@@ -49,9 +49,9 @@
 HD_OP_MODE_T getPreviousOperationMode( void );                      // Get the previous operation mode
 U32  getCurrentSubMode( void );                                     // Get the current sub-mode
 void initiateAlarmAction( ALARM_ACTION_T action );                  // Initiate an alarm or alarm recovery action according to current op mode
-CONFIRMATION_REQUEST_STATUS_T getConfirmationRequestStatus( GENERIC_CONFIRM_ID_T request_id );      // Get the current confirmation request status
-void setConfirmationRequestStatus( GENERIC_CONFIRM_ID_T request_id, CONFIRMATION_REQUEST_STATUS_T status );  // Set the confirmation request status
-GENERIC_CONFIRM_ID_T addConfirmationRequest( GENERIC_CONFIRM_ID_T request_id, GENERIC_CONFIRM_COMMAND_T request_type, U32 reject_reason );  // Add a new confirmation request
+CONFIRMATION_REQUEST_STATUS_T getConfirmationRequestStatus( GENERIC_CONFIRM_ID_T requestID );                // Get the current confirmation request status
+void setConfirmationRequestStatus( GENERIC_CONFIRM_ID_T requestID, CONFIRMATION_REQUEST_STATUS_T status );   // Set the confirmation request status
+GENERIC_CONFIRM_ID_T addConfirmationRequest( GENERIC_CONFIRM_ID_T requestID, GENERIC_CONFIRM_COMMAND_T requestType, U32 rejectReason );  // Add a new confirmation request
 void setCurrentSubState( U32 subState );                            // Set the current substate.
 
 BOOL testSetOperationMode( HD_OP_MODE_T newMode );                  // Force transition to a given mode (if allowed)