diff --git a/src/Mod/Fem/ccxInpWriter.py b/src/Mod/Fem/ccxInpWriter.py
index bf6932c918..e9076723f7 100644
--- a/src/Mod/Fem/ccxInpWriter.py
+++ b/src/Mod/Fem/ccxInpWriter.py
@@ -189,7 +189,7 @@ class inp_writer:
                     e_count += len(e_not_referenced)
                 f.write('\n')
             else:  # all fem_elements are solids --> volume mesh
-                material_elementset_name = 'MaterialSolidElements'
+                material_elementset_name = 'MechanicalMaterialSolid'
                 f.write('*ELSET,ELSET=' + material_elementset_name + '\n')
                 f.write('Eall\n')
         if hasattr(self, 'fem_element_table'):
@@ -296,7 +296,7 @@ class inp_writer:
                     f.write(el_prop)
                     f.write(sc_prop)
             else:  # all fem_elements are solids
-                el_set = 'ELSET=' + 'MaterialSolidElements' + ', '
+                el_set = 'ELSET=' + 'MechanicalMaterialSolid' + ', '
                 material = 'MATERIAL=' + mat_name
                 el_prop = '*SOLID SECTION, ' + el_set + material + '\n'
                 f.write(el_prop)
diff --git a/src/Mod/Fem/test_files/cube_frequency.inp b/src/Mod/Fem/test_files/cube_frequency.inp
index 3095d1ac7a..da77390d58 100644
--- a/src/Mod/Fem/test_files/cube_frequency.inp
+++ b/src/Mod/Fem/test_files/cube_frequency.inp
@@ -415,7 +415,7 @@
 ***********************************************************
 ** Element sets for materials and FEM element type (solid, shell, beam)
 ** written by write_element_sets_material_and_femelement_type function
-*ELSET,ELSET=MaterialSolidElements
+*ELSET,ELSET=MechanicalMaterialSolid
 Eall
 
 ***********************************************************
@@ -483,7 +483,7 @@ Eall
 ***********************************************************
 ** Sections
 ** written by write_femelementsets function
-*SOLID SECTION, ELSET=MaterialSolidElements, MATERIAL=Steel
+*SOLID SECTION, ELSET=MechanicalMaterialSolid, MATERIAL=Steel
 
 ***********************************************************
 ** One step is needed to calculate the mechanical analysis of FreeCAD
diff --git a/src/Mod/Fem/test_files/cube_static.inp b/src/Mod/Fem/test_files/cube_static.inp
index 48b5cf6135..4a7f01c022 100644
--- a/src/Mod/Fem/test_files/cube_static.inp
+++ b/src/Mod/Fem/test_files/cube_static.inp
@@ -415,7 +415,7 @@
 ***********************************************************
 ** Element sets for materials and FEM element type (solid, shell, beam)
 ** written by write_element_sets_material_and_femelement_type function
-*ELSET,ELSET=MaterialSolidElements
+*ELSET,ELSET=MechanicalMaterialSolid
 Eall
 
 ***********************************************************
@@ -483,7 +483,7 @@ Eall
 ***********************************************************
 ** Sections
 ** written by write_femelementsets function
-*SOLID SECTION, ELSET=MaterialSolidElements, MATERIAL=Steel
+*SOLID SECTION, ELSET=MechanicalMaterialSolid, MATERIAL=Steel
 
 ***********************************************************
 ** One step is needed to calculate the mechanical analysis of FreeCAD
diff --git a/src/Mod/Fem/test_files/frequency_analysis.inp b/src/Mod/Fem/test_files/frequency_analysis.inp
index c29558ef0d..8bc5f779eb 100644
--- a/src/Mod/Fem/test_files/frequency_analysis.inp
+++ b/src/Mod/Fem/test_files/frequency_analysis.inp
@@ -391,7 +391,7 @@
 ***********************************************************
 ** Element sets for materials and FEM element type (solid, shell, beam)
 ** written by write_element_sets_material_and_femelement_type function
-*ELSET,ELSET=MaterialSolidElements
+*ELSET,ELSET=MechanicalMaterialSolid
 Eall
 
 ***********************************************************
@@ -459,7 +459,7 @@ Eall
 ***********************************************************
 ** Sections
 ** written by write_femelementsets function
-*SOLID SECTION, ELSET=MaterialSolidElements, MATERIAL=TestMaterial
+*SOLID SECTION, ELSET=MechanicalMaterialSolid, MATERIAL=TestMaterial
 
 ***********************************************************
 ** One step is needed to calculate the mechanical analysis of FreeCAD
diff --git a/src/Mod/Fem/test_files/static_analysis.inp b/src/Mod/Fem/test_files/static_analysis.inp
index def8ccdb18..c3b8e5a725 100644
--- a/src/Mod/Fem/test_files/static_analysis.inp
+++ b/src/Mod/Fem/test_files/static_analysis.inp
@@ -391,7 +391,7 @@
 ***********************************************************
 ** Element sets for materials and FEM element type (solid, shell, beam)
 ** written by write_element_sets_material_and_femelement_type function
-*ELSET,ELSET=MaterialSolidElements
+*ELSET,ELSET=MechanicalMaterialSolid
 Eall
 
 ***********************************************************
@@ -459,7 +459,7 @@ Eall
 ***********************************************************
 ** Sections
 ** written by write_femelementsets function
-*SOLID SECTION, ELSET=MaterialSolidElements, MATERIAL=TestMaterial
+*SOLID SECTION, ELSET=MechanicalMaterialSolid, MATERIAL=TestMaterial
 
 ***********************************************************
 ** One step is needed to calculate the mechanical analysis of FreeCAD