diff --git a/homeassistant/components/xbox/binary_sensor.py b/homeassistant/components/xbox/binary_sensor.py
index 0f0b9799d3d..af95834425a 100644
--- a/homeassistant/components/xbox/binary_sensor.py
+++ b/homeassistant/components/xbox/binary_sensor.py
@@ -10,9 +10,9 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .base_sensor import XboxBaseSensorEntity
 from .const import DOMAIN
 from .coordinator import XboxUpdateCoordinator
+from .entity import XboxBaseEntity
 
 PRESENCE_ATTRIBUTES = ["online", "in_party", "in_game", "in_multiplayer"]
 
@@ -32,7 +32,7 @@ async def async_setup_entry(
     update_friends()
 
 
-class XboxBinarySensorEntity(XboxBaseSensorEntity, BinarySensorEntity):
+class XboxBinarySensorEntity(XboxBaseEntity, BinarySensorEntity):
     """Representation of a Xbox presence state."""
 
     @property
diff --git a/homeassistant/components/xbox/base_sensor.py b/homeassistant/components/xbox/entity.py
similarity index 97%
rename from homeassistant/components/xbox/base_sensor.py
rename to homeassistant/components/xbox/entity.py
index f252385d4ca..d4a63b71b39 100644
--- a/homeassistant/components/xbox/base_sensor.py
+++ b/homeassistant/components/xbox/entity.py
@@ -11,7 +11,7 @@ from .const import DOMAIN
 from .coordinator import PresenceData, XboxUpdateCoordinator
 
 
-class XboxBaseSensorEntity(CoordinatorEntity[XboxUpdateCoordinator]):
+class XboxBaseEntity(CoordinatorEntity[XboxUpdateCoordinator]):
     """Base Sensor for the Xbox Integration."""
 
     def __init__(
diff --git a/homeassistant/components/xbox/sensor.py b/homeassistant/components/xbox/sensor.py
index ff6591d5b3e..f269e0a5bb9 100644
--- a/homeassistant/components/xbox/sensor.py
+++ b/homeassistant/components/xbox/sensor.py
@@ -10,9 +10,9 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .base_sensor import XboxBaseSensorEntity
 from .const import DOMAIN
 from .coordinator import XboxUpdateCoordinator
+from .entity import XboxBaseEntity
 
 SENSOR_ATTRIBUTES = ["status", "gamer_score", "account_tier", "gold_tenure"]
 
@@ -34,7 +34,7 @@ async def async_setup_entry(
     update_friends()
 
 
-class XboxSensorEntity(XboxBaseSensorEntity, SensorEntity):
+class XboxSensorEntity(XboxBaseEntity, SensorEntity):
     """Representation of a Xbox presence state."""
 
     @property