From 11d49d00e74618500e5c51e4c7f858eb906ccea8 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 11 Feb 2023 03:47:17 +0000
Subject: [PATCH] Remove matrix_init_quantum/matrix_scan_quantum (#19806)

---
 docs/custom_matrix.md                             |  4 ++--
 docs/ja/custom_matrix.md                          |  4 ++--
 keyboards/bpiphany/hid_liber/matrix.c             |  4 ++--
 keyboards/bpiphany/kitten_paw/matrix.c            |  4 ++--
 keyboards/bpiphany/pegasushoof/2013/matrix.c      |  4 ++--
 keyboards/bpiphany/pegasushoof/2015/matrix.c      |  4 ++--
 keyboards/bpiphany/tiger_lily/matrix.c            |  4 ++--
 keyboards/bpiphany/unloved_bastard/matrix.c       |  4 ++--
 keyboards/converter/adb_usb/matrix.c              |  4 ++--
 keyboards/converter/hp_46010a/matrix.c            | 14 ++------------
 keyboards/converter/m0110_usb/matrix.c            |  4 ++--
 keyboards/converter/palm_usb/matrix.c             |  4 ++--
 keyboards/converter/siemens_tastatur/matrix.c     |  4 ++--
 keyboards/converter/sun_usb/matrix.c              |  4 ++--
 keyboards/converter/usb_usb/custom_matrix.cpp     |  4 ++--
 keyboards/converter/xt_usb/matrix.c               |  4 ++--
 keyboards/dc01/arrow/matrix.c                     | 14 ++------------
 keyboards/dc01/left/matrix.c                      | 14 ++------------
 keyboards/dc01/numpad/matrix.c                    | 14 ++------------
 keyboards/dc01/right/matrix.c                     | 14 ++------------
 keyboards/dichotomy/matrix.c                      | 14 ++------------
 keyboards/dp60/matrix.c                           |  4 ++--
 keyboards/duck/eagle_viper/v2/matrix.c            |  4 ++--
 keyboards/duck/lightsaver/matrix.c                |  4 ++--
 keyboards/duck/octagon/v1/matrix.c                |  4 ++--
 keyboards/duck/octagon/v2/matrix.c                |  4 ++--
 keyboards/duck/orion/v3/matrix.c                  |  4 ++--
 keyboards/duck/tcv3/matrix.c                      |  4 ++--
 keyboards/ergodox_stm32/matrix.c                  |  4 ++--
 keyboards/fc660c/matrix.c                         |  4 ++--
 keyboards/fc980c/matrix.c                         |  4 ++--
 keyboards/gboards/ergotaco/matrix.c               |  4 ++--
 keyboards/gboards/georgi/matrix.c                 |  4 ++--
 keyboards/gboards/gergo/matrix.c                  |  4 ++--
 keyboards/gboards/gergoplex/matrix.c              |  4 ++--
 keyboards/halfcliff/matrix.c                      |  4 ++--
 keyboards/handwired/dactyl/matrix.c               |  4 ++--
 keyboards/handwired/datahand/matrix.c             |  4 ++--
 keyboards/handwired/frenchdev/matrix.c            |  4 ++--
 keyboards/handwired/owlet60/matrix.c              |  6 +++---
 keyboards/handwired/promethium/matrix.c           |  4 ++--
 keyboards/handwired/pterodactyl/matrix.c          |  4 ++--
 .../symmetric70_proto/matrix_debug/matrix.c       |  4 ++--
 .../symmetric70_proto/matrix_fast/matrix.c        |  4 ++--
 keyboards/hhkb/ansi/matrix.c                      |  4 ++--
 keyboards/hhkb/jp/matrix.c                        |  4 ++--
 keyboards/hotdox/matrix.c                         |  4 ++--
 keyboards/jones/v03/matrix.c                      |  4 ++--
 keyboards/jones/v03_1/matrix.c                    |  4 ++--
 keyboards/kakunpc/angel64/alpha/matrix.c          | 14 ++------------
 keyboards/kakunpc/angel64/rev1/matrix.c           | 14 ++------------
 keyboards/kakunpc/thedogkeyboard/matrix.c         | 14 ++------------
 keyboards/keyboardio/model01/matrix.c             |  4 ++--
 keyboards/keyhive/honeycomb/matrix.c              | 14 ++------------
 keyboards/kinesis/alvicstep/matrix.c              |  2 +-
 keyboards/kmac/matrix.c                           |  8 ++------
 keyboards/kmini/matrix.c                          |  4 ++--
 keyboards/matrix/noah/matrix.c                    |  4 ++--
 keyboards/moon/matrix.c                           |  8 ++------
 keyboards/nek_type_a/matrix.c                     | 15 ++-------------
 keyboards/planck/rev6_drop/matrix.c               |  4 ++--
 keyboards/preonic/rev3_drop/matrix.c              |  4 ++--
 keyboards/redscarf_iiplus/verb/matrix.c           | 14 ++------------
 keyboards/redscarf_iiplus/verc/matrix.c           | 14 ++------------
 keyboards/redscarf_iiplus/verd/matrix.c           | 14 ++------------
 keyboards/sixkeyboard/matrix.c                    |  4 ++--
 keyboards/sx60/matrix.c                           | 14 ++------------
 keyboards/touchpad/matrix.c                       |  4 ++--
 keyboards/woodkeys/meira/matrix.c                 |  4 ++--
 keyboards/ymdk/sp64/matrix.c                      |  4 ++--
 quantum/matrix.c                                  |  4 ++--
 quantum/matrix.h                                  |  4 ----
 quantum/matrix_common.c                           |  6 +++---
 quantum/quantum.c                                 |  8 --------
 tests/test_common/matrix.c                        |  4 ++--
 users/drashna/callbacks.md                        |  2 +-
 76 files changed, 148 insertions(+), 319 deletions(-)

diff --git a/docs/custom_matrix.md b/docs/custom_matrix.md
index 6d6ae5e9726864f1fe88b9709785277325f916b8..ef206944e1811f88813ed4dfd80fd9056ef9625f 100644
--- a/docs/custom_matrix.md
+++ b/docs/custom_matrix.md
@@ -77,7 +77,7 @@ void matrix_init(void) {
     debounce_init(MATRIX_ROWS);
 
     // This *must* be called for correct keyboard behavior
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -89,7 +89,7 @@ uint8_t matrix_scan(void) {
     changed = debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
 
     // This *must* be called for correct keyboard behavior
-    matrix_scan_quantum();
+    matrix_scan_kb();
 
     return changed;
 }
diff --git a/docs/ja/custom_matrix.md b/docs/ja/custom_matrix.md
index 2c697bb1489f2b932909e697c15152ab57b156bd..194960d77c903ddd11979304a0ccbd29f926b9af 100644
--- a/docs/ja/custom_matrix.md
+++ b/docs/ja/custom_matrix.md
@@ -83,7 +83,7 @@ void matrix_init(void) {
     debounce_init(MATRIX_ROWS);
 
     // 正しいキーボード動作のためにこれを呼び出す*必要があります*
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -95,7 +95,7 @@ uint8_t matrix_scan(void) {
     changed = debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
 
     // 正しいキーボード動作のためにこれを呼び出す*必要があります*
-    matrix_scan_quantum();
+    matrix_scan_kb();
 
     return changed;
 }
diff --git a/keyboards/bpiphany/hid_liber/matrix.c b/keyboards/bpiphany/hid_liber/matrix.c
index 90e8a327b580673a89f24bd98bbca240ee528119..f8ffe0eff1db504d150d05ffd52f0b6d20148bc8 100755
--- a/keyboards/bpiphany/hid_liber/matrix.c
+++ b/keyboards/bpiphany/hid_liber/matrix.c
@@ -182,7 +182,7 @@ void matrix_init(void)
         matrix_debouncing[i] = 0;
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -214,7 +214,7 @@ uint8_t matrix_scan(void)
         }
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/bpiphany/kitten_paw/matrix.c b/keyboards/bpiphany/kitten_paw/matrix.c
index 6548040c7c73a0ee2501a84fd7a20a7faac2b5fa..d4fc17140435da46c30023865ec9d7d9c71ce6f8 100644
--- a/keyboards/bpiphany/kitten_paw/matrix.c
+++ b/keyboards/bpiphany/kitten_paw/matrix.c
@@ -85,7 +85,7 @@ void matrix_init(void) {
     matrix[i] = 0;
     matrix_debouncing[i] = 0;
   }
-  matrix_init_quantum();
+  matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -113,7 +113,7 @@ uint8_t matrix_scan(void) {
       }
     }
   }
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return 1;
 }
 
