diff --git a/src/Mod/Arch/Arch.py b/src/Mod/Arch/Arch.py
index 406ff0d44..d1f64572b 100644
--- a/src/Mod/Arch/Arch.py
+++ b/src/Mod/Arch/Arch.py
@@ -29,13 +29,13 @@ import FreeCADGui
 
 FreeCADGui.updateLocale()
 
-from Wall import *
-from Cell import *
-from Floor import *
-from Site import *
-from Building import *
-from Structure import *
-from Commands import *
-from SectionPlane import *
-from Window import *
-from Axis import *
+from ArchWall import *
+from ArchCell import *
+from ArchFloor import *
+from ArchSite import *
+from ArchBuilding import *
+from ArchStructure import *
+from ArchCommands import *
+from ArchSectionPlane import *
+from ArchWindow import *
+from ArchAxis import *
diff --git a/src/Mod/Arch/Axis.py b/src/Mod/Arch/ArchAxis.py
similarity index 100%
rename from src/Mod/Arch/Axis.py
rename to src/Mod/Arch/ArchAxis.py
diff --git a/src/Mod/Arch/Building.py b/src/Mod/Arch/ArchBuilding.py
similarity index 100%
rename from src/Mod/Arch/Building.py
rename to src/Mod/Arch/ArchBuilding.py
diff --git a/src/Mod/Arch/Cell.py b/src/Mod/Arch/ArchCell.py
similarity index 100%
rename from src/Mod/Arch/Cell.py
rename to src/Mod/Arch/ArchCell.py
diff --git a/src/Mod/Arch/Commands.py b/src/Mod/Arch/ArchCommands.py
similarity index 100%
rename from src/Mod/Arch/Commands.py
rename to src/Mod/Arch/ArchCommands.py
diff --git a/src/Mod/Arch/Component.py b/src/Mod/Arch/ArchComponents.py
similarity index 100%
rename from src/Mod/Arch/Component.py
rename to src/Mod/Arch/ArchComponents.py
diff --git a/src/Mod/Arch/Floor.py b/src/Mod/Arch/ArchFloor.py
similarity index 100%
rename from src/Mod/Arch/Floor.py
rename to src/Mod/Arch/ArchFloor.py
diff --git a/src/Mod/Arch/SectionPlane.py b/src/Mod/Arch/ArchSectionPlane.py
similarity index 100%
rename from src/Mod/Arch/SectionPlane.py
rename to src/Mod/Arch/ArchSectionPlane.py
diff --git a/src/Mod/Arch/Site.py b/src/Mod/Arch/ArchSite.py
similarity index 100%
rename from src/Mod/Arch/Site.py
rename to src/Mod/Arch/ArchSite.py
diff --git a/src/Mod/Arch/Structure.py b/src/Mod/Arch/ArchStructure.py
similarity index 100%
rename from src/Mod/Arch/Structure.py
rename to src/Mod/Arch/ArchStructure.py
diff --git a/src/Mod/Arch/Wall.py b/src/Mod/Arch/ArchWall.py
similarity index 100%
rename from src/Mod/Arch/Wall.py
rename to src/Mod/Arch/ArchWall.py
diff --git a/src/Mod/Arch/Window.py b/src/Mod/Arch/ArchWindow.py
similarity index 100%
rename from src/Mod/Arch/Window.py
rename to src/Mod/Arch/ArchWindow.py
diff --git a/src/Mod/Arch/CMakeLists.txt b/src/Mod/Arch/CMakeLists.txt
index c59709a8e..a75a0c4af 100644
--- a/src/Mod/Arch/CMakeLists.txt
+++ b/src/Mod/Arch/CMakeLists.txt
@@ -2,24 +2,24 @@
 SET(Arch_SRCS
     Init.py
     InitGui.py
-    Component.py
-    Cell.py
-    Wall.py
+    ArchComponent.py
+    ArchCell.py
+    ArchWall.py
     importIFC.py
     ifcReader.py
     IFC2X3_TC1.exp
     Arch_rc.py
     Arch.py
-    Building.py
-    Floor.py
-    Site.py
-    Structure.py
-    Commands.py
-    SectionPlane.py
+    ArchBuilding.py
+    ArchFloor.py
+    ArchSite.py
+    ArchStructure.py
+    ArchCommands.py
+    ArchSectionPlane.py
     importDAE.py
     importOBJ.py
-    Window.py
-    Axis.py
+    ArchWindow.py
+    ArchAxis.py
 )
 SOURCE_GROUP("" FILES ${Arch_SRCS})
 
