diff --git a/model_data/simulation_system/generate_rdsap_change.py b/model_data/simulation_system/generate_rdsap_change.py
index 0c8c1a21..50ccaee6 100644
--- a/model_data/simulation_system/generate_rdsap_change.py
+++ b/model_data/simulation_system/generate_rdsap_change.py
@@ -55,24 +55,22 @@ def process_and_prune_desriptions(df, cleaned_lookup):
         "walls": [
             'original_description', 'clean_description', 'thermal_transmittance_unit',
             'original_description_ENDING', 'clean_description_ENDING',
-            'thermal_transmittance_ENDING', 'thermal_transmittance_unit_ENDING',
+            'thermal_transmittance_unit_ENDING',
             'is_cavity_wall_ENDING', 'is_filled_cavity_ENDING',
             'is_solid_brick_ENDING', 'is_system_built_ENDING',
             'is_timber_frame_ENDING', 'is_granite_or_whinstone_ENDING',
             'is_as_built_ENDING', 'is_cob_ENDING', 'is_assumed_ENDING',
-            'is_sandstone_or_limestone_ENDING'
+            'is_sandstone_or_limestone_ENDING',
+            # Re remove the is_assumed columns
+            "is_assumed", "is_assumed_ENDING"
         ],
         "floor": [
-            'original_description', 'thermal_transmittance',
-            'thermal_transmittance_unit', 'is_assumed', 'is_to_unheated_space',
-            'is_to_external_air', 'is_suspended', 'is_solid',
-            'another_property_below', 'insulation_thickness', 'no_data',
-            'original_description_ENDING',
-            'thermal_transmittance_ENDING', 'thermal_transmittance_unit_ENDING',
-            'is_assumed_ENDING', 'is_to_unheated_space_ENDING',
-            'is_to_external_air_ENDING', 'is_suspended_ENDING', 'is_solid_ENDING',
-            'another_property_below_ENDING', 'insulation_thickness_ENDING',
-            'no_data_ENDING',
+            "original_description", "clean_description", "thermal_transmittance_unit",
+            "no_data", "no_data_ENDING", "original_description_ENDING",
+            "clean_description_ENDING", "thermal_transmittance_unit_ENDING",
+            "is_suspended_ENDING", "is_solid_ENDING", "another_property_below_ENDING",
+            "is_to_unheated_space_ENDING", "is_to_external_air_ENDING", "is_assumed",
+            "is_assumed_ENDING"
         ],
         "roof": [
             'original_description', 'thermal_transmittance',
@@ -119,7 +117,8 @@ def process_and_prune_desriptions(df, cleaned_lookup):
                 (df["is_suspended"] == df["is_suspended_ENDING"]) &
                 (df["is_solid"] == df["is_solid_ENDING"]) &
                 (df["another_property_below"] == df["another_property_below_ENDING"]) &
-                (df["is_to_unheated_space"] == df["is_to_unheated_space_ENDING"])
+                (df["is_to_unheated_space"] == df["is_to_unheated_space_ENDING"]) &
+                (df["is_to_external_air"] == df["is_to_external_air_ENDING"])
                 ]
         else:
             df = df[
@@ -143,6 +142,23 @@ def process_and_prune_desriptions(df, cleaned_lookup):
             columns=cols_to_drop[component] + original_cols
         )
 
+        # If we have an insulation_thickness column, rename it
+        if "insulation_thickness" in cleaned_lookup[f"{component}-description"][0]:
+            df = df.rename(
+                columns={
+                    "insulation_thickness": f"{component}_insulation_thickness",
+                    "insulation_thickness_ENDING": f"{component}_insulation_thickness_ENDING",
+                }
+            )
+        # If we have thermal transmittance, rename it
+        if "thermal_transmittance" in cleaned_lookup[f"{component}-description"][0]:
+            df = df.rename(
+                columns={
+                    "thermal_transmittance": f"{component}_thermal_transmittance",
+                    "thermal_transmittance_ENDING": f"{component}_thermal_transmittance_ENDING",
+                }
+            )
+
     return df