diff --git a/devices/generic/subdevices/airpurifier.json b/devices/generic/subdevices/air_purifier.json
similarity index 100%
rename from devices/generic/subdevices/airpurifier.json
rename to devices/generic/subdevices/air_purifier.json
diff --git a/devices/generic/subdevices/airquality_sensor.json b/devices/generic/subdevices/air_quality_sensor.json
similarity index 100%
rename from devices/generic/subdevices/airquality_sensor.json
rename to devices/generic/subdevices/air_quality_sensor.json
diff --git a/devices/generic/subdevices/lightlevel_sensor.json b/devices/generic/subdevices/light_level_sensor.json
similarity index 100%
rename from devices/generic/subdevices/lightlevel_sensor.json
rename to devices/generic/subdevices/light_level_sensor.json
diff --git a/devices/generic/subdevices/onoff_light.json b/devices/generic/subdevices/on_off_light.json
similarity index 100%
rename from devices/generic/subdevices/onoff_light.json
rename to devices/generic/subdevices/on_off_light.json
diff --git a/devices/generic/subdevices/onoff_output.json b/devices/generic/subdevices/on_off_output.json
similarity index 100%
rename from devices/generic/subdevices/onoff_output.json
rename to devices/generic/subdevices/on_off_output.json
diff --git a/devices/generic/subdevices/onoff_plugin_unit.json b/devices/generic/subdevices/on_off_plugin_unit.json
similarity index 100%
rename from devices/generic/subdevices/onoff_plugin_unit.json
rename to devices/generic/subdevices/on_off_plugin_unit.json
diff --git a/devices/generic/subdevices/openclose_sensor.json b/devices/generic/subdevices/open_close_sensor.json
similarity index 100%
rename from devices/generic/subdevices/openclose_sensor.json
rename to devices/generic/subdevices/open_close_sensor.json
diff --git a/devices/generic/subdevices/waterleak_sensor.json b/devices/generic/subdevices/water_leak_sensor.json
similarity index 100%
rename from devices/generic/subdevices/waterleak_sensor.json
rename to devices/generic/subdevices/water_leak_sensor.json