diff --git a/main/config_RF.h b/main/config_RF.h
index a2c3687..a13792e 100644
--- a/main/config_RF.h
+++ b/main/config_RF.h
@@ -82,57 +82,57 @@ struct RTL_433device {
 
 const char parameters[53][4][24] = {
     // RTL_433 key, name, unit, device_class
-    {"alarm", "alarm", "", ""},
-    {"battery_mV", "battery", "mV", "voltage"},
-    {"battery_ok", "battery", "%", "battery"},
+    {"alarm", "Alarm", "", ""},
+    {"battery_mV", "Battery", "mV", "voltage"},
+    {"battery_ok", "Battery", "%", "battery"},
     {"co2_ppm", "Carbon Dioxide", "ppm", "carbon_dioxide"},
-    {"depth_cm", "depth", "cm", "distance"},
-    {"estimated_pm10_0_ug_m3", "estimated PM10", "μg/m³", "pm10"},
-    {"event", "Status", "", "moisture"},
+    {"depth_cm", "Depth", "cm", "distance"},
+    {"estimated_pm10_0_ug_m3", "Estimated PM10", "μg/m³", "pm10"},
+    {"event", "Status", "", ""},
     {"group", "Group", "", ""},
-    {"gust_speed_km_h", "gust speed", "km/h", "wind_speed"},
-    {"gust_speed_m_s", "gust speed", "m/s", "wind_speed"},
-    {"humidity", "humidity", "%", "humidity"},
-    {"light_lux", "light", "lx", "illuminance"},
-    {"lux", "lux", "lx", "illuminance"},
-    {"moisture", "moisture", "%", "humidity"},
-    {"motion", "motion", "", "motion"},
-    {"noise", "noise", "dB", "sound_pressure"},
+    {"gust_speed_km_h", "Gust speed", "km/h", "wind_speed"},
+    {"gust_speed_m_s", "Gust speed", "m/s", "wind_speed"},
+    {"humidity", "Humidity", "%", "humidity"},
+    {"light_lux", "Illuminance", "lx", "illuminance"},
+    {"lux", "Illuminance", "lx", "illuminance"},
+    {"moisture", "Moisture", "%", "humidity"},
+    {"motion", "Motion", "", "motion"},
+    {"noise", "Noise", "dB", "sound_pressure"},
     {"pm1_ug_m3", "PM1", "μg/m³", "pm1"},
     {"pm10_ug_m3", "PM10", "μg/m³", "pm10"},
     {"pm2_5_ug_m3", "PM2.5", "μg/m³", "pm25"},
-    {"power_W", "power", "W", "power"},
-    {"pressure_hPa", "pressure", "hPa", "pressure"},
-    {"pressure_kPa", "pressure", "kPa", "pressure"},
-    {"rain_in", "rain", "in", "precipitation"},
-    {"rain_mm", "rain", "mm", "precipitation"},
-    {"rain_rate_in_h", "rain", "in/h", "precipitation_intensity"},
-    {"rain_rate_mm_h", "rain", "mm/h", "precipitation_intensity"},
-    {"rssi", "rssi", "dB", "signal_strength"},
-    {"snr", "snr", "dB", ""},
+    {"power_W", "Power", "W", "power"},
+    {"pressure_hPa", "Pressure", "hPa", "pressure"},
+    {"pressure_kPa", "Pressure", "kPa", "pressure"},
+    {"rain_in", "Rain", "in", "precipitation"},
+    {"rain_mm", "Rain", "mm", "precipitation"},
+    {"rain_rate_in_h", "Rain", "in/h", "precipitation_intensity"},
+    {"rain_rate_mm_h", "Rain", "mm/h", "precipitation_intensity"},
+    {"rssi", "RSSI", "dB", "signal_strength"},
+    {"snr", "SNR", "dB", ""},
     {"state", "State", "", ""},
-    {"storm_dist_km", "storm distance", "km", "distance"},
-    {"storm_dist", "storm distance", "mi", "distance"},
-    {"strike_count", "strike count", "", ""}, // from rtl_433_mqtt_hass.py
-    {"strike_distance_km", "strike distance", "km", "distance"},
-    {"strike_distance", "strike distance", "mi", "distance"},
-    {"tamper", "tamper", "", ""},
-    {"temperature_1_C", "temperature", "°C", "temperature"},
-    {"temperature_2_C", "temperature", "°C", "temperature"},
-    {"temperature_C", "temperature", "°C", "temperature"},
-    {"temperature_F", "temperature", "°F", "temperature"},
-    {"time", "timestamp", "", "timestamp"},
+    {"storm_dist_km", "Storm distance", "km", "distance"},
+    {"storm_dist", "Storm distance", "mi", "distance"},
+    {"strike_count", "Strike count", "", ""}, // from rtl_433_mqtt_hass.py
+    {"strike_distance_km", "Strike distance", "km", "distance"},
+    {"strike_distance", "Strike distance", "mi", "distance"},
+    {"tamper", "Tamper", "", ""},
+    {"temperature_1_C", "Temperature", "°C", "temperature"},
+    {"temperature_2_C", "Temperature", "°C", "temperature"},
+    {"temperature_C", "Temperature", "°C", "temperature"},
+    {"temperature_F", "Temperature", "°F", "temperature"},
+    {"time", "Timestamp", "", "timestamp"},
     {"unit", "Unit", "", ""},
     {"uv", "UV", "UV level", ""},
     {"uvi", "UVI", "UV index", ""},
-    {"wind_avg_km_h", "wind average", "km/h", "wind_speed"},
-    {"wind_avg_m_s", "wind average", "m/s", "wind_speed"},
-    {"wind_avg_mi_h", "wind average", "mi/h", "wind_speed"},
-    {"wind_dir_deg", "wind direction", "°", ""},
-    {"wind_max_km_h", "wind max", "km/h", "wind_speed"},
-    {"wind_max_m_s", "wind max", "m/s", "wind_speed"},
-    {"wind_speed_km_h", "wind speed", "km/h", "wind_speed"},
-    {"wind_speed_m_s", "wind speed", "m/s", "wind_speed"}};
+    {"wind_avg_km_h", "Wind average", "km/h", "wind_speed"},
+    {"wind_avg_m_s", "Wind average", "m/s", "wind_speed"},
+    {"wind_avg_mi_h", "Wind average", "mi/h", "wind_speed"},
+    {"wind_dir_deg", "Wind direction", "°", ""},
+    {"wind_max_km_h", "Wind max", "km/h", "wind_speed"},
+    {"wind_max_m_s", "Wind max", "m/s", "wind_speed"},
+    {"wind_speed_km_h", "Wind speed", "km/h", "wind_speed"},
+    {"wind_speed_m_s", "Wind speed", "m/s", "wind_speed"}};
 #  endif
 #  ifdef RTL_433_DISCOVERY_LOGGING
 #    define DISCOVERY_TRACE_LOG(...) Log.trace(__VA_ARGS__)