diff --git a/keyboards/1upkeyboards/pi50/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi50/keymaps/default/keymap.c
index 8df3a613fbe7..bd66c00bff8e 100644
--- a/keyboards/1upkeyboards/pi50/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/pi50/keymaps/default/keymap.c
@@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_ONE]   =  { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
     [_TWO]   =  { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) },
     [_THREE] =  { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) },
diff --git a/keyboards/1upkeyboards/pi50/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi50/keymaps/via/keymap.c
index ff4cb35f5a98..b800a9a68b82 100644
--- a/keyboards/1upkeyboards/pi50/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/pi50/keymaps/via/keymap.c
@@ -271,7 +271,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_ONE]   =  { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
     [_TWO]   =  { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) },
     [_THREE] =  { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) },
diff --git a/keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c b/keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c
index defb5169624a..448a009d87b6 100644
--- a/keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c
+++ b/keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
     [2] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
diff --git a/keyboards/dotmod/dymium65/keymaps/default/keymap.c b/keyboards/dotmod/dymium65/keymaps/default/keymap.c
index 483746b53f61..e18c3b5b230d 100644
--- a/keyboards/dotmod/dymium65/keymaps/default/keymap.c
+++ b/keyboards/dotmod/dymium65/keymaps/default/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_BASE] =   { ENCODER_CCW_CW(KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP) },
     [_FN] =     { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
     [_LN] =     { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
diff --git a/keyboards/dotmod/dymium65/keymaps/via/keymap.c b/keyboards/dotmod/dymium65/keymaps/via/keymap.c
index 483746b53f61..e18c3b5b230d 100644
--- a/keyboards/dotmod/dymium65/keymaps/via/keymap.c
+++ b/keyboards/dotmod/dymium65/keymaps/via/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_BASE] =   { ENCODER_CCW_CW(KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP) },
     [_FN] =     { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
     [_LN] =     { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/vnmm/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/vnmm/keymap.c
index ad8416dc0fdc..e6627959c4c6 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/vnmm/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/vnmm/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [WIN_FN] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
diff --git a/keyboards/handwired/phantagom/baragon/keymaps/default/keymap.c b/keyboards/handwired/phantagom/baragon/keymaps/default/keymap.c
index 96431bbedbac..b44b7a0a3889 100644
--- a/keyboards/handwired/phantagom/baragon/keymaps/default/keymap.c
+++ b/keyboards/handwired/phantagom/baragon/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)  },
     [1] = { ENCODER_CCW_CW(KC_MRWD, KC_MFFD)  },
 };
diff --git a/keyboards/handwired/phantagom/baragon/keymaps/via/keymap.c b/keyboards/handwired/phantagom/baragon/keymaps/via/keymap.c
index ee6b9d5ec6df..042ed7e34d16 100644
--- a/keyboards/handwired/phantagom/baragon/keymaps/via/keymap.c
+++ b/keyboards/handwired/phantagom/baragon/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
     [1] = { ENCODER_CCW_CW(KC_MRWD, KC_MFFD)  },
 };
diff --git a/keyboards/kalakos/bahrnob/keymaps/via/keymap.c b/keyboards/kalakos/bahrnob/keymaps/via/keymap.c
index eff227ff296b..77f5db6e23ae 100644
--- a/keyboards/kalakos/bahrnob/keymaps/via/keymap.c
+++ b/keyboards/kalakos/bahrnob/keymaps/via/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
     [2] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
diff --git a/keyboards/keychron/v3/ansi_encoder/keymaps/vnmm/keymap.c b/keyboards/keychron/v3/ansi_encoder/keymaps/vnmm/keymap.c
index 376a715a843a..e32c683016fd 100644
--- a/keyboards/keychron/v3/ansi_encoder/keymaps/vnmm/keymap.c
+++ b/keyboards/keychron/v3/ansi_encoder/keymaps/vnmm/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
diff --git a/keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c b/keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c
index 58c149f7e982..a4cd13134c66 100644
--- a/keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [1] = { ENCODER_CCW_CW(_______, _______) },
     [2] = { ENCODER_CCW_CW(_______, _______) },
