diff --git a/cmake/DD4hepBuild.cmake b/cmake/DD4hepBuild.cmake
index 204ce915c61c5be2cc0b9d70d2d20ff03c2cecf3..088abfa8c41455e2422989294d1460a2aa7a792c 100644
--- a/cmake/DD4hepBuild.cmake
+++ b/cmake/DD4hepBuild.cmake
@@ -805,7 +805,7 @@ MACRO(DD4HEP_SETUP_GEANT4_TARGETS)
     # Geant4::10.2.2 at least, not in 10.5 (check where it switches)
     string(REPLACE " " ";" Geant4_Flags ${Geant4_CXX_FLAGS} ${Geant4_CXX_FLAGS_${CMAKE_BUILD_TYPE}})
 
-    #Geant4_DEFINITIONS already include -D, we jave to get rid of that so we can join things when creating dictionaries
+    #Geant4_DEFINITIONS already include -D, we have to get rid of that so we can join things when creating dictionaries
     SET(G4_DEF_TEMP "")
     foreach(def ${Geant4_DEFINITIONS})
       string(REPLACE "-D" "" def ${def})
diff --git a/examples/CLICSiD/CMakeLists.txt b/examples/CLICSiD/CMakeLists.txt
index a2715034342d5c6fa986f0243a4df9a98bc30b5f..9c8a1050c917438f0d110a613f531a1889fd1a7e 100644
--- a/examples/CLICSiD/CMakeLists.txt
+++ b/examples/CLICSiD/CMakeLists.txt
@@ -128,7 +128,7 @@ dd4hep_add_test_reg( CLICSiD_GDML_import_LONGTEST
 #
 endif()
 #
-#---Geant4 Testsing-----------------------------------------------------------------
+#---Geant4 Testing-----------------------------------------------------------------
 #
 if (DD4HEP_USE_GEANT4)
   #
diff --git a/examples/DDG4/CMakeLists.txt b/examples/DDG4/CMakeLists.txt
index cebdfcad504881acb9cc04fad7b4a619fb85f49d..e33e16ea68debd903b54dbd6493e3a87d3f41c03 100644
--- a/examples/DDG4/CMakeLists.txt
+++ b/examples/DDG4/CMakeLists.txt
@@ -22,7 +22,7 @@ dd4hep_set_compiler_flags()
 
 set(DDG4examples_INSTALL  ${CMAKE_INSTALL_PREFIX}/examples/DDG4)
 #
-#---Geant4 Testsing-----------------------------------------------------------------
+#---Geant4 Testing-----------------------------------------------------------------
 #
 if (DD4HEP_USE_GEANT4)
   #----  Dictionary of classes to be written to the ROOT file   --------------------
diff --git a/examples/DDG4_MySensDet/CMakeLists.txt b/examples/DDG4_MySensDet/CMakeLists.txt
index 27e6fd7f1864ee94c29190d5913266eb3d1251b2..86f670b8599c324bedd03bd8da2f13fc186dc3ef 100644
--- a/examples/DDG4_MySensDet/CMakeLists.txt
+++ b/examples/DDG4_MySensDet/CMakeLists.txt
@@ -31,7 +31,7 @@ dd4hep_configure_scripts(DDG4_MySensDet DEFAULT_SETUP WITH_TESTS)
 enable_testing ()
 include(CTest)
 #
-#---Geant4 Testsing-----------------------------------------------------------------
+#---Geant4 Testing-----------------------------------------------------------------
 #
 if (DD4HEP_USE_GEANT4)
   #---------------------------  Plugin library for the simulation framework  ---------
diff --git a/examples/LHeD/CMakeLists.txt b/examples/LHeD/CMakeLists.txt
index 6c5ab0ade0bd4fe230b6ad36e8e280689059b073..0d34a57a3f4e54d2ae512ef617dee2735b4ec594 100644
--- a/examples/LHeD/CMakeLists.txt
+++ b/examples/LHeD/CMakeLists.txt
@@ -79,7 +79,7 @@ dd4hep_add_test_reg( LHeD_check_overlaps_LONGTEST
                     --tolerance=0.1
   REGEX_PASS " Execution finished..." )
 #
-#---Geant4 Testsing-----------------------------------------------------------------
+#---Geant4 Testing-----------------------------------------------------------------
 #
 if (DD4HEP_USE_GEANT4)
   #