diff --git a/keyboards/bpiphany/pegasushoof/2013/matrix.c b/keyboards/bpiphany/pegasushoof/2013/matrix.c
index 3250e71fe67890e6fa0c36b0115d30fb019c381f..3b1bd5663f3cae13b28e449e7902e4674a36e09b 100644
--- a/keyboards/bpiphany/pegasushoof/2013/matrix.c
+++ b/keyboards/bpiphany/pegasushoof/2013/matrix.c
@@ -80,7 +80,7 @@ void matrix_init(void)
 		matrix_debouncing[i] = 0;
 	}
 
-	matrix_init_quantum();
+	matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -109,7 +109,7 @@ uint8_t matrix_scan(void)
 		}
 	}
 
-	matrix_scan_quantum();
+	matrix_scan_kb();
 
 	return 1;
 }
diff --git a/keyboards/bpiphany/pegasushoof/2015/matrix.c b/keyboards/bpiphany/pegasushoof/2015/matrix.c
index 2b142f9fc8f9d9c1cded78b6a5d16ea1905f67da..6fc1fd6e9ebb02b6a58d637b3f7e5db97221f98d 100644
--- a/keyboards/bpiphany/pegasushoof/2015/matrix.c
+++ b/keyboards/bpiphany/pegasushoof/2015/matrix.c
@@ -70,7 +70,7 @@ void matrix_init(void)
     matrix_debouncing[i] = 0;
   }
 
-  matrix_init_quantum();
+  matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -90,7 +90,7 @@ uint8_t matrix_scan(void)
   }
 
   debounce(matrix_debouncing, matrix, matrix_rows(), changed);
-  matrix_scan_quantum();
+  matrix_scan_kb();
 
   return (uint8_t)changed;
 }
diff --git a/keyboards/bpiphany/tiger_lily/matrix.c b/keyboards/bpiphany/tiger_lily/matrix.c
index abf6f3f42bb073bd4eae418aacc804b6df663982..85e8e394639af5b0832d7ce2733bbbaba3eb643f 100644
--- a/keyboards/bpiphany/tiger_lily/matrix.c
+++ b/keyboards/bpiphany/tiger_lily/matrix.c
@@ -98,7 +98,7 @@ void matrix_init(void) {
     for (uint8_t i=0; i < MATRIX_ROWS; i++)
         matrix[i] = matrix_debouncing[i] = 0;
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -124,7 +124,7 @@ uint8_t matrix_scan(void) {
                 matrix[i] = matrix_debouncing[i];
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/bpiphany/unloved_bastard/matrix.c b/keyboards/bpiphany/unloved_bastard/matrix.c
index 98cdf22f487a1cda3b37176e2e8edf645bb47777..ac7a1e7f0644cb2d2dc57cc4f1b0e132a33eb3f8 100644
--- a/keyboards/bpiphany/unloved_bastard/matrix.c
+++ b/keyboards/bpiphany/unloved_bastard/matrix.c
@@ -99,7 +99,7 @@ void matrix_init(void) {
     for (uint8_t i=0; i < MATRIX_ROWS; i++)
         matrix[i] = matrix_debouncing[i] = 0;
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -125,7 +125,7 @@ uint8_t matrix_scan(void) {
                 matrix[i] = matrix_debouncing[i];
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/converter/adb_usb/matrix.c b/keyboards/converter/adb_usb/matrix.c
index e6a4921960e7cd61520f6baf48ef3702ee5bab98..20479eb466eb9e6e24ca3fcfc08e36af2e6aa350 100644
--- a/keyboards/converter/adb_usb/matrix.c
+++ b/keyboards/converter/adb_usb/matrix.c
@@ -76,7 +76,7 @@ void matrix_init(void)
     // debug_mouse = true;
     // print("debug enabled.\n");
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 #ifdef ADB_MOUSE_ENABLE
@@ -241,7 +241,7 @@ uint8_t matrix_scan(void)
             extra_key = key1<<8 | 0xFF; // process in a separate call
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/converter/hp_46010a/matrix.c b/keyboards/converter/hp_46010a/matrix.c
index eafe320a3df89a640ffd32bbc3c34df59a9127e3..7f4e11ab27f496fc74281976d98b2558602ff9ef 100644
--- a/keyboards/converter/hp_46010a/matrix.c
+++ b/keyboards/converter/hp_46010a/matrix.c
@@ -50,16 +50,6 @@ static uint8_t matrix_debounce_old [MATRIX_ROWS] = {0};
 static uint8_t matrix_debounce_new [MATRIX_ROWS] = {0};
 #endif 
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {    
     matrix_init_user();
@@ -161,7 +151,7 @@ void matrix_init (void) {
     DDRD  |= LED ;
     PORTD &= ~LED ;
 
-    matrix_init_quantum();
+    matrix_init_kb();
 
     //toggle reset, to put the keyboard logic into a known state
     Matrix_Reset() ;
@@ -206,7 +196,7 @@ uint8_t matrix_scan(void)  {
 #endif
     Matrix_Reset() ;
     
-    matrix_scan_quantum() ;
+    matrix_scan_kb() ;
     return 1;
 }
 
diff --git a/keyboards/converter/m0110_usb/matrix.c b/keyboards/converter/m0110_usb/matrix.c
index daba7a138aa61c5ed3b0604214f59d2fa737e664..6c39d4b6b0ec7e4cce349567f728ecd7a64d9dcc 100644
--- a/keyboards/converter/m0110_usb/matrix.c
+++ b/keyboards/converter/m0110_usb/matrix.c
@@ -72,7 +72,7 @@ void matrix_init(void)
     for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00;
     matrix = _matrix0;
 
-	matrix_init_quantum();
+	matrix_init_kb();
     return;
 }
 
@@ -96,7 +96,7 @@ uint8_t matrix_scan(void)
         print("["); print_hex8(key); print("]\n");
     }
     
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c
index 28d4b87d838bd17045e27b3d616bf52316053d34..4226dfa52c5186a368879d0e77d9bbd5caac9a49 100644
--- a/keyboards/converter/palm_usb/matrix.c
+++ b/keyboards/converter/palm_usb/matrix.c
@@ -280,7 +280,7 @@ void matrix_init(void)
     // initialize matrix state: all keys off
     for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
 
-    matrix_init_quantum();
+    matrix_init_kb();
     return;
     
     
@@ -348,7 +348,7 @@ uint8_t matrix_scan(void)
         }
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return code;
 }
 
diff --git a/keyboards/converter/siemens_tastatur/matrix.c b/keyboards/converter/siemens_tastatur/matrix.c
index 2da4e33d3d8e52bb5cc2ba0cd11d64da3606c124..ea1aa2287e06bf80ccd4b01771ec588c346dd177 100644
--- a/keyboards/converter/siemens_tastatur/matrix.c
+++ b/keyboards/converter/siemens_tastatur/matrix.c
@@ -109,7 +109,7 @@ void matrix_init(void) {
     memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
     memset(matrix_debouncing, 0, MATRIX_ROWS * sizeof(matrix_row_t));
 
-    matrix_init_quantum();
+    matrix_init_kb();
 
     osalSysLock();
     enable_input_events();
@@ -215,7 +215,7 @@ uint8_t matrix_scan(void) {
     porta_buffer = 65535;
     portb_buffer = 65535;
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c
index 35ec391024f6f011a6116aa601d030a3deabb263..9f22eca1eb4fe074cb4616a791f43e1461b5c38f 100644
--- a/keyboards/converter/sun_usb/matrix.c
+++ b/keyboards/converter/sun_usb/matrix.c
@@ -97,7 +97,7 @@ void matrix_init(void)
 
     /* PORTD &= ~(1<<6); */
 
-    matrix_init_quantum();
+    matrix_init_kb();
     return;
 }
 
@@ -148,7 +148,7 @@ uint8_t matrix_scan(void)
         }
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return code;
 }
 
diff --git a/keyboards/converter/usb_usb/custom_matrix.cpp b/keyboards/converter/usb_usb/custom_matrix.cpp
index 8b5fd4451a74ac2f48110016a9b76dda8c21bcef..f5f751da14f10ef92bc01b8e0f3ba45db11e3722 100644
--- a/keyboards/converter/usb_usb/custom_matrix.cpp
+++ b/keyboards/converter/usb_usb/custom_matrix.cpp
@@ -93,7 +93,7 @@ extern "C" {
         kbd2.SetReportParser(0, (HIDReportParser*)&kbd_parser2);
         kbd3.SetReportParser(0, (HIDReportParser*)&kbd_parser3);
         kbd4.SetReportParser(0, (HIDReportParser*)&kbd_parser4);
-        matrix_init_quantum();
+        matrix_init_kb();
     }
 
     static void or_report(report_keyboard_t report) {
@@ -182,7 +182,7 @@ extern "C" {
                 led_set(host_keyboard_leds());
             }
         }
-        matrix_scan_quantum();
+        matrix_scan_kb();
         return changed;
     }
 
