diff --git a/keyboards/olkb/planck/ez/ez.h b/keyboards/olkb/planck/ez/ez.h
index f989cd9386..9a94d20073 100644
--- a/keyboards/olkb/planck/ez/ez.h
+++ b/keyboards/olkb/planck/ez/ez.h
@@ -17,7 +17,7 @@
 
 #include "planck.h"
 
-#ifdef KEYBOARD_planck_ez_glow
+#ifdef KEYBOARD_olkb_planck_ez_glow
 #    include "glow.h"
 #endif
 
diff --git a/keyboards/olkb/planck/keymaps/abishalom/keymap.c b/keyboards/olkb/planck/keymaps/abishalom/keymap.c
index 4c1185ad99..c687fbca65 100644
--- a/keyboards/olkb/planck/keymaps/abishalom/keymap.c
+++ b/keyboards/olkb/planck/keymaps/abishalom/keymap.c
@@ -175,12 +175,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef BACKLIGHT_ENABLE
           backlight_step();
         #endif
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           writePinLow(E6);
         #endif
       } else {
         unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           writePinHigh(E6);
         #endif
       }
diff --git a/keyboards/olkb/planck/keymaps/buffet/keymap.c b/keyboards/olkb/planck/keymaps/buffet/keymap.c
index 78a9f711c4..528791d147 100644
--- a/keyboards/olkb/planck/keymaps/buffet/keymap.c
+++ b/keyboards/olkb/planck/keymaps/buffet/keymap.c
@@ -358,7 +358,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return false;
 }
 
-#ifdef KEYBOARD_planck_ez
+#ifdef KEYBOARD_olkb_planck_ez
 
 #define LED_BRIGHTNESS 50
 
@@ -381,4 +381,4 @@ layer_state_t default_layer_state_set_user(layer_state_t state) {
     return state;
 }
 
-#endif /* KEYBOARD_planck_ez */
+#endif /* KEYBOARD_olkb_planck_ez */
diff --git a/keyboards/olkb/planck/keymaps/default/keymap.c b/keyboards/olkb/planck/keymaps/default/keymap.c
index 22ff24c92b..de4794f114 100644
--- a/keyboards/olkb/planck/keymaps/default/keymap.c
+++ b/keyboards/olkb/planck/keymaps/default/keymap.c
@@ -207,12 +207,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef BACKLIGHT_ENABLE
           backlight_step();
         #endif
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           writePinLow(E6);
         #endif
       } else {
         unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           writePinHigh(E6);
         #endif
       }
diff --git a/keyboards/olkb/planck/keymaps/fabian/keymap.c b/keyboards/olkb/planck/keymaps/fabian/keymap.c
index 5be91772d7..112056509c 100644
--- a/keyboards/olkb/planck/keymaps/fabian/keymap.c
+++ b/keyboards/olkb/planck/keymaps/fabian/keymap.c
@@ -216,12 +216,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef BACKLIGHT_ENABLE
           backlight_step();
         #endif
-        #ifndef KEYBOARD_planck_rev6
+        #ifndef KEYBOARD_olkb_planck_rev6
           PORTE &= ~(1<<6);
         #endif
       } else {
         unregister_code(KC_RSFT);
-        #ifndef KEYBOARD_planck_rev6
+        #ifndef KEYBOARD_olkb_planck_rev6
           PORTE |= (1<<6);
         #endif
       }
diff --git a/keyboards/olkb/planck/keymaps/mgalisa/keymap.c b/keyboards/olkb/planck/keymaps/mgalisa/keymap.c
index 09acceb4c0..e4de1abb5f 100644
--- a/keyboards/olkb/planck/keymaps/mgalisa/keymap.c
+++ b/keyboards/olkb/planck/keymaps/mgalisa/keymap.c
@@ -238,12 +238,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef BACKLIGHT_ENABLE
           backlight_step();
         #endif
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE &= ~(1<<6);
         #endif
       } else {
         unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE |= (1<<6);
         #endif
       }
diff --git a/keyboards/olkb/planck/keymaps/mikethetiger/keymap.c b/keyboards/olkb/planck/keymaps/mikethetiger/keymap.c
index 7a4f0b816a..d1d596eba0 100644
--- a/keyboards/olkb/planck/keymaps/mikethetiger/keymap.c
+++ b/keyboards/olkb/planck/keymaps/mikethetiger/keymap.c
@@ -207,12 +207,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef BACKLIGHT_ENABLE
           backlight_step();
         #endif
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE &= ~(1<<6);
         #endif
       } else {
         unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE |= (1<<6);
         #endif
       }
diff --git a/keyboards/olkb/planck/keymaps/msiu/keymap.c b/keyboards/olkb/planck/keymaps/msiu/keymap.c
index aea59e8d77..3349f1c556 100644
--- a/keyboards/olkb/planck/keymaps/msiu/keymap.c
+++ b/keyboards/olkb/planck/keymaps/msiu/keymap.c
@@ -107,12 +107,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef BACKLIGHT_ENABLE
           backlight_step();
         #endif
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE &= ~(1<<6);
         #endif
       } else {
         unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE |= (1<<6);
         #endif
       }
diff --git a/keyboards/olkb/planck/keymaps/muzfuz/keymap.c b/keyboards/olkb/planck/keymaps/muzfuz/keymap.c
index 84452a3f17..b559f8c93f 100644
--- a/keyboards/olkb/planck/keymaps/muzfuz/keymap.c
+++ b/keyboards/olkb/planck/keymaps/muzfuz/keymap.c
@@ -154,14 +154,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
 #ifdef BACKLIGHT_ENABLE
       backlight_step();
 #endif
-#ifdef KEYBOARD_planck_rev5
+#ifdef KEYBOARD_olkb_planck_rev5
       PORTE &= ~(1 << 6);
 #endif
     }
     else
     {
       unregister_code(KC_RSFT);
-#ifdef KEYBOARD_planck_rev5
+#ifdef KEYBOARD_olkb_planck_rev5
       PORTE |= (1 << 6);
 #endif
     }
diff --git a/keyboards/olkb/planck/keymaps/oryx/keymap.c b/keyboards/olkb/planck/keymaps/oryx/keymap.c
index 7892d1a5fb..fe6d427c23 100644
--- a/keyboards/olkb/planck/keymaps/oryx/keymap.c
+++ b/keyboards/olkb/planck/keymaps/oryx/keymap.c
@@ -270,12 +270,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef BACKLIGHT_ENABLE
           backlight_step();
         #endif
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE &= ~(1<<6);
         #endif
       } else {
         unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE |= (1<<6);
         #endif
       }
diff --git a/keyboards/olkb/planck/keymaps/pascamel/keymap.c b/keyboards/olkb/planck/keymaps/pascamel/keymap.c
index 9ee0dde359..a7c359dd22 100644
--- a/keyboards/olkb/planck/keymaps/pascamel/keymap.c
+++ b/keyboards/olkb/planck/keymaps/pascamel/keymap.c
@@ -130,12 +130,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef BACKLIGHT_ENABLE
           backlight_step();
         #endif
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE &= ~(1<<6);
         #endif
       } else {
         unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE |= (1<<6);
         #endif
       }
diff --git a/keyboards/olkb/planck/keymaps/priyadi/config.h b/keyboards/olkb/planck/keymaps/priyadi/config.h
index c85e8656e6..46ac2f0097 100644
--- a/keyboards/olkb/planck/keymaps/priyadi/config.h
+++ b/keyboards/olkb/planck/keymaps/priyadi/config.h
@@ -35,7 +35,7 @@
     {k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c}, \
     {k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c} \
 }
-#elif KEYBOARD_planck_rev6
+#elif KEYBOARD_olkb_planck_rev6
 #define LAYOUT( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
diff --git a/keyboards/olkb/planck/keymaps/ptillemans/keymap.c b/keyboards/olkb/planck/keymaps/ptillemans/keymap.c
index c1f847e2f3..be7f829760 100644
--- a/keyboards/olkb/planck/keymaps/ptillemans/keymap.c
+++ b/keyboards/olkb/planck/keymaps/ptillemans/keymap.c
@@ -183,12 +183,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef BACKLIGHT_ENABLE
           backlight_step();
         #endif
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE &= ~(1<<6);
         #endif
       } else {
         unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE |= (1<<6);
         #endif
       }
diff --git a/keyboards/olkb/planck/keymaps/raffle/keymap.c b/keyboards/olkb/planck/keymaps/raffle/keymap.c
index 0dbab38939..3220d75fb1 100644
--- a/keyboards/olkb/planck/keymaps/raffle/keymap.c
+++ b/keyboards/olkb/planck/keymaps/raffle/keymap.c
@@ -183,12 +183,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef BACKLIGHT_ENABLE
           backlight_step();
         #endif
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE &= ~(1<<6);
         #endif
       } else {
         unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE |= (1<<6);
         #endif
       }
