diff --git a/custom_components/idrac_power/binary_sensor.py b/custom_components/idrac_power/binary_sensor.py
index cd1ff86..1ddf4b8 100644
--- a/custom_components/idrac_power/binary_sensor.py
+++ b/custom_components/idrac_power/binary_sensor.py
@@ -34,7 +34,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_e
     serial = info[JSON_SERIAL_NUMBER]
 
     device_info = DeviceInfo(
-        identifiers={('serial', serial)},
+        identifiers={(DOMAIN, serial)},
         name=name,
         manufacturer=manufacturer,
         model=model,
diff --git a/custom_components/idrac_power/button.py b/custom_components/idrac_power/button.py
index ba146c3..d4cacec 100644
--- a/custom_components/idrac_power/button.py
+++ b/custom_components/idrac_power/button.py
@@ -28,7 +28,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_e
     serial = info[JSON_SERIAL_NUMBER]
 
     device_info = DeviceInfo(
-        identifiers={('serial', serial)},
+        identifiers={(DOMAIN, serial)},
         name=name,
         manufacturer=manufacturer,
         model=model,
@@ -37,7 +37,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_e
     )
 
     async_add_entities([
-        IdracPowerONButton(hass, rest_client, device_info, f"{serial}_{name}_status", name),
+        IdracPowerONButton(hass, rest_client, device_info, f"{serial}_{name}_power_on", name),
         IdracRefreshButton(hass, rest_client, device_info, f"{serial}_{name}_refresh", name)
     ])
 
@@ -70,7 +70,7 @@ def __init__(self, hass, rest: IdracRest, device_info, unique_id, name):
         self.rest = rest
 
         self.entity_description = ButtonEntityDescription(
-            key='power_on',
+            key='refresh',
             name=f"Refresh {name}",
             icon='mdi:power',
             device_class=ButtonDeviceClass.UPDATE,
diff --git a/custom_components/idrac_power/sensor.py b/custom_components/idrac_power/sensor.py
index afee4c6..11a5f5d 100644
--- a/custom_components/idrac_power/sensor.py
+++ b/custom_components/idrac_power/sensor.py
@@ -37,7 +37,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_e
     serial = info[JSON_SERIAL_NUMBER]
 
     device_info = DeviceInfo(
-        identifiers={('serial', serial)},
+        identifiers={(DOMAIN, serial)},
         name=name,
         manufacturer=manufacturer,
         model=model,