diff --git a/keyboards/converter/xt_usb/matrix.c b/keyboards/converter/xt_usb/matrix.c
index 7a16750432dbbc465de928de92f3043cd96b88e9..71211cbc034e6fdd4687cf78dbc65d675bd80a52 100644
--- a/keyboards/converter/xt_usb/matrix.c
+++ b/keyboards/converter/xt_usb/matrix.c
@@ -59,7 +59,7 @@ void matrix_init(void) {
         matrix[i] = 0x00;
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 // convert E0-escaped codes into unused area
@@ -188,7 +188,7 @@ uint8_t matrix_scan(void) {
             state = XT_STATE_INIT;
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
 
     return 1;
 }
diff --git a/keyboards/dc01/arrow/matrix.c b/keyboards/dc01/arrow/matrix.c
index e7c3bec2b5615e62ee054952c6da0aeace883eea..211855c300d9cd1c0b81034c718cf71e9d600a5f 100644
--- a/keyboards/dc01/arrow/matrix.c
+++ b/keyboards/dc01/arrow/matrix.c
@@ -88,16 +88,6 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS];
     static void select_col(uint8_t col);
 #endif
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -143,7 +133,7 @@ void matrix_init(void) {
         matrix_debouncing[i] = 0;
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -198,7 +188,7 @@ uint8_t matrix_scan(void)
         i2c_slave_reg[i+2] = matrix[i]; //send matrix over i2c
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/dc01/left/matrix.c b/keyboards/dc01/left/matrix.c
index 8b8f89a0817524492672e14003d70c7173914d6d..d384c6a4bca801477ba3ee61eb1f38325406c3b0 100644
--- a/keyboards/dc01/left/matrix.c
+++ b/keyboards/dc01/left/matrix.c
@@ -92,16 +92,6 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS];
     static void select_col(uint8_t col);
 #endif
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -154,7 +144,7 @@ void matrix_init(void) {
         matrix_debouncing[i] = 0;
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -223,7 +213,7 @@ if (i2c_transaction(SLAVE_I2C_ADDRESS_NUMPAD, 0x1FFFF, 11)) {
     }
 }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/dc01/numpad/matrix.c b/keyboards/dc01/numpad/matrix.c
index 1dc90a6b84834b5ae8b7e898e4f3261ae148abbc..73b245f56e8eb5e731c6cf527678966202c1777a 100644
--- a/keyboards/dc01/numpad/matrix.c
+++ b/keyboards/dc01/numpad/matrix.c
@@ -88,16 +88,6 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS];
     static void select_col(uint8_t col);
 #endif
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -143,7 +133,7 @@ void matrix_init(void) {
         matrix_debouncing[i] = 0;
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -198,7 +188,7 @@ uint8_t matrix_scan(void)
         i2c_slave_reg[i+2] = matrix[i]; //send matrix over i2c
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/dc01/right/matrix.c b/keyboards/dc01/right/matrix.c
index f21dec1d2b1a547acf42c33e6dc1a952d5b70904..04a6d03804ee58c9326f9922c19b4cb2c85d588f 100644
--- a/keyboards/dc01/right/matrix.c
+++ b/keyboards/dc01/right/matrix.c
@@ -89,16 +89,6 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS];
     static void select_col(uint8_t col);
 #endif
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -144,7 +134,7 @@ void matrix_init(void) {
         matrix_debouncing[i] = 0;
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -199,7 +189,7 @@ uint8_t matrix_scan(void)
         i2c_slave_reg[i+2] = matrix[i]; //send matrix over i2c
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/dichotomy/matrix.c b/keyboards/dichotomy/matrix.c
index 0799554f0a918622d7143520b95e66324a77dc3a..a3c94275eb2d6d6811c933611c83533c31ea75b7 100755
--- a/keyboards/dichotomy/matrix.c
+++ b/keyboards/dichotomy/matrix.c
@@ -53,16 +53,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* matrix state(1:on, 0:off) */
 static matrix_row_t matrix[MATRIX_ROWS];
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -92,7 +82,7 @@ uint8_t matrix_cols(void) {
 }
 
 void matrix_init(void) {
-    matrix_init_quantum();
+    matrix_init_kb();
     uart_init(1000000);
 }
 
@@ -190,7 +180,7 @@ uint8_t matrix_scan(void)
     }
     //matrix_print();
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/dp60/matrix.c b/keyboards/dp60/matrix.c
index 1803e0f94fad880c285a15fcac7ec6c345e5dd50..e32c9a58f94bdbb62958bc716d6cb5b85843fd51 100644
--- a/keyboards/dp60/matrix.c
+++ b/keyboards/dp60/matrix.c
@@ -64,7 +64,7 @@ void matrix_init(void)
     matrix_debouncing[i] = 0;
   }
 
-  matrix_init_quantum();
+  matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -96,7 +96,7 @@ uint8_t matrix_scan(void)
     }
   }
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return 1;
 }
 
diff --git a/keyboards/duck/eagle_viper/v2/matrix.c b/keyboards/duck/eagle_viper/v2/matrix.c
index a673c536c2489642970e92781c3823d056087b4c..c918a8d1c44c53577c2aa7badf15ae9e0dd9fe40 100644
--- a/keyboards/duck/eagle_viper/v2/matrix.c
+++ b/keyboards/duck/eagle_viper/v2/matrix.c
@@ -78,7 +78,7 @@ void matrix_init(void) {
     matrix_debouncing[i] = 0;
   }
 
-  matrix_init_quantum();
+  matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -112,7 +112,7 @@ uint8_t matrix_scan(void) {
     }
   }
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return 1;
 }
 