diff --git a/keyboards/olkb/planck/keymaps/skug/keymap.c b/keyboards/olkb/planck/keymaps/skug/keymap.c
index 27efc4759d..705a833d91 100644
--- a/keyboards/olkb/planck/keymaps/skug/keymap.c
+++ b/keyboards/olkb/planck/keymaps/skug/keymap.c
@@ -171,12 +171,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef BACKLIGHT_ENABLE
           backlight_step();
         #endif
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE &= ~(1<<6);
         #endif
       } else {
         unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE |= (1<<6);
         #endif
       }
diff --git a/keyboards/olkb/planck/keymaps/smittey/keymap.c b/keyboards/olkb/planck/keymaps/smittey/keymap.c
index fd5e91fb91..7298005e47 100644
--- a/keyboards/olkb/planck/keymaps/smittey/keymap.c
+++ b/keyboards/olkb/planck/keymaps/smittey/keymap.c
@@ -251,12 +251,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef BACKLIGHT_ENABLE
           backlight_step();
         #endif
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           writePinLow(E6);
         #endif
       } else {
         unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           writePinHigh(E6);
         #endif
       }
diff --git a/keyboards/olkb/planck/keymaps/unagi/keymap.c b/keyboards/olkb/planck/keymaps/unagi/keymap.c
index 596973ba3c..42ae0433db 100644
--- a/keyboards/olkb/planck/keymaps/unagi/keymap.c
+++ b/keyboards/olkb/planck/keymaps/unagi/keymap.c
@@ -218,12 +218,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef BACKLIGHT_ENABLE
           backlight_step();
         #endif
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE &= ~(1<<6);
         #endif
       } else {
         unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           PORTE |= (1<<6);
         #endif
       }
diff --git a/keyboards/olkb/planck/planck.h b/keyboards/olkb/planck/planck.h
index 1beafa7764..1b18e2134c 100644
--- a/keyboards/olkb/planck/planck.h
+++ b/keyboards/olkb/planck/planck.h
@@ -5,21 +5,21 @@
 
 #define encoder_update(clockwise) encoder_update_user(uint8_t index, clockwise)
 
-#if defined(KEYBOARD_planck_ez)
+#if defined(KEYBOARD_olkb_planck_ez)
   #include "ez.h"
-#elif defined(KEYBOARD_planck_light)
+#elif defined(KEYBOARD_olkb_planck_light)
   #include "light.h"
-#elif defined(KEYBOARD_planck_rev1)
+#elif defined(KEYBOARD_olkb_planck_rev1)
   #include "rev1.h"
-#elif defined(KEYBOARD_planck_rev2)
+#elif defined(KEYBOARD_olkb_planck_rev2)
   #include "rev2.h"
-#elif defined(KEYBOARD_planck_rev3)
+#elif defined(KEYBOARD_olkb_planck_rev3)
   #include "rev3.h"
-#elif defined(KEYBOARD_planck_rev4)
+#elif defined(KEYBOARD_olkb_planck_rev4)
   #include "rev4.h"
-#elif defined(KEYBOARD_planck_rev5)
+#elif defined(KEYBOARD_olkb_planck_rev5)
   #include "rev5.h"
-#elif defined(KEYBOARD_planck_rev6)
+#elif defined(KEYBOARD_olkb_planck_rev6)
   #include "rev6.h"
 #endif // Planck revisions
 
diff --git a/keyboards/olkb/preonic/preonic.h b/keyboards/olkb/preonic/preonic.h
index 4f8ebcc3ee..8dada880ef 100644
--- a/keyboards/olkb/preonic/preonic.h
+++ b/keyboards/olkb/preonic/preonic.h
@@ -5,15 +5,15 @@
 /**************************************************
 ** Include headers specific to keyboard revision **
 **************************************************/
-#ifdef KEYBOARD_preonic_rev1
+#ifdef KEYBOARD_olkb_preonic_rev1
   #include "rev1.h"
 #endif
 
-#ifdef KEYBOARD_preonic_rev2
+#ifdef KEYBOARD_olkb_preonic_rev2
   #include "rev2.h"
 #endif
 
-#ifdef KEYBOARD_preonic_rev3
+#ifdef KEYBOARD_olkb_preonic_rev3
   #include "rev3.h"
 #endif
 
