diff --git a/docs/config_and_keymap.md b/docs/config_and_keymap.md
index 5b25cf4..0e0e614 100644
--- a/docs/config_and_keymap.md
+++ b/docs/config_and_keymap.md
@@ -1,7 +1,7 @@
 # Configuring KMK
 
 KMK is configured through a rather large plain-old-Python class called
-`KeyboardConfig`. Subclasses of this configuration exist which pre-fill defaults
+`KMKKeyboard`. Subclasses of this configuration exist which pre-fill defaults
 for various known keyboards (for example, many Keebio keyboards are supported
 through our ItsyBitsy to ProMicro pinout adapter). This class is the main
 interface between end users and the inner workings of KMK. Let's dive in!
@@ -17,13 +17,13 @@ interface between end users and the inner workings of KMK. Let's dive in!
   corruption bugs, or you might just have bad luck and delete the wrong file
   some day.
 
-- Import the `KeyboardConfig` object for your keyboard from `kmk.boards` (or, if
-  handwiring your keyboard, import `KeyboardConfig` from `kmk.keyboard_config`).
+- Import the `KMKKeyboard` object for your keyboard from `kmk.boards` (or, if
+  handwiring your keyboard, import `KMKKeyboard` from `kmk.kmk_keyboard`).
 
-- Assign a `KeyboardConfig` instance to a variable (ex. `keyboard = KeyboardConfig()` - note
+- Assign a `KMKKeyboard` instance to a variable (ex. `keyboard = KMKKeyboard()` - note
   the parentheses)
 
-- Make sure this `KeyboardConfig` instance is actually run at the end of the file with
+- Make sure this `KMKKeyboard` instance is actually run at the end of the file with
   a block such as the following:
 
 ```python
diff --git a/docs/tapdance.md b/docs/tapdance.md
index a974734..02b82fc 100644
--- a/docs/tapdance.md
+++ b/docs/tapdance.md
@@ -40,11 +40,11 @@ Here's an example of all this in action:
 
 ```python
 # user_keymaps/some_silly_example.py
-from kmk.boards.klarank import KeyboardConfig
+from kmk.boards.klarank import KMKKeyboard
 from kmk.keycodes import KC
 from kmk.macros.simple import send_string
 
-keyboard = KeyboardConfig()
+keyboard = KMKKeyboard()
 
 keyboard.tap_time = 750
 
diff --git a/kmk/boards/converter/fourtypercentclub/gherkin.py b/kmk/boards/converter/fourtypercentclub/gherkin.py
index 853717d..85f0dc3 100644
--- a/kmk/boards/converter/fourtypercentclub/gherkin.py
+++ b/kmk/boards/converter/fourtypercentclub/gherkin.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     col_pins = (board.D9, board.D10, board.D11, board.D12, board.D13, board.SCL)
     row_pins = (board.A3, board.A4, board.A5, board.SCK, board.MOSI)
     diode_orientation = DiodeOrientation.COLUMNS
diff --git a/kmk/boards/converter/fourtypercentclub/luddite.py b/kmk/boards/converter/fourtypercentclub/luddite.py
index 35c1695..4be875f 100644
--- a/kmk/boards/converter/fourtypercentclub/luddite.py
+++ b/kmk/boards/converter/fourtypercentclub/luddite.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     col_pins = (
         board.A0,
         board.A1,
diff --git a/kmk/boards/converter/keebio/bdn9.py b/kmk/boards/converter/keebio/bdn9.py
index 7afec64..de7789c 100644
--- a/kmk/boards/converter/keebio/bdn9.py
+++ b/kmk/boards/converter/keebio/bdn9.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     col_pins = (
         board.RX,
         board.D13,
diff --git a/kmk/boards/converter/keebio/fourier.py b/kmk/boards/converter/keebio/fourier.py
index 9eada4b..b32847b 100644
--- a/kmk/boards/converter/keebio/fourier.py
+++ b/kmk/boards/converter/keebio/fourier.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     col_pins = (board.A1, board.A2, board.A3, board.A4, board.A5, board.SCK, board.MOSI)
     row_pins = (board.A0, board.D11, board.D10, board.D9)
     diode_orientation = DiodeOrientation.COLUMNS
diff --git a/kmk/boards/converter/keebio/iris_r1.py b/kmk/boards/converter/keebio/iris_r1.py
index 0152149..4e47e2f 100644
--- a/kmk/boards/converter/keebio/iris_r1.py
+++ b/kmk/boards/converter/keebio/iris_r1.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     col_pins = (board.A2, board.A3, board.A4, board.A5, board.SCK, board.MOSI)
     row_pins = (board.D11, board.D10, board.D9, board.D7, board.D13)
     diode_orientation = DiodeOrientation.COLUMNS
diff --git a/kmk/boards/converter/keebio/iris_r2.py b/kmk/boards/converter/keebio/iris_r2.py
index 5789f8d..651b407 100644
--- a/kmk/boards/converter/keebio/iris_r2.py
+++ b/kmk/boards/converter/keebio/iris_r2.py
@@ -1,11 +1,11 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 from kmk.matrix import intify_coordinate as ic
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     # Pin mappings for converter board found at hardware/README.md
     # QMK: MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
     # QMK: MATRIX_ROW_PINS { D7, E6, B4, D2, D4 }
diff --git a/kmk/boards/converter/keebio/lapace.py b/kmk/boards/converter/keebio/lapace.py
index a97f575..6ff410c 100644
--- a/kmk/boards/converter/keebio/lapace.py
+++ b/kmk/boards/converter/keebio/lapace.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     col_pins = (
         board.SDA,
         board.A2,
diff --git a/kmk/boards/converter/keebio/levinson_r1.py b/kmk/boards/converter/keebio/levinson_r1.py
index f3b7410..a074d29 100644
--- a/kmk/boards/converter/keebio/levinson_r1.py
+++ b/kmk/boards/converter/keebio/levinson_r1.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     col_pins = (board.A2, board.A3, board.A4, board.A5, board.SCK, board.A0)
     row_pins = (board.D11, board.D10, board.D9, board.D7)
     diode_orientation = DiodeOrientation.COLUMNS
diff --git a/kmk/boards/converter/keebio/levinson_r2.py b/kmk/boards/converter/keebio/levinson_r2.py
index 7595f76..1626821 100644
--- a/kmk/boards/converter/keebio/levinson_r2.py
+++ b/kmk/boards/converter/keebio/levinson_r2.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     col_pins = (board.A2, board.A3, board.A4, board.A5, board.SCK, board.MOSI)
     row_pins = (board.D13, board.D11, board.D10, board.D9)
     diode_orientation = DiodeOrientation.COLUMNS
diff --git a/kmk/boards/converter/keebio/nyquist_r1.py b/kmk/boards/converter/keebio/nyquist_r1.py
index 6a899b4..ded8feb 100644
--- a/kmk/boards/converter/keebio/nyquist_r1.py
+++ b/kmk/boards/converter/keebio/nyquist_r1.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     col_pins = (board.A2, board.A3, board.A4, board.A5, board.SCK, board.MOSI)
     row_pins = (board.D13, board.D11, board.D10, board.D9, board.D7)
     diode_orientation = DiodeOrientation.COLUMNS
diff --git a/kmk/boards/converter/keebio/nyquist_r2.py b/kmk/boards/converter/keebio/nyquist_r2.py
index e99ec2f..708e09b 100644
--- a/kmk/boards/converter/keebio/nyquist_r2.py
+++ b/kmk/boards/converter/keebio/nyquist_r2.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     col_pins = (board.RX, board.A1, board.A2, board.A3, board.A4, board.A5)
     row_pins = (board.D13, board.D11, board.D10, board.D9, board.D7)
     diode_orientation = DiodeOrientation.COLUMNS
diff --git a/kmk/boards/converter/keebio/quefrency.py b/kmk/boards/converter/keebio/quefrency.py
index efc997e..93e101a 100644
--- a/kmk/boards/converter/keebio/quefrency.py
+++ b/kmk/boards/converter/keebio/quefrency.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     # Will need additional work and testing
     col_pins = (
         board.A1,
diff --git a/kmk/boards/converter/keebio/rorschach.py b/kmk/boards/converter/keebio/rorschach.py
index 2b996cb..fd45d16 100644
--- a/kmk/boards/converter/keebio/rorschach.py
+++ b/kmk/boards/converter/keebio/rorschach.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     col_pins = (board.A2, board.A3, board.A4, board.A5, board.SCK, board.MOSI)
     row_pins = (board.D11, board.D10, board.D9, board.RX, board.D13)
     diode_orientation = DiodeOrientation.COLUMNS
diff --git a/kmk/boards/converter/keebio/tragicforce68.py b/kmk/boards/converter/keebio/tragicforce68.py
index 273f819..716b780 100644
--- a/kmk/boards/converter/keebio/tragicforce68.py
+++ b/kmk/boards/converter/keebio/tragicforce68.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     col_pins = (
         board.A0,
         board.A1,
diff --git a/kmk/boards/converter/keebio/viterbi_r1.py b/kmk/boards/converter/keebio/viterbi_r1.py
index f2e49d5..43ffaa3 100644
--- a/kmk/boards/converter/keebio/viterbi_r1.py
+++ b/kmk/boards/converter/keebio/viterbi_r1.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     col_pins = (board.A1, board.A2, board.A3, board.A4, board.A5, board.SCK, board.MOSI)
     row_pins = (board.D13, board.D11, board.D10, board.D9, board.D7)
     diode_orientation = DiodeOrientation.COLUMNS
diff --git a/kmk/boards/converter/keebio/viterbi_r2.py b/kmk/boards/converter/keebio/viterbi_r2.py
index 5eaefe9..a17344d 100644
--- a/kmk/boards/converter/keebio/viterbi_r2.py
+++ b/kmk/boards/converter/keebio/viterbi_r2.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     col_pins = (board.A0, board.A1, board.A2, board.A3, board.A4, board.A5, board.SCK)
     row_pins = (board.D13, board.D11, board.D10, board.D9, board.D7)
     diode_orientation = DiodeOrientation.COLUMNS
diff --git a/kmk/boards/converter/lets-split/lets-split_r1.py b/kmk/boards/converter/lets-split/lets-split_r1.py
index f72fdf3..8ddc827 100644
--- a/kmk/boards/converter/lets-split/lets-split_r1.py
+++ b/kmk/boards/converter/lets-split/lets-split_r1.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     col_pins = (board.A5, board.A4, board.A3, board.A2, board.A1, board.A0)
     row_pins = (board.D7, board.D9, board.D10, board.D11)
     diode_orientation = DiodeOrientation.COLUMNS
diff --git a/kmk/boards/converter/lets-split/lets-split_r2.py b/kmk/boards/converter/lets-split/lets-split_r2.py
index 7d392a8..f13ec94 100644
--- a/kmk/boards/converter/lets-split/lets-split_r2.py
+++ b/kmk/boards/converter/lets-split/lets-split_r2.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     col_pins = (board.MOSI, board.SCK, board.A5, board.A4, board.A3, board.A2)
     row_pins = (board.D11, board.D10, board.D9, board.D7)
     diode_orientation = DiodeOrientation.COLUMNS
diff --git a/kmk/boards/klarank.py b/kmk/boards/klarank.py
index 15e583b..7827f86 100644
--- a/kmk/boards/klarank.py
+++ b/kmk/boards/klarank.py
@@ -1,10 +1,10 @@
 import board
 
-from kmk.keyboard_config import KeyboardConfig as _KeyboardConfig
+from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
 from kmk.matrix import DiodeOrientation
 from kmk.matrix import intify_coordinate as ic
 
-# Implements what used to be handled by KeyboardConfig.swap_indicies for this
+# Implements what used to be handled by KMKKeyboard.swap_indicies for this
 # board, by flipping various row3 (bottom physical row) keys so their
 # coord_mapping matches what the user pressed (even if the wiring
 # underneath is sending different coordinates)
@@ -18,7 +18,7 @@ def r3_swap(col):
         return col
 
 
-class KeyboardConfig(_KeyboardConfig):
+class KMKKeyboard(_KMKKeyboard):
     # physical, visible cols (SCK, MO, MI, RX, TX, D4)
     # physical, visible rows (10, 11, 12, 13) (9, 6, 5, SCL)
     col_pins = (board.SCK, board.MOSI, board.MISO, board.RX, board.TX, board.D4)
diff --git a/kmk/keyboard_config.py b/kmk/kmk_keyboard.py
similarity index 99%
rename from kmk/keyboard_config.py
rename to kmk/kmk_keyboard.py
index addfbd4..7b1a5cd 100644
--- a/kmk/keyboard_config.py
+++ b/kmk/kmk_keyboard.py
@@ -16,7 +16,7 @@ from kmk.matrix import MatrixScanner
 from kmk.matrix import intify_coordinate as ic
 
 
-class KeyboardConfig:
+class KMKKeyboard:
     debug_enabled = False
 
     keymap = None
@@ -56,7 +56,7 @@ class KeyboardConfig:
 
     def __repr__(self):
         return (
-            'KeyboardConfig('
+            'KMKKeyboard('
             'debug_enabled={} '
             'keymap=truncated '
             'coord_mapping=truncated '
diff --git a/user_keymaps/default/converter/fourtypercentclub/luddite.py b/user_keymaps/default/converter/fourtypercentclub/luddite.py
index 265af3b..ec9ffff 100644
--- a/user_keymaps/default/converter/fourtypercentclub/luddite.py
+++ b/user_keymaps/default/converter/fourtypercentclub/luddite.py
@@ -1,7 +1,7 @@
-from kmk.boards.converter.fourtypercentclub.luddite import KeyboardConfig
+from kmk.boards.converter.fourtypercentclub.luddite import KMKKeyboard
 from kmk.keys import KC
 
-keyboard = KeyboardConfig()
+keyboard = KMKKeyboard()
 
 _______ = KC.TRNS
 XXXXXXX = KC.NO
diff --git a/user_keymaps/default/converter/keebio/nyquist_r2.py b/user_keymaps/default/converter/keebio/nyquist_r2.py
index d5dbc3b..860ff0c 100644
--- a/user_keymaps/default/converter/keebio/nyquist_r2.py
+++ b/user_keymaps/default/converter/keebio/nyquist_r2.py
@@ -1,7 +1,7 @@
-from kmk.boards.converter.keebio.nyquist_r2 import KeyboardConfig
+from kmk.boards.converter.keebio.nyquist_r2 import KMKKeyboard
 from kmk.keys import KC
 
-keyboard = KeyboardConfig()
+keyboard = KMKKeyboard()
 
 _______ = KC.TRNS
 XXXXXXX = KC.NO
diff --git a/user_keymaps/kdb424/gherkin.py b/user_keymaps/kdb424/gherkin.py
index 4089aa7..6df6978 100644
--- a/user_keymaps/kdb424/gherkin.py
+++ b/user_keymaps/kdb424/gherkin.py
@@ -2,12 +2,12 @@ import board
 
 from kmk.consts import UnicodeMode
 from kmk.handlers.sequences import compile_unicode_string_sequences, send_string
-from kmk.keyboard_config import KeyboardConfig
 from kmk.keys import KC
+from kmk.kmk_keyboard import KMKKeyboard
 from kmk.matrix import DiodeOrientation
 from kmk.types import AttrDict
 
-keyboard = KeyboardConfig()
+keyboard = KMKKeyboard()
 
 '''
 Converter/handwire:
diff --git a/user_keymaps/kdb424/klanck.py b/user_keymaps/kdb424/klanck.py
index ae736ef..555d3c9 100644
--- a/user_keymaps/kdb424/klanck.py
+++ b/user_keymaps/kdb424/klanck.py
@@ -2,12 +2,12 @@ import board
 
 from kmk.consts import UnicodeMode
 from kmk.handlers.sequences import compile_unicode_string_sequences, send_string
-from kmk.keyboard_config import KeyboardConfig
 from kmk.keys import KC
+from kmk.kmk_keyboard import KMKKeyboard
 from kmk.matrix import DiodeOrientation
 from kmk.types import AttrDict
 
-keyboard = KeyboardConfig()
+keyboard = KMKKeyboard()
 
 keyboard.col_pins = (board.A0, board.A1, board.A2, board.A3, board.A4, board.A5, board.SCK, board.MOSI, board.MISO, board.RX, board.TX, board.D4)
 keyboard.row_pins = (board.D10, board.D11, board.D12, board.D13)
diff --git a/user_keymaps/kdb424/levinson_r2.py b/user_keymaps/kdb424/levinson_r2.py
index 9fd2b70..5ae7352 100644
--- a/user_keymaps/kdb424/levinson_r2.py
+++ b/user_keymaps/kdb424/levinson_r2.py
@@ -1,9 +1,9 @@
-from kmk.boards.converter.keebio.levinson_r2 import KeyboardConfig
+from kmk.boards.converter.keebio.levinson_r2 import KMKKeyboard
 from kmk.consts import LeaderMode, UnicodeMode
 from kmk.handlers.sequences import compile_unicode_string_sequences
 from kmk.keys import KC
 
-keyboard = KeyboardConfig()
+keyboard = KMKKeyboard()
 
 # ------------------User level config variables ---------------------------------------
 keyboard.leader_mode = LeaderMode.TIMEOUT
diff --git a/user_keymaps/kdb424/luddite.py b/user_keymaps/kdb424/luddite.py
index 7dd27ce..0b1dc68 100644
--- a/user_keymaps/kdb424/luddite.py
+++ b/user_keymaps/kdb424/luddite.py
@@ -1,7 +1,7 @@
-from kmk.boards.converter.fourtypercentclub.luddite import KeyboardConfig
+from kmk.boards.converter.fourtypercentclub.luddite import KMKKeyboard
 from kmk.keys import KC
 
-keyboard = KeyboardConfig()
+keyboard = KMKKeyboard()
 
 # ---------------------------------- Config  --------------------------------------------
 
diff --git a/user_keymaps/kdb424/nyquist_r2.py b/user_keymaps/kdb424/nyquist_r2.py
index 1ca9a13..c2bc1a0 100644
--- a/user_keymaps/kdb424/nyquist_r2.py
+++ b/user_keymaps/kdb424/nyquist_r2.py
@@ -1,7 +1,7 @@
-from kmk.boards.converter.keebio.nyquist_r2 import KeyboardConfig
+from kmk.boards.converter.keebio.nyquist_r2 import KMKKeyboard
 from kmk.keys import KC
 
-keyboard = KeyboardConfig()
+keyboard = KMKKeyboard()
 
 # ------------------User level config variables ---------------------------------------
 keyboard.tap_time = 150
diff --git a/user_keymaps/klardotsh/iris_r2.py b/user_keymaps/klardotsh/iris_r2.py
index e686a47..dab29a1 100644
--- a/user_keymaps/klardotsh/iris_r2.py
+++ b/user_keymaps/klardotsh/iris_r2.py
@@ -1,10 +1,10 @@
-from kmk.boards.converter.keebio.iris_r2 import KeyboardConfig
+from kmk.boards.converter.keebio.iris_r2 import KMKKeyboard
 from kmk.consts import LeaderMode, UnicodeMode
 from kmk.handlers.sequences import compile_unicode_string_sequences as cuss
 from kmk.handlers.sequences import send_string
 from kmk.keys import KC
 
-keyboard = KeyboardConfig()
+keyboard = KMKKeyboard()
 
 keyboard.debug_enabled = False
 keyboard.unicode_mode = UnicodeMode.LINUX
diff --git a/user_keymaps/klardotsh/klarank_featherm4.py b/user_keymaps/klardotsh/klarank_featherm4.py
index c1e5897..bc099a0 100644
--- a/user_keymaps/klardotsh/klarank_featherm4.py
+++ b/user_keymaps/klardotsh/klarank_featherm4.py
@@ -1,10 +1,10 @@
-from kmk.boards.klarank import KeyboardConfig
+from kmk.boards.klarank import KMKKeyboard
 from kmk.consts import LeaderMode, UnicodeMode
 from kmk.handlers.sequences import compile_unicode_string_sequences as cuss
 from kmk.handlers.sequences import send_string
 from kmk.keys import KC, make_key
 
-keyboard = KeyboardConfig()
+keyboard = KMKKeyboard()
 
 keyboard.debug_enabled = True
 keyboard.unicode_mode = UnicodeMode.LINUX
diff --git a/user_keymaps/rk463345/levinson_r2.py b/user_keymaps/rk463345/levinson_r2.py
index ced0733..aa8dadc 100755
--- a/user_keymaps/rk463345/levinson_r2.py
+++ b/user_keymaps/rk463345/levinson_r2.py
@@ -1,9 +1,9 @@
-from kmk.boards.converter.keebio.levinson_r2 import KeyboardConfig
+from kmk.boards.converter.keebio.levinson_r2 import KMKKeyboard
 from kmk.consts import LeaderMode, UnicodeMode
 from kmk.handlers.sequences import compile_unicode_string_sequences
 from kmk.keys import KC
 
-keyboard = KeyboardConfig()
+keyboard = KMKKeyboard()
 
 # ------------------User level config variables ---------------------------------------
 keyboard.leader_mode = LeaderMode.TIMEOUT