diff --git a/converter/adb_usb/keymap_common.c b/converter/adb_usb/keymap_common.c
index 241d2e33b1..55a13793cb 100644
--- a/converter/adb_usb/keymap_common.c
+++ b/converter/adb_usb/keymap_common.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
 }
diff --git a/converter/ascii_usb/keymap.c b/converter/ascii_usb/keymap.c
index 5c13beaffa..a0c61ce8de 100644
--- a/converter/ascii_usb/keymap.c
+++ b/converter/ascii_usb/keymap.c
@@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Keymap is not used. See matrix.c.
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     return KC_NO;
 }
diff --git a/converter/ibm4704_usb/keymap_common.c b/converter/ibm4704_usb/keymap_common.c
index 241d2e33b1..55a13793cb 100644
--- a/converter/ibm4704_usb/keymap_common.c
+++ b/converter/ibm4704_usb/keymap_common.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
 }
diff --git a/converter/m0110_usb/keymap.c b/converter/m0110_usb/keymap.c
index 031c881b72..4570dd2832 100644
--- a/converter/m0110_usb/keymap.c
+++ b/converter/m0110_usb/keymap.c
@@ -209,7 +209,7 @@ static const uint16_t fn_actions[] PROGMEM = {
 
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
 }
diff --git a/converter/m0110_usb/keymap_common.c b/converter/m0110_usb/keymap_common.c
index bad18c91a8..4ac2d71783 100644
--- a/converter/m0110_usb/keymap_common.c
+++ b/converter/m0110_usb/keymap_common.c
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
 }
diff --git a/converter/next_usb/keymap.c b/converter/next_usb/keymap.c
index d844f8a4e2..3a51075483 100644
--- a/converter/next_usb/keymap.c
+++ b/converter/next_usb/keymap.c
@@ -165,7 +165,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
 }
diff --git a/converter/pc98_usb/keymap.c b/converter/pc98_usb/keymap.c
index 7420e24ac8..8922ea7bab 100644
--- a/converter/pc98_usb/keymap.c
+++ b/converter/pc98_usb/keymap.c
@@ -185,7 +185,7 @@ static const uint16_t PROGMEM fn_actions[] = {
 #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     if (layer < KEYMAPS_SIZE) {
         return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
diff --git a/converter/serialmouse_usb/keymap.c b/converter/serialmouse_usb/keymap.c
index de8f75c2af..cb78b4d195 100644
--- a/converter/serialmouse_usb/keymap.c
+++ b/converter/serialmouse_usb/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     return KC_NO;
 }
diff --git a/converter/serialmouse_usb/keymap_common.c b/converter/serialmouse_usb/keymap_common.c
index 241d2e33b1..55a13793cb 100644
--- a/converter/serialmouse_usb/keymap_common.c
+++ b/converter/serialmouse_usb/keymap_common.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
 }
diff --git a/converter/terminal_bluefruit/keymap.c b/converter/terminal_bluefruit/keymap.c
index 716590a456..8acd8cfb33 100644
--- a/converter/terminal_bluefruit/keymap.c
+++ b/converter/terminal_bluefruit/keymap.c
@@ -214,7 +214,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 }
 */
 
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
 }
diff --git a/keyboard/gh60/keymap_common.c b/keyboard/gh60/keymap_common.c
index 7b6379f6b6..fdb1769e1c 100644
--- a/keyboard/gh60/keymap_common.c
+++ b/keyboard/gh60/keymap_common.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
 }
diff --git a/keyboard/hid_liber/keymap.c b/keyboard/hid_liber/keymap.c
index f17d3762b9..433a620975 100644
--- a/keyboard/hid_liber/keymap.c
+++ b/keyboard/hid_liber/keymap.c
@@ -103,7 +103,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     if (layer < KEYMAPS_SIZE) {
         return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
diff --git a/keyboard/kitten_paw/keymap.c b/keyboard/kitten_paw/keymap.c
index 23db421f9b..e9ad9efe1a 100644
--- a/keyboard/kitten_paw/keymap.c
+++ b/keyboard/kitten_paw/keymap.c
@@ -80,7 +80,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     if (layer < KEYMAPS_SIZE) {
         return pgm_read_byte(&keymaps[(layer)][(key.col)][(key.row)]);
diff --git a/keyboard/kmac/keymap.c b/keyboard/kmac/keymap.c
index 5474b1b65e..1ffa60387e 100644
--- a/keyboard/kmac/keymap.c
+++ b/keyboard/kmac/keymap.c
@@ -74,7 +74,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     if (layer < KEYMAPS_SIZE) {
         return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
diff --git a/keyboard/lightpad/keymap.c b/keyboard/lightpad/keymap.c
index 6d078230bb..2ca79a81b5 100644
--- a/keyboard/lightpad/keymap.c
+++ b/keyboard/lightpad/keymap.c
@@ -50,7 +50,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     if (layer < KEYMAPS_SIZE) {
         return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
diff --git a/keyboard/lightsaber/keymap.c b/keyboard/lightsaber/keymap.c
index 398e51ec4a..477da9d865 100644
--- a/keyboard/lightsaber/keymap.c
+++ b/keyboard/lightsaber/keymap.c
@@ -54,7 +54,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     if (layer < KEYMAPS_SIZE) {
         return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
diff --git a/keyboard/onekey/keymap.c b/keyboard/onekey/keymap.c
index 90f195c2b7..dce4e9191e 100644
--- a/keyboard/onekey/keymap.c
+++ b/keyboard/onekey/keymap.c
@@ -43,7 +43,7 @@ static const uint16_t PROGMEM fn_actions[] = {
 #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     if (layer < KEYMAPS_SIZE) {
         return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
diff --git a/keyboard/phantom/keymap.c b/keyboard/phantom/keymap.c
index 1899874dd7..a040434f24 100644
--- a/keyboard/phantom/keymap.c
+++ b/keyboard/phantom/keymap.c
@@ -128,7 +128,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
 
 /* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
     if (layer < KEYMAPS_SIZE) {
         return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);