diff --git a/keyboards/duck/lightsaver/matrix.c b/keyboards/duck/lightsaver/matrix.c
index 48861e08febed1c710c62ba220ad2818aa818c9a..cafa4f28555b0138a88aac034ba90dfbc94aaccc 100644
--- a/keyboards/duck/lightsaver/matrix.c
+++ b/keyboards/duck/lightsaver/matrix.c
@@ -74,7 +74,7 @@ void matrix_init(void) {
     matrix_debouncing[i] = 0;
   }
 
-  matrix_init_quantum();
+  matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -110,7 +110,7 @@ uint8_t matrix_scan(void) {
     }
   }
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return 1;
 }
 
diff --git a/keyboards/duck/octagon/v1/matrix.c b/keyboards/duck/octagon/v1/matrix.c
index c903e619aa362b5b37c8148cd69c9d7b42bb5b3c..cf37a654a6026a9e0cf36ec9b7fc64dbf0f51043 100644
--- a/keyboards/duck/octagon/v1/matrix.c
+++ b/keyboards/duck/octagon/v1/matrix.c
@@ -73,7 +73,7 @@ void matrix_init(void) {
     matrix_debouncing[i] = 0;
   }
 
-  matrix_init_quantum();
+  matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -107,7 +107,7 @@ uint8_t matrix_scan(void) {
     }
   }
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return 1;
 }
 
diff --git a/keyboards/duck/octagon/v2/matrix.c b/keyboards/duck/octagon/v2/matrix.c
index c70eb73747c9386bca0407a44eafb7cd9e25028a..98bf03d769f2e8c79c016cd0c428630aebae4be6 100644
--- a/keyboards/duck/octagon/v2/matrix.c
+++ b/keyboards/duck/octagon/v2/matrix.c
@@ -78,7 +78,7 @@ void matrix_init(void) {
     matrix_debouncing[i] = 0;
   }
 
-  matrix_init_quantum();
+  matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -112,7 +112,7 @@ uint8_t matrix_scan(void) {
     }
   }
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return 1;
 }
 
diff --git a/keyboards/duck/orion/v3/matrix.c b/keyboards/duck/orion/v3/matrix.c
index a5b522d78b2db85ca440119fe81f145780c74150..c82d5dd9994439f55ed006dd849b04d44d01adb3 100644
--- a/keyboards/duck/orion/v3/matrix.c
+++ b/keyboards/duck/orion/v3/matrix.c
@@ -72,7 +72,7 @@ void matrix_init(void) {
     matrix_debouncing[i] = 0;
   }
 
-  matrix_init_quantum();
+  matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -106,7 +106,7 @@ uint8_t matrix_scan(void) {
     }
   }
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return 1;
 }
 
diff --git a/keyboards/duck/tcv3/matrix.c b/keyboards/duck/tcv3/matrix.c
index cc4ebeb5dc3918cdde6c812badae0051bb8ed8f8..d3f44bf886a08d7b52425d1fd2679709ed5ccfe8 100644
--- a/keyboards/duck/tcv3/matrix.c
+++ b/keyboards/duck/tcv3/matrix.c
@@ -78,7 +78,7 @@ void matrix_init(void) {
     matrix_debouncing[i] = 0;
   }
 
-  matrix_init_quantum();
+  matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -112,7 +112,7 @@ uint8_t matrix_scan(void) {
     }
   }
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return 1;
 }
 
diff --git a/keyboards/ergodox_stm32/matrix.c b/keyboards/ergodox_stm32/matrix.c
index 094d4a9e0f765d7b6fa9476b3d3d1947a3525ffb..2046e39c1f046863e9dca4f867eb2d8e2d2e01e4 100644
--- a/keyboards/ergodox_stm32/matrix.c
+++ b/keyboards/ergodox_stm32/matrix.c
@@ -56,7 +56,7 @@ void matrix_init(void) {
       debounce_matrix[i * MATRIX_COLS + j] = 0;
     }
   }
-  matrix_init_quantum();
+  matrix_init_kb();
 }
 
 void matrix_power_up(void) {
@@ -115,7 +115,7 @@ uint8_t matrix_scan(void) {
 
     unselect_rows();
   }
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return 0;
 }
 
