diff --git a/examples/companion_radio/ui-new/Alarmscreen.h b/examples/companion_radio/ui-new/AlarmScreen.h
similarity index 100%
rename from examples/companion_radio/ui-new/Alarmscreen.h
rename to examples/companion_radio/ui-new/AlarmScreen.h
diff --git a/examples/companion_radio/ui-new/Audiobookplayerscreen.h b/examples/companion_radio/ui-new/AudiobookPlayerScreen.h
similarity index 100%
rename from examples/companion_radio/ui-new/Audiobookplayerscreen.h
rename to examples/companion_radio/ui-new/AudiobookPlayerScreen.h
diff --git a/examples/companion_radio/ui-new/Channelpickerscreen.h b/examples/companion_radio/ui-new/ChannelPickerScreen.h
similarity index 100%
rename from examples/companion_radio/ui-new/Channelpickerscreen.h
rename to examples/companion_radio/ui-new/ChannelPickerScreen.h
diff --git a/examples/companion_radio/ui-new/Contactsscreen.h b/examples/companion_radio/ui-new/ContactsScreen.h
similarity index 100%
rename from examples/companion_radio/ui-new/Contactsscreen.h
rename to examples/companion_radio/ui-new/ContactsScreen.h
diff --git a/examples/companion_radio/ui-new/Discoveryscreen.h b/examples/companion_radio/ui-new/DiscoveryScreen.h
similarity index 100%
rename from examples/companion_radio/ui-new/Discoveryscreen.h
rename to examples/companion_radio/ui-new/DiscoveryScreen.h
diff --git a/examples/companion_radio/ui-new/emojipicker.h b/examples/companion_radio/ui-new/EmojiPicker.h
similarity index 100%
rename from examples/companion_radio/ui-new/emojipicker.h
rename to examples/companion_radio/ui-new/EmojiPicker.h
diff --git a/examples/companion_radio/ui-new/Emojisprites.h b/examples/companion_radio/ui-new/EmojiSprites.h
similarity index 100%
rename from examples/companion_radio/ui-new/Emojisprites.h
rename to examples/companion_radio/ui-new/EmojiSprites.h
diff --git a/examples/companion_radio/ui-new/Epubprocessor.h b/examples/companion_radio/ui-new/EpubProcessor.h
similarity index 100%
rename from examples/companion_radio/ui-new/Epubprocessor.h
rename to examples/companion_radio/ui-new/EpubProcessor.h
diff --git a/examples/companion_radio/ui-new/homeicons.h b/examples/companion_radio/ui-new/HomeIcons.h
similarity index 100%
rename from examples/companion_radio/ui-new/homeicons.h
rename to examples/companion_radio/ui-new/HomeIcons.h
diff --git a/examples/companion_radio/ui-new/Lastheardscreen.h b/examples/companion_radio/ui-new/LastHeardScreen.h
similarity index 100%
rename from examples/companion_radio/ui-new/Lastheardscreen.h
rename to examples/companion_radio/ui-new/LastHeardScreen.h
diff --git a/examples/companion_radio/ui-new/Mapscreen.h b/examples/companion_radio/ui-new/MapScreen.h
similarity index 100%
rename from examples/companion_radio/ui-new/Mapscreen.h
rename to examples/companion_radio/ui-new/MapScreen.h
diff --git a/examples/companion_radio/ui-new/Meckfonts.h b/examples/companion_radio/ui-new/MeckFonts.h
similarity index 100%
rename from examples/companion_radio/ui-new/Meckfonts.h
rename to examples/companion_radio/ui-new/MeckFonts.h
diff --git a/examples/companion_radio/ui-new/Notesscreen.h b/examples/companion_radio/ui-new/NotesScreen.h
similarity index 100%
rename from examples/companion_radio/ui-new/Notesscreen.h
rename to examples/companion_radio/ui-new/NotesScreen.h
diff --git a/examples/companion_radio/ui-new/Patheditorscreen.h b/examples/companion_radio/ui-new/PathEditorScreen.h
similarity index 100%
rename from examples/companion_radio/ui-new/Patheditorscreen.h
rename to examples/companion_radio/ui-new/PathEditorScreen.h
diff --git a/examples/companion_radio/ui-new/Radiopresets.h b/examples/companion_radio/ui-new/RadioPresets.h
similarity index 100%
rename from examples/companion_radio/ui-new/Radiopresets.h
rename to examples/companion_radio/ui-new/RadioPresets.h
diff --git a/examples/companion_radio/ui-new/Repeateradminscreen.h b/examples/companion_radio/ui-new/RepeaterAdminScreen.h
similarity index 100%
rename from examples/companion_radio/ui-new/Repeateradminscreen.h
rename to examples/companion_radio/ui-new/RepeaterAdminScreen.h
diff --git a/examples/companion_radio/ui-new/Settingsscreen.h b/examples/companion_radio/ui-new/SettingsScreen.h
similarity index 100%
rename from examples/companion_radio/ui-new/Settingsscreen.h
rename to examples/companion_radio/ui-new/SettingsScreen.h
diff --git a/examples/companion_radio/ui-new/Snakescreen.h b/examples/companion_radio/ui-new/SnakeScreen.h
similarity index 100%
rename from examples/companion_radio/ui-new/Snakescreen.h
rename to examples/companion_radio/ui-new/SnakeScreen.h
diff --git a/examples/companion_radio/ui-new/Textreaderscreen.h b/examples/companion_radio/ui-new/TextReaderScreen.h
similarity index 100%
rename from examples/companion_radio/ui-new/Textreaderscreen.h
rename to examples/companion_radio/ui-new/TextReaderScreen.h
diff --git a/examples/companion_radio/ui-new/Touchinput.h b/examples/companion_radio/ui-new/TouchInput.h
similarity index 100%
rename from examples/companion_radio/ui-new/Touchinput.h
rename to examples/companion_radio/ui-new/TouchInput.h
diff --git a/examples/companion_radio/ui-new/Utf8cp437.h b/examples/companion_radio/ui-new/Utf8CP437.h
similarity index 100%
rename from examples/companion_radio/ui-new/Utf8cp437.h
rename to examples/companion_radio/ui-new/Utf8CP437.h
diff --git a/examples/companion_radio/ui-new/virtualkeyboard.h b/examples/companion_radio/ui-new/VirtualKeyboard.h
similarity index 100%
rename from examples/companion_radio/ui-new/virtualkeyboard.h
rename to examples/companion_radio/ui-new/VirtualKeyboard.h
diff --git a/examples/companion_radio/ui-new/Voicemessagescreen.h b/examples/companion_radio/ui-new/VoiceMessageScreen.h
similarity index 100%
rename from examples/companion_radio/ui-new/Voicemessagescreen.h
rename to examples/companion_radio/ui-new/VoiceMessageScreen.h
diff --git a/examples/companion_radio/ui-new/Webreaderscreen.h b/examples/companion_radio/ui-new/WebReaderScreen.h
similarity index 100%
rename from examples/companion_radio/ui-new/Webreaderscreen.h
rename to examples/companion_radio/ui-new/WebReaderScreen.h
diff --git a/examples/simple_repeater/Cellularmqtt.h b/examples/simple_repeater/CellularMQTT.h
similarity index 100%
rename from examples/simple_repeater/Cellularmqtt.h
rename to examples/simple_repeater/CellularMQTT.h
diff --git a/examples/simple_repeater/wifimqtt.h b/examples/simple_repeater/WiFiMQTT.h
similarity index 100%
rename from examples/simple_repeater/wifimqtt.h
rename to examples/simple_repeater/WiFiMQTT.h
diff --git a/variants/lilygo_t5s3_epaper_pro/Pcf85063clock.h b/variants/lilygo_t5s3_epaper_pro/PCF85063Clock.h
similarity index 100%
rename from variants/lilygo_t5s3_epaper_pro/Pcf85063clock.h
rename to variants/lilygo_t5s3_epaper_pro/PCF85063Clock.h
diff --git a/variants/lilygo_t5s3_epaper_pro/platformio.ini b/variants/lilygo_t5s3_epaper_pro/platformio.ini
index d66e69d7..28cb7497 100644
--- a/variants/lilygo_t5s3_epaper_pro/platformio.ini
+++ b/variants/lilygo_t5s3_epaper_pro/platformio.ini
@@ -18,7 +18,7 @@ board_build.arduino.memory_type = qio_opi
 board_upload.flash_size = 16MB
 build_flags =
   ${esp32_base.build_flags}
-  -I variants/LilyGo_T5S3_EPaper_Pro
+  -I variants/lilygo_t5s3_epaper_pro
   -D LilyGo_T5S3_EPaper_Pro
   -D T5_S3_EPAPER_PRO_V2
   -D BOARD_HAS_PSRAM=1
@@ -61,7 +61,7 @@ build_flags =
   -D ARDUINO_LOOP_STACK_SIZE=32768
   -D HAS_MECK_FONTS
 build_src_filter = ${esp32_base.build_src_filter}
-  +<../variants/LilyGo_T5S3_EPaper_Pro>
+  +<../variants/lilygo_t5s3_epaper_pro>
 lib_deps =
   ${esp32_base.lib_deps}
   WebServer
diff --git a/variants/lilygo_tdeck_max/Tca8418keyboard.h b/variants/lilygo_tdeck_max/TCA8418Keyboard.h
similarity index 100%
rename from variants/lilygo_tdeck_max/Tca8418keyboard.h
rename to variants/lilygo_tdeck_max/TCA8418Keyboard.h
diff --git a/variants/lilygo_tdeck_max/platformio.ini b/variants/lilygo_tdeck_max/platformio.ini
index e401a20e..8ec369f3 100644
--- a/variants/lilygo_tdeck_max/platformio.ini
+++ b/variants/lilygo_tdeck_max/platformio.ini
@@ -42,7 +42,7 @@ build_flags =
   ; Include MAX variant first (for variant.h, target.h, TDeckProMaxBoard.h)
   ; then V1.1 variant (for TDeckBoard.h, which TDeckProMaxBoard inherits from)
   -I variants/lilygo_tdeck_max
-  -I variants/LilyGo_TDeck_Pro
+  -I variants/lilygo_tdeck_pro
   ; Both defines needed: LilyGo_TDeck_Pro for existing UI code guards,
   ; LilyGo_TDeck_Pro_Max for MAX-specific code paths
   -D LilyGo_TDeck_Pro
diff --git a/variants/lilygo_tdeck_pro/Tca8418keyboard.h b/variants/lilygo_tdeck_pro/TCA8418Keyboard.h
similarity index 100%
rename from variants/lilygo_tdeck_pro/Tca8418keyboard.h
rename to variants/lilygo_tdeck_pro/TCA8418Keyboard.h
diff --git a/variants/lilygo_tdeck_pro/platformio.ini b/variants/lilygo_tdeck_pro/platformio.ini
index f2219f7c..fbbb4ac8 100644
--- a/variants/lilygo_tdeck_pro/platformio.ini
+++ b/variants/lilygo_tdeck_pro/platformio.ini
@@ -9,7 +9,7 @@ board_upload.flash_size = 16MB
 build_flags =
   ${esp32_base.build_flags}
   ${sensor_base.build_flags}
-  -I variants/LilyGo_TDeck_Pro
+  -I variants/lilygo_tdeck_pro
   -D LilyGo_TDeck_Pro
   -D HAS_GPS=1
   -D BOARD_HAS_PSRAM=1
@@ -89,7 +89,7 @@ build_flags =
   -D ARDUINO_LOOP_STACK_SIZE=32768
   -D HAS_MECK_FONTS
 build_src_filter = ${esp32_base.build_src_filter}
-  +<../variants/LilyGo_TDeck_Pro>
+  +<../variants/lilygo_tdeck_pro>
   +<helpers/sensors/*.cpp>
 lib_deps =
   ${esp32_base.lib_deps}