diff --git a/backend/onboarders/tests/test_floor_remapping.py b/backend/onboarders/tests/test_floor_remapping.py
index 26a05d22..c20372b7 100644
--- a/backend/onboarders/tests/test_floor_remapping.py
+++ b/backend/onboarders/tests/test_floor_remapping.py
@@ -1,14 +1,13 @@
 import pytest
 
-from backend.onboarders.epc_descriptions import (
-    EpcConstructionAgeBand,
-    EpcFloorDescriptions,
-)
-from backend.onboarders.mappings.as_built_floor_classifiers import (
+from datatypes.epc.construction_age_band import EpcConstructionAgeBand
+from datatypes.epc.floor import EpcFloorDescriptions
+
+from backend.onboarders.mappings.parity.as_built_floor_classifiers import (
     unknown_floor_as_built,
     unknown_floor_retrofitted,
-    solid_floor_as_built,
-    suspended_floor_as_built,
+    map_solid_floor_as_built,
+    map_suspended_floor_as_built,
 )
 
 
@@ -75,7 +74,7 @@ def test_unknown_floor_retrofitted(age_band, expected):
     ],
 )
 def test_solid_floor_as_built(age_band, expected):
-    assert solid_floor_as_built(age_band) == expected
+    assert map_solid_floor_as_built(age_band) == expected
 
 
 @pytest.mark.parametrize(
@@ -95,4 +94,4 @@ def test_solid_floor_as_built(age_band, expected):
     ],
 )
 def test_suspended_floor_as_built(age_band, expected):
-    assert suspended_floor_as_built(age_band) == expected
+    assert map_suspended_floor_as_built(age_band) == expected
diff --git a/backend/onboarders/tests/test_roof_remapping.py b/backend/onboarders/tests/test_roof_remapping.py
index a08471f9..cc19e057 100644
--- a/backend/onboarders/tests/test_roof_remapping.py
+++ b/backend/onboarders/tests/test_roof_remapping.py
@@ -1,16 +1,14 @@
 import pytest
 
-from backend.onboarders.epc_descriptions import (
-    EpcConstructionAgeBand,
-    EpcRoofDescriptions,
-    EpcEfficiency,
-    resolve_roof_efficiency,
-)
+from datatypes.epc.construction_age_band import EpcConstructionAgeBand
+from datatypes.epc.roof import EpcRoofDescriptions
+from datatypes.epc.efficiency import EpcEfficiency
 
-from backend.onboarders.mappings.as_built_roof_classifiers import (
-    classify_flat_roof,
-    classify_sloping_ceiling_roof,
+from backend.onboarders.mappings.parity.as_built_roof_classifiers import (
+    map_flat_roof,
+    map_sloping_ceiling_roof,
 )
+from backend.onboarders.mappings.parity.roof import resolve_roof_efficiency
 
 
 # ---------------------------------------------------------------------
@@ -30,7 +28,7 @@ from backend.onboarders.mappings.as_built_roof_classifiers import (
     ],
 )
 def test_classify_flat_roof(age_band, expected):
-    assert classify_flat_roof(age_band) == expected
+    assert map_flat_roof(age_band) == expected
 
 
 @pytest.mark.parametrize(
@@ -45,7 +43,7 @@ def test_classify_flat_roof(age_band, expected):
     ],
 )
 def test_classify_sloping_ceiling_roof(age_band, expected):
-    assert classify_sloping_ceiling_roof(age_band) == expected
+    assert map_sloping_ceiling_roof(age_band) == expected
 
 
 # ---------------------------------------------------------------------
diff --git a/backend/onboarders/tests/test_wall_remapping.py b/backend/onboarders/tests/test_wall_remapping.py
index eaac5afb..c9476211 100644
--- a/backend/onboarders/tests/test_wall_remapping.py
+++ b/backend/onboarders/tests/test_wall_remapping.py
@@ -1,13 +1,11 @@
 import pytest
 
-from backend.onboarders.epc_descriptions import (
-    EpcConstructionAgeBand,
-    EpcWallDescriptions,
-    EpcEfficiency,
-    resolve_wall_efficiency,
-)
+from datatypes.epc.construction_age_band import EpcConstructionAgeBand
+from datatypes.epc.walls import EpcWallDescriptions
+from datatypes.epc.efficiency import EpcEfficiency
 
-from backend.onboarders.mappings.as_built_wall_classifiers import (
+from backend.onboarders.mappings.parity.walls import resolve_wall_efficiency
+from backend.onboarders.mappings.parity.as_built_wall_classifiers import (
     map_cavity_wall_insulation,
     map_solid_wall_insulation,
     map_timber_frame_wall_insulation,