diff --git a/homeassistant/components/homekit_controller/connection.py b/homeassistant/components/homekit_controller/connection.py
index db85dbda3d5..b937e7f2e0b 100644
--- a/homeassistant/components/homekit_controller/connection.py
+++ b/homeassistant/components/homekit_controller/connection.py
@@ -272,7 +272,7 @@ class HKDevice:
                     self.hass,
                     self.async_update_available_state,
                     timedelta(seconds=BLE_AVAILABILITY_CHECK_INTERVAL),
-                    name=f"HomeKit Controller {self.unique_id} BLE availability "
+                    name=f"HomeKit Device {self.unique_id} BLE availability "
                     "check poll",
                 )
             )
@@ -291,7 +291,7 @@ class HKDevice:
                 self.hass,
                 self.async_request_update,
                 self.pairing.poll_interval,
-                name=f"HomeKit Controller {self.unique_id} availability check poll",
+                name=f"HomeKit Device {self.unique_id} availability check poll",
             )
         )
 
@@ -714,7 +714,7 @@ class HKDevice:
             if not self._polling_lock_warned:
                 _LOGGER.warning(
                     (
-                        "HomeKit controller update skipped as previous poll still in"
+                        "HomeKit device update skipped as previous poll still in"
                         " flight: %s"
                     ),
                     self.unique_id,
@@ -725,7 +725,7 @@ class HKDevice:
         if self._polling_lock_warned:
             _LOGGER.info(
                 (
-                    "HomeKit controller no longer detecting back pressure - not"
+                    "HomeKit device no longer detecting back pressure - not"
                     " skipping poll: %s"
                 ),
                 self.unique_id,
@@ -733,7 +733,7 @@ class HKDevice:
             self._polling_lock_warned = False
 
         async with self._polling_lock:
-            _LOGGER.debug("Starting HomeKit controller update: %s", self.unique_id)
+            _LOGGER.debug("Starting HomeKit device update: %s", self.unique_id)
 
             try:
                 new_values_dict = await self.get_characteristics(
@@ -755,7 +755,7 @@ class HKDevice:
             self._poll_failures = 0
             self.process_new_events(new_values_dict)
 
-            _LOGGER.debug("Finished HomeKit controller update: %s", self.unique_id)
+            _LOGGER.debug("Finished HomeKit device update: %s", self.unique_id)
 
     def process_new_events(
         self, new_values_dict: dict[tuple[int, int], dict[str, Any]]
diff --git a/homeassistant/components/homekit_controller/manifest.json b/homeassistant/components/homekit_controller/manifest.json
index 19167e762e9..d0a88bf8249 100644
--- a/homeassistant/components/homekit_controller/manifest.json
+++ b/homeassistant/components/homekit_controller/manifest.json
@@ -1,6 +1,6 @@
 {
   "domain": "homekit_controller",
-  "name": "HomeKit Controller",
+  "name": "HomeKit Device",
   "after_dependencies": ["thread"],
   "bluetooth": [
     {
diff --git a/homeassistant/components/homekit_controller/strings.json b/homeassistant/components/homekit_controller/strings.json
index 2291f66d88a..7420ef7f3f9 100644
--- a/homeassistant/components/homekit_controller/strings.json
+++ b/homeassistant/components/homekit_controller/strings.json
@@ -1,18 +1,18 @@
 {
-  "title": "HomeKit Controller",
+  "title": "HomeKit Device",
   "config": {
     "flow_title": "{name} ({category})",
     "step": {
       "user": {
         "title": "Device selection",
-        "description": "HomeKit Controller communicates over the local area network using a secure encrypted connection without a separate HomeKit controller or iCloud. Select the device you want to pair with:",
+        "description": "HomeKit Device communicates over the local area network using a secure encrypted connection without a separate HomeKit Controller or iCloud. Select the device you want to pair with:",
         "data": {
           "device": "Device"
         }
       },
       "pair": {
         "title": "Pair with a device via HomeKit Accessory Protocol",
-        "description": "HomeKit Controller communicates with {name} ({category}) over the local area network using a secure encrypted connection without a separate HomeKit controller or iCloud. Enter your HomeKit pairing code (in the format XXX-XX-XXX) to use this accessory. This code is usually found on the device itself or in the packaging.",
+        "description": "HomeKit Device communicates with {name} ({category}) over the local area network using a secure encrypted connection without a separate HomeKit Controller or iCloud. Enter your HomeKit pairing code (in the format XXX-XX-XXX) to use this accessory. This code is usually found on the device itself or in the packaging.",
         "data": {
           "pairing_code": "Pairing Code",
           "allow_insecure_setup_codes": "Allow pairing with insecure setup codes."