diff --git a/src/rpi-cpu2mqtt.py b/src/rpi-cpu2mqtt.py
index ed2fad3..7daeae3 100644
--- a/src/rpi-cpu2mqtt.py
+++ b/src/rpi-cpu2mqtt.py
@@ -31,7 +31,7 @@ def check_wifi_signal(format):
             wifi_signal = round((int(wifi_signal) / 70)* 100)
             
     except Exception:
-        wifi_signal = 'NA'
+        wifi_signal = 0
         
     return wifi_signal
 
@@ -165,57 +165,57 @@ def config_json(what_config):
     data["unique_id"] = hostname + "_" + what_config
     if what_config == "cpuload":
         data["icon"] = "mdi:speedometer"
-        data["name"] = hostname + " CPU Usage"
+        data["name"] = "CPU Usage"
         data["state_class"] = "measurement"
         data["unit_of_measurement"] = "%"
     elif what_config == "cputemp":
         data["icon"] = "hass:thermometer"
-        data["name"] = hostname + " CPU Temperature"
+        data["name"] = "CPU Temperature"
         data["unit_of_measurement"] = "°C"
         data["state_class"] = "measurement"
     elif what_config == "diskusage":
         data["icon"] = "mdi:harddisk"
-        data["name"] = hostname + " Disk Usage"
+        data["name"] = "Disk Usage"
         data["unit_of_measurement"] = "%"
         data["state_class"] = "measurement"
     elif what_config == "voltage":
         data["icon"] = "mdi:flash"
-        data["name"] = hostname + " CPU Voltage"
+        data["name"] = "CPU Voltage"
         data["unit_of_measurement"] = "V"
         data["state_class"] = "measurement"
     elif what_config == "swap":
         data["icon"] = "mdi:harddisk"
-        data["name"] = hostname + " Disk Swap"
+        data["name"] = "Disk Swap"
         data["unit_of_measurement"] = "%"
         data["state_class"] = "measurement"
     elif what_config == "memory":
         data["icon"] = "mdi:memory"
-        data["name"] = hostname + " Memory Usage"
+        data["name"] = "Memory Usage"
         data["unit_of_measurement"] = "%"
         data["state_class"] = "measurement"
     elif what_config == "sys_clock_speed":
         data["icon"] = "mdi:speedometer"
-        data["name"] = hostname + " CPU Clock Speed"
+        data["name"] = "CPU Clock Speed"
         data["unit_of_measurement"] = "MHz"
         data["state_class"] = "measurement"
     elif what_config == "uptime_days":
         data["icon"] = "mdi:calendar"
-        data["name"] = hostname + " Uptime"
+        data["name"] = "Uptime"
         data["unit_of_measurement"] = "days"
         data["state_class"] = "measurement"
     elif what_config == "wifi_signal":
         data["icon"] = "mdi:wifi"
-        data["name"] = hostname + " Wifi Signal"
+        data["name"] = "Wifi Signal"
         data["unit_of_measurement"] = "%"
         data["state_class"] = "measurement"
     elif what_config == "wifi_signal_dbm":
         data["icon"] = "mdi:wifi"
-        data["name"] = hostname + " Wifi Signal"
+        data["name"] = "Wifi Signal"
         data["unit_of_measurement"] = "dBm"
         data["state_class"] = "measurement"
     elif what_config == "rpi5_fan_speed":
         data["icon"] = "mdi:fan"
-        data["name"] = hostname + " Fan Speed"
+        data["name"] = "Fan Speed"
         data["unit_of_measurement"] = "RPM"
         data["state_class"] = "measurement"
     else:
@@ -366,6 +366,7 @@ if __name__ == '__main__':
         wifi_signal_dbm = check_wifi_signal('dbm')
     if config.rpi5_fan_speed:
         rpi5_fan_speed = check_rpi5_fan_speed()
+        
     # Publish messages to MQTT
     if hasattr(config, 'group_messages') and config.group_messages:
         bulk_publish_to_mqtt(cpu_load, cpu_temp, used_space, voltage, sys_clock_speed, swap, memory, uptime_days, wifi_signal, wifi_signal_dbm, rpi5_fan_speed)