diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
index 9d90f103cc04..374cc2a9925b 100644
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -109,7 +109,6 @@ SET(FemGuiScripts_SRCS
     PyGui/_CommandAnalysis.py
     PyGui/_CommandBeamSection.py
     PyGui/_CommandClearMesh.py
-    PyGui/_CommandControlSolver.py
     PyGui/_CommandConstraintSelfWeight.py
     PyGui/_CommandFEMMesh2Mesh.py
     PyGui/_CommandFluidSection.py
@@ -125,6 +124,7 @@ SET(FemGuiScripts_SRCS
     PyGui/_CommandShellThickness.py
     PyGui/_CommandShowResult.py
     PyGui/_CommandSolverCalculix.py
+    PyGui/_CommandSolverControl.py
     PyGui/_CommandSolverRun.py
     PyGui/_CommandSolverZ88.py
     PyGui/_TaskPanelFemBeamSection.py
diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index a9e5162d839f..eeebdb4ed20b 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -70,7 +70,6 @@ INSTALL(
         PyGui/_CommandAnalysis.py
         PyGui/_CommandBeamSection.py
         PyGui/_CommandClearMesh.py
-        PyGui/_CommandControlSolver.py
         PyGui/_CommandConstraintSelfWeight.py
         PyGui/_CommandFEMMesh2Mesh.py
         PyGui/_CommandFluidSection.py
@@ -86,6 +85,7 @@ INSTALL(
         PyGui/_CommandShellThickness.py
         PyGui/_CommandShowResult.py
         PyGui/_CommandSolverCalculix.py
+        PyGui/_CommandSolverControl.py
         PyGui/_CommandSolverRun.py
         PyGui/_CommandSolverZ88.py
         PyGui/_TaskPanelFemBeamSection.py
diff --git a/src/Mod/Fem/Gui/Workbench.cpp b/src/Mod/Fem/Gui/Workbench.cpp
index a2d91ba792c7..25b769692620 100755
--- a/src/Mod/Fem/Gui/Workbench.cpp
+++ b/src/Mod/Fem/Gui/Workbench.cpp
@@ -100,7 +100,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
          << "FEM_ConstraintHeatflux"
          << "FEM_ConstraintInitialTemperature"
          << "Separator"
-         << "FEM_ControlSolver"
+         << "FEM_SolverControl"
          << "FEM_SolverRun"
          << "Separator"
          << "FEM_PurgeResults"
@@ -176,7 +176,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
          << "FEM_ConstraintHeatflux"
          << "FEM_ConstraintInitialTemperature"
          << "Separator"
-         << "FEM_ControlSolver"
+         << "FEM_SolverControl"
          << "FEM_SolverRun"
          << "Separator"
          << "FEM_PurgeResults"
diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py
index 52e7233a6288..bf5f4e1589b3 100644
--- a/src/Mod/Fem/InitGui.py
+++ b/src/Mod/Fem/InitGui.py
@@ -49,7 +49,6 @@ def Initialize(self):
         import PyGui._CommandPurgeResults
         import PyGui._CommandClearMesh
         import PyGui._CommandPrintMeshInfo
-        import PyGui._CommandControlSolver
         import PyGui._CommandFEMMesh2Mesh
         import PyGui._CommandMeshGmshFromShape
         import PyGui._CommandMeshNetgenFromShape
@@ -63,6 +62,7 @@ def Initialize(self):
         import PyGui._CommandMaterialFluid
         import PyGui._CommandMaterialMechanicalNonlinear
         import PyGui._CommandSolverCalculix
+        import PyGui._CommandSolverControl
         import PyGui._CommandSolverRun
         import PyGui._CommandSolverZ88
         import PyGui._CommandConstraintSelfWeight
diff --git a/src/Mod/Fem/PyGui/_CommandControlSolver.py b/src/Mod/Fem/PyGui/_CommandSolverControl.py
similarity index 86%
rename from src/Mod/Fem/PyGui/_CommandControlSolver.py
rename to src/Mod/Fem/PyGui/_CommandSolverControl.py
index 97818f00645e..d052608e3c25 100644
--- a/src/Mod/Fem/PyGui/_CommandControlSolver.py
+++ b/src/Mod/Fem/PyGui/_CommandSolverControl.py
@@ -24,7 +24,7 @@
 __author__ = "Juergen Riegel"
 __url__ = "http://www.freecadweb.org"
 
-## @package CommandControlSolver
+## @package CommandSolverControl
 #  \ingroup FEM
 
 from FemCommands import FemCommands
@@ -32,14 +32,14 @@
 from PySide import QtCore
 
 
-class _CommandControlSolver(FemCommands):
-    "the FEM_ControlSolver command definition"
+class _CommandSolverControl(FemCommands):
+    "the FEM_SolverControl command definition"
     def __init__(self):
-        super(_CommandControlSolver, self).__init__()
+        super(_CommandSolverControl, self).__init__()
         self.resources = {'Pixmap': 'fem-control-solver',
-                          'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_ControlSolver", "Solver job control"),
+                          'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_SolverControl", "Solver job control"),
                           'Accel': "S, C",
-                          'ToolTip': QtCore.QT_TRANSLATE_NOOP("FEM_ControlSolver", "Changes solver attributes and runs the calculations for the selected solver")}
+                          'ToolTip': QtCore.QT_TRANSLATE_NOOP("FEM_SolverControl", "Changes solver attributes and runs the calculations for the selected solver")}
         self.is_active = 'with_solver'
 
     def Activated(self):
@@ -47,4 +47,4 @@ def Activated(self):
         FreeCADGui.ActiveDocument.setEdit(solver_obj, 0)
 
 
-FreeCADGui.addCommand('FEM_ControlSolver', _CommandControlSolver())
+FreeCADGui.addCommand('FEM_SolverControl', _CommandSolverControl())