diff --git a/right/src/key_matrix_instance.h b/right/src/key_matrix_instance.h
deleted file mode 100644
index eec60e3..0000000
--- a/right/src/key_matrix_instance.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __KEY_MATRIX_INSTANCE_H__
-#define __KEY_MATRIX_INSTANCE_H__
-
-// Includes:
-
-    #include "key_matrix.h"
-
-// Macros:
-
-    #define KEYBOARD_MATRIX_COLS_NUM 7
-    #define KEYBOARD_MATRIX_ROWS_NUM 5
-    #define KEYBOARD_MATRIX_KEY_COUNT (KEYBOARD_MATRIX_COLS_NUM * KEYBOARD_MATRIX_ROWS_NUM)
-
-// Variables:
-
-    extern key_matrix_t KeyMatrix;
-
-#endif
diff --git a/right/src/key_scanner.c b/right/src/key_scanner.c
index 23da4c8..7517ed3 100644
--- a/right/src/key_scanner.c
+++ b/right/src/key_scanner.c
@@ -7,7 +7,7 @@ uint32_t counter = 0;
 void PIT_KEY_SCANNER_HANDLER(void)
 {
     *((uint32_t*)(UsbDebugInfo+20)) = counter++;
-    KeyMatrix_ScanRow(&KeyMatrix);
+    KeyMatrix_ScanRow(&RightKeyMatrix);
     PIT_ClearStatusFlags(PIT, PIT_KEY_SCANNER_CHANNEL, PIT_TFLG_TIF_MASK);
 }
 
diff --git a/right/src/key_scanner.h b/right/src/key_scanner.h
index 15da5b9..e1b1050 100644
--- a/right/src/key_scanner.h
+++ b/right/src/key_scanner.h
@@ -3,11 +3,11 @@
 
 // Includes:
 
-    #include "key_matrix_instance.h"
+    #include "right_key_matrix.h"
 
 // Macros:
 
-    #define KEY_SCANNER_INTERVAL_USEC (1000 / KEYBOARD_MATRIX_ROWS_NUM)
+    #define KEY_SCANNER_INTERVAL_USEC (1000 / RIGHT_KEY_MATRIX_ROWS_NUM)
 
     #define PIT_KEY_SCANNER_HANDLER PIT1_IRQHandler
     #define PIT_KEY_SCANNER_IRQ_ID PIT1_IRQn
diff --git a/right/src/main.c b/right/src/main.c
index 8ba0060..dc96930 100644
--- a/right/src/main.c
+++ b/right/src/main.c
@@ -14,7 +14,7 @@
 #include "command.h"
 #include "bootloader/wormhole.h"
 #include "eeprom.h"
-#include "key_matrix_instance.h"
+#include "right_key_matrix.h"
 #include "key_scanner.h"
 #include "key_states.h"
 
@@ -25,7 +25,7 @@ void updateUsbReports(void)
     }
 
 #ifndef INTERRUPT_KEY_SCANNER
-    KeyMatrix_Scan(&KeyMatrix);
+    KeyMatrix_Scan(&RightKeyMatrix);
 #endif
 
     ResetActiveUsbBasicKeyboardReport();
@@ -68,7 +68,7 @@ void main(void)
         handleUsbBusPalCommand();
     } else {
         InitSlaveScheduler();
-        KeyMatrix_Init(&KeyMatrix);
+        KeyMatrix_Init(&RightKeyMatrix);
 #ifdef INTERRUPT_KEY_SCANNER
         InitKeyScanner();
 #endif
diff --git a/right/src/key_matrix_instance.c b/right/src/right_key_matrix.c
similarity index 80%
rename from right/src/key_matrix_instance.c
rename to right/src/right_key_matrix.c
index 41badb8..e9786b0 100644
--- a/right/src/key_matrix_instance.c
+++ b/right/src/right_key_matrix.c
@@ -1,8 +1,8 @@
-#include "key_matrix_instance.h"
+#include "right_key_matrix.h"
 
-key_matrix_t KeyMatrix = {
-    .colNum = KEYBOARD_MATRIX_COLS_NUM,
-    .rowNum = KEYBOARD_MATRIX_ROWS_NUM,
+key_matrix_t RightKeyMatrix = {
+    .colNum = RIGHT_KEY_MATRIX_COLS_NUM,
+    .rowNum = RIGHT_KEY_MATRIX_ROWS_NUM,
     .cols = (key_matrix_pin_t[]){
         {PORTA, GPIOA, kCLOCK_PortA, 5},
         {PORTB, GPIOB, kCLOCK_PortB, 16},
diff --git a/right/src/right_key_matrix.h b/right/src/right_key_matrix.h
new file mode 100644
index 0000000..fe4b84d
--- /dev/null
+++ b/right/src/right_key_matrix.h
@@ -0,0 +1,18 @@
+#ifndef __RIGHT_KEY_MATRIX_H__
+#define __RIGHT_KEY_MATRIX_H__
+
+// Includes:
+
+    #include "key_matrix.h"
+
+// Macros:
+
+    #define RIGHT_KEY_MATRIX_COLS_NUM 7
+    #define RIGHT_KEY_MATRIX_ROWS_NUM 5
+    #define RIGHT_KEY_MATRIX_KEY_COUNT (RIGHT_KEY_MATRIX_COLS_NUM * RIGHT_KEY_MATRIX_ROWS_NUM)
+
+// Variables:
+
+    extern key_matrix_t RightKeyMatrix;
+
+#endif
diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c
index 0077b19..fe860c3 100644
--- a/right/src/usb_report_updater.c
+++ b/right/src/usb_report_updater.c
@@ -10,7 +10,7 @@
 #include "led_pwm.h"
 #include "macros.h"
 #include "key_states.h"
-#include "key_matrix_instance.h"
+#include "right_key_matrix.h"
 
 static uint8_t mouseWheelDivisorCounter = 0;
 static uint8_t mouseSpeedAccelDivisorCounter = 0;
@@ -99,8 +99,8 @@ void UpdateActiveUsbReports(void)
     static uint8_t previousModifiers = 0;
     uint8_t activeLayer;
 
-    for (uint8_t keyId=0; keyId < KEYBOARD_MATRIX_KEY_COUNT; keyId++) {
-        KeyStates[SlotId_RightKeyboardHalf][keyId].current = KeyMatrix.keyStates[keyId];
+    for (uint8_t keyId=0; keyId < RIGHT_KEY_MATRIX_KEY_COUNT; keyId++) {
+        KeyStates[SlotId_RightKeyboardHalf][keyId].current = RightKeyMatrix.keyStates[keyId];
     }
 
     if (MacroPlaying) {