diff --git a/left/src/module.h b/left/src/module.h
index b622bcd..4b1574c 100644
--- a/left/src/module.h
+++ b/left/src/module.h
@@ -3,7 +3,7 @@
 
 // Macros:
 
-    #define LEFT_KEYBOARD_HALF_KEY_COUNT (5*7)
+    #define MODULE_KEY_COUNT (5*7)
     #define MODULE_HAS_POINTER false
 
 #endif
diff --git a/left/src/slave_protocol_handler.c b/left/src/slave_protocol_handler.c
index b60ac48..8f7598e 100644
--- a/left/src/slave_protocol_handler.c
+++ b/left/src/slave_protocol_handler.c
@@ -62,7 +62,7 @@ void SlaveTxHandler(void)
             switch (propertyId) {
                 case SlaveProperty_Features: {
                     uhk_module_features_t *moduleFeatures = (uhk_module_features_t*)&TxMessage.data;
-                    moduleFeatures->keyCount = LEFT_KEYBOARD_HALF_KEY_COUNT;
+                    moduleFeatures->keyCount = MODULE_KEY_COUNT;
                     moduleFeatures->hasPointer = MODULE_HAS_POINTER;
                     TxMessage.length = sizeof(uhk_module_features_t);
                     break;
@@ -71,7 +71,7 @@ void SlaveTxHandler(void)
             break;
         }
         case SlaveCommand_RequestKeyStates:
-            BoolBytesToBits(keyMatrix.keyStates, TxMessage.data, LEFT_KEYBOARD_HALF_KEY_COUNT);
+            BoolBytesToBits(keyMatrix.keyStates, TxMessage.data, MODULE_KEY_COUNT);
             TxMessage.length = KEY_STATE_SIZE;
             break;
     }
diff --git a/left/src/slave_protocol_handler.h b/left/src/slave_protocol_handler.h
index 605a182..997e225 100644
--- a/left/src/slave_protocol_handler.h
+++ b/left/src/slave_protocol_handler.h
@@ -12,7 +12,7 @@
     #define PROTOCOL_RESPONSE_SUCCESS       0
     #define PROTOCOL_RESPONSE_GENERIC_ERROR 1
 
-    #define KEY_STATE_SIZE (LEFT_KEYBOARD_HALF_KEY_COUNT/8 + (LEFT_KEYBOARD_HALF_KEY_COUNT % 8 ? 1 : 0))
+    #define KEY_STATE_SIZE (MODULE_KEY_COUNT/8 + (MODULE_KEY_COUNT % 8 ? 1 : 0))
 
 // Variables: