diff --git a/src/Kaleidoscope-Model01-TestMode.cpp b/src/Kaleidoscope-Model01-TestMode.cpp
index 7bef678a..e7c4a882 100644
--- a/src/Kaleidoscope-Model01-TestMode.cpp
+++ b/src/Kaleidoscope-Model01-TestMode.cpp
@@ -31,7 +31,7 @@ void TestMode_::loopHook(bool postClear) {
 void TestMode_::wait_for_keypress() {
   delay(25);
   while (1) {
-    KeyboardHardware.read_matrix();
+    KeyboardHardware.readMatrix();
     if (KeyboardHardware.leftHandState.all ==  R3C6
         && KeyboardHardware.previousLeftHandState.all == 0) {
       break;
@@ -65,10 +65,10 @@ void TestMode_::test_leds(void) {
 
 
 
-void TestMode_::test_matrix() {
+void TestMode_::testMatrix() {
   LEDControl.set_all_leds_to(200, 0, 0);
   while (1) {
-    KeyboardHardware.read_matrix();
+    KeyboardHardware.readMatrix();
     if (KeyboardHardware.leftHandState.all == TEST_MODE_KEY_COMBO) {
       break;
     }
@@ -117,7 +117,7 @@ void TestMode_::run_tests() {
   toggle_programming_leds_on();
 
   test_leds();
-  test_matrix();
+  testMatrix();
   //  Serial.println("Done running tests");
 }
 
diff --git a/src/Kaleidoscope-Model01-TestMode.h b/src/Kaleidoscope-Model01-TestMode.h
index efd00026..144bad52 100644
--- a/src/Kaleidoscope-Model01-TestMode.h
+++ b/src/Kaleidoscope-Model01-TestMode.h
@@ -13,7 +13,7 @@ class TestMode_ : public KaleidoscopePlugin {
  private:
   static void run_tests();
   static void test_leds();
-  static void test_matrix();
+  static void testMatrix();
   static void toggle_programming_leds_on();
   static void wait_for_keypress();
   static void loopHook(bool postClear);