diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c
index 94f79f3..3f69055 100644
--- a/right/src/usb_protocol_handler.c
+++ b/right/src/usb_protocol_handler.c
@@ -27,7 +27,7 @@ void UsbProtocolHandler(void)
         case UsbCommandId_SetTestLed:
             UsbCommand_SetTestLed();
             break;
-        case UsbCommandId_WriteUserConfiguration:
+        case UsbCommandId_WriteUserConfig:
             UsbCommand_WriteConfig(false);
             break;
         case UsbCommandId_ApplyConfig:
@@ -42,13 +42,13 @@ void UsbProtocolHandler(void)
         case UsbCommandId_LaunchEepromTransferLegacy:
             UsbCommand_LaunchEepromTransferLegacy();
             break;
-        case UsbCommandId_ReadHardwareConfiguration:
+        case UsbCommandId_ReadHardwareConfig:
             UsbCommand_ReadConfig(true);
             break;
-        case UsbCommandId_WriteHardwareConfiguration:
+        case UsbCommandId_WriteHardwareConfig:
             UsbCommand_WriteConfig(true);
             break;
-        case UsbCommandId_ReadUserConfiguration:
+        case UsbCommandId_ReadUserConfig:
             UsbCommand_ReadConfig(false);
             break;
         case UsbCommandId_GetKeyboardState:
@@ -57,10 +57,10 @@ void UsbProtocolHandler(void)
         case UsbCommandId_GetDebugInfo:
             UsbCommand_GetDebugBuffer();
             break;
-        case UsbCommandId_JumpToSlaveBootloader:
+        case UsbCommandId_JumpToModuleBootloader:
             UsbCommand_JumpToSlaveBootloader();
             break;
-        case UsbCommandId_SendKbootCommand:
+        case UsbCommandId_SendKbootCommandToModule:
             UsbCommand_SendKbootCommand();
             break;
         default:
diff --git a/right/src/usb_protocol_handler.h b/right/src/usb_protocol_handler.h
index 2ccb423..13daf24 100644
--- a/right/src/usb_protocol_handler.h
+++ b/right/src/usb_protocol_handler.h
@@ -24,18 +24,18 @@
         UsbCommandId_GetProperty                =  0,
         UsbCommandId_Reenumerate                =  1,
         UsbCommandId_SetTestLed                 =  2,
-        UsbCommandId_WriteUserConfiguration     =  8,
+        UsbCommandId_WriteUserConfig            =  8,
         UsbCommandId_ApplyConfig                =  9,
         UsbCommandId_SetLedPwmBrightness        = 10,
         UsbCommandId_GetAdcValue                = 11,
         UsbCommandId_LaunchEepromTransferLegacy = 12,
-        UsbCommandId_ReadHardwareConfiguration  = 13,
-        UsbCommandId_WriteHardwareConfiguration = 14,
-        UsbCommandId_ReadUserConfiguration      = 15,
+        UsbCommandId_ReadHardwareConfig         = 13,
+        UsbCommandId_WriteHardwareConfig        = 14,
+        UsbCommandId_ReadUserConfig             = 15,
         UsbCommandId_GetKeyboardState           = 16,
         UsbCommandId_GetDebugInfo               = 17,
-        UsbCommandId_JumpToSlaveBootloader      = 18,
-        UsbCommandId_SendKbootCommand           = 19,
+        UsbCommandId_JumpToModuleBootloader     = 18,
+        UsbCommandId_SendKbootCommandToModule   = 19,
     } usb_command_id_t;
 
     typedef enum {