diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index 831d2e97aa..8e9d19115b 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -37,8 +37,8 @@ SET(FemExamples_SRCS
     femexamples/__init__.py
     femexamples/boxanalysis.py
     femexamples/ccx_cantilever_std.py
+    femexamples/constraint_contact_shell_shell.py
     femexamples/constraint_contact_solid_solid.py
-    femexamples/contact_shell_shell.py
     femexamples/manager.py
     femexamples/material_multiple_twoboxes.py
     femexamples/material_nl_platewithhole.py
@@ -165,8 +165,8 @@ SET(FemTestsFiles_SRCS
 
 SET(FemTestsCcx_SRCS
     femtest/data/ccx/__init__.py
-    femtest/data/ccx/contact_shell_shell.FCStd
-    femtest/data/ccx/contact_shell_shell.inp
+    femtest/data/ccx/constraint_contact_shell_shell.FCStd
+    femtest/data/ccx/constraint_contact_shell_shell.inp
     femtest/data/ccx/constraint_contact_solid_solid.FCStd
     femtest/data/ccx/constraint_contact_solid_solid.inp
     femtest/data/ccx/cube_frequency.inp
diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py
index 155791890a..8974c391a1 100644
--- a/src/Mod/Fem/TestFem.py
+++ b/src/Mod/Fem/TestFem.py
@@ -125,7 +125,7 @@ gf()
 ./bin/FreeCADCmd --run-test "femtest.app.test_femimport.TestObjectExistance.test_objects_existance"
 ./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_freq_analysis"
 ./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_static_analysis"
-./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_static_contact_shell_shell"
+./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_static_constraint_contact_shell_shell"
 ./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_static_constraint_contact_solid_solid"
 ./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_static_material_multiple"
 ./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_static_material_nonlinar"
@@ -172,7 +172,7 @@ import unittest
 unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName("femtest.app.test_ccxtools.TestCcxTools.test_static_analysis"))
 
 import unittest
-unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName("femtest.app.test_ccxtools.TestCcxTools.test_static_contact_shell_shell"))
+unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName("femtest.app.test_ccxtools.TestCcxTools.test_constraint_static_contact_shell_shell"))
 
 import unittest
 unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName("femtest.app.test_ccxtools.TestCcxTools.test_constraint_static_contact_solid_solid"))
diff --git a/src/Mod/Fem/femexamples/contact_shell_shell.py b/src/Mod/Fem/femexamples/constraint_contact_shell_shell.py
similarity index 99%
rename from src/Mod/Fem/femexamples/contact_shell_shell.py
rename to src/Mod/Fem/femexamples/constraint_contact_shell_shell.py
index 7586ce5616..7b77103e94 100644
--- a/src/Mod/Fem/femexamples/contact_shell_shell.py
+++ b/src/Mod/Fem/femexamples/constraint_contact_shell_shell.py
@@ -27,7 +27,7 @@
 # based on https://forum.freecadweb.org/viewtopic.php?f=18&t=42228#p359488
 # to run the example use:
 """
-from femexamples.contact_shell_shell import setup
+from femexamples.constraint_contact_shell_shell import setup
 setup()
 
 """
diff --git a/src/Mod/Fem/femexamples/manager.py b/src/Mod/Fem/femexamples/manager.py
index bd11d5edc7..ce9e1c039d 100644
--- a/src/Mod/Fem/femexamples/manager.py
+++ b/src/Mod/Fem/femexamples/manager.py
@@ -33,7 +33,7 @@ doc = run_boxanalysisfrequency()
 doc = run_ccx_cantileverfaceload()
 doc = run_ccx_cantilevernodeload()
 doc = run_ccx_cantileverprescribeddisplacement()
-doc = run_contact_shell_shell()
+doc = run_constraint_contact_shell_shell()
 doc = run_constraint_contact_solid_solid()
 doc = run_material_nl_platewithhole()
 doc = run_material_multiple_twoboxes()
@@ -175,13 +175,13 @@ def run_ccx_cantileverprescribeddisplacement(solver=None, base_name=None):
     return doc
 
 
-def run_contact_shell_shell(solver=None, base_name=None):
+def run_constraint_contact_shell_shell(solver=None, base_name=None):
 
-    from .contact_shell_shell import setup
+    from .constraint_contact_shell_shell import setup
     doc = setup()
 
     if base_name is None:
-        base_name = "Contact_Shell_Shell"
+        base_name = "Constraint_Contact_Shell_Shell"
         if solver is not None:
             base_name += "_" + solver
     run_analysis(doc, base_name)
diff --git a/src/Mod/Fem/femtest/app/test_ccxtools.py b/src/Mod/Fem/femtest/app/test_ccxtools.py
index d006c02782..98c5f61ec0 100644
--- a/src/Mod/Fem/femtest/app/test_ccxtools.py
+++ b/src/Mod/Fem/femtest/app/test_ccxtools.py
@@ -134,17 +134,17 @@ class TestCcxTools(unittest.TestCase):
         )
 
     # ********************************************************************************************
-    def test_static_contact_shell_shell(
+    def test_static_constraint_contact_shell_shell(
         self
     ):
         # set up
-        from femexamples.contact_shell_shell import setup
+        from femexamples.constraint_contact_shell_shell import setup
         setup(self.active_doc, "ccxtools")
-        test_name = "contact shell shell"
-        base_name = "contact_shell_shell"
+        test_name = "constraint contact shell shell"
+        base_name = "constraint_contact_shell_shell"
         analysis_dir = testtools.get_unit_test_tmp_dir(
             self.temp_dir,
-            "FEM_ccx_contact_shell_shell",
+            "FEM_ccx_constraint_contact_shell_shell",
         )
 
         # test input file writing
diff --git a/src/Mod/Fem/femtest/data/ccx/contact_shell_shell.FCStd b/src/Mod/Fem/femtest/data/ccx/constraint_contact_shell_shell.FCStd
similarity index 100%
rename from src/Mod/Fem/femtest/data/ccx/contact_shell_shell.FCStd
rename to src/Mod/Fem/femtest/data/ccx/constraint_contact_shell_shell.FCStd
diff --git a/src/Mod/Fem/femtest/data/ccx/contact_shell_shell.inp b/src/Mod/Fem/femtest/data/ccx/constraint_contact_shell_shell.inp
similarity index 100%
rename from src/Mod/Fem/femtest/data/ccx/contact_shell_shell.inp
rename to src/Mod/Fem/femtest/data/ccx/constraint_contact_shell_shell.inp