diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c
index 010d9a9..97abca7 100644
--- a/right/src/usb_protocol_handler.c
+++ b/right/src/usb_protocol_handler.c
@@ -53,39 +53,39 @@ void usbProtocolHandler()
     bzero(GenericHidOutBuffer, USB_GENERIC_HID_OUT_BUFFER_LENGTH);
     uint8_t command = GenericHidInBuffer[0];
     switch (command) {
-        case USB_COMMAND_GET_SYSTEM_PROPERTY:
+        case UsbCommand_GetSystemProperty:
             getSystemProperty();
             break;
-        case USB_COMMAND_REENUMERATE:
+        case UsbCommand_Reenumerate:
             reenumerate();
             break;
-        case USB_COMMAND_SET_TEST_LED:
+        case UsbCommand_SetTestLed:
             setTestLed();
             break;
-        case USB_COMMAND_WRITE_LED_DRIVER:
+        case UsbCommand_WriteLedDriver:
             break;
-        case USB_COMMAND_WRITE_EEPROM:
+        case UsbCommand_WriteEeprom:
             writeEeprom();
             break;
-        case USB_COMMAND_READ_EEPROM:
+        case UsbCommand_ReadEeprom:
             readEeprom();
             break;
-        case USB_COMMAND_READ_MERGE_SENSOR:
+        case UsbCommand_ReadMergeSensor:
             readMergeSensor();
             break;
-        case USB_COMMAND_UPLOAD_CONFIG:
+        case UsbCommand_UploadConfig:
             uploadConfig();
             break;
-        case USB_COMMAND_APPLY_CONFIG:
+        case UsbCommand_ApplyConfig:
             applyConfig();
             break;
-        case USB_COMMAND_SET_LED_PWM:
+        case UsbCommand_SetLedPwm:
             setLedPwm();
             break;
-        case USB_COMMAND_GET_ADC_VALUE:
+        case UsbCommand_GetAdcValue:
             getAdcValue();
             break;
-        case USB_COMMAND_LAUNCH_EEPROM_TRANSFER:
+        case UsbCommand_LaunchEepromTransfer:
             launchEepromTransfer();
         default:
             break;
diff --git a/right/src/usb_protocol_handler.h b/right/src/usb_protocol_handler.h
index da3d0d8..3924365 100644
--- a/right/src/usb_protocol_handler.h
+++ b/right/src/usb_protocol_handler.h
@@ -10,26 +10,31 @@
     #define PROTOCOL_RESPONSE_SUCCESS       0
     #define PROTOCOL_RESPONSE_GENERIC_ERROR 1
 
-    #define USB_COMMAND_GET_SYSTEM_PROPERTY 0
-        #define SYSTEM_PROPERTY_USB_PROTOCOL_VERSION_ID      0
-        #define SYSTEM_PROPERTY_BRIDGE_PROTOCOL_VERSION_ID   1
-        #define SYSTEM_PROPERTY_DATA_MODEL_VERSION_ID        2
-        #define SYSTEM_PROPERTY_FIRMWARE_VERSION_ID          3
-    #define USB_COMMAND_REENUMERATE  1
-    #define USB_COMMAND_SET_TEST_LED            2
-    #define USB_COMMAND_WRITE_LED_DRIVER    3
-        #define WRITE_LED_DRIVER_RESPONSE_INVALID_ADDRESS      1
-        #define WRITE_LED_DRIVER_RESPONSE_INVALID_PAYLOAD_SIZE 2
-    #define USB_COMMAND_WRITE_EEPROM        5
-        #define WRITE_EEPROM_RESPONSE_INVALID_PAYLOAD_SIZE 1
-    #define USB_COMMAND_READ_EEPROM     6
-    #define USB_COMMAND_READ_MERGE_SENSOR   7
-    #define USB_COMMAND_UPLOAD_CONFIG       8
-        #define UPLOAD_CONFIG_INVALID_PAYLOAD_SIZE 1
-    #define USB_COMMAND_APPLY_CONFIG        9
-    #define USB_COMMAND_SET_LED_PWM        10
-    #define USB_COMMAND_GET_ADC_VALUE      11
-    #define USB_COMMAND_LAUNCH_EEPROM_TRANSFER     12
+    #define SYSTEM_PROPERTY_USB_PROTOCOL_VERSION_ID      0
+    #define SYSTEM_PROPERTY_BRIDGE_PROTOCOL_VERSION_ID   1
+    #define SYSTEM_PROPERTY_DATA_MODEL_VERSION_ID        2
+    #define SYSTEM_PROPERTY_FIRMWARE_VERSION_ID          3
+    #define WRITE_LED_DRIVER_RESPONSE_INVALID_ADDRESS      1
+    #define WRITE_LED_DRIVER_RESPONSE_INVALID_PAYLOAD_SIZE 2
+    #define WRITE_EEPROM_RESPONSE_INVALID_PAYLOAD_SIZE 1
+    #define UPLOAD_CONFIG_INVALID_PAYLOAD_SIZE 1
+
+// Typedefs:
+
+    typedef enum {
+        UsbCommand_GetSystemProperty    =  0,
+        UsbCommand_Reenumerate          =  1,
+        UsbCommand_SetTestLed           =  2,
+        UsbCommand_WriteLedDriver       =  3,
+        UsbCommand_WriteEeprom          =  5,
+        UsbCommand_ReadEeprom           =  6,
+        UsbCommand_ReadMergeSensor      =  7,
+        UsbCommand_UploadConfig         =  8,
+        UsbCommand_ApplyConfig          =  9,
+        UsbCommand_SetLedPwm            = 10,
+        UsbCommand_GetAdcValue          = 11,
+        UsbCommand_LaunchEepromTransfer = 12,
+    } usb_command_t;
 
 // Functions: