diff --git a/src/Mod/Arch/ArchEquipment.py b/src/Mod/Arch/ArchEquipment.py
index 5673535cd0..93caa762ff 100644
--- a/src/Mod/Arch/ArchEquipment.py
+++ b/src/Mod/Arch/ArchEquipment.py
@@ -285,7 +285,7 @@ class _Equipment(ArchComponent.Component):
             # IFC2x3 does know a IfcFurnishingElement
             obj.IfcType = "Furnishing Element"
         else:
-            obj.IfcType = "Undefined"
+            obj.IfcType = "Building Element Proxy"
         # Add features in the SketchArch External Add-on, if present
         self.addSketchArchFeatures(obj)
 
diff --git a/src/Mod/Arch/ArchPipe.py b/src/Mod/Arch/ArchPipe.py
index c1f8aecd3b..bdcdfac1ab 100644
--- a/src/Mod/Arch/ArchPipe.py
+++ b/src/Mod/Arch/ArchPipe.py
@@ -190,7 +190,7 @@ class _ArchPipe(ArchComponent.Component):
             obj.IfcType = "Pipe Segment"
         else:
             # IFC2x3 does not know a Pipe Segment
-            obj.IfcType = "Undefined"
+            obj.IfcType = "Building Element Proxy"
 
     def setProperties(self,obj):
 
diff --git a/src/Mod/Arch/ArchProfile.py b/src/Mod/Arch/ArchProfile.py
index 4513093d21..063e6646c0 100644
--- a/src/Mod/Arch/ArchProfile.py
+++ b/src/Mod/Arch/ArchProfile.py
@@ -516,7 +516,7 @@ class ProfileTaskPanel:
         elif isinstance(self.obj.Proxy,_ProfileT):
             self.type = "T"
         else:
-            self.type = "Undefined"
+            self.type = "Building Element Proxy"
         self.form = QtGui.QWidget()
         layout = QtGui.QVBoxLayout(self.form)
         self.comboCategory = QtGui.QComboBox(self.form)
diff --git a/src/Mod/Arch/ArchStructure.py b/src/Mod/Arch/ArchStructure.py
index 4711f53cbb..a7168b745f 100644
--- a/src/Mod/Arch/ArchStructure.py
+++ b/src/Mod/Arch/ArchStructure.py
@@ -117,7 +117,7 @@ def makeStructure(baseobj=None,length=None,width=None,height=None,name=None):
                 obj.Length = h
 
     if not height and not length:
-        obj.IfcType = "Undefined"
+        obj.IfcType = "Building Element Proxy"
         obj.Label = name if name else translate("Arch","Structure")
     elif obj.Length > obj.Height:
         obj.IfcType = "Beam"
diff --git a/src/Mod/Arch/Presets/ifc_products_IFC2X3.json b/src/Mod/Arch/Presets/ifc_products_IFC2X3.json
index d5b26f0807..9f7ac4d6f2 100644
--- a/src/Mod/Arch/Presets/ifc_products_IFC2X3.json
+++ b/src/Mod/Arch/Presets/ifc_products_IFC2X3.json
@@ -4007,11 +4007,5 @@
             }
         ],
         "complex_attributes": []
-    },
-    "IfcUndefined": {
-        "is_abstract": false,
-        "parent": "IfcObject",
-        "attributes": [],
-        "complex_attributes": []
     }
 }
diff --git a/src/Mod/Arch/Presets/ifc_products_IFC4.json b/src/Mod/Arch/Presets/ifc_products_IFC4.json
index 08606ea66c..ca10dac135 100644
--- a/src/Mod/Arch/Presets/ifc_products_IFC4.json
+++ b/src/Mod/Arch/Presets/ifc_products_IFC4.json
@@ -13265,11 +13265,5 @@
                 "type": "IfcProductRepresentation"
             }
         ]
-    },
-    "IfcUndefined": {
-        "is_abstract": false,
-        "parent": "IfcObject",
-        "attributes": [],
-        "complex_attributes": []
     }
 }
diff --git a/src/Mod/Arch/TestArch.py b/src/Mod/Arch/TestArch.py
index f1907bf880..40f513ee31 100644
--- a/src/Mod/Arch/TestArch.py
+++ b/src/Mod/Arch/TestArch.py
@@ -678,7 +678,7 @@ class ArchTest(unittest.TestCase):
     def testRemove(self):
         App.Console.PrintLog ('Checking Arch Remove...\n')
         l=Draft.makeLine(App.Vector(0,0,0),App.Vector(2,0,0))
-        w = Arch.makeWall(l,width=0.2,height=2)
+        w = Arch.makeWall(l,width=0.2,height=2,align="Right")
         sb = Part.makeBox(1,1,1)
         b = App.ActiveDocument.addObject('Part::Feature','Box')
         b.Shape = sb