diff --git a/keyboards/fc660c/matrix.c b/keyboards/fc660c/matrix.c
index 40d606f57221ec771e13bd2f4bdf1b478803bd33..e9d13eeac4e9737e95c46b17ce51b83e4d60b21e 100644
--- a/keyboards/fc660c/matrix.c
+++ b/keyboards/fc660c/matrix.c
@@ -120,7 +120,7 @@ void matrix_init(void)
     for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00;
     matrix = _matrix0;
     matrix_prev = _matrix1;
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -180,7 +180,7 @@ uint8_t matrix_scan(void)
             matrix_last_modified = timer_read32();
         }
     }
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/fc980c/matrix.c b/keyboards/fc980c/matrix.c
index 6cdd9cf42e9aaaa6681885333a1c24d287010f88..f5c3ec08c726a7df15908b0de7412aa19a2112a1 100644
--- a/keyboards/fc980c/matrix.c
+++ b/keyboards/fc980c/matrix.c
@@ -122,7 +122,7 @@ void matrix_init(void)
     for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00;
     matrix = _matrix0;
     matrix_prev = _matrix1;
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -182,7 +182,7 @@ uint8_t matrix_scan(void)
             matrix_last_modified = timer_read32();
         }
     }
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/gboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c
index 7e5d675218a9c7e2e21d4eb849ce3c5d98b6a3d5..1bab5e89812ffa94162ba6ee32ddeaa31ac08da1 100644
--- a/keyboards/gboards/ergotaco/matrix.c
+++ b/keyboards/gboards/ergotaco/matrix.c
@@ -112,7 +112,7 @@ void matrix_init(void)
         }
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 void matrix_power_up(void) {
@@ -188,7 +188,7 @@ uint8_t matrix_scan(void)
         unselect_rows();
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
 
 #ifdef DEBUG_MATRIX
     for (uint8_t c = 0; c < MATRIX_COLS; c++)
diff --git a/keyboards/gboards/georgi/matrix.c b/keyboards/gboards/georgi/matrix.c
index 24bb2d7acf812ec43174b4757c327f8479f85d6b..5ac696fd31941484060e6431be8cdeb87e0efc4f 100644
--- a/keyboards/gboards/georgi/matrix.c
+++ b/keyboards/gboards/georgi/matrix.c
@@ -133,7 +133,7 @@ void matrix_init(void)
         }
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 void matrix_power_up(void) {
@@ -209,7 +209,7 @@ uint8_t matrix_scan(void)
         unselect_rows();
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
 
 #ifdef DEBUG_MATRIX
     for (uint8_t c = 0; c < MATRIX_COLS; c++)
diff --git a/keyboards/gboards/gergo/matrix.c b/keyboards/gboards/gergo/matrix.c
index 3898246e307983fd74568581b68bac9f882f9975..c352be24e1dab6b526ffddfcfcaa9d214add8355 100644
--- a/keyboards/gboards/gergo/matrix.c
+++ b/keyboards/gboards/gergo/matrix.c
@@ -153,7 +153,7 @@ void matrix_init(void) {
   }
 
     debounce_init(MATRIX_ROWS);
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 void matrix_power_up(void) {
@@ -260,7 +260,7 @@ uint8_t matrix_scan(void) {
     }
 
     debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
-    matrix_scan_quantum();
+    matrix_scan_kb();
 
     enableInterrupts();
 
diff --git a/keyboards/gboards/gergoplex/matrix.c b/keyboards/gboards/gergoplex/matrix.c
index df2b2dde15136d5ab364d90d651e13faea1b3141..c9f5528b749bf6faffe64637a50d849ede106be8 100644
--- a/keyboards/gboards/gergoplex/matrix.c
+++ b/keyboards/gboards/gergoplex/matrix.c
@@ -83,7 +83,7 @@ void matrix_init(void) {
     }
 
     debounce_init(MATRIX_ROWS);
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 void matrix_power_up(void) {
     mcp23018_status = init_mcp23018();
@@ -141,7 +141,7 @@ uint8_t matrix_scan(void) {
     }
 
     debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
-    matrix_scan_quantum();
+    matrix_scan_kb();
 
 #ifdef DEBUG_MATRIX
     for (uint8_t c = 0; c < MATRIX_COLS; c++)
diff --git a/keyboards/halfcliff/matrix.c b/keyboards/halfcliff/matrix.c
index 556b75ca5901cb9eafab00f8567564cde6fbd3e2..fd18fd27bdab1713d5594fefd781d1a25af71305 100644
--- a/keyboards/halfcliff/matrix.c
+++ b/keyboards/halfcliff/matrix.c
@@ -206,7 +206,7 @@ void matrix_init(void) {
 
     debounce_init(ROWS_PER_HAND);
 
-    matrix_init_quantum();
+    matrix_init_kb();
 
     split_post_init();
 }
@@ -240,7 +240,7 @@ bool matrix_post_scan(void) {
             }
         }
 
-        matrix_scan_quantum();
+        matrix_scan_kb();
     } else {
         transport_slave(matrix + thatHand, matrix + thisHand);
 
diff --git a/keyboards/handwired/dactyl/matrix.c b/keyboards/handwired/dactyl/matrix.c
index 5869b43c1b404fd22d36e3b7f2a14ea919f5e5ec..d87fe4cbd1a42714918bb5828919037d2e4e3a07 100644
--- a/keyboards/handwired/dactyl/matrix.c
+++ b/keyboards/handwired/dactyl/matrix.c
@@ -124,7 +124,7 @@ void matrix_init(void)
         matrix_debouncing[i] = 0;
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 void init_expander(void) {
@@ -277,7 +277,7 @@ uint8_t matrix_scan(void)
         }
 #   endif
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/handwired/datahand/matrix.c b/keyboards/handwired/datahand/matrix.c
index 9eead28cd64c8d9edba3f8cb38f92dd04fe5d507..afce07e10de2326e7d2c0e4dae62ffbcefa1f5d3 100644
--- a/keyboards/handwired/datahand/matrix.c
+++ b/keyboards/handwired/datahand/matrix.c
@@ -59,7 +59,7 @@ void matrix_init(void) {
   /* Turn off the lock LEDs. */
   PORTF |= LED_CAPS_LOCK | LED_NUM_LOCK | LED_SCROLL_LOCK | LED_MOUSE_LOCK;
 
-  matrix_init_quantum();
+  matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -73,7 +73,7 @@ uint8_t matrix_scan(void) {
     matrix[row] = read_cols();
   }
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
 
   return 1;
 }
diff --git a/keyboards/handwired/frenchdev/matrix.c b/keyboards/handwired/frenchdev/matrix.c
index 6dec9c6a74aaa077e653bef48ea8690446f2897a..3e859d47ef7318baba01b8ab2adc09ef6f40e282 100644
--- a/keyboards/handwired/frenchdev/matrix.c
+++ b/keyboards/handwired/frenchdev/matrix.c
@@ -111,7 +111,7 @@ void matrix_init(void)
         matrix_debouncing[i] = 0;
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 void matrix_power_up(void) {
@@ -169,7 +169,7 @@ uint8_t matrix_scan(void)
         }
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
 
     return 1;
 }
diff --git a/keyboards/handwired/owlet60/matrix.c b/keyboards/handwired/owlet60/matrix.c
index 3b68c08b458e71ef011355b4c96a44387682ca3b..ad36c99039d124ac4ed55280e62dcc06dc201008 100644
--- a/keyboards/handwired/owlet60/matrix.c
+++ b/keyboards/handwired/owlet60/matrix.c
@@ -200,7 +200,7 @@ void matrix_init(void) {
 
     debounce_init(MATRIX_ROWS);
 
-    matrix_init_quantum();
+    matrix_init_kb();
 
     setPinInput(D5);
     setPinInput(B0);
@@ -217,7 +217,7 @@ uint8_t matrix_scan(void)
 
     debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return (uint8_t)changed;
 }
 
@@ -235,7 +235,7 @@ uint8_t matrix_scan(void)
 
   debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return (uint8_t)changed;
 }
 */
diff --git a/keyboards/handwired/promethium/matrix.c b/keyboards/handwired/promethium/matrix.c
index 3b03ab8893f7183725f33bfa601f88d76dac31c0..9f6d707aab05882e87e6aea6d6d0ea044c39e9bf 100644
--- a/keyboards/handwired/promethium/matrix.c
+++ b/keyboards/handwired/promethium/matrix.c
@@ -111,7 +111,7 @@ void matrix_init(void) {
         matrix_debouncing[i] = 0;
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -141,7 +141,7 @@ uint8_t matrix_scan(void)
         }
 #   endif
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/handwired/pterodactyl/matrix.c b/keyboards/handwired/pterodactyl/matrix.c
index 9d81a64bb49ac3341e8ba8995e4b97088f6933b8..c12cf5a3227f82a7a8896db5c62caf8c7549f361 100644
--- a/keyboards/handwired/pterodactyl/matrix.c
+++ b/keyboards/handwired/pterodactyl/matrix.c
@@ -137,7 +137,7 @@ void matrix_init(void)
         matrix_debouncing[i] = 0;
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 void init_expander(void) {
@@ -278,7 +278,7 @@ uint8_t matrix_scan(void)
         }
 #   endif
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
index 7e15761a98b68a4eda67d4d0fcb4d367ad22bc67..8a303714cf0704fae14b441af0f29b7b9ed9fe79 100644
--- a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
+++ b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
@@ -295,7 +295,7 @@ void matrix_init(void) {
 
     debounce_init(MATRIX_ROWS);
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -323,7 +323,7 @@ uint8_t matrix_scan(void) {
     MATRIX_DEBUG_GAP();
 
     MATRIX_DEBUG_SCAN_START();
-    matrix_scan_quantum();
+    matrix_scan_kb();
     MATRIX_DEBUG_SCAN_END();
     return (uint8_t)changed;
 }
diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c
index cb21bfcf8dc30f52d4cb178b3deb94cd9120582b..2bc97bd9e81b75da9fc3c72d46fb4e833819f0eb 100644
--- a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c
+++ b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c
@@ -171,7 +171,7 @@ void matrix_init(void) {
 
     debounce_init(MATRIX_ROWS);
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -228,7 +228,7 @@ uint8_t matrix_scan(void) {
     MATRIX_DEBUG_SCAN_END(); MATRIX_DEBUG_GAP();
 
     MATRIX_DEBUG_SCAN_START();
-    matrix_scan_quantum();
+    matrix_scan_kb();
     MATRIX_DEBUG_SCAN_END();
     return (uint8_t)changed;
 }
diff --git a/keyboards/hhkb/ansi/matrix.c b/keyboards/hhkb/ansi/matrix.c
index 8b0e4606bc6aabe31df1bbb16be6cea45cd2b8c4..a1bda95841001d4ed1f15ea3a1ceb82818c31c37 100644
--- a/keyboards/hhkb/ansi/matrix.c
+++ b/keyboards/hhkb/ansi/matrix.c
@@ -71,7 +71,7 @@ void matrix_init(void)
     matrix = _matrix0;
     matrix_prev = _matrix1;
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 __attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
@@ -158,7 +158,7 @@ uint8_t matrix_scan(void)
         suspend_power_down();
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
 
     return 1;
 }
diff --git a/keyboards/hhkb/jp/matrix.c b/keyboards/hhkb/jp/matrix.c
index 9d04d62849a8591eb8bfa86977a0dc11fba376e0..caedeef0080dc01a13203911abb9930976fa1d51 100644
--- a/keyboards/hhkb/jp/matrix.c
+++ b/keyboards/hhkb/jp/matrix.c
@@ -71,7 +71,7 @@ void matrix_init(void)
     matrix = _matrix0;
     matrix_prev = _matrix1;
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 __attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
@@ -159,7 +159,7 @@ uint8_t matrix_scan(void)
         suspend_power_down();
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
 
     return 1;
 }
diff --git a/keyboards/hotdox/matrix.c b/keyboards/hotdox/matrix.c
index 0da5a3e3a2e92fe2208fdcb5a02acbf107872b3a..04b6d72b754f0f8d30709a3250a687cb6ad689b7 100644
--- a/keyboards/hotdox/matrix.c
+++ b/keyboards/hotdox/matrix.c
@@ -81,7 +81,7 @@ void matrix_init(void)
     }
   }
 
-  matrix_init_quantum();
+  matrix_init_kb();
 }
 
 void matrix_power_up(void) {
@@ -133,7 +133,7 @@ uint8_t matrix_scan(void)
     unselect_rows();
   }
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
 
   return 1;
 }
diff --git a/keyboards/jones/v03/matrix.c b/keyboards/jones/v03/matrix.c
index 9f3e76f935d3822c2231bc0538a4677c15397f6a..efcd7043e64c86b8b6bffbfc96a703ebce35543c 100644
--- a/keyboards/jones/v03/matrix.c
+++ b/keyboards/jones/v03/matrix.c
@@ -83,7 +83,7 @@ void matrix_init_custom(void) {
     // initialize key pins
     init_pins();
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 bool matrix_scan_custom(matrix_row_t current_matrix[]) {
@@ -94,6 +94,6 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
         changed |= read_cols_on_row(current_matrix, current_row);
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return changed;
 }
diff --git a/keyboards/jones/v03_1/matrix.c b/keyboards/jones/v03_1/matrix.c
index 9f3e76f935d3822c2231bc0538a4677c15397f6a..efcd7043e64c86b8b6bffbfc96a703ebce35543c 100644
--- a/keyboards/jones/v03_1/matrix.c
+++ b/keyboards/jones/v03_1/matrix.c
@@ -83,7 +83,7 @@ void matrix_init_custom(void) {
     // initialize key pins
     init_pins();
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 bool matrix_scan_custom(matrix_row_t current_matrix[]) {
@@ -94,6 +94,6 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
         changed |= read_cols_on_row(current_matrix, current_row);
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return changed;
 }
diff --git a/keyboards/kakunpc/angel64/alpha/matrix.c b/keyboards/kakunpc/angel64/alpha/matrix.c
index 8ca9841e48e077999e65cc5289d528924ecc3bb1..7abc50005b65b1cda0ede04724b51a753f50cd24 100644
--- a/keyboards/kakunpc/angel64/alpha/matrix.c
+++ b/keyboards/kakunpc/angel64/alpha/matrix.c
@@ -49,16 +49,6 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 static matrix_row_t raw_matrix[MATRIX_ROWS]; //raw values
 static matrix_row_t matrix[MATRIX_ROWS]; //debounced values
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -244,7 +234,7 @@ void matrix_init(void) {
 
     debounce_init(MATRIX_ROWS);
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -263,6 +253,6 @@ uint8_t matrix_scan(void)
 
   debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return (uint8_t)changed;
 }
diff --git a/keyboards/kakunpc/angel64/rev1/matrix.c b/keyboards/kakunpc/angel64/rev1/matrix.c
index 8ca9841e48e077999e65cc5289d528924ecc3bb1..7abc50005b65b1cda0ede04724b51a753f50cd24 100644
--- a/keyboards/kakunpc/angel64/rev1/matrix.c
+++ b/keyboards/kakunpc/angel64/rev1/matrix.c
@@ -49,16 +49,6 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 static matrix_row_t raw_matrix[MATRIX_ROWS]; //raw values
 static matrix_row_t matrix[MATRIX_ROWS]; //debounced values
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -244,7 +234,7 @@ void matrix_init(void) {
 
     debounce_init(MATRIX_ROWS);
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -263,6 +253,6 @@ uint8_t matrix_scan(void)
 
   debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return (uint8_t)changed;
 }
diff --git a/keyboards/kakunpc/thedogkeyboard/matrix.c b/keyboards/kakunpc/thedogkeyboard/matrix.c
index 8ca9841e48e077999e65cc5289d528924ecc3bb1..7abc50005b65b1cda0ede04724b51a753f50cd24 100644
--- a/keyboards/kakunpc/thedogkeyboard/matrix.c
+++ b/keyboards/kakunpc/thedogkeyboard/matrix.c
@@ -49,16 +49,6 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 static matrix_row_t raw_matrix[MATRIX_ROWS]; //raw values
 static matrix_row_t matrix[MATRIX_ROWS]; //debounced values
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -244,7 +234,7 @@ void matrix_init(void) {
 
     debounce_init(MATRIX_ROWS);
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -263,6 +253,6 @@ uint8_t matrix_scan(void)
 
   debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return (uint8_t)changed;
 }
diff --git a/keyboards/keyboardio/model01/matrix.c b/keyboards/keyboardio/model01/matrix.c
index 524ec9bdca20142fbde9595ece0972bc187f93f8..4b788d2812896e8662967ada659ba0696b27365f 100644
--- a/keyboards/keyboardio/model01/matrix.c
+++ b/keyboards/keyboardio/model01/matrix.c
@@ -77,14 +77,14 @@ void matrix_init(void) {
   i2c_set_keyscan_interval(RIGHT, 2);
   memset(rows, 0, sizeof(rows));
 
-  matrix_init_quantum();
+  matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
   uint8_t ret = 0;
   ret |= i2c_read_hand(LEFT);
   ret |= i2c_read_hand(RIGHT);
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return ret;
 }
 
diff --git a/keyboards/keyhive/honeycomb/matrix.c b/keyboards/keyhive/honeycomb/matrix.c
index c8a7992ec5fc5dbee13e924861b74dc5933cdf52..64008228af9b9b418eee82fa35bb7b142b1e7eef 100755
--- a/keyboards/keyhive/honeycomb/matrix.c
+++ b/keyboards/keyhive/honeycomb/matrix.c
@@ -53,16 +53,6 @@ static matrix_row_t matrix[MATRIX_ROWS];
 //extern int8_t encoderValue;
 int8_t encoderValue = 0;
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -93,7 +83,7 @@ uint8_t matrix_cols(void) {
 
 void matrix_init(void) {
 
-    matrix_init_quantum();
+    matrix_init_kb();
     uart_init(1000000);
 }
 
@@ -168,7 +158,7 @@ uint8_t matrix_scan(void)
         xprintf("\r\nRequested packet, data 3 was %d",uart_data[3]);
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/kinesis/alvicstep/matrix.c b/keyboards/kinesis/alvicstep/matrix.c
index 5636418849d095be56e0180e3cc97253e5b98c1d..07df19e966bb6c6a49f59bc19209014b17828c4e 100644
--- a/keyboards/kinesis/alvicstep/matrix.c
+++ b/keyboards/kinesis/alvicstep/matrix.c
@@ -132,7 +132,7 @@ uint8_t matrix_scan(void)
             }
         }
     }
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/kmac/matrix.c b/keyboards/kmac/matrix.c
index 2052a9be7181ae8fc39d8cfc08b1fb64f7ff353d..65698670325ee9d092d2c74d218e370caa3821bd 100644
--- a/keyboards/kmac/matrix.c
+++ b/keyboards/kmac/matrix.c
@@ -45,10 +45,6 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 static matrix_row_t raw_matrix[MATRIX_ROWS];  // raw values
 static matrix_row_t matrix[MATRIX_ROWS];      // debounced values
 
-__attribute__((weak)) void matrix_init_quantum(void) { matrix_init_kb(); }
-
-__attribute__((weak)) void matrix_scan_quantum(void) { matrix_scan_kb(); }
-
 __attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
 
 __attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
@@ -191,7 +187,7 @@ void matrix_init(void) {
 
     debounce_init(MATRIX_ROWS);
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -203,7 +199,7 @@ uint8_t matrix_scan(void) {
 
     debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
 
     return (uint8_t)changed;
 }
diff --git a/keyboards/kmini/matrix.c b/keyboards/kmini/matrix.c
index f3e60eb8693df8d3be8ad09dc5212c8e7f0f446a..92565e937a043a5445990446dfb58011136e639d 100755
--- a/keyboards/kmini/matrix.c
+++ b/keyboards/kmini/matrix.c
@@ -84,7 +84,7 @@ void matrix_init(void) {
         matrix_debouncing[i] = 0;
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -105,7 +105,7 @@ uint8_t matrix_scan(void)
         debouncing = false;
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/matrix/noah/matrix.c b/keyboards/matrix/noah/matrix.c
index d5aca79cf6480e3e40560cf48f99f8def2c6a54c..90e7006b7859e427129ca30c283cc195b9a7c100 100644
--- a/keyboards/matrix/noah/matrix.c
+++ b/keyboards/matrix/noah/matrix.c
@@ -85,7 +85,7 @@ void matrix_init(void)
     memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
     memset(matrix_debouncing, 0, MATRIX_COLS * sizeof(matrix_row_t));
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -156,7 +156,7 @@ uint8_t matrix_scan(void)
         debouncing = false;
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
 
     return 1;
 }
diff --git a/keyboards/moon/matrix.c b/keyboards/moon/matrix.c
index 977338b2f63c74c7bc6792364b1e8913309c5434..bb46e1b576f1b5abe25c96a52d8a130f93ee5068 100644
--- a/keyboards/moon/matrix.c
+++ b/keyboards/moon/matrix.c
@@ -91,10 +91,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 static matrix_row_t raw_matrix[MATRIX_ROWS];  // raw values
 static matrix_row_t matrix[MATRIX_ROWS];      // debounced values
 
-__attribute__((weak)) void matrix_init_quantum(void) { matrix_init_kb(); }
-
-__attribute__((weak)) void matrix_scan_quantum(void) { matrix_scan_kb(); }
-
 __attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
 
 __attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
@@ -191,7 +187,7 @@ void matrix_init(void) {
 
   debounce_init(MATRIX_ROWS);
 
-  matrix_init_quantum();
+  matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -203,7 +199,7 @@ uint8_t matrix_scan(void) {
 
   debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
 
   return (uint8_t)changed;
 }
diff --git a/keyboards/nek_type_a/matrix.c b/keyboards/nek_type_a/matrix.c
index 2989af5108414604b2da4f0dce24dd773d10ae68..76613947f615d971e11c427836275c88c4cf0699 100644
--- a/keyboards/nek_type_a/matrix.c
+++ b/keyboards/nek_type_a/matrix.c
@@ -91,17 +91,6 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS];
     static void select_col(uint8_t col);
 #endif
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    expander_init();
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -146,7 +135,7 @@ void matrix_init(void) {
         matrix_debouncing[i] = 0;
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
     set_output(OUTPUT_AUTO);
 }
 
@@ -198,7 +187,7 @@ uint8_t matrix_scan(void)
         }
 #   endif
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/planck/rev6_drop/matrix.c b/keyboards/planck/rev6_drop/matrix.c
index 7eaaf053f8ea958a7f2667df5be69a5df22e1235..6f7d6725a1928579181de995af86eb5fd60cae99 100644
--- a/keyboards/planck/rev6_drop/matrix.c
+++ b/keyboards/planck/rev6_drop/matrix.c
@@ -67,7 +67,7 @@ void matrix_init(void) {
     memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
     memset(matrix_debouncing, 0, MATRIX_COLS * sizeof(matrix_row_t));
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -142,7 +142,7 @@ uint8_t matrix_scan(void) {
         debouncing = false;
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
 
     return 1;
 }
diff --git a/keyboards/preonic/rev3_drop/matrix.c b/keyboards/preonic/rev3_drop/matrix.c
index 2477dfca1bc1b129dcb87fd1915a7067bceb7810..60718caaba899e67acc8de771cb4844b31976a9f 100644
--- a/keyboards/preonic/rev3_drop/matrix.c
+++ b/keyboards/preonic/rev3_drop/matrix.c
@@ -71,7 +71,7 @@ void matrix_init(void) {
     memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
     memset(matrix_debouncing, 0, MATRIX_COLS * sizeof(matrix_col_t));
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
@@ -146,7 +146,7 @@ uint8_t matrix_scan(void) {
         debouncing = false;
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
 
     return 1;
 }
diff --git a/keyboards/redscarf_iiplus/verb/matrix.c b/keyboards/redscarf_iiplus/verb/matrix.c
index 930d246434cdfb04650d26e6d630a15375f5a173..aa2cd8e51079aec074af549df349574d7a7683ff 100755
--- a/keyboards/redscarf_iiplus/verb/matrix.c
+++ b/keyboards/redscarf_iiplus/verb/matrix.c
@@ -53,16 +53,6 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 static matrix_row_t raw_matrix[MATRIX_ROWS]; //raw values
 static matrix_row_t matrix[MATRIX_ROWS]; //debounced values
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -345,7 +335,7 @@ void matrix_init(void) {
 
     debounce_init(MATRIX_ROWS);
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -366,6 +356,6 @@ uint8_t matrix_scan(void)
 
   debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return 1;
 }
diff --git a/keyboards/redscarf_iiplus/verc/matrix.c b/keyboards/redscarf_iiplus/verc/matrix.c
index 930d246434cdfb04650d26e6d630a15375f5a173..aa2cd8e51079aec074af549df349574d7a7683ff 100755
--- a/keyboards/redscarf_iiplus/verc/matrix.c
+++ b/keyboards/redscarf_iiplus/verc/matrix.c
@@ -53,16 +53,6 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 static matrix_row_t raw_matrix[MATRIX_ROWS]; //raw values
 static matrix_row_t matrix[MATRIX_ROWS]; //debounced values
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -345,7 +335,7 @@ void matrix_init(void) {
 
     debounce_init(MATRIX_ROWS);
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -366,6 +356,6 @@ uint8_t matrix_scan(void)
 
   debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return 1;
 }
diff --git a/keyboards/redscarf_iiplus/verd/matrix.c b/keyboards/redscarf_iiplus/verd/matrix.c
index b7039322292653f5a0fb0990acb9ff5393373d1d..382847e9419999b2d31e3e6ca1be33abafba2464 100644
--- a/keyboards/redscarf_iiplus/verd/matrix.c
+++ b/keyboards/redscarf_iiplus/verd/matrix.c
@@ -53,16 +53,6 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 static matrix_row_t raw_matrix[MATRIX_ROWS]; //raw values
 static matrix_row_t matrix[MATRIX_ROWS]; //debounced values
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -345,7 +335,7 @@ void matrix_init(void) {
 
     debounce_init(MATRIX_ROWS);
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -366,6 +356,6 @@ uint8_t matrix_scan(void)
 
   debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
   return 1;
 }
diff --git a/keyboards/sixkeyboard/matrix.c b/keyboards/sixkeyboard/matrix.c
index 36ae05fb4271e34fc68c35eb2fe912f0c4520124..17d51a8885436c713003bfb80c001fed5d344cd6 100644
--- a/keyboards/sixkeyboard/matrix.c
+++ b/keyboards/sixkeyboard/matrix.c
@@ -85,7 +85,7 @@ void matrix_init(void)
         matrix_stage[i] = 0;
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
 
 }
 
@@ -109,7 +109,7 @@ uint8_t matrix_scan(void)
         debouncing = false;
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
 
     return 1;
 }
