diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
index bb00e3dfd0..e849dd8d80 100755
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -87,7 +87,7 @@ SET(FemScripts_SRCS
     _MechanicalMaterial.py
     _TaskPanelFemBeamSection.py
     _TaskPanelFemShellThickness.py
-    _TaskPanelJobControl.py
+    _TaskPanelFemSolverCalculix.py
     _TaskPanelMechanicalMaterial.py
     _TaskPanelResultControl.py
     _ViewProviderFemAnalysis.py
@@ -114,7 +114,7 @@ SET(FemScripts_SRCS
 
     TaskPanelFemBeamSection.ui
     TaskPanelFemShellThickness.ui
-    TaskPanelMechanicalAnalysis.ui
+    TaskPanelFemSolverCalculix.ui
     TaskPanelMechanicalMaterial.ui
     TaskPanelShowDisplacement.ui
 )
diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index 9f1349f149..c602ed81d0 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -38,8 +38,8 @@ INSTALL(
         _CommandNewMechanicalAnalysis.py
 
         _CommandMechanicalJobControl.py
-        _TaskPanelJobControl.py
-        TaskPanelMechanicalAnalysis.ui
+        _TaskPanelFemSolverCalculix.py
+        TaskPanelFemSolverCalculix.ui
 
         FemBeamSection.py
         _FemBeamSection.py
diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt
index c7e65e962e..986e582db4 100755
--- a/src/Mod/Fem/Gui/CMakeLists.txt
+++ b/src/Mod/Fem/Gui/CMakeLists.txt
@@ -212,7 +212,6 @@ fc_target_copy_resource(FemGui
     ${CMAKE_BINARY_DIR}/Mod/Fem
     InitGui.py
     TaskPanelMechanicalMaterial.ui
-    TaskPanelMechanicalAnalysis.ui
     )
 
 SET(FemGuiIcon_SVG
diff --git a/src/Mod/Fem/TaskPanelMechanicalAnalysis.ui b/src/Mod/Fem/TaskPanelFemSolverCalculix.ui
similarity index 100%
rename from src/Mod/Fem/TaskPanelMechanicalAnalysis.ui
rename to src/Mod/Fem/TaskPanelFemSolverCalculix.ui
diff --git a/src/Mod/Fem/_CommandMechanicalJobControl.py b/src/Mod/Fem/_CommandMechanicalJobControl.py
index e2de9e1a15..9ddce3d2dc 100644
--- a/src/Mod/Fem/_CommandMechanicalJobControl.py
+++ b/src/Mod/Fem/_CommandMechanicalJobControl.py
@@ -44,8 +44,8 @@ class _CommandMechanicalJobControl(FemCommands):
         self.is_active = 'with_analysis'
 
     def Activated(self):
-        import _TaskPanelJobControl
-        taskd = _TaskPanelJobControl._TaskPanelJobControl(FemGui.getActiveAnalysis())
+        import _TaskPanelFemSolverCalculix
+        taskd = _TaskPanelFemSolverCalculix._TaskPanelFemSolverCalculix(FreeCADGui.Selection.getSelection()[0])
         #taskd.obj = vobj.Object
         taskd.update()
         FreeCADGui.Control.showDialog(taskd)
diff --git a/src/Mod/Fem/_TaskPanelJobControl.py b/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
similarity index 98%
rename from src/Mod/Fem/_TaskPanelJobControl.py
rename to src/Mod/Fem/_TaskPanelFemSolverCalculix.py
index 47aeded262..9fead06048 100644
--- a/src/Mod/Fem/_TaskPanelJobControl.py
+++ b/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
@@ -20,7 +20,7 @@
 #*                                                                         *
 #***************************************************************************
 
-__title__ = "Job Control Task Panel"
+__title__ = "Calculix Job Control Task Panel"
 __author__ = "Juergen Riegel"
 __url__ = "http://www.freecadweb.org"
 
@@ -38,9 +38,9 @@ if FreeCAD.GuiUp:
     from PySide.QtGui import QApplication
 
 
-class _TaskPanelJobControl:
+class _TaskPanelFemSolverCalculix:
     def __init__(self, solver_object):
-        self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/TaskPanelMechanicalAnalysis.ui")
+        self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/TaskPanelFemSolverCalculix.ui")
         self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem")
         ccx_binary = self.fem_prefs.GetString("ccxBinaryPath", "")
         if ccx_binary:
diff --git a/src/Mod/Fem/_ViewProviderFemSolverCalculix.py b/src/Mod/Fem/_ViewProviderFemSolverCalculix.py
index 00f1f83bcf..36997a5259 100644
--- a/src/Mod/Fem/_ViewProviderFemSolverCalculix.py
+++ b/src/Mod/Fem/_ViewProviderFemSolverCalculix.py
@@ -49,8 +49,8 @@ class _ViewProviderFemSolverCalculix:
         return
 
     def setEdit(self, vobj, mode=0):
-        import _TaskPanelJobControl
-        taskd = _TaskPanelJobControl._TaskPanelJobControl(self.Object)
+        import _TaskPanelFemSolverCalculix
+        taskd = _TaskPanelFemSolverCalculix._TaskPanelFemSolverCalculix(self.Object)
         FreeCADGui.Control.showDialog(taskd)
         return True