diff --git a/src/ifcopenshell-python/test/api/alignment/test_add_segment_to_curve.py b/src/ifcopenshell-python/test/api/alignment/test_add_segment_to_curve.py
index 8098f7b51b..92dd120a1c 100644
--- a/src/ifcopenshell-python/test/api/alignment/test_add_segment_to_curve.py
+++ b/src/ifcopenshell-python/test/api/alignment/test_add_segment_to_curve.py
@@ -22,7 +22,7 @@ import ifcopenshell.api.context
 
 
 def test_add_segment_to_curve():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     project = file.createIfcProject(Name="Test")
     geometric_representation_context = ifcopenshell.api.context.add_context(file, context_type="Model")
     axis_model_representation_subcontext = ifcopenshell.api.context.add_context(
diff --git a/src/ifcopenshell-python/test/api/alignment/test_add_segment_to_layout.py b/src/ifcopenshell-python/test/api/alignment/test_add_segment_to_layout.py
index 96ad157f60..4b52eba82d 100644
--- a/src/ifcopenshell-python/test/api/alignment/test_add_segment_to_layout.py
+++ b/src/ifcopenshell-python/test/api/alignment/test_add_segment_to_layout.py
@@ -22,7 +22,7 @@ import ifcopenshell.api.context
 
 
 def test_add_segment_to_layout():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     project = file.createIfcProject(Name="Test")
     geometric_representation_context = ifcopenshell.api.context.add_context(file, context_type="Model")
     axis_model_representation_subcontext = ifcopenshell.api.context.add_context(
diff --git a/src/ifcopenshell-python/test/api/alignment/test_add_stationing_to_alignment.py b/src/ifcopenshell-python/test/api/alignment/test_add_stationing_to_alignment.py
index 26344871cf..19017db300 100644
--- a/src/ifcopenshell-python/test/api/alignment/test_add_stationing_to_alignment.py
+++ b/src/ifcopenshell-python/test/api/alignment/test_add_stationing_to_alignment.py
@@ -22,7 +22,7 @@ import ifcopenshell.api.context
 
 
 def test_add_stationing_to_alignment():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     project = file.createIfcProject(Name="Test")
     geometric_representation_context = ifcopenshell.api.context.add_context(file, context_type="Model")
     axis_model_representation_subcontext = ifcopenshell.api.context.add_context(
diff --git a/src/ifcopenshell-python/test/api/alignment/test_add_vertical_by_pi_method.py b/src/ifcopenshell-python/test/api/alignment/test_add_vertical_by_pi_method.py
index 53a8f7c0df..53a4957b5d 100644
--- a/src/ifcopenshell-python/test/api/alignment/test_add_vertical_by_pi_method.py
+++ b/src/ifcopenshell-python/test/api/alignment/test_add_vertical_by_pi_method.py
@@ -22,7 +22,7 @@ import ifcopenshell.api.context
 
 
 def test_add_vertical_by_pi_method():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     project = file.createIfcProject(Name="Test")
     geometric_representation_context = ifcopenshell.api.context.add_context(file, context_type="Model")
     axis_model_representation_subcontext = ifcopenshell.api.context.add_context(
diff --git a/src/ifcopenshell-python/test/api/alignment/test_distance_along_from_station.py b/src/ifcopenshell-python/test/api/alignment/test_distance_along_from_station.py
index fa42765c56..4d305c62b6 100644
--- a/src/ifcopenshell-python/test/api/alignment/test_distance_along_from_station.py
+++ b/src/ifcopenshell-python/test/api/alignment/test_distance_along_from_station.py
@@ -22,7 +22,7 @@ import ifcopenshell.api.context
 
 
 def test_add_stationing_to_alignment():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     project = file.createIfcProject(Name="Test")
     geometric_representation_context = ifcopenshell.api.context.add_context(file, context_type="Model")
     axis_model_representation_subcontext = ifcopenshell.api.context.add_context(
diff --git a/src/ifcopenshell-python/test/api/alignment/test_get_basis_curve.py b/src/ifcopenshell-python/test/api/alignment/test_get_basis_curve.py
index ee1a65af19..d08bf70476 100644
--- a/src/ifcopenshell-python/test/api/alignment/test_get_basis_curve.py
+++ b/src/ifcopenshell-python/test/api/alignment/test_get_basis_curve.py
@@ -25,7 +25,7 @@ import ifcopenshell.api.context
 
 # class TestGetBasisCurve(test.bootstrap.IFC4X3):
 def test_horizontal():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     project = file.createIfcProject(Name="Test")
     geometric_representation_context = ifcopenshell.api.context.add_context(file, context_type="Model")
     axis_model_representation_subcontext = ifcopenshell.api.context.add_context(
@@ -46,7 +46,7 @@ def test_horizontal():
 
 
 def test_horizontal_and_vertical():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     project = file.createIfcProject(Name="Test")
     geometric_representation_context = ifcopenshell.api.context.add_context(file, context_type="Model")
     axis_model_representation_subcontext = ifcopenshell.api.context.add_context(
diff --git a/src/ifcopenshell-python/test/api/alignment/test_get_curve.py b/src/ifcopenshell-python/test/api/alignment/test_get_curve.py
index a00104d1b6..01fddaf749 100644
--- a/src/ifcopenshell-python/test/api/alignment/test_get_curve.py
+++ b/src/ifcopenshell-python/test/api/alignment/test_get_curve.py
@@ -25,7 +25,7 @@ import ifcopenshell.api.context
 
 # class TestGetCurve(test.bootstrap.IFC4X3):
 def test_horizontal():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     project = file.createIfcProject(Name="Test")
     geometric_representation_context = ifcopenshell.api.context.add_context(file, context_type="Model")
     axis_model_representation_subcontext = ifcopenshell.api.context.add_context(
@@ -46,7 +46,7 @@ def test_horizontal():
 
 
 def test_horizontal_and_vertical():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     project = file.createIfcProject(Name="Test")
     geometric_representation_context = ifcopenshell.api.context.add_context(file, context_type="Model")
     axis_model_representation_subcontext = ifcopenshell.api.context.add_context(
diff --git a/src/ifcopenshell-python/test/api/alignment/test_has_zero_length_segment.py b/src/ifcopenshell-python/test/api/alignment/test_has_zero_length_segment.py
index b70002baa5..a200e58e55 100644
--- a/src/ifcopenshell-python/test/api/alignment/test_has_zero_length_segment.py
+++ b/src/ifcopenshell-python/test/api/alignment/test_has_zero_length_segment.py
@@ -26,7 +26,7 @@ import ifcopenshell.api.nest
 
 
 def _test_business_definition():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     project = file.createIfcProject(Name="Test")
     geometric_representation_context = ifcopenshell.api.context.add_context(file, context_type="Model")
     axis_model_representation_subcontext = ifcopenshell.api.context.add_context(
@@ -70,7 +70,7 @@ def _test_business_definition():
 
 
 def _test_geometric_definition():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     project = file.createIfcProject(Name="Test")
     geometric_representation_context = ifcopenshell.api.context.add_context(file, context_type="Model")
     axis_model_representation_subcontext = ifcopenshell.api.context.add_context(
diff --git a/src/ifcopenshell-python/test/api/alignment/test_map_alignment_cant_segment.py b/src/ifcopenshell-python/test/api/alignment/test_map_alignment_cant_segment.py
index 3e938df6e5..a909a75ab9 100644
--- a/src/ifcopenshell-python/test/api/alignment/test_map_alignment_cant_segment.py
+++ b/src/ifcopenshell-python/test/api/alignment/test_map_alignment_cant_segment.py
@@ -1606,7 +1606,7 @@ def _SineCurve_100_0__inf__300_1_Meter(file):
 
 
 def test_map_alignment_cant_segment():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     _BlossCurve_100_0_300_1000_1_Meter(file)
     _BlossCurve_100_0__300__1000_1_Meter(file)
     _BlossCurve_100_0_300_inf_1_Meter(file)
diff --git a/src/ifcopenshell-python/test/api/alignment/test_map_alignment_horizontal_segment.py b/src/ifcopenshell-python/test/api/alignment/test_map_alignment_horizontal_segment.py
index bbe744e537..2d3ff69140 100644
--- a/src/ifcopenshell-python/test/api/alignment/test_map_alignment_horizontal_segment.py
+++ b/src/ifcopenshell-python/test/api/alignment/test_map_alignment_horizontal_segment.py
@@ -2032,7 +2032,7 @@ def _SineCurve_100_0__inf__300_1_Meter(file):
 
 
 def test_map_alignment_horizontal_segment():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     _BlossCurve_100_0_300_1000_1_Meter(file)
     _BlossCurve_100_0__300__1000_1_Meter(file)
     _BlossCurve_100_0_300_inf_1_Meter(file)
diff --git a/src/ifcopenshell-python/test/api/alignment/test_map_alignment_vertical_segment.py b/src/ifcopenshell-python/test/api/alignment/test_map_alignment_vertical_segment.py
index 0d72fe6b83..53deed18de 100644
--- a/src/ifcopenshell-python/test/api/alignment/test_map_alignment_vertical_segment.py
+++ b/src/ifcopenshell-python/test/api/alignment/test_map_alignment_vertical_segment.py
@@ -766,7 +766,7 @@ def _ParabolicArc_100_0_10_0__1_0__0_5_1_Meter(file):
 
 
 def test_map_alignment_vertical_segment():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     _CircularArc_100_0_10_0_0_0_0_5_1_Meter(file)
     _CircularArc_100_0_10_0_0_0__0_5_1_Meter(file)
     _CircularArc_100_0_10_0_0_5_0_0_1_Meter(file)
diff --git a/src/ifcopenshell-python/test/api/alignment/test_name_segments.py b/src/ifcopenshell-python/test/api/alignment/test_name_segments.py
index 4ad01063d5..8423291a99 100644
--- a/src/ifcopenshell-python/test/api/alignment/test_name_segments.py
+++ b/src/ifcopenshell-python/test/api/alignment/test_name_segments.py
@@ -22,7 +22,7 @@ import ifcopenshell.api.context
 
 
 def test_name_segments():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     project = file.createIfcProject(Name="Test")
     geometric_representation_context = ifcopenshell.api.context.add_context(file, context_type="Model")
     axis_model_representation_subcontext = ifcopenshell.api.context.add_context(
diff --git a/src/ifcopenshell-python/test/api/alignment/test_update_curve_segment_transition_code.py b/src/ifcopenshell-python/test/api/alignment/test_update_curve_segment_transition_code.py
index fcfe6cb2af..2bb47b4f79 100644
--- a/src/ifcopenshell-python/test/api/alignment/test_update_curve_segment_transition_code.py
+++ b/src/ifcopenshell-python/test/api/alignment/test_update_curve_segment_transition_code.py
@@ -22,7 +22,7 @@ import ifcopenshell.api.context
 
 
 def _test1():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     project = file.createIfcProject(Name="Test")
     geometric_representation_context = ifcopenshell.api.context.add_context(file, context_type="Model")
     axis_model_representation_subcontext = ifcopenshell.api.context.add_context(
@@ -84,7 +84,7 @@ def _test1():
 
 
 def _test2():
-    file = ifcopenshell.file(schema="IFC4X3_ADD2")
+    file = ifcopenshell.file(schema="IFC4X3")
     project = file.createIfcProject(Name="Test")
     geometric_representation_context = ifcopenshell.api.context.add_context(file, context_type="Model")
     axis_model_representation_subcontext = ifcopenshell.api.context.add_context(