diff --git a/keyboards/42keebs/basketweave_s/config.h b/keyboards/42keebs/basketweave_s/config.h
index 5cc200d0ff..cb4a00831c 100644
--- a/keyboards/42keebs/basketweave_s/config.h
+++ b/keyboards/42keebs/basketweave_s/config.h
@@ -48,8 +48,8 @@
  */
 // #define GRAVE_ESC_CTRL_OVERRIDE
 
-#define ENCODERS_PAD_A { B3, D1 }
-#define ENCODERS_PAD_B { B4, D0 }
+#define ENCODER_A_PINS { B3, D1 }
+#define ENCODER_B_PINS { B4, D0 }
 #define ENCODER_RESOLUTION 4
 #define TAP_CODE_DELAY 10
 
diff --git a/keyboards/42keebs/discipline/config.h b/keyboards/42keebs/discipline/config.h
index f2f475053b..79e9e6bbd4 100644
--- a/keyboards/42keebs/discipline/config.h
+++ b/keyboards/42keebs/discipline/config.h
@@ -35,8 +35,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define USB_MAX_POWER_CONSUMPTION 100
 
-#define ENCODERS_PAD_A { D0 }
-#define ENCODERS_PAD_B { D1 }
+#define ENCODER_A_PINS { D0 }
+#define ENCODER_B_PINS { D1 }
 #define ENCODER_DIRECTION_FLIP
 #define ENCODER_RESOLUTION 4
 #define TAP_CODE_DELAY 10
diff --git a/keyboards/42keebs/mysterium/v15c/config.h b/keyboards/42keebs/mysterium/v15c/config.h
index 2f94b7dbae..fb5433fc02 100644
--- a/keyboards/42keebs/mysterium/v15c/config.h
+++ b/keyboards/42keebs/mysterium/v15c/config.h
@@ -16,8 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define ENCODERS_PAD_A { C0 }
-#define ENCODERS_PAD_B { C1 }
+#define ENCODER_A_PINS { C0 }
+#define ENCODER_B_PINS { C1 }
 #define ENCODER_DIRECTION_FLIP
 #define ENCODER_RESOLUTION 4
 #define TAP_CODE_DELAY 10
diff --git a/keyboards/42keebs/mysterium/v15d/config.h b/keyboards/42keebs/mysterium/v15d/config.h
index 0d02caf0a4..600c202fc5 100644
--- a/keyboards/42keebs/mysterium/v15d/config.h
+++ b/keyboards/42keebs/mysterium/v15d/config.h
@@ -16,6 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define ENCODERS_PAD_A { B5 }
-#define ENCODERS_PAD_B { B6 }
+#define ENCODER_A_PINS { B5 }
+#define ENCODER_B_PINS { B6 }
 #define ENCODER_RESOLUTION 4
diff --git a/keyboards/doio/kb04/config.h b/keyboards/doio/kb04/config.h
index b3f17583d6..62d8cb153e 100644
--- a/keyboards/doio/kb04/config.h
+++ b/keyboards/doio/kb04/config.h
@@ -31,8 +31,8 @@
 #define DEBOUNCE 5
 
 /* Encoder pins */
-#define ENCODERS_PAD_A { B5 }
-#define ENCODERS_PAD_B { B6 }
+#define ENCODER_A_PINS { B5 }
+#define ENCODER_B_PINS { B6 }
 
 #ifdef RGB_MATRIX_ENABLE
     /* RGB Matrix config */
diff --git a/keyboards/lazydesigners/cloud/config.h b/keyboards/lazydesigners/cloud/config.h
index 5fa9810d4c..117646a00d 100644
--- a/keyboards/lazydesigners/cloud/config.h
+++ b/keyboards/lazydesigners/cloud/config.h
@@ -24,8 +24,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { F0, F6, D5, F7 }
 #define MATRIX_COL_PINS { E6, B2, B3, B7, D4, D6, D7, B4, B5, B6, C6, C7, F1 }
 
-#define ENCODERS_PAD_A { F4 }
-#define ENCODERS_PAD_B { F5 }
+#define ENCODER_A_PINS { F4 }
+#define ENCODER_B_PINS { F5 }
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/rgbkb/mun2/config.h b/keyboards/rgbkb/mun2/config.h
index 788665356d..3ff170284e 100644
--- a/keyboards/rgbkb/mun2/config.h
+++ b/keyboards/rgbkb/mun2/config.h
@@ -31,11 +31,11 @@
 #define TAP_CODE_DELAY 1 // without a slight delay, the RP2040 doesn't register instant taps
 
 /* Encoder Configuration */
-#define ENCODERS_PAD_A { GP7, GP27, GP4 }
-#define ENCODERS_PAD_A_RIGHT { GP27, GP7, GP5 }
+#define ENCODER_A_PINS { GP7, GP27, GP4 }
+#define ENCODER_A_PINS_RIGHT { GP27, GP7, GP5 }
 
-#define ENCODERS_PAD_B { GP6, GP28, GP5 }
-#define ENCODERS_PAD_B_RIGHT { GP26, GP6, GP4 }
+#define ENCODER_B_PINS { GP6, GP28, GP5 }
+#define ENCODER_B_PINS_RIGHT { GP26, GP6, GP4 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sergiopoverony/creator_lite/config.h b/keyboards/sergiopoverony/creator_lite/config.h
index bb680a318d..4ab4fa2363 100644
--- a/keyboards/sergiopoverony/creator_lite/config.h
+++ b/keyboards/sergiopoverony/creator_lite/config.h
@@ -24,8 +24,8 @@
 #define UNUSED_PINS
 
 /* encoder */
-#define ENCODERS_PAD_A { D3 }
-#define ENCODERS_PAD_B { D2 }
+#define ENCODER_A_PINS { D3 }
+#define ENCODER_B_PINS { D2 }
 #define ENCODER_RESOLUTION 1
 
 #define USB_POLLING_INTERVAL_MS 1
diff --git a/keyboards/soroka/config.h b/keyboards/soroka/config.h
index 5c58efb395..cdcf313c8a 100644
--- a/keyboards/soroka/config.h
+++ b/keyboards/soroka/config.h
@@ -3,5 +3,5 @@
 
 #pragma once
 
-#define ENCODERS_PAD_A { GP0 }
-#define ENCODERS_PAD_B { GP1 }
\ No newline at end of file
+#define ENCODER_A_PINS { GP0 }
+#define ENCODER_B_PINS { GP1 }
\ No newline at end of file
diff --git a/keyboards/velocifire/sun20pro/config.h b/keyboards/velocifire/sun20pro/config.h
index 0ab5911d18..23abdc1308 100644
--- a/keyboards/velocifire/sun20pro/config.h
+++ b/keyboards/velocifire/sun20pro/config.h
@@ -16,8 +16,8 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { F7, F6, F5, F4 }
-#define ENCODERS_PAD_A { D6 }
-#define ENCODERS_PAD_B { D7 }
+#define ENCODER_A_PINS { D6 }
+#define ENCODER_B_PINS { D7 }
 
 /* COL2ROW or ROW2COL */