diff --git a/datatypes/epc/domain/__init__.py b/datatypes/epc/domain/__init__.py
index 6ef7a4c0..e69de29b 100644
--- a/datatypes/epc/domain/__init__.py
+++ b/datatypes/epc/domain/__init__.py
@@ -1,31 +0,0 @@
-from .dwelling import (
-    Dwelling,
-    FloorDimensions,
-    FloorDetails,
-    HotWaterSystem,
-    LightingDetails,
-    MainHeatingSystem,
-    PropertyDetails,
-    RenewablesDetails,
-    RoofDetails,
-    SecondaryHeatingSystem,
-    VentilationDetails,
-    WallDetails,
-    WindowDetails,
-)
-
-__all__ = [
-    "Dwelling",
-    "FloorDimensions",
-    "FloorDetails",
-    "HotWaterSystem",
-    "LightingDetails",
-    "MainHeatingSystem",
-    "PropertyDetails",
-    "RenewablesDetails",
-    "RoofDetails",
-    "SecondaryHeatingSystem",
-    "VentilationDetails",
-    "WallDetails",
-    "WindowDetails",
-]
diff --git a/datatypes/epc/domain/mapper.py b/datatypes/epc/domain/mapper.py
index 51f13518..58ba5433 100644
--- a/datatypes/epc/domain/mapper.py
+++ b/datatypes/epc/domain/mapper.py
@@ -20,7 +20,7 @@ AnyRdSapSchema = Union[
 ]
 
 
-class DwellingMapper:
+class EpcPropertyDataMapper:
 
     @staticmethod
     def from_site_notes(survey: PasHubRdSapSiteNotes) -> EpcPropertyData:
diff --git a/datatypes/epc/domain/tests/test_from_rdsap_schema.py b/datatypes/epc/domain/tests/test_from_rdsap_schema.py
index a285147e..dcea42c2 100644
--- a/datatypes/epc/domain/tests/test_from_rdsap_schema.py
+++ b/datatypes/epc/domain/tests/test_from_rdsap_schema.py
@@ -5,7 +5,7 @@ from typing import Any, Dict
 import pytest
 
 from datatypes.epc.domain import Dwelling
-from datatypes.epc.domain.mapper import DwellingMapper
+from datatypes.epc.domain.mapper import EpcPropertyDataMapper
 from datatypes.epc.schema.rdsap_schema_21_0_1 import RdSapSchema21_0_1
 from datatypes.epc.schema.tests.helpers import from_dict
 
@@ -25,7 +25,7 @@ class TestFromRdSapSchema21_0_1:
     @pytest.fixture
     def dwelling(self) -> Dwelling:
         schema = from_dict(RdSapSchema21_0_1, load("21_0_1.json"))
-        return DwellingMapper.from_rdsap_schema(schema)
+        return EpcPropertyDataMapper.from_rdsap_schema(schema)
 
     # --- property_details ---