diff --git a/keyboards/meletrix/zoom75/keymaps/default/keymap.c b/keyboards/meletrix/zoom75/keymaps/default/keymap.c
index b1cbfb9e9fca..6e9cc098e566 100644
--- a/keyboards/meletrix/zoom75/keymaps/default/keymap.c
+++ b/keyboards/meletrix/zoom75/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 #include QMK_KEYBOARD_H
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
     [1] =  { ENCODER_CCW_CW(KC_MPRV, KC_MNXT),  },
 };
diff --git a/keyboards/meletrix/zoom75/keymaps/via/keymap.c b/keyboards/meletrix/zoom75/keymaps/via/keymap.c
index 00fa34dd1307..e3e2fbaea5e5 100644
--- a/keyboards/meletrix/zoom75/keymaps/via/keymap.c
+++ b/keyboards/meletrix/zoom75/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] = {  ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
     [1] = {  ENCODER_CCW_CW(KC_MNXT, KC_MPRV)  },
 };
diff --git a/keyboards/quadrum/delta/keymaps/ansi/keymap.c b/keyboards/quadrum/delta/keymaps/ansi/keymap.c
index 7c509a233139..15f016cc62e9 100644
--- a/keyboards/quadrum/delta/keymaps/ansi/keymap.c
+++ b/keyboards/quadrum/delta/keymaps/ansi/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [1] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
 };
diff --git a/keyboards/quadrum/delta/keymaps/default/keymap.c b/keyboards/quadrum/delta/keymaps/default/keymap.c
index f9c8a59d271b..dfe2fb287d2b 100644
--- a/keyboards/quadrum/delta/keymaps/default/keymap.c
+++ b/keyboards/quadrum/delta/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [1] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
 };
diff --git a/keyboards/quadrum/delta/keymaps/iso/keymap.c b/keyboards/quadrum/delta/keymaps/iso/keymap.c
index 20a3db615099..8a35ff1d0d90 100644
--- a/keyboards/quadrum/delta/keymaps/iso/keymap.c
+++ b/keyboards/quadrum/delta/keymaps/iso/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [1] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
 };
diff --git a/keyboards/quadrum/delta/keymaps/via/keymap.c b/keyboards/quadrum/delta/keymaps/via/keymap.c
index 6d4e9835ae32..f2be5088d900 100644
--- a/keyboards/quadrum/delta/keymaps/via/keymap.c
+++ b/keyboards/quadrum/delta/keymaps/via/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [1] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [2] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/sofle/keymaps/via/keymap.c b/keyboards/sofle/keymaps/via/keymap.c
index bbb4c648263c..21717a7a6c2d 100644
--- a/keyboards/sofle/keymaps/via/keymap.c
+++ b/keyboards/sofle/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 #include "oled.c"
 
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU),           ENCODER_CCW_CW(KC_PGDN, KC_PGUP) },
     [1] = { ENCODER_CCW_CW(_______, _______),           ENCODER_CCW_CW(_______, _______) },
     [2] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI),           ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
diff --git a/keyboards/stello65/beta/keymaps/default/keymap.c b/keyboards/stello65/beta/keymaps/default/keymap.c
index 7b5c54f09835..50b79b7c79ad 100644
--- a/keyboards/stello65/beta/keymaps/default/keymap.c
+++ b/keyboards/stello65/beta/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [_FN] =   { ENCODER_CCW_CW(_______, _______) },
 };
diff --git a/keyboards/stello65/beta/keymaps/via/keymap.c b/keyboards/stello65/beta/keymaps/via/keymap.c
index a4a76353aa21..64dd96bb8298 100644
--- a/keyboards/stello65/beta/keymaps/via/keymap.c
+++ b/keyboards/stello65/beta/keymaps/via/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [_FN1] =  { ENCODER_CCW_CW(_______, _______) },
     [_FN2] =  { ENCODER_CCW_CW(_______, _______) },
diff --git a/keyboards/tweetydabird/lotus58/keymaps/default/keymap.c b/keyboards/tweetydabird/lotus58/keymaps/default/keymap.c
index 392ed06ec13b..2a74f1b9a9db 100644
--- a/keyboards/tweetydabird/lotus58/keymaps/default/keymap.c
+++ b/keyboards/tweetydabird/lotus58/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ LCTL_T(KC_LEFT), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_DOWN,        KC
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },