diff --git a/right/src/usb_commands/usb_command_get_module_property.h b/right/src/usb_commands/usb_command_get_module_property.h
index 52b3947..c4631e4 100644
--- a/right/src/usb_commands/usb_command_get_module_property.h
+++ b/right/src/usb_commands/usb_command_get_module_property.h
@@ -1,5 +1,5 @@
-#ifndef __USB_COMMAND_GET_MODULE_PROPERTIES_H__
-#define __USB_COMMAND_GET_MODULE_PROPERTIES_H__
+#ifndef __USB_COMMAND_GET_MODULE_PROPERTY_H__
+#define __USB_COMMAND_GET_MODULE_PROPERTY_H__
 
 // Functions:
 
@@ -9,6 +9,6 @@
 
     typedef enum {
         UsbStatusCode_GetModuleProperty_InvalidModuleSlotId = 2,
-    } usb_status_code_get_module_properties_t;
+    } usb_status_code_get_module_property_t;
 
 #endif
diff --git a/right/src/usb_protocol_handler.h b/right/src/usb_protocol_handler.h
index 7113634..4aa6832 100644
--- a/right/src/usb_protocol_handler.h
+++ b/right/src/usb_protocol_handler.h
@@ -30,7 +30,7 @@
         UsbCommandId_GetDebugBuffer           = 0x0b,
         UsbCommandId_GetAdcValue              = 0x0c,
         UsbCommandId_SetLedPwmBrightness      = 0x0d,
-        UsbCommandId_GetModuleProperty      = 0x0e,
+        UsbCommandId_GetModuleProperty        = 0x0e,
     } usb_command_id_t;
 
     typedef enum {