diff --git a/keyboards/sx60/matrix.c b/keyboards/sx60/matrix.c
index 94d581f574b31b91fecca0e10fc1ac88f9a891e3..66bc494be6c27bf1e957d9ea58f24edd8e7372a1 100644
--- a/keyboards/sx60/matrix.c
+++ b/keyboards/sx60/matrix.c
@@ -71,16 +71,6 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
 static void unselect_rows(void);
 static void select_row(uint8_t row);
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -122,7 +112,7 @@ void matrix_init(void) {
         matrix_debouncing[i] = 0;
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -165,7 +155,7 @@ uint8_t matrix_scan(void)
         }
 #   endif
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/keyboards/touchpad/matrix.c b/keyboards/touchpad/matrix.c
index 3af4c5c3c7915090a6e035f5f0c96912db5c8194..6bffb826bddf09e93514746e5833f78d973b5553 100644
--- a/keyboards/touchpad/matrix.c
+++ b/keyboards/touchpad/matrix.c
@@ -158,7 +158,7 @@ void matrix_init(void) {
 
   memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
 
-  matrix_init_quantum();
+  matrix_init_kb();
 }
 
 
@@ -261,7 +261,7 @@ uint8_t matrix_scan(void) {
     writePinLow(E6);
   }
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
 
   return 1;
 
diff --git a/keyboards/woodkeys/meira/matrix.c b/keyboards/woodkeys/meira/matrix.c
index 4fdc354237ec378f627d0c809ba4d0b890abf430..145750a418919a893ef2b06a614febcd92bc80a9 100644
--- a/keyboards/woodkeys/meira/matrix.c
+++ b/keyboards/woodkeys/meira/matrix.c
@@ -119,7 +119,7 @@ void matrix_init(void)
         matrix_debouncing[i] = 0;
     }
 
-    matrix_init_quantum();
+    matrix_init_kb();
 
 }
 
@@ -154,7 +154,7 @@ uint8_t _matrix_scan(void)
 uint8_t matrix_scan(void)
 {
 	uint8_t ret = _matrix_scan();
-	matrix_scan_quantum();
+	matrix_scan_kb();
 	return ret;
 }
 
diff --git a/keyboards/ymdk/sp64/matrix.c b/keyboards/ymdk/sp64/matrix.c
index 69276c7b3c28e5f0cac1ad87565a4446354934b5..b5f0e104620f30dc962d1e79b5804f5489303078 100644
--- a/keyboards/ymdk/sp64/matrix.c
+++ b/keyboards/ymdk/sp64/matrix.c
@@ -74,7 +74,7 @@ void matrix_init(void)
     matrix_debouncing[row] = 0;
   }
   debounce_init(MATRIX_ROWS);
-  matrix_init_quantum();
+  matrix_init_kb();
 }
 
 uint8_t matrix_scan(void)
@@ -127,7 +127,7 @@ uint8_t matrix_scan(void)
 
   debounce(matrix_debouncing, matrix, MATRIX_ROWS, changed);
 
-  matrix_scan_quantum();
+  matrix_scan_kb();
 
 #ifdef DEBUG_MATRIX
   for (uint8_t c = 0; c < MATRIX_COLS; c++)
diff --git a/quantum/matrix.c b/quantum/matrix.c
index 0de65c6cddc178f8947abd6005b016968e53bcb7..97d41caeddedd2af645ff1364f2980560f840746 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -308,7 +308,7 @@ void matrix_init(void) {
 
     debounce_init(ROWS_PER_HAND);
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 #ifdef SPLIT_KEYBOARD
@@ -342,7 +342,7 @@ uint8_t matrix_scan(void) {
     changed = debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed) | matrix_post_scan();
 #else
     changed = debounce(raw_matrix, matrix, ROWS_PER_HAND, changed);
-    matrix_scan_quantum();
+    matrix_scan_kb();
 #endif
     return (uint8_t)changed;
 }
diff --git a/quantum/matrix.h b/quantum/matrix.h
index 4b4210cb0faf3c20ed8cd86fafd487ec7f9e3384..760d21e0c1a4b95df039509208af21530c75d16e 100644
--- a/quantum/matrix.h
+++ b/quantum/matrix.h
@@ -67,10 +67,6 @@ void matrix_io_delay(void);
 void matrix_power_up(void);
 void matrix_power_down(void);
 
-/* executes code for Quantum */
-void matrix_init_quantum(void);
-void matrix_scan_quantum(void);
-
 void matrix_init_kb(void);
 void matrix_scan_kb(void);
 
diff --git a/quantum/matrix_common.c b/quantum/matrix_common.c
index f2b9d58937459afc16e44ce9d15befcdb43e3732..3173351888dd8556953a8db073f8511d7a50f0e1 100644
--- a/quantum/matrix_common.c
+++ b/quantum/matrix_common.c
@@ -111,7 +111,7 @@ bool matrix_post_scan(void) {
 
         if (changed) memcpy(matrix + thatHand, slave_matrix, sizeof(slave_matrix));
 
-        matrix_scan_quantum();
+        matrix_scan_kb();
     } else {
         transport_slave(matrix + thatHand, matrix + thisHand);
 
@@ -162,7 +162,7 @@ __attribute__((weak)) void matrix_init(void) {
 
     debounce_init(ROWS_PER_HAND);
 
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 __attribute__((weak)) uint8_t matrix_scan(void) {
@@ -172,7 +172,7 @@ __attribute__((weak)) uint8_t matrix_scan(void) {
     changed = debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed) | matrix_post_scan();
 #else
     changed = debounce(raw_matrix, matrix, ROWS_PER_HAND, changed);
-    matrix_scan_quantum();
+    matrix_scan_kb();
 #endif
 
     return changed;
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 653f553f60076bf9cc7ad70d6a39eea967837586..5554ecab327b07d67ff927172276d65fd0327b2a 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -453,14 +453,6 @@ void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
     layer_state_set(update_tri_layer_state(layer_state, layer1, layer2, layer3));
 }
 
-// TODO: remove legacy api
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 //------------------------------------------------------------------------------
 // Override these functions in your keymap file to play different tunes on
 // different events such as startup and bootloader jump
diff --git a/tests/test_common/matrix.c b/tests/test_common/matrix.c
index 45e76d32c589c4fb68679500d5265d033f4db785..1d9940271392837da003759e82d922dde127aa69 100644
--- a/tests/test_common/matrix.c
+++ b/tests/test_common/matrix.c
@@ -22,11 +22,11 @@ static matrix_row_t matrix[MATRIX_ROWS] = {};
 
 void matrix_init(void) {
     clear_all_keys();
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 uint8_t matrix_scan(void) {
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
diff --git a/users/drashna/callbacks.md b/users/drashna/callbacks.md
index 5908a66142a3789bc1d597e4f0a9a70cbf74ed29..e23f7f6d86c198cd281c4720a35d8005980df940 100644
--- a/users/drashna/callbacks.md
+++ b/users/drashna/callbacks.md
@@ -2,7 +2,7 @@
 
 Specifically QMK works by using customized callback functions for everything. This allows for multiple levels of customization. 
 
-`matrix_scan` calls `matrix_scan_quantum`, which calls `matrix_scan_kb`, which calls `matrix_scan_user`. 
+`matrix_scan` calls `matrix_scan_kb`, which calls `matrix_scan_user`. 
 `process_record` calls a bunch of stuff, but eventually calls `process_record_kb` which calls `process_record_user`
 The same goes for `matrix_init`, `layer_state_set`, `led_set`, and a few other functions.