diff --git a/src/Mod/Arch/Makefile.am b/src/Mod/Arch/Makefile.am
index 0066fd6f5..7ceebfc68 100644
--- a/src/Mod/Arch/Makefile.am
+++ b/src/Mod/Arch/Makefile.am
@@ -10,10 +10,10 @@ datadir = $(prefix)/Mod/Arch
 data_DATA = \
 		Arch_rc.py \
 		Arch.py \
-		Component.py \
-		Building.py \
-		Cell.py \
-		Floor.py \
+		ArchComponent.py \
+		ArchBuilding.py \
+		ArchCell.py \
+		ArchFloor.py \
         IFC2X3_TC1.exp \
 		ifcReader.py \
 		importDAE.py \
@@ -21,13 +21,13 @@ data_DATA = \
 		importOBJ.py \
 		Init.py \
 		InitGui.py \
-		Site.py \
-		Structure.py \
-		Wall.py \
-		SectionPlane.py \
-		Window.py \
-		Commands.py \
-		Axis.py
+		ArchSite.py \
+		ArchStructure.py \
+		ArchWall.py \
+		ArchSectionPlane.py \
+		ArchWindow.py \
+		ArchCommands.py \
+		ArchAxis.py
 
 CLEANFILES = $(BUILT_SOURCES)
 
@@ -58,5 +58,7 @@ EXTRA_DIST = \
         Resources/icons/Arch_Site_Tree.svg \
         Resources/icons/Arch_Structure_Tree.svg \
         Resources/icons/Arch_Window_Tree.svg \
+		Resources/icons/Arch_Axis.svg \
+		Resources/icons/Arch_Axis_Tree.svg
 		Resources/ui/archprefs-base.ui
 
diff --git a/src/WindowsInstaller/ModArch.wxi b/src/WindowsInstaller/ModArch.wxi
index bd1944649..94f6217c4 100644
--- a/src/WindowsInstaller/ModArch.wxi
+++ b/src/WindowsInstaller/ModArch.wxi
@@ -28,21 +28,22 @@
             <File Id="ArchInitGuiPy" Name="InitGui.py" DiskId="1" />
             <File Id="ArchPy" Name="Arch.py" DiskId="1" />
             <File Id="ArchRcPy" Name="Arch_rc.py" DiskId="1" />
-            <File Id="ArchBuildingPy" Name="Building.py" DiskId="1" />
-            <File Id="ArchCellPy" Name="Cell.py" DiskId="1" />
-            <File Id="ArchCommandsPy" Name="Commands.py" DiskId="1" />
-            <File Id="ArchComponentPy" Name="Component.py" DiskId="1" />
+            <File Id="ArchBuildingPy" Name="ArchBuilding.py" DiskId="1" />
+            <File Id="ArchCellPy" Name="ArchCell.py" DiskId="1" />
+            <File Id="ArchCommandsPy" Name="ArchCommands.py" DiskId="1" />
+            <File Id="ArchComponentPy" Name="ArchComponent.py" DiskId="1" />
             <File Id="ArchIfcSchemaExp" Name="IFC2X3_TC1.exp" DiskId="1" />
             <File Id="ArchIfcReaderPy" Name="ifcReader.py" DiskId="1" />
             <File Id="importDAEPy" Name="importDAE.py" DiskId="1" />
             <File Id="importIFCPy" Name="importIFC.py" DiskId="1" />
             <File Id="importOBJPy" Name="importOBJ.py" DiskId="1" />
-            <File Id="ArchSitePy" Name="Site.py" DiskId="1" />
-            <File Id="ArchStructurePy" Name="Structure.py" DiskId="1" />
-            <File Id="ArchWallPy" Name="Wall.py" DiskId="1" />
-            <File Id="ArchFloorPy" Name="Floor.py" DiskId="1" />
-            <File Id="ArchSectionPlanePy" Name="SectionPlane.py" DiskId="1" />
-            <File Id="ArchWindowPy" Name="Window.py" DiskId="1" />
+            <File Id="ArchSitePy" Name="ArchSite.py" DiskId="1" />
+            <File Id="ArchStructurePy" Name="ArchStructure.py" DiskId="1" />
+            <File Id="ArchWallPy" Name="ArchWall.py" DiskId="1" />
+            <File Id="ArchFloorPy" Name="ArchFloor.py" DiskId="1" />
+            <File Id="ArchSectionPlanePy" Name="ArchSectionPlane.py" DiskId="1" />
+            <File Id="ArchWindowPy" Name="ArchWindow.py" DiskId="1" />
+            <File Id="ArchAxisPy" Name="ArchAxis.py" DiskId="1" />
         </Component>
     </Directory>
 </Include>