diff --git a/src/Mod/Material/App/Array2DPyImpl.cpp b/src/Mod/Material/App/Array2DPyImp.cpp
similarity index 100%
rename from src/Mod/Material/App/Array2DPyImpl.cpp
rename to src/Mod/Material/App/Array2DPyImp.cpp
diff --git a/src/Mod/Material/App/Array3DPyImpl.cpp b/src/Mod/Material/App/Array3DPyImp.cpp
similarity index 100%
rename from src/Mod/Material/App/Array3DPyImpl.cpp
rename to src/Mod/Material/App/Array3DPyImp.cpp
diff --git a/src/Mod/Material/App/CMakeLists.txt b/src/Mod/Material/App/CMakeLists.txt
index 98bf98a67a..da3cc37772 100644
--- a/src/Mod/Material/App/CMakeLists.txt
+++ b/src/Mod/Material/App/CMakeLists.txt
@@ -55,23 +55,23 @@ generate_from_xml(UUIDsPy)
 SET(Python_SRCS
     Exceptions.h
     Array2DPy.xml
-    Array2DPyImpl.cpp
+    Array2DPyImp.cpp
     Array3DPy.xml
-    Array3DPyImpl.cpp
+    Array3DPyImp.cpp
     MaterialManagerPy.xml
-    MaterialManagerPyImpl.cpp
+    MaterialManagerPyImp.cpp
     MaterialPy.xml
-    MaterialPyImpl.cpp
+    MaterialPyImp.cpp
     MaterialFilterPy.xml
-    MaterialFilterPyImpl.cpp
+    MaterialFilterPyImp.cpp
     ModelManagerPy.xml
-    ModelManagerPyImpl.cpp
+    ModelManagerPyImp.cpp
     ModelPropertyPy.xml
-    ModelPropertyPyImpl.cpp
+    ModelPropertyPyImp.cpp
     ModelPy.xml
-    ModelPyImpl.cpp
+    ModelPyImp.cpp
     UUIDsPy.xml
-    UUIDsPyImpl.cpp
+    UUIDsPyImp.cpp
 )
 SOURCE_GROUP("Python" FILES ${Python_SRCS})
 
diff --git a/src/Mod/Material/App/MaterialFilterPyImpl.cpp b/src/Mod/Material/App/MaterialFilterPyImp.cpp
similarity index 100%
rename from src/Mod/Material/App/MaterialFilterPyImpl.cpp
rename to src/Mod/Material/App/MaterialFilterPyImp.cpp
diff --git a/src/Mod/Material/App/MaterialManagerPyImpl.cpp b/src/Mod/Material/App/MaterialManagerPyImp.cpp
similarity index 100%
rename from src/Mod/Material/App/MaterialManagerPyImpl.cpp
rename to src/Mod/Material/App/MaterialManagerPyImp.cpp
diff --git a/src/Mod/Material/App/MaterialPyImpl.cpp b/src/Mod/Material/App/MaterialPyImp.cpp
similarity index 100%
rename from src/Mod/Material/App/MaterialPyImpl.cpp
rename to src/Mod/Material/App/MaterialPyImp.cpp
diff --git a/src/Mod/Material/App/ModelManagerPyImpl.cpp b/src/Mod/Material/App/ModelManagerPyImp.cpp
similarity index 100%
rename from src/Mod/Material/App/ModelManagerPyImpl.cpp
rename to src/Mod/Material/App/ModelManagerPyImp.cpp
diff --git a/src/Mod/Material/App/ModelPropertyPyImpl.cpp b/src/Mod/Material/App/ModelPropertyPyImp.cpp
similarity index 100%
rename from src/Mod/Material/App/ModelPropertyPyImpl.cpp
rename to src/Mod/Material/App/ModelPropertyPyImp.cpp
diff --git a/src/Mod/Material/App/ModelPyImpl.cpp b/src/Mod/Material/App/ModelPyImp.cpp
similarity index 100%
rename from src/Mod/Material/App/ModelPyImpl.cpp
rename to src/Mod/Material/App/ModelPyImp.cpp
diff --git a/src/Mod/Material/App/UUIDsPyImpl.cpp b/src/Mod/Material/App/UUIDsPyImp.cpp
similarity index 100%
rename from src/Mod/Material/App/UUIDsPyImpl.cpp
rename to src/Mod/Material/App/UUIDsPyImp.cpp
diff --git a/src/Mod/Material/Gui/CMakeLists.txt b/src/Mod/Material/Gui/CMakeLists.txt
index c5a8524ce1..a33c503e90 100644
--- a/src/Mod/Material/Gui/CMakeLists.txt
+++ b/src/Mod/Material/Gui/CMakeLists.txt
@@ -40,7 +40,7 @@ generate_from_xml(MaterialTreeWidgetPy)
 
 SET(Python_SRCS
     MaterialTreeWidgetPy.xml
-    MaterialTreeWidgetPyImpl.cpp
+    MaterialTreeWidgetPyImp.cpp
 )
 SOURCE_GROUP("Python" FILES ${Python_SRCS})
 
diff --git a/src/Mod/Material/Gui/MaterialTreeWidgetPyImpl.cpp b/src/Mod/Material/Gui/MaterialTreeWidgetPyImp.cpp
similarity index 100%
rename from src/Mod/Material/Gui/MaterialTreeWidgetPyImpl.cpp
rename to src/Mod/Material/Gui/MaterialTreeWidgetPyImp.cpp