diff --git a/src/Mod/Fem/FemSolverCalculix.py b/src/Mod/Fem/FemSolverCalculix.py
index d081c3df5..08c7fc3d3 100644
--- a/src/Mod/Fem/FemSolverCalculix.py
+++ b/src/Mod/Fem/FemSolverCalculix.py
@@ -29,7 +29,7 @@ import FreeCAD
 import _FemSolverCalculix
 
 
-def makeFemSolverCalculix(name="Calculix"):
+def makeFemSolverCalculix(name="CalculiX"):
     '''makeSolverCalculix(name): makes a Calculix solver object'''
     obj = FreeCAD.ActiveDocument.addObject("Fem::FemSolverObjectPython", name)
     _FemSolverCalculix._FemSolverCalculix(obj)
diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py
index 5429575b3..6f76bf396 100644
--- a/src/Mod/Fem/TestFem.py
+++ b/src/Mod/Fem/TestFem.py
@@ -74,7 +74,7 @@ class FemTest(unittest.TestCase):
         self.active_doc.recompute()
 
     def create_new_solver(self):
-        self.solver_object = FemSolverCalculix.makeFemSolverCalculix('Calculix')
+        self.solver_object = FemSolverCalculix.makeFemSolverCalculix('CalculiX')
         self.active_doc.recompute()
 
     def create_new_mesh(self):
diff --git a/src/Mod/Fem/_CommandFemSolverCalculix.py b/src/Mod/Fem/_CommandFemSolverCalculix.py
index 2713e3d13..402678d74 100644
--- a/src/Mod/Fem/_CommandFemSolverCalculix.py
+++ b/src/Mod/Fem/_CommandFemSolverCalculix.py
@@ -38,9 +38,9 @@ class _CommandFemSolverCalculix(FemCommands):
     def __init__(self):
         super(_CommandFemSolverCalculix, self).__init__()
         self.resources = {'Pixmap': 'fem-solver',
-                          'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_SolverCalculix", "Create FEM Solver Calculix ..."),
+                          'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_SolverCalculix", "Create FEM Solver CalculiX ..."),
                           'Accel': "S, C",
-                          'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_SolverCalculix", "Creates FEM Solver Calculix")}
+                          'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_SolverCalculix", "Creates FEM Solver CalculiX")}
         self.is_active = 'with_analysis'
 
     def Activated(self):
diff --git a/src/Mod/Fem/_CommandNewMechanicalAnalysis.py b/src/Mod/Fem/_CommandNewMechanicalAnalysis.py
index 335ed6258..4418214a5 100644
--- a/src/Mod/Fem/_CommandNewMechanicalAnalysis.py
+++ b/src/Mod/Fem/_CommandNewMechanicalAnalysis.py
@@ -49,7 +49,7 @@ class _CommandNewMechanicalAnalysis(FemCommands):
         FreeCADGui.addModule("FemSolverCalculix")
         FreeCADGui.doCommand("FemAnalysis.makeFemAnalysis('MechanicalAnalysis')")
         FreeCADGui.doCommand("FemGui.setActiveAnalysis(App.activeDocument().ActiveObject)")
-        FreeCADGui.doCommand("FemSolverCalculix.makeFemSolverCalculix('Calculix')")
+        FreeCADGui.doCommand("FemSolverCalculix.makeFemSolverCalculix('CalculiX')")
         FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [App.activeDocument().ActiveObject]")
         sel = FreeCADGui.Selection.getSelection()
         if (len(sel) == 1):
diff --git a/src/Mod/Fem/_TaskPanelFemSolverCalculix.py b/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
index 9fead0604..f4f3bb25f 100644
--- a/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
+++ b/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
@@ -20,7 +20,7 @@
 #*                                                                         *
 #***************************************************************************
 
-__title__ = "Calculix Job Control Task Panel"
+__title__ = "CalculiX Job Control Task Panel"
 __author__ = "Juergen Riegel"
 __url__ = "http://www.freecadweb.org"
 
@@ -45,7 +45,7 @@ class _TaskPanelFemSolverCalculix:
         ccx_binary = self.fem_prefs.GetString("ccxBinaryPath", "")
         if ccx_binary:
             self.CalculixBinary = ccx_binary
-            print ("Using ccx binary path from FEM preferences: {}".format(ccx_binary))
+            print ("Using CalculiX binary path from FEM preferences: {}".format(ccx_binary))
         else:
             from platform import system
             if system() == 'Linux':
@@ -137,7 +137,7 @@ class _TaskPanelFemSolverCalculix:
         self.printCalculiXstdout()
         self.Timer.stop()
 
-        self.femConsoleMessage("Calculix done!", "#00AA00")
+        self.femConsoleMessage("CalculiX done!", "#00AA00")
 
         self.form.pb_run_ccx.setText("Re-run CalculiX")
         self.femConsoleMessage("Loading result sets...")
@@ -236,10 +236,10 @@ class _TaskPanelFemSolverCalculix:
         self.Start = time.time()
 
         self.femConsoleMessage("CalculiX binary: {}".format(self.CalculixBinary))
-        self.femConsoleMessage("Run Calculix...")
+        self.femConsoleMessage("Run CalculiX...")
 
         # run Calculix
-        print ('run Calculix at: {} with: {}'.format(self.CalculixBinary, os.path.splitext(self.inp_file_name)[0]))
+        print ('run CalculiX at: {} with: {}'.format(self.CalculixBinary, os.path.splitext(self.inp_file_name)[0]))
         # change cwd because ccx may crash if directory has no write permission
         # there is also a limit of the length of file names so jump to the document directory
         self.cwd = QtCore.QDir.currentPath()