diff --git a/src/Mod/Arch/ArchCommands.py b/src/Mod/Arch/ArchCommands.py
index 0803b5411..83f6059ad 100644
--- a/src/Mod/Arch/ArchCommands.py
+++ b/src/Mod/Arch/ArchCommands.py
@@ -215,12 +215,12 @@ def removeShape(objs,mark=True):
                 print tp
                 if tp == "Structure":
                     FreeCAD.ActiveDocument.removeObject(name)
-                    import Structure
-                    str = Structure.makeStructure(length=dims[1],width=dims[2],height=dims[3],name=name)
+                    import ArchStructure
+                    str = ArchStructure.makeStructure(length=dims[1],width=dims[2],height=dims[3],name=name)
                     str.Placement = dims[0]
                 elif tp == "Wall":
                     FreeCAD.ActiveDocument.removeObject(name)
-                    import Wall
+                    import ArchWall
                     length = dims[1]
                     width = dims[2]
                     v1 = Vector(length/2,0,0)
@@ -228,7 +228,7 @@ def removeShape(objs,mark=True):
                     v1 = dims[0].multVec(v1)
                     v2 = dims[0].multVec(v2)
                     line = Draft.makeLine(v1,v2)
-                    wal = Wall.makeWall(line,width=width,height=dims[3],name=name)
+                    wal = ArchWall.makeWall(line,width=width,height=dims[3],name=name)
         else:
             if mark:
                 obj.ViewObject.ShapeColor = (1.0,0.0,0.0,1.0)