diff --git a/usermods/ADS1115_v2/usermod_ads1115.h b/usermods/ADS1115_v2/ADS1115_v2.h
similarity index 100%
rename from usermods/ADS1115_v2/usermod_ads1115.h
rename to usermods/ADS1115_v2/ADS1115_v2.h
diff --git a/usermods/AHT10_v2/usermod_aht10.h b/usermods/AHT10_v2/AHT10_v2.h
similarity index 100%
rename from usermods/AHT10_v2/usermod_aht10.h
rename to usermods/AHT10_v2/AHT10_v2.h
diff --git a/usermods/BH1750_v2/usermod_bh1750.h b/usermods/BH1750_v2/BH1750_v2.h
similarity index 100%
rename from usermods/BH1750_v2/usermod_bh1750.h
rename to usermods/BH1750_v2/BH1750_v2.h
diff --git a/usermods/BME280_v2/usermod_bme280.h b/usermods/BME280_v2/BME280_v2.h
similarity index 100%
rename from usermods/BME280_v2/usermod_bme280.h
rename to usermods/BME280_v2/BME280_v2.h
diff --git a/usermods/BME68X_v2/usermod_bme68x.h b/usermods/BME68X_v2/BME68X_v2.h
similarity index 100%
rename from usermods/BME68X_v2/usermod_bme68x.h
rename to usermods/BME68X_v2/BME68X_v2.h
diff --git a/usermods/INA226_v2/usermod_ina226.h b/usermods/INA226_v2/INA226_v2.h
similarity index 100%
rename from usermods/INA226_v2/usermod_ina226.h
rename to usermods/INA226_v2/INA226_v2.h
diff --git a/usermods/Internal_Temperature_v2/usermod_internal_temperature.h b/usermods/Internal_Temperature_v2/Internal_Temperature_v2.h
similarity index 100%
rename from usermods/Internal_Temperature_v2/usermod_internal_temperature.h
rename to usermods/Internal_Temperature_v2/Internal_Temperature_v2.h
diff --git a/usermods/LD2410_v2/usermod_ld2410.h b/usermods/LD2410_v2/LD2410_v2.h
similarity index 100%
rename from usermods/LD2410_v2/usermod_ld2410.h
rename to usermods/LD2410_v2/LD2410_v2.h
diff --git a/usermods/MAX17048_v2/usermod_max17048.h b/usermods/MAX17048_v2/MAX17048_v2.h
similarity index 100%
rename from usermods/MAX17048_v2/usermod_max17048.h
rename to usermods/MAX17048_v2/MAX17048_v2.h
diff --git a/usermods/MY9291/usermode_MY9291.h b/usermods/MY9291/MY9291.h
similarity index 100%
rename from usermods/MY9291/usermode_MY9291.h
rename to usermods/MY9291/MY9291.h
diff --git a/usermods/TetrisAI_v2/usermod_v2_tetrisai.h b/usermods/TetrisAI_v2/TetrisAI_v2.h
similarity index 100%
rename from usermods/TetrisAI_v2/usermod_v2_tetrisai.h
rename to usermods/TetrisAI_v2/TetrisAI_v2.h
diff --git a/usermods/mqtt_switch_v2/usermod_mqtt_switch.h b/usermods/mqtt_switch_v2/mqtt_switch_v2.h
similarity index 100%
rename from usermods/mqtt_switch_v2/usermod_mqtt_switch.h
rename to usermods/mqtt_switch_v2/mqtt_switch_v2.h
diff --git a/usermods/sensors_to_mqtt/usermod_v2_SensorsToMqtt.h b/usermods/sensors_to_mqtt/sensors_to_mqtt.h
similarity index 100%
rename from usermods/sensors_to_mqtt/usermod_v2_SensorsToMqtt.h
rename to usermods/sensors_to_mqtt/sensors_to_mqtt.h
diff --git a/usermods/seven_segment_display_reloaded/usermod_seven_segment_reloaded.h b/usermods/seven_segment_display_reloaded/seven_segment_display_reloaded.h
similarity index 100%
rename from usermods/seven_segment_display_reloaded/usermod_seven_segment_reloaded.h
rename to usermods/seven_segment_display_reloaded/seven_segment_display_reloaded.h
diff --git a/usermods/stairway_wipe_basic/stairway-wipe-usermod-v2.h b/usermods/stairway_wipe_basic/stairway_wipe_basic.h
similarity index 100%
rename from usermods/stairway_wipe_basic/stairway-wipe-usermod-v2.h
rename to usermods/stairway_wipe_basic/stairway_wipe_basic.h
diff --git a/usermods/word-clock-matrix/usermod_word_clock_matrix.h b/usermods/word-clock-matrix/word-clock-matrix.h
similarity index 100%
rename from usermods/word-clock-matrix/usermod_word_clock_matrix.h
rename to usermods/word-clock-matrix/word-clock-matrix.h