diff --git a/custom_components/airstage/__init__.py b/custom_components/fujitsu_airstage/__init__.py
similarity index 97%
rename from custom_components/airstage/__init__.py
rename to custom_components/fujitsu_airstage/__init__.py
index afb0087..659b816 100644
--- a/custom_components/airstage/__init__.py
+++ b/custom_components/fujitsu_airstage/__init__.py
@@ -62,7 +62,7 @@ async def async_get():
         coordinator = DataUpdateCoordinator(
             hass,
             _LOGGER,
-            name="Airstage Fujitsu",
+            name="Fujitsu Airstage",
             update_method=async_get,
             update_interval=timedelta(seconds=AIRSTAGE_SYNC_INTERVAL),
         )
@@ -97,7 +97,7 @@ async def async_get():
         coordinator = DataUpdateCoordinator(
             hass,
             _LOGGER,
-            name="Airstage Fujitsu",
+            name="Fujitsu Airstage",
             update_method=async_get,
             update_interval=timedelta(seconds=AIRSTAGE_SYNC_INTERVAL),
         )
diff --git a/custom_components/airstage/climate.py b/custom_components/fujitsu_airstage/climate.py
similarity index 100%
rename from custom_components/airstage/climate.py
rename to custom_components/fujitsu_airstage/climate.py
diff --git a/custom_components/airstage/config_flow.py b/custom_components/fujitsu_airstage/config_flow.py
similarity index 98%
rename from custom_components/airstage/config_flow.py
rename to custom_components/fujitsu_airstage/config_flow.py
index 6ed9667..5af1d01 100644
--- a/custom_components/airstage/config_flow.py
+++ b/custom_components/fujitsu_airstage/config_flow.py
@@ -11,7 +11,6 @@
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.components.climate import ClimateEntity
 
 from homeassistant.const import (
     CONF_COUNTRY,
diff --git a/custom_components/airstage/const.py b/custom_components/fujitsu_airstage/const.py
similarity index 94%
rename from custom_components/airstage/const.py
rename to custom_components/fujitsu_airstage/const.py
index 9214c2f..daf5339 100644
--- a/custom_components/airstage/const.py
+++ b/custom_components/fujitsu_airstage/const.py
@@ -1,6 +1,6 @@
 """Constants for the Airstage Fujitsu integration."""
 
-DOMAIN = "airstage"
+DOMAIN = "fujitsu_airstage"
 AIRSTAGE_RETRY = 10
 
 
diff --git a/custom_components/airstage/entity.py b/custom_components/fujitsu_airstage/entity.py
similarity index 97%
rename from custom_components/airstage/entity.py
rename to custom_components/fujitsu_airstage/entity.py
index fff1acb..8839425 100644
--- a/custom_components/airstage/entity.py
+++ b/custom_components/fujitsu_airstage/entity.py
@@ -50,7 +50,7 @@ def __init__(self, instance: AirstageData, ac_key: str) -> None:
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, self._attr_unique_id)},
-            manufacturer="Airstage",
+            manufacturer="Fujitsu Airstage",
             model=self.coordinator.data[self.ac_key]["model"],
             name=self.coordinator.data[self.ac_key]["deviceName"],
         )
diff --git a/custom_components/airstage/manifest.json b/custom_components/fujitsu_airstage/manifest.json
similarity index 68%
rename from custom_components/airstage/manifest.json
rename to custom_components/fujitsu_airstage/manifest.json
index 65cb8f4..c04ab89 100644
--- a/custom_components/airstage/manifest.json
+++ b/custom_components/fujitsu_airstage/manifest.json
@@ -1,12 +1,12 @@
 {
-  "domain": "airstage",
-  "name": "Airstage Fujitsu",
+  "domain": "fujitsu_airstage",
+  "name": "Fujitsu Airstage",
   "codeowners": [
     "@danielkaldheim"
   ],
   "config_flow": true,
   "dependencies": [],
-  "documentation": "https://www.home-assistant.io/integrations/airstage",
+  "documentation": "https://www.home-assistant.io/integrations/fujitsu_airstage",
   "homekit": {},
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/danielkaldheim/ha_airstage/issues",
diff --git a/custom_components/airstage/models.py b/custom_components/fujitsu_airstage/models.py
similarity index 100%
rename from custom_components/airstage/models.py
rename to custom_components/fujitsu_airstage/models.py
diff --git a/custom_components/airstage/sensor.py b/custom_components/fujitsu_airstage/sensor.py
similarity index 89%
rename from custom_components/airstage/sensor.py
rename to custom_components/fujitsu_airstage/sensor.py
index 10a864e..9cb069b 100644
--- a/custom_components/airstage/sensor.py
+++ b/custom_components/fujitsu_airstage/sensor.py
@@ -10,30 +10,12 @@
 from pyairstage import constants
 from .entity import AirstageAcEntity
 from .models import AirstageData
-
 from homeassistant.util import slugify
 
-from homeassistant.components.climate import (
-    FAN_AUTO,
-    FAN_HIGH,
-    FAN_LOW,
-    FAN_MEDIUM,
-    ClimateEntity,
-    ClimateEntityFeature,
-    HVACMode,
-)
-
 from .const import (
     DOMAIN as AIRSTAGE_DOMAIN,
-    FAN_QUIET,
-    VERTICAL_HIGH,
-    VERTICAL_HIGHEST,
-    VERTICAL_LOW,
-    VERTICAL_LOWEST,
-    VERTICAL_SWING,
 )
 
-
 from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
@@ -45,8 +27,6 @@
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
diff --git a/custom_components/airstage/strings.json b/custom_components/fujitsu_airstage/strings.json
similarity index 100%
rename from custom_components/airstage/strings.json
rename to custom_components/fujitsu_airstage/strings.json
diff --git a/custom_components/airstage/switch.py b/custom_components/fujitsu_airstage/switch.py
similarity index 99%
rename from custom_components/airstage/switch.py
rename to custom_components/fujitsu_airstage/switch.py
index 53dfe71..abc8e11 100644
--- a/custom_components/airstage/switch.py
+++ b/custom_components/fujitsu_airstage/switch.py
@@ -15,9 +15,6 @@
 )
 
 
-_LOGGER = logging.getLogger(__name__)
-
-
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
diff --git a/custom_components/airstage/translations/en.json b/custom_components/fujitsu_airstage/translations/en.json
similarity index 100%
rename from custom_components/airstage/translations/en.json
rename to custom_components/fujitsu_airstage/translations/en.json