diff --git a/src/ifcfm/ifcfm/basic.py b/src/ifcfm/ifcfm/basic.py
index 61725fc533..28ed242ee3 100644
--- a/src/ifcfm/ifcfm/basic.py
+++ b/src/ifcfm/ifcfm/basic.py
@@ -72,8 +72,8 @@ def get_facility_data(ifc_file, element):
         "ModelProjectID": ifc_file.by_type("IfcProject")[0].GlobalId,
         "ModelSiteID": getattr(get_facility_parent(element, "IfcSite"), "GlobalId", None),
         "ModelBuildingID": element.GlobalId,
-        "LinearUnits": "millimeters",
-        "AreaUnits": "square meters",
+        "LengthUnit": "millimeters",
+        "AreaUnit": "square meters",
         "Phase": ifc_file.by_type("IfcProject")[0].Phase,
     }
 
@@ -99,7 +99,7 @@ def get_space_data(ifc_file, element):
         "Description": element.LongName,
         "ClassificationIdentification": get_classification_identification(element),
         "ClassificationName": get_classification_name(element),
-        "LevelName": getattr(get_facility_parent(element, "IfcBuildingStorey"), "Name", None),
+        "StoreyName": getattr(get_facility_parent(element, "IfcBuildingStorey"), "Name", None),
         "OrganizationName": get_owner_name(element),
         "CreationDate": get_owner_creation_date(element),
         "ModelSoftware": get_owner_application(element),
@@ -261,8 +261,8 @@ config = {
                 "ModelProjectID",
                 "ModelSiteID",
                 "ModelBuildingID",
-                "LinearUnits",
-                "AreaUnits",
+                "LengthUnit",
+                "AreaUnit",
                 "Phase",
             ],
             "colours": "ppppreeeeesss",
@@ -295,7 +295,7 @@ config = {
                 "Description",
                 "ClassificationIdentification",
                 "ClassificationName",
-                "LevelName",
+                "StoreyName",
                 "OrganizationName",
                 "CreationDate",
                 "ModelSoftware",
@@ -305,7 +305,7 @@ config = {
                 "NetFloorArea",
             ],
             "colours": "ppprreeess",
-            "sort": [{"name": "LevelName", "order": "ASC"}, {"name": "Name", "order": "ASC"}],
+            "sort": [{"name": "StoreyName", "order": "ASC"}, {"name": "Name", "order": "ASC"}],
             "get_category_elements": get_spaces,
             "get_element_data": get_space_data,
         },