diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
index 2025ba837648..7767f4e5ddae 100644
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -129,16 +129,17 @@ SET(FemGuiScripts_SRCS
     PyGui/_CommandFemSolverZ88.py
     PyGui/_TaskPanelFemBeamSection.py
     PyGui/_TaskPanelFemFluidSection.py
+    PyGui/_TaskPanelFemMaterial.py
     PyGui/_TaskPanelFemMeshGmsh.py
     PyGui/_TaskPanelFemMeshGroup.py
     PyGui/_TaskPanelFemMeshRegion.py
+    PyGui/_TaskPanelFemResultShow.py
     PyGui/_TaskPanelFemShellThickness.py
     PyGui/_TaskPanelFemSolverCalculix.py
-    PyGui/_TaskPanelFemMaterial.py
-    PyGui/_TaskPanelResultShow.py
     PyGui/_ViewProviderFemBeamSection.py
     PyGui/_ViewProviderFemConstraintSelfWeight.py
     PyGui/_ViewProviderFemFluidSection.py
+    PyGui/_ViewProviderFemMaterial.py
     PyGui/_ViewProviderFemMaterialMechanicalNonlinear.py
     PyGui/_ViewProviderFemMeshGmsh.py
     PyGui/_ViewProviderFemMeshGroup.py
@@ -147,16 +148,15 @@ SET(FemGuiScripts_SRCS
     PyGui/_ViewProviderFemShellThickness.py
     PyGui/_ViewProviderFemSolverCalculix.py
     PyGui/_ViewProviderFemSolverZ88.py
-    PyGui/_ViewProviderFemMaterial.py
     PyGui/TaskPanelFemBeamSection.ui
     PyGui/TaskPanelFemFluidSection.ui
+    PyGui/TaskPanelFemMaterial.ui
     PyGui/TaskPanelFemMeshGmsh.ui
     PyGui/TaskPanelFemMeshGroup.ui
     PyGui/TaskPanelFemMeshRegion.ui
+    PyGui/TaskPanelFemResultShow.ui
     PyGui/TaskPanelFemShellThickness.ui
     PyGui/TaskPanelFemSolverCalculix.ui
-    PyGui/TaskPanelFemMaterial.ui
-    PyGui/TaskPanelResultShow.ui
 )
 
 SET(FemTests_SRCS
diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index e9499b0995c7..e3bf18f781ba 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -90,16 +90,17 @@ INSTALL(
         PyGui/_CommandFemSolverZ88.py
         PyGui/_TaskPanelFemBeamSection.py
         PyGui/_TaskPanelFemFluidSection.py
+        PyGui/_TaskPanelFemMaterial.py
         PyGui/_TaskPanelFemMeshGmsh.py
         PyGui/_TaskPanelFemMeshGroup.py
         PyGui/_TaskPanelFemMeshRegion.py
+        PyGui/_TaskPanelFemResultShow.py
         PyGui/_TaskPanelFemShellThickness.py
         PyGui/_TaskPanelFemSolverCalculix.py
-        PyGui/_TaskPanelFemMaterial.py
-        PyGui/_TaskPanelResultShow.py
         PyGui/_ViewProviderFemBeamSection.py
         PyGui/_ViewProviderFemConstraintSelfWeight.py
         PyGui/_ViewProviderFemFluidSection.py
+        PyGui/_ViewProviderFemMaterial.py
         PyGui/_ViewProviderFemMaterialMechanicalNonlinear.py
         PyGui/_ViewProviderFemMeshGmsh.py
         PyGui/_ViewProviderFemMeshGroup.py
@@ -108,16 +109,15 @@ INSTALL(
         PyGui/_ViewProviderFemShellThickness.py
         PyGui/_ViewProviderFemSolverCalculix.py
         PyGui/_ViewProviderFemSolverZ88.py
-        PyGui/_ViewProviderFemMaterial.py
         PyGui/TaskPanelFemBeamSection.ui
         PyGui/TaskPanelFemFluidSection.ui
         PyGui/TaskPanelFemMaterial.ui
         PyGui/TaskPanelFemMeshGmsh.ui
         PyGui/TaskPanelFemMeshGroup.ui
         PyGui/TaskPanelFemMeshRegion.ui
+        PyGui/TaskPanelFemResultShow.ui
         PyGui/TaskPanelFemShellThickness.ui
         PyGui/TaskPanelFemSolverCalculix.ui
-        PyGui/TaskPanelResultShow.ui
     DESTINATION
         Mod/Fem/PyGui
 )
diff --git a/src/Mod/Fem/PyGui/TaskPanelResultShow.ui b/src/Mod/Fem/PyGui/TaskPanelFemResultShow.ui
similarity index 100%
rename from src/Mod/Fem/PyGui/TaskPanelResultShow.ui
rename to src/Mod/Fem/PyGui/TaskPanelFemResultShow.ui
diff --git a/src/Mod/Fem/PyGui/_TaskPanelResultShow.py b/src/Mod/Fem/PyGui/_TaskPanelFemResultShow.py
similarity index 99%
rename from src/Mod/Fem/PyGui/_TaskPanelResultShow.py
rename to src/Mod/Fem/PyGui/_TaskPanelFemResultShow.py
index 028902635028..b29383c00a8d 100644
--- a/src/Mod/Fem/PyGui/_TaskPanelResultShow.py
+++ b/src/Mod/Fem/PyGui/_TaskPanelFemResultShow.py
@@ -24,7 +24,7 @@
 __author__ = "Juergen Riegel, Michael Hindley"
 __url__ = "http://www.freecadweb.org"
 
-## @package TaskPanelResultShow
+## @package TaskPanelFemResultShow
 #  \ingroup FEM
 
 import FreeCAD
@@ -37,7 +37,7 @@
 from PySide.QtGui import QApplication
 
 
-class _TaskPanelResultShow:
+class _TaskPanelFemResultShow:
     '''The task panel for the post-processing'''
     def __init__(self, obj):
         self.result_obj = obj
@@ -45,7 +45,7 @@ def __init__(self, obj):
         # task panel should be started by use of setEdit of view provider
         # in view provider checks: Mesh, active analysis and if Mesh and result are in active analysis
 
-        self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/PyGui/TaskPanelResultShow.ui")
+        self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/PyGui/TaskPanelFemResultShow.ui")
         self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/General")
         self.restore_result_settings_in_dialog = self.fem_prefs.GetBool("RestoreResultDialog", True)
 
diff --git a/src/Mod/Fem/PyGui/_ViewProviderFemResultMechanical.py b/src/Mod/Fem/PyGui/_ViewProviderFemResultMechanical.py
index 2b1f8294471f..6e4b67b1d14d 100644
--- a/src/Mod/Fem/PyGui/_ViewProviderFemResultMechanical.py
+++ b/src/Mod/Fem/PyGui/_ViewProviderFemResultMechanical.py
@@ -72,8 +72,8 @@ def setEdit(self, vobj, mode=0):
                 mem = FemGui.getActiveAnalysis().Member
                 if self.Object in mem:
                     if self.Object.Mesh in mem:
-                        import PyGui._TaskPanelResultShow
-                        taskd = PyGui._TaskPanelResultShow._TaskPanelResultShow(self.Object)
+                        import PyGui._TaskPanelFemResultShow
+                        taskd = PyGui._TaskPanelFemResultShow._TaskPanelFemResultShow(self.Object)
                         taskd.obj = vobj.Object
                         FreeCADGui.Control.showDialog(taskd)
                         return True