diff --git a/layouts/community/ortho_4x12/brandonschlack/config.h b/layouts/community/ortho_4x12/brandonschlack/config.h
index 9b6789c1c9..6ccc688913 100644
--- a/layouts/community/ortho_4x12/brandonschlack/config.h
+++ b/layouts/community/ortho_4x12/brandonschlack/config.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#ifdef KEYBOARD_planck_rev6
+#ifdef KEYBOARD_olkb_planck_rev6
 #ifdef AUDIO_ENABLE
     #define STARTUP_SONG SONG(PLANCK_SOUND)
     // #define STARTUP_SONG SONG(NO_SOUND)
diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c
index d4c1a4a867..a9f378ee85 100644
--- a/layouts/community/ortho_4x12/brandonschlack/keymap.c
+++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include QMK_KEYBOARD_H
-#ifdef KEYBOARD_planck_rev6
+#ifdef KEYBOARD_olkb_planck_rev6
     #include "muse.h"
 #endif
 #include "brandonschlack.h"
@@ -109,7 +109,7 @@ void led_set_user(uint8_t usb_led) {
 }
 #endif
 
-#ifdef KEYBOARD_planck_rev6
+#ifdef KEYBOARD_olkb_planck_rev6
 #ifdef AUDIO_ENABLE
     float plover_song[][2]     = SONG(PLOVER_SOUND);
     float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
diff --git a/layouts/community/ortho_4x12/drashna/config.h b/layouts/community/ortho_4x12/drashna/config.h
index 6a99fcda01..bf0bb8e500 100644
--- a/layouts/community/ortho_4x12/drashna/config.h
+++ b/layouts/community/ortho_4x12/drashna/config.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
-#    if defined(KEYBOARD_planck_light)
+#    if defined(KEYBOARD_olkb_planck_light)
 #        define RGB_DI_PIN A0
 #        define RGBLED_NUM 13  // Number of LEDs
 #    endif
@@ -40,7 +40,7 @@
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED true  // turn off effects when suspended
 #    undef RGB_MATRIX_LED_PROCESS_LIMIT
 #    undef RGB_MATRIX_LED_FLUSH_LIMIT
-#    ifdef KEYBOARD_planck_rev6
+#    ifdef KEYBOARD_olkb_planck_rev6
 #        define DRIVER_LED_TOTAL RGBLED_NUM
 #    endif
 #endif
@@ -51,7 +51,7 @@
 #    define EE_HANDS
 #endif
 
-#if !defined(KEYBOARD_planck_light)
+#if !defined(KEYBOARD_olkb_planck_light)
 #    ifdef RGBLIGHT_ENABLE
 #        define NO_MUSIC_MODE
 #    endif  // RGBLIGHT_ENABLE
@@ -65,15 +65,15 @@
 #    undef QMK_SPEAKER
 #    define QMK_SPEAKER B5
 #    define SOLENOID_PIN A1
-#endif  // KEYBOARD_planck_light
+#endif  // KEYBOARD_olkb_planck_light
 
-#if defined(KEYBOARD_planck)
+#if defined(KEYBOARD_olkb_planck)
 #    undef PRODUCT
-#    if defined(KEYBOARD_planck_light)
+#    if defined(KEYBOARD_olkb_planck_light)
 #        define PRODUCT Drashna Hacked RGB Beacon(Planck Light)
-#    elif defined(KEYBOARD_planck_rev6)
+#    elif defined(KEYBOARD_olkb_planck_rev6)
 #        define PRODUCT Drashna Hacked Planck Rev6
-#    elif defined(KEYBOARD_planck_ez)
+#    elif defined(KEYBOARD_olkb_planck_ez)
 #        define PRODUCT Drashna Hacked Planck EZ
 #    endif
 #endif
diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c
index 8070a7d35e..46fdad2933 100644
--- a/layouts/community/ortho_4x12/drashna/keymap.c
+++ b/layouts/community/ortho_4x12/drashna/keymap.c
@@ -33,7 +33,7 @@ enum planck_keycodes {
 };
 #endif
 
-#ifdef KEYBOARD_planck_ez
+#ifdef KEYBOARD_olkb_planck_ez
 #    define PLNK_1 BK_LWER
 #    define PLNK_2 SP_LWER
 #    define PLNK_3 KC_NO
@@ -162,7 +162,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
             }
             break;
 #endif
-#ifdef KEYBOARD_planck_ez
+#ifdef KEYBOARD_olkb_planck_ez
         case TH_LVL:
             if (record->event.pressed) {
                 keyboard_config.led_level++;
@@ -196,7 +196,7 @@ bool music_mask_user(uint16_t keycode) {
 
 #ifdef RGB_MATRIX_ENABLE
 
-#    ifdef KEYBOARD_planck_rev6
+#    ifdef KEYBOARD_olkb_planck_rev6
 // clang-format off
 led_config_t g_led_config = {
     {
@@ -236,7 +236,7 @@ void rgb_matrix_indicators_user(void) {
     uint8_t this_led = host_keyboard_leds();
     uint8_t this_osm = get_oneshot_mods();
     bool    is_ez;
-#    ifdef KEYBOARD_planck_ez
+#    ifdef KEYBOARD_olkb_planck_ez
     is_ez = true;
 #    endif
 
@@ -332,7 +332,7 @@ void rgb_matrix_indicators_user(void) {
 }
 
 void matrix_init_keymap(void) {
-#    ifdef KEYBOARD_planck_light
+#    ifdef KEYBOARD_olkb_planck_light
     writePinLow(D6);
 #    endif
     // rgblight_mode(RGB_MATRIX_MULTISPLASH);
@@ -340,7 +340,7 @@ void matrix_init_keymap(void) {
 #else  // RGB_MATRIX_INIT
 
 void matrix_init_keymap(void) {
-#    if !defined(CONVERT_TO_PROTON_C) && !defined(KEYBOARD_planck)
+#    if !defined(CONVERT_TO_PROTON_C) && !defined(KEYBOARD_olkb_planck)
     setPinOutput(D5);
     writePinHigh(D5);
 
@@ -377,7 +377,7 @@ void encoder_update(bool clockwise) {
 }
 #endif  // ENCODER_ENABLE
 
-#ifdef KEYBOARD_planck_rev6
+#ifdef KEYBOARD_olkb_planck_rev6
 void dip_update(uint8_t index, bool active) {
     switch (index) {
         case 0:
@@ -402,9 +402,9 @@ void dip_update(uint8_t index, bool active) {
             break;
     }
 }
-#endif  // KEYBOARD_planck_rev6
+#endif  // KEYBOARD_olkb_planck_rev6
 
-#ifdef KEYBOARD_planck_ez
+#ifdef KEYBOARD_olkb_planck_ez
 layer_state_t layer_state_set_keymap(layer_state_t state) {
     planck_ez_left_led_off();
     planck_ez_right_led_off();
diff --git a/layouts/community/ortho_4x12/jarred/keymap.c b/layouts/community/ortho_4x12/jarred/keymap.c
index 4be5f9ed69..2bac5c8c74 100644
--- a/layouts/community/ortho_4x12/jarred/keymap.c
+++ b/layouts/community/ortho_4x12/jarred/keymap.c
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifdef RGB_MATRIX_ENABLE
 void rgb_matrix_indicators_user(void) {
-    #ifdef KEYBOARD_planck_light
+    #ifdef KEYBOARD_olkb_planck_light
     // Disable light in middle of 2U position of Planck Light
     rgb_matrix_set_color(42, 0, 0, 0);
     #endif
diff --git a/layouts/community/ortho_4x12/juno/keymap.c b/layouts/community/ortho_4x12/juno/keymap.c
index a22c229e29..dffcf9de3c 100644
--- a/layouts/community/ortho_4x12/juno/keymap.c
+++ b/layouts/community/ortho_4x12/juno/keymap.c
@@ -230,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #endif
 
 // Disable LED on Rev6
-#ifdef KEYBOARD_planck_rev6
+#ifdef KEYBOARD_olkb_planck_rev6
 layer_state_t layer_state_set_user(layer_state_t state) {
   return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
 }
@@ -283,12 +283,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef BACKLIGHT_ENABLE
           backlight_step();
         #endif
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           writePinLow(E6);
         #endif
       } else {
         unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           writePinHigh(E6);
         #endif
       }
diff --git a/layouts/community/ortho_4x12/junonum/keymap.c b/layouts/community/ortho_4x12/junonum/keymap.c
index e5eab8848b..8be14706fb 100644
--- a/layouts/community/ortho_4x12/junonum/keymap.c
+++ b/layouts/community/ortho_4x12/junonum/keymap.c
@@ -179,12 +179,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef BACKLIGHT_ENABLE
           backlight_step();
         #endif
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           writePinLow(E6);
         #endif
       } else {
         unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           writePinHigh(E6);
         #endif
       }
diff --git a/layouts/community/ortho_4x12/mguterl/keymap.c b/layouts/community/ortho_4x12/mguterl/keymap.c
index 2be2d449e3..403d37388e 100644
--- a/layouts/community/ortho_4x12/mguterl/keymap.c
+++ b/layouts/community/ortho_4x12/mguterl/keymap.c
@@ -208,12 +208,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef BACKLIGHT_ENABLE
           backlight_step();
         #endif
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           writePinLow(E6);
         #endif
       } else {
         unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
+        #ifdef KEYBOARD_olkb_planck_rev5
           writePinHigh(E6);
         #endif
       }
diff --git a/layouts/community/ortho_4x12/xyverz/config.h b/layouts/community/ortho_4x12/xyverz/config.h
index 287f4cc2b7..5bfc322100 100644
--- a/layouts/community/ortho_4x12/xyverz/config.h
+++ b/layouts/community/ortho_4x12/xyverz/config.h
@@ -8,7 +8,7 @@
 #define EE_HANDS
 
 #undef RGBLED_NUM
-#if defined(KEYBOARD_planck_rev5)
+#if defined(KEYBOARD_olkb_planck_rev5)
   #define RGBLED_NUM 10
   #define RGB_DI_PIN D1
 #elif defined(KEYBOARD_keebio_levinson_rev2)
diff --git a/layouts/community/ortho_5x12/brandonschlack/config.h b/layouts/community/ortho_5x12/brandonschlack/config.h
index 9968297363..a6c0095c2f 100644
--- a/layouts/community/ortho_5x12/brandonschlack/config.h
+++ b/layouts/community/ortho_5x12/brandonschlack/config.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#ifdef KEYBOARD_preonic_rev3
+#ifdef KEYBOARD_olkb_preonic_rev3
 #ifdef AUDIO_ENABLE
     #define STARTUP_SONG SONG(PREONIC_SOUND)
     // #define STARTUP_SONG SONG(NO_SOUND)
diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c
index 4d7b7483ad..cb0b9d169d 100644
--- a/layouts/community/ortho_5x12/brandonschlack/keymap.c
+++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include QMK_KEYBOARD_H
-#ifdef KEYBOARD_preonic_rev3
+#ifdef KEYBOARD_olkb_preonic_rev3
     #include "muse.h"
 #endif
 #include "brandonschlack.h"
@@ -104,7 +104,7 @@ layer_state_t layer_state_set_keymap(layer_state_t state) {
     return state;
 }
 
-#ifdef KEYBOARD_preonic_rev3
+#ifdef KEYBOARD_olkb_preonic_rev3
 #ifdef AUDIO_ENABLE
   float plover_song[][2]     = SONG(PLOVER_SOUND);
   float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
diff --git a/layouts/community/ortho_5x12/xyverz/config.h b/layouts/community/ortho_5x12/xyverz/config.h
index 5f9f6e5c11..ce6da24334 100644
--- a/layouts/community/ortho_5x12/xyverz/config.h
+++ b/layouts/community/ortho_5x12/xyverz/config.h
@@ -9,7 +9,7 @@
 #ifndef RGBLIGHT_ENABLE
 #undef RGB_DI_PIN
 #endif
-#if defined(KEYBOARD_preonic_rev2)
+#if defined(KEYBOARD_olkb_preonic_rev2)
   #define RGB_DI_PIN B3
   #undef RGBLED_NUM
   #define RGBLIGHT_ANIMATIONS
diff --git a/users/dshields/dshields.h b/users/dshields/dshields.h
index e1aa07a5db..c2f7d3b2cf 100644
--- a/users/dshields/dshields.h
+++ b/users/dshields/dshields.h
@@ -17,21 +17,21 @@
 #define MT_SPC  SFT_T(KC_SPC)
 
 // LED/RGB controls
-#ifdef KEYBOARD_planck_light
+#ifdef KEYBOARD_olkb_planck_light
     #define LGT_TOG RGB_TOG
     #define LGT_MOD RGB_MOD
     #define LGT_BRT _______
     #define LGT_INC RGB_HUI
     #define LGT_DEC RGB_HUD
 #endif
-#ifdef KEYBOARD_planck_rev3
+#ifdef KEYBOARD_olkb_planck_rev3
     #define LGT_TOG BL_TOGG
     #define LGT_MOD BL_STEP
     #define LGT_BRT BL_BRTG
     #define LGT_INC BL_INC
     #define LGT_DEC BL_DEC
 #endif
-#ifdef KEYBOARD_planck_rev6
+#ifdef KEYBOARD_olkb_planck_rev6
     #define LGT_TOG _______
     #define LGT_MOD _______
     #define LGT_BRT _______