diff --git a/custom_components/midea_ac_lan/midea_devices.py b/custom_components/midea_ac_lan/midea_devices.py
index 0832db6f..776451ff 100644
--- a/custom_components/midea_ac_lan/midea_devices.py
+++ b/custom_components/midea_ac_lan/midea_devices.py
@@ -197,9 +197,15 @@
     0x40: {
         "name": "Integrated Ceiling Fan",
         "entities": {
-            "fan": {"type": Platform.FAN, "icon": "mdi:fan", "default": True},
+            "fan": {
+                "type": Platform.FAN,
+                "has_entity_name": True,
+                "icon": "mdi:fan",
+                "default": True,
+            },
             X40Attributes.current_temperature: {
                 "type": Platform.SENSOR,
+                "has_entity_name": True,
                 "name": "Current Temperature",
                 "device_class": SensorDeviceClass.TEMPERATURE,
                 "unit": UnitOfTemperature.CELSIUS,
@@ -207,16 +213,22 @@
             },
             X40Attributes.light: {
                 "type": Platform.SWITCH,
+                "has_entity_name": True,
+                "translation_key": "light",
                 "name": "Light",
                 "icon": "mdi:lightbulb",
             },
             X40Attributes.ventilation: {
                 "type": Platform.SWITCH,
+                "has_entity_name": True,
+                "translation_key": "ventilation",
                 "name": "Ventilation",
                 "icon": "mdi:air-filter",
             },
             X40Attributes.smelly_sensor: {
                 "type": Platform.SWITCH,
+                "has_entity_name": True,
+                "translation_key": "smelly_sensor",
                 "name": "Smelly Sensor",
                 "icon": "mdi:scent",
             },
diff --git a/custom_components/midea_ac_lan/midea_entity.py b/custom_components/midea_ac_lan/midea_entity.py
index 4ecfe30a..98ccaae5 100644
--- a/custom_components/midea_ac_lan/midea_entity.py
+++ b/custom_components/midea_ac_lan/midea_entity.py
@@ -38,7 +38,11 @@ def __init__(self, device: MideaDevice, entity_key: str) -> None:
 
         self._attr_translation_key = self._config.get("translation_key")
         self._attr_has_entity_name = self._config.get("has_entity_name", False)
-        if not self.has_entity_name:  # old behavior
+        if self.has_entity_name:
+            if self._config.get("name") is None:
+                self._attr_name = None
+        else:
+            # old behavior
             self._attr_name = (
                 f"{self._device_name} {self._config.get('name')}"
                 if "name" in self._config
diff --git a/custom_components/midea_ac_lan/translations/de.json b/custom_components/midea_ac_lan/translations/de.json
index e83484c5..13fb0d7a 100644
--- a/custom_components/midea_ac_lan/translations/de.json
+++ b/custom_components/midea_ac_lan/translations/de.json
@@ -97,8 +97,17 @@
       }
     },
     "switch": {
+      "light": {
+        "name": "Light"
+      },
       "power": {
         "name": "Power"
+      },
+      "smelly_sensor": {
+        "name": "Smelly Sensor"
+      },
+      "ventilation": {
+        "name": "Ventilation"
       }
     }
   },
diff --git a/custom_components/midea_ac_lan/translations/en.json b/custom_components/midea_ac_lan/translations/en.json
index 298ec964..9a34414e 100644
--- a/custom_components/midea_ac_lan/translations/en.json
+++ b/custom_components/midea_ac_lan/translations/en.json
@@ -97,8 +97,17 @@
       }
     },
     "switch": {
+      "light": {
+        "name": "Light"
+      },
       "power": {
         "name": "Power"
+      },
+      "smelly_sensor": {
+        "name": "Smelly Sensor"
+      },
+      "ventilation": {
+        "name": "Ventilation"
       }
     }
   },
diff --git a/custom_components/midea_ac_lan/translations/fr.json b/custom_components/midea_ac_lan/translations/fr.json
index 7be801ea..ea8a5a72 100644
--- a/custom_components/midea_ac_lan/translations/fr.json
+++ b/custom_components/midea_ac_lan/translations/fr.json
@@ -97,8 +97,17 @@
       }
     },
     "switch": {
+      "light": {
+        "name": "Light"
+      },
       "power": {
         "name": "Power"
+      },
+      "smelly_sensor": {
+        "name": "Smelly Sensor"
+      },
+      "ventilation": {
+        "name": "Ventilation"
       }
     }
   },
diff --git a/custom_components/midea_ac_lan/translations/hu.json b/custom_components/midea_ac_lan/translations/hu.json
index 0149faa5..589dd265 100644
--- a/custom_components/midea_ac_lan/translations/hu.json
+++ b/custom_components/midea_ac_lan/translations/hu.json
@@ -97,8 +97,17 @@
       }
     },
     "switch": {
+      "light": {
+        "name": "Light"
+      },
       "power": {
         "name": "Power"
+      },
+      "smelly_sensor": {
+        "name": "Smelly Sensor"
+      },
+      "ventilation": {
+        "name": "Ventilation"
       }
     }
   },
diff --git a/custom_components/midea_ac_lan/translations/ru.json b/custom_components/midea_ac_lan/translations/ru.json
index a9567e72..12168a84 100644
--- a/custom_components/midea_ac_lan/translations/ru.json
+++ b/custom_components/midea_ac_lan/translations/ru.json
@@ -97,8 +97,17 @@
       }
     },
     "switch": {
+      "light": {
+        "name": "Light"
+      },
       "power": {
         "name": "Power"
+      },
+      "smelly_sensor": {
+        "name": "Smelly Sensor"
+      },
+      "ventilation": {
+        "name": "Ventilation"
       }
     }
   },
diff --git a/custom_components/midea_ac_lan/translations/sk.json b/custom_components/midea_ac_lan/translations/sk.json
index 7a2a947a..13adc973 100644
--- a/custom_components/midea_ac_lan/translations/sk.json
+++ b/custom_components/midea_ac_lan/translations/sk.json
@@ -97,8 +97,17 @@
       }
     },
     "switch": {
+      "light": {
+        "name": "Light"
+      },
       "power": {
         "name": "Power"
+      },
+      "smelly_sensor": {
+        "name": "Smelly Sensor"
+      },
+      "ventilation": {
+        "name": "Ventilation"
       }
     }
   },
diff --git a/custom_components/midea_ac_lan/translations/zh-Hans.json b/custom_components/midea_ac_lan/translations/zh-Hans.json
index b752bcb3..37f5a4f1 100644
--- a/custom_components/midea_ac_lan/translations/zh-Hans.json
+++ b/custom_components/midea_ac_lan/translations/zh-Hans.json
@@ -97,8 +97,17 @@
       }
     },
     "switch": {
+      "light": {
+        "name": "灯光"
+      },
       "power": {
         "name": "电源开关"
+      },
+      "smelly_sensor": {
+        "name": "异味感应"
+      },
+      "ventilation": {
+        "name": "换气"
       }
     }
   },