diff --git a/boards/shields/numpad-generic/Kconfig.defconfig b/boards/shields/generic-numpad/Kconfig.defconfig
similarity index 100%
rename from boards/shields/numpad-generic/Kconfig.defconfig
rename to boards/shields/generic-numpad/Kconfig.defconfig
diff --git a/boards/shields/generic-numpad/Kconfig.shield b/boards/shields/generic-numpad/Kconfig.shield
new file mode 100644
index 0000000..2bb4c6b
--- /dev/null
+++ b/boards/shields/generic-numpad/Kconfig.shield
@@ -0,0 +1,2 @@
+config SHIELD_GENERIC_NUMPAD
+    def_bool $(shields_list_contains,generic-numpad)
\ No newline at end of file
diff --git a/boards/shields/numpad-generic/boards/nice_nano_v2.overlay b/boards/shields/generic-numpad/boards/nice_nano_v2.overlay
similarity index 100%
rename from boards/shields/numpad-generic/boards/nice_nano_v2.overlay
rename to boards/shields/generic-numpad/boards/nice_nano_v2.overlay
diff --git a/boards/shields/numpad-generic/numpad-generic.conf b/boards/shields/generic-numpad/generic-numpad.conf
similarity index 100%
rename from boards/shields/numpad-generic/numpad-generic.conf
rename to boards/shields/generic-numpad/generic-numpad.conf
diff --git a/boards/shields/numpad-generic/numpad-generic.keymap b/boards/shields/generic-numpad/generic-numpad.keymap
similarity index 97%
rename from boards/shields/numpad-generic/numpad-generic.keymap
rename to boards/shields/generic-numpad/generic-numpad.keymap
index 9bc0397..c9232be 100644
--- a/boards/shields/numpad-generic/numpad-generic.keymap
+++ b/boards/shields/generic-numpad/generic-numpad.keymap
@@ -47,7 +47,7 @@
             bindings = <
     &trans       &trans          &trans       &trans
     &trans       &trans          &trans       &trans
-    &kp LEFT     &trans          &kp RIGHT       &trans
+    &kp LEFT     &trans          &kp RIGHT    &trans
     &trans       &trans          &trans       &trans
     &trans       &trans          &trans       &bootloader
             >;
diff --git a/boards/shields/numpad-generic/numpad-generic.overlay b/boards/shields/generic-numpad/generic-numpad.overlay
similarity index 100%
rename from boards/shields/numpad-generic/numpad-generic.overlay
rename to boards/shields/generic-numpad/generic-numpad.overlay
diff --git a/boards/shields/numpad-generic/numpad-generic.zmk.yml b/boards/shields/generic-numpad/generic-numpad.zmk.yml
similarity index 100%
rename from boards/shields/numpad-generic/numpad-generic.zmk.yml
rename to boards/shields/generic-numpad/generic-numpad.zmk.yml
diff --git a/boards/shields/numpad-generic/Kconfig.shield b/boards/shields/numpad-generic/Kconfig.shield
deleted file mode 100644
index 30bb23e..0000000
--- a/boards/shields/numpad-generic/Kconfig.shield
+++ /dev/null
@@ -1,2 +0,0 @@
-config SHIELD_GENERIC_NUMPAD
-    def_bool $(shields_list_contains,numpad-generic)
\ No newline at end of file