Index: firmware/App/Services/CpldInterface.c
===================================================================
diff -u -r766e65a173747dd60a9faae1cac228cd5f8a55a6 -r772fdd144e4006fada12a2e91519378b29d54bae
--- firmware/App/Services/CpldInterface.c	(.../CpldInterface.c)	(revision 766e65a173747dd60a9faae1cac228cd5f8a55a6)
+++ firmware/App/Services/CpldInterface.c	(.../CpldInterface.c)	(revision 772fdd144e4006fada12a2e91519378b29d54bae)
@@ -18,8 +18,8 @@
 #include "gio.h"
 #include "mibspi.h"
 
-#include "CpldIO.h"
 #include "CpldInterface.h"
+#include "GPIO.h"
 #include "Messaging.h"
 #include "Timers.h"
 
@@ -71,18 +71,18 @@
 void initCPLD( void )
 {
     // Initialize watchdog pet output low (inactive)
-    CLR_WD_PET();
+    clrWatchdogPetSignal();
 
     // Initialize power off request output low (inactive)
-    CLR_OFF_REQ();
+    clrPowerOffRequestSignal();
 
     // Initialize alarm lamp color LED outputs low (off)
-    CLR_GREEN();
-    CLR_RED();
-    CLR_BLUE();
+    clrAlarmLampGreenSignal();
+    clrAlarmLampRedSignal();
+    clrAlarmLampBlueSignal();
 
     // Initialize safety shutdown
-    CLR_SAFETY_SHUTDOWN();
+    clrSafetyShutdownSignal();
     safetyShutdownActivated          = FALSE;
     safetyShutdownOverrideResetState = FALSE;
     safetyShutdownSelfTestState      = SAFETY_SHUTDOWN_SELF_TEST_STATE_START;
@@ -99,7 +99,7 @@
  *************************************************************************/
 void toggleCPLDWatchdog( void )
 {
-    TGL_WD_PET();
+    toggleWatchdogPetSignal();
 }
 
 /*********************************************************************//**
@@ -112,7 +112,7 @@
  *************************************************************************/
 PIN_SIGNAL_STATE_T getCPLDWatchdogExpired( void )
 {
-    PIN_SIGNAL_STATE_T level = GET_WD_EXP();
+    PIN_SIGNAL_STATE_T level = getSafetySignal();
 
     return level;
 }
@@ -127,7 +127,7 @@
  *************************************************************************/
 BOOL getCPLDACPowerLossDetected( void )
 {
-    PIN_SIGNAL_STATE_T acLevel = GET_AC_PRESENT();
+    PIN_SIGNAL_STATE_T acLevel = getACPowerPresentSignal();
     BOOL acLost = ( PIN_SIGNAL_HIGH == acLevel ? FALSE : TRUE );
 
     return acLost;
@@ -146,11 +146,11 @@
 {
     if ( level == PIN_SIGNAL_HIGH )
     {
-        SET_GREEN();
+        setAlarmLampGreenSignal();
     }
     else
     {
-        CLR_GREEN();
+        clrAlarmLampGreenSignal();
     }
 }
 
@@ -167,11 +167,11 @@
 {
     if ( level == PIN_SIGNAL_HIGH )
     {
-        SET_BLUE();
+        setAlarmLampBlueSignal();
     }
     else
     {
-        CLR_BLUE();
+        clrAlarmLampBlueSignal();
     }
 }
 
@@ -188,11 +188,11 @@
 {
     if ( level == PIN_SIGNAL_HIGH )
     {
-        SET_RED();
+        setAlarmLampRedSignal();
     }
     else
     {
-        CLR_RED();
+        clrAlarmLampRedSignal();
     }
 }
 
@@ -208,7 +208,7 @@
  *************************************************************************/
 void toggleCPLDOffRequest( void )
 {
-    TGL_OFF_REQ();
+    togglePowerOffRequestSignal();
 }
 
 /*********************************************************************//**
@@ -221,7 +221,7 @@
  *************************************************************************/
 PIN_SIGNAL_STATE_T getCPLDOffButton( void )
 {
-    PIN_SIGNAL_STATE_T level = GET_OFF();
+    PIN_SIGNAL_STATE_T level = getOffButtonSignal();
 
     return level;
 }
@@ -236,7 +236,7 @@
  *************************************************************************/
 PIN_SIGNAL_STATE_T getCPLDStopButton( void )
 {
-    PIN_SIGNAL_STATE_T level = GET_STOP();
+    PIN_SIGNAL_STATE_T level = getStopButtonSignal();
 
     return level;
 }
@@ -251,7 +251,7 @@
 void activateSafetyShutdown( void )
 {
     safetyShutdownActivated = TRUE;
-    SET_SAFETY_SHUTDOWN();
+    setSafetyShutdownSignal();
 //    SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SAFETY_LINE, 1, 0 )
 }
 
@@ -313,7 +313,7 @@
 //                    safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED;
 //                }
                 safetyShutdownSelfTestTimerCount = getMSTimerCount();
-                CLR_SAFETY_SHUTDOWN();
+                clrSafetyShutdownSignal();
                 safetyShutdownActivated = FALSE;
                 safetyShutdownSelfTestState = SAFETY_SHUTDOWN_SELF_TEST_STATE_RECOVER;
             }
@@ -392,7 +392,7 @@
         else
         {
             safetyShutdownActivated = FALSE;
-            CLR_SAFETY_SHUTDOWN();
+            clrSafetyShutdownSignal();
         }
         result = TRUE;
     }
@@ -421,7 +421,7 @@
         else
         {
             safetyShutdownActivated = FALSE;
-            CLR_SAFETY_SHUTDOWN();
+            clrSafetyShutdownSignal();
         }
         result = TRUE;
     }