diff --git a/FullSimLight/CMakeLists.txt b/FullSimLight/CMakeLists.txt
index a758278193b8347318f37ee12ea53a5031aac161..49fb3b6d21308d0b17a15afd3c187e9661081c2e 100644
--- a/FullSimLight/CMakeLists.txt
+++ b/FullSimLight/CMakeLists.txt
@@ -100,7 +100,7 @@ target_link_libraries(FullSimLight_obj
     nlohmann_json::nlohmann_json
     GeoModel2G4
     GeoModelCore::GeoModelKernel
-    GeoModelCore::GeoModelFuncSnippets
+    GeoModelCore::GeoModelHelpers
     GeoModelIO::GeoModelRead
     GeoModelIO::GeoModelWrite
     ${HEPMC3_LIB}
diff --git a/FullSimLight/src/FSLDetectorConstruction.cc b/FullSimLight/src/FSLDetectorConstruction.cc
index a253ab31a60a7ff60411b7f6f145a481e2c769d9..a0341fd7bd55ed2cb543c47cb926a6e9109e1e28 100644
--- a/FullSimLight/src/FSLDetectorConstruction.cc
+++ b/FullSimLight/src/FSLDetectorConstruction.cc
@@ -73,7 +73,7 @@
 #include "GeoModelKernel/GeoGeometryPluginLoader.h"
 #include "GeoModelKernel/GeoVolumeCursor.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"
-#include "GeoModelFuncSnippets/defineWorld.h"
+#include "GeoModelHelpers/defineWorld.h"
 
 // For Sensitive Detector plugins:
 #include "FullSimLight/FSLSensitiveDetectorPlugin.h"
diff --git a/GeoModelCore/CMakeLists.txt b/GeoModelCore/CMakeLists.txt
index 814e20f8db35c7897030b6e37787ea61f0f1251c..4a8c37c04b7537dca113caefe5367593bb3ef83c 100644
--- a/GeoModelCore/CMakeLists.txt
+++ b/GeoModelCore/CMakeLists.txt
@@ -8,7 +8,7 @@ project( "GeoModelCore" VERSION ${GeoModel_VERSION} LANGUAGES CXX )
 # Set up the build of the two libraries of the (sub-)project.
 add_subdirectory( GeoGenericFunctions )
 add_subdirectory( GeoModelKernel )
-add_subdirectory( GeoModelFuncSnippets )
+add_subdirectory( GeoModelHelpers )
 
 # Create and install the version description of the project.
 include( WriteBasicConfigVersionFile )
diff --git a/GeoModelCore/GeoModelFuncSnippets/.DS_Store b/GeoModelCore/GeoModelFuncSnippets/.DS_Store
deleted file mode 100644
index ae5c8ecde22999e8b2b13eb4d697826d2742b328..0000000000000000000000000000000000000000
Binary files a/GeoModelCore/GeoModelFuncSnippets/.DS_Store and /dev/null differ
diff --git a/GeoModelCore/GeoModelFuncSnippets/CMakeLists.txt b/GeoModelCore/GeoModelHelpers/CMakeLists.txt
similarity index 67%
rename from GeoModelCore/GeoModelFuncSnippets/CMakeLists.txt
rename to GeoModelCore/GeoModelHelpers/CMakeLists.txt
index e30ae17d92585799d0130a3af30c8dc09410c8ca..39b9d50e3ddccc9b7566d136d922dd18b535253f 100644
--- a/GeoModelCore/GeoModelFuncSnippets/CMakeLists.txt
+++ b/GeoModelCore/GeoModelHelpers/CMakeLists.txt
@@ -2,29 +2,29 @@
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
-file( GLOB HEADERS GeoModelFuncSnippets/*.h GeoModelFuncSnippets/*.icc )
+file( GLOB HEADERS GeoModelHelpers/*.h GeoModelHelpers/*.icc )
 
 # Create the library.
-add_library( GeoModelFuncSnippets SHARED ${HEADERS} ${SOURCES} )
+add_library( GeoModelHelpers SHARED ${HEADERS} ${SOURCES} )
 
-target_link_libraries( GeoModelFuncSnippets PRIVATE GeoModelCore::GeoModelKernel )
+target_link_libraries( GeoModelHelpers PRIVATE GeoModelCore::GeoModelKernel )
 
 
-target_include_directories( GeoModelFuncSnippets PUBLIC
+target_include_directories( GeoModelHelpers PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
-source_group( "GeoModelFuncSnippets" FILES ${HEADERS} )
+source_group( "GeoModelHelpers" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} )
-set_target_properties( GeoModelFuncSnippets PROPERTIES
+set_target_properties( GeoModelHelpers PROPERTIES
    VERSION ${PROJECT_VERSION}
    SOVERSION ${PROJECT_VERSION_MAJOR} )
 
 # Set up an alias with the same name that you would get by "finding" a pre-built
 # version of the library.
-add_library( GeoModelCore::GeoModelFuncSnippets ALIAS GeoModelFuncSnippets )
+add_library( GeoModelCore::GeoModelHelpers ALIAS GeoModelHelpers )
 
 # Install the library.
-install(TARGETS GeoModelFuncSnippets
+install(TARGETS GeoModelHelpers
     EXPORT ${PROJECT_NAME}-export
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
             COMPONENT Runtime
@@ -33,13 +33,13 @@ install(TARGETS GeoModelFuncSnippets
             NAMELINK_COMPONENT Development   # Requires CMake 3.12
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
             COMPONENT Development
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelFuncSnippets
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelHelpers
             COMPONENT Development
     INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
 
 install( FILES ${HEADERS}
-   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelFuncSnippets
+   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelHelpers
    COMPONENT Development )
 
 file(GLOB_RECURSE files "tests/*.cxx")
@@ -52,7 +52,7 @@ foreach(_exeFile ${files})
   endif() 
   
   add_executable(${_theExec} ${_exeFile})
-  target_link_libraries( ${_theExec} GeoModelCore::GeoModelFuncSnippets GeoModelCore::GeoModelKernel)
+  target_link_libraries( ${_theExec} GeoModelCore::GeoModelHelpers GeoModelCore::GeoModelKernel)
   add_test(NAME ${_theExec}
            COMMAND ${_theExec})
 
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/FileUtils.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/FileUtils.h
similarity index 89%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/FileUtils.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/FileUtils.h
index 89381e64ee39f8edda13ba2774e012e9ab33dad4..4e62f0d60eb07ef2074ce17666aaa8521770e6e7 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/FileUtils.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/FileUtils.h
@@ -1,8 +1,8 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#ifndef GEOMODELFUNCSNIPPETS_FILEUTILS_H
-#define GEOMODELFUNCSNIPPETS_FILEUTILS_H
+#ifndef GeoModelHelpers_FILEUTILS_H
+#define GeoModelHelpers_FILEUTILS_H
 
 #include <string>
 #include <string_view>
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoDeDuplicator.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoDeDuplicator.h
similarity index 91%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoDeDuplicator.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoDeDuplicator.h
index b11634c8c25da825806fc5f0c2d5f5f2caba4e04..614bc6606b15c7e6db08d71c5c2021d9cb2785f8 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoDeDuplicator.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoDeDuplicator.h
@@ -1,17 +1,17 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#ifndef GEOMODELFUNCSNIPPETS_GEODEDUPLICATOR_H
-#define GEOMODELFUNCSNIPPETS_GEODEDUPLICATOR_H
+#ifndef GeoModelHelpers_GEODEDUPLICATOR_H
+#define GeoModelHelpers_GEODEDUPLICATOR_H
 
 #include "GeoModelKernel/GeoPhysVol.h"
 #include "GeoModelKernel/GeoShape.h"
 #include "GeoModelKernel/GeoTransform.h"
 
-#include "GeoModelFuncSnippets/GeoLogVolSorter.h"
-#include "GeoModelFuncSnippets/GeoPhysVolSorter.h"
-#include "GeoModelFuncSnippets/GeoShapeSorter.h"
-#include "GeoModelFuncSnippets/TransformSorter.h"
+#include "GeoModelHelpers/GeoLogVolSorter.h"
+#include "GeoModelHelpers/GeoPhysVolSorter.h"
+#include "GeoModelHelpers/GeoShapeSorter.h"
+#include "GeoModelHelpers/TransformSorter.h"
 
 #include <set>
 /***
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoLogVolSorter.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoLogVolSorter.h
similarity index 93%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoLogVolSorter.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoLogVolSorter.h
index 7dca5c7006624d8e70e3435da6a0eb5527708efe..7e682f2ed933754a3dbe896603184bd7c352eeb7 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoLogVolSorter.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoLogVolSorter.h
@@ -1,8 +1,8 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#ifndef GEOMODELFUNCSNIPPETS_GEOLOGVOLSORTER_H
-#define GEOMODELFUNCSNIPPETS_GEOLOGVOLSORTER_H
+#ifndef GeoModelHelpers_GEOLOGVOLSORTER_H
+#define GeoModelHelpers_GEOLOGVOLSORTER_H
 
 #include "GeoModelKernel/GeoLogVol.h"
 #include "GeoModelKernel/GeoIntrusivePtr.h"
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoPhysVolSorter.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoPhysVolSorter.h
similarity index 91%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoPhysVolSorter.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoPhysVolSorter.h
index 0612a7dcbfe20ccd808a275187ac04ddc12568b7..12a9cc09076b9768b853bf164c331068071fbda6 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoPhysVolSorter.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoPhysVolSorter.h
@@ -2,8 +2,8 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#ifndef GEOMODELFUNCSNIPPETS_GEOPHYSVOLSORTER_H
-#define GEOMODELFUNCSNIPPETS_GEOPHYSVOLSORTER_H
+#ifndef GeoModelHelpers_GEOPHYSVOLSORTER_H
+#define GeoModelHelpers_GEOPHYSVOLSORTER_H
 
 #include "GeoModelKernel/GeoVPhysVol.h"
 
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoShapeSorter.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoShapeSorter.h
similarity index 94%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoShapeSorter.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoShapeSorter.h
index 6c04c0ba458677fa3282924d80fad571965ab2d7..a18006c36a16d4088b6e08566a30fa19dfe0ebdb 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoShapeSorter.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoShapeSorter.h
@@ -1,8 +1,8 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#ifndef GEOMODELFUNCSNIPPETS_GeoShapeSorter_H
-#define GEOMODELFUNCSNIPPETS_GeoShapeSorter_H
+#ifndef GeoModelHelpers_GeoShapeSorter_H
+#define GeoModelHelpers_GeoShapeSorter_H
 
 #include "GeoModelKernel/GeoShape.h"
 #include "GeoModelKernel/GeoIntrusivePtr.h"
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoShapeUtils.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoShapeUtils.h
similarity index 100%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoShapeUtils.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoShapeUtils.h
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/MaterialManager.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/MaterialManager.h
similarity index 100%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/MaterialManager.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/MaterialManager.h
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/StringUtils.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/StringUtils.h
similarity index 94%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/StringUtils.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/StringUtils.h
index da93675a5aa3610c11c8c29eeb6a7c9b510271f9..6a7a3d2f24b553858b2d8383909145df4e859fd5 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/StringUtils.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/StringUtils.h
@@ -1,8 +1,8 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#ifndef GEOMODELFUNCSNIPPETS_STRINGUTILS_H
-#define GEOMODELFUNCSNIPPETS_STRINGUTILS_H
+#ifndef GeoModelHelpers_STRINGUTILS_H
+#define GeoModelHelpers_STRINGUTILS_H
 
 #include <string>
 #include <string_view>
@@ -62,5 +62,5 @@ namespace GeoStrUtils{
                                                  const std::string_view glue =";");
 
 }
-#include "GeoModelFuncSnippets/StringUtils.icc"
+#include "GeoModelHelpers/StringUtils.icc"
 #endif
\ No newline at end of file
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/StringUtils.icc b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/StringUtils.icc
similarity index 90%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/StringUtils.icc
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/StringUtils.icc
index aaae117703a59b5c76b30f01b7857576a71a265a..04c7d2e17240a08c9b5a732f6e8f8ec35b6c754f 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/StringUtils.icc
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/StringUtils.icc
@@ -1,8 +1,8 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#ifndef GEOMODELFUNCSNIPPETS_STRINGUTILS_ICC
-#define GEOMODELFUNCSNIPPETS_STRINGUTILS_ICC
+#ifndef GeoModelHelpers_STRINGUTILS_ICC
+#define GeoModelHelpers_STRINGUTILS_ICC
 
 #include <sstream>
 namespace GeoStrUtils {
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/TransformSorter.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/TransformSorter.h
similarity index 96%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/TransformSorter.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/TransformSorter.h
index 17693e891411617ae08646b6804223e0705fa1b0..4f42720d0b24661070d09d6a96763f3178fd2133 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/TransformSorter.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/TransformSorter.h
@@ -1,8 +1,8 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#ifndef GEOMODELFUNCSNIPPETS_TRANSFORMSORTER_H
-#define GEOMODELFUNCSNIPPETS_TRANSFORMSORTER_H
+#ifndef GeoModelHelpers_TRANSFORMSORTER_H
+#define GeoModelHelpers_TRANSFORMSORTER_H
 
 #include "GeoModelKernel/GeoDefinitions.h"
 #include "GeoModelKernel/GeoTransform.h"
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/TransformToStringConverter.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/TransformToStringConverter.h
similarity index 88%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/TransformToStringConverter.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/TransformToStringConverter.h
index 62dfe421cdaaa321e2e36cb56cdf423ff2034d58..5e15a85a0a572d2913ce0f816baf5e5c8a5404b9 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/TransformToStringConverter.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/TransformToStringConverter.h
@@ -1,8 +1,8 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#ifndef GEOMODELFUNCSNIPPETS_TRANSFORMTOSTRINGCONVERTER_H
-#define GEOMODELFUNCSNIPPETS_TRANSFORMTOSTRINGCONVERTER_H
+#ifndef GeoModelHelpers_TRANSFORMTOSTRINGCONVERTER_H
+#define GeoModelHelpers_TRANSFORMTOSTRINGCONVERTER_H
 #include "GeoModelKernel/GeoDefinitions.h"
 
 #include <string>
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/defineWorld.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/defineWorld.h
similarity index 100%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/defineWorld.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/defineWorld.h
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/getChildNodesWithTrf.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/getChildNodesWithTrf.h
similarity index 100%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/getChildNodesWithTrf.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/getChildNodesWithTrf.h
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/throwExcept.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/throwExcept.h
similarity index 84%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/throwExcept.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/throwExcept.h
index 7be2db17993584667dc5005f3cc78fc831f591c6..82d3ae0aece5240ca82b84a31c3aadf3a70d5b52 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/throwExcept.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/throwExcept.h
@@ -1,8 +1,8 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#ifndef GEOMODELFUNCSNIPPETS_THROWEXCEPT_H
-#define GEOMODELFUNCSNIPPETS_THROWEXCEPT_H
+#ifndef GeoModelHelpers_THROWEXCEPT_H
+#define GeoModelHelpers_THROWEXCEPT_H
 
 #include <exception>
 #include <sstream>
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/FileUtils.cxx b/GeoModelCore/GeoModelHelpers/src/FileUtils.cxx
similarity index 96%
rename from GeoModelCore/GeoModelFuncSnippets/src/FileUtils.cxx
rename to GeoModelCore/GeoModelHelpers/src/FileUtils.cxx
index 08b2c2fc3f59bab7d487d65798aedf6d36b1450f..58afa8e045068339358655fd8d37c103e718be55 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/FileUtils.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/FileUtils.cxx
@@ -1,8 +1,8 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#include "GeoModelFuncSnippets/FileUtils.h"
-#include "GeoModelFuncSnippets/StringUtils.h"
+#include "GeoModelHelpers/FileUtils.h"
+#include "GeoModelHelpers/StringUtils.h"
 
 
 #include <filesystem>
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/GeoDeDuplicator.cxx b/GeoModelCore/GeoModelHelpers/src/GeoDeDuplicator.cxx
similarity index 94%
rename from GeoModelCore/GeoModelFuncSnippets/src/GeoDeDuplicator.cxx
rename to GeoModelCore/GeoModelHelpers/src/GeoDeDuplicator.cxx
index 0d48d05db8bd4d0e2929d5887f13d01413107bf8..8ba6eab4a41a6216dca4747b9f49ae15cdadba91 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/GeoDeDuplicator.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/GeoDeDuplicator.cxx
@@ -3,7 +3,7 @@
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "GeoModelFuncSnippets/GeoDeDuplicator.h"
+#include "GeoModelHelpers/GeoDeDuplicator.h"
 
 GeoDeDuplicator::TrfSet GeoDeDuplicator::s_trfStore{};
 GeoDeDuplicator::ShapeSet GeoDeDuplicator::s_shapeStore{};
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/GeoLogVolSorter.cxx b/GeoModelCore/GeoModelHelpers/src/GeoLogVolSorter.cxx
similarity index 80%
rename from GeoModelCore/GeoModelFuncSnippets/src/GeoLogVolSorter.cxx
rename to GeoModelCore/GeoModelHelpers/src/GeoLogVolSorter.cxx
index 592349222e004264cff0e33c2b7d04d1b53a5682..381c9896f1641d39b883d86000fbab086f8f2af1 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/GeoLogVolSorter.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/GeoLogVolSorter.cxx
@@ -1,9 +1,9 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#include "GeoModelFuncSnippets/GeoLogVolSorter.h"
-#include "GeoModelFuncSnippets/throwExcept.h"
-#include "GeoModelFuncSnippets/GeoShapeSorter.h"
+#include "GeoModelHelpers/GeoLogVolSorter.h"
+#include "GeoModelHelpers/throwExcept.h"
+#include "GeoModelHelpers/GeoShapeSorter.h"
 
 bool GeoLogVolSorter::operator()(const GeoLogVol* a, const GeoLogVol* b) const{
     return compare(a, b) < 0;
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/GeoPhysVolSorter.cxx b/GeoModelCore/GeoModelHelpers/src/GeoPhysVolSorter.cxx
similarity index 90%
rename from GeoModelCore/GeoModelFuncSnippets/src/GeoPhysVolSorter.cxx
rename to GeoModelCore/GeoModelHelpers/src/GeoPhysVolSorter.cxx
index 4ed7551232f5deefd044656a50d1273df4cc2196..d5f72bd28f628e8520fda9a82f4ee3669b325895 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/GeoPhysVolSorter.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/GeoPhysVolSorter.cxx
@@ -1,13 +1,13 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#include "GeoModelFuncSnippets/GeoPhysVolSorter.h"
+#include "GeoModelHelpers/GeoPhysVolSorter.h"
 #include "GeoModelKernel/GeoFullPhysVol.h"
 
-#include "GeoModelFuncSnippets/TransformSorter.h"
-#include "GeoModelFuncSnippets/GeoLogVolSorter.h"
+#include "GeoModelHelpers/TransformSorter.h"
+#include "GeoModelHelpers/GeoLogVolSorter.h"
 #include "GeoModelKernel/GeoVolumeCursor.h"
-#include "GeoModelFuncSnippets/getChildNodesWithTrf.h"
+#include "GeoModelHelpers/getChildNodesWithTrf.h"
 
 int GeoPhysVolSorter::compare(const GeoVPhysVol* a, const GeoVPhysVol* b) const {
     /// If one of the given volumes is a full physical volume, let's assume that they've been
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/GeoShapeSorter.cxx b/GeoModelCore/GeoModelHelpers/src/GeoShapeSorter.cxx
similarity index 97%
rename from GeoModelCore/GeoModelFuncSnippets/src/GeoShapeSorter.cxx
rename to GeoModelCore/GeoModelHelpers/src/GeoShapeSorter.cxx
index 1bd89c0d5af9c79aa44a01d46524032ea19e6134..5d1aee7624151e8b5fc1b276836bd425052542e4 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/GeoShapeSorter.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/GeoShapeSorter.cxx
@@ -1,11 +1,11 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#include "GeoModelFuncSnippets/GeoShapeSorter.h"
-#include "GeoModelFuncSnippets/TransformSorter.h"
-#include "GeoModelFuncSnippets/TransformToStringConverter.h"
-#include "GeoModelFuncSnippets/GeoShapeUtils.h"
-#include "GeoModelFuncSnippets/throwExcept.h"
+#include "GeoModelHelpers/GeoShapeSorter.h"
+#include "GeoModelHelpers/TransformSorter.h"
+#include "GeoModelHelpers/TransformToStringConverter.h"
+#include "GeoModelHelpers/GeoShapeUtils.h"
+#include "GeoModelHelpers/throwExcept.h"
 
 #include "GeoModelKernel/Units.h"
 
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/GeoShapeUtils.cxx b/GeoModelCore/GeoModelHelpers/src/GeoShapeUtils.cxx
similarity index 98%
rename from GeoModelCore/GeoModelFuncSnippets/src/GeoShapeUtils.cxx
rename to GeoModelCore/GeoModelHelpers/src/GeoShapeUtils.cxx
index 10ba0d3b2850e844df40222965b1789e4d141e10..2117315dddf4126c109e9e629702de12f4ce8fad 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/GeoShapeUtils.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/GeoShapeUtils.cxx
@@ -1,9 +1,9 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#include "GeoModelFuncSnippets/GeoShapeUtils.h"
-#include "GeoModelFuncSnippets/TransformToStringConverter.h"
-#include "GeoModelFuncSnippets/throwExcept.h"
+#include "GeoModelHelpers/GeoShapeUtils.h"
+#include "GeoModelHelpers/TransformToStringConverter.h"
+#include "GeoModelHelpers/throwExcept.h"
 
 /// Boolean volume shapes
 #include "GeoModelKernel/GeoShapeUnion.h"
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/MaterialManager.cxx b/GeoModelCore/GeoModelHelpers/src/MaterialManager.cxx
similarity index 98%
rename from GeoModelCore/GeoModelFuncSnippets/src/MaterialManager.cxx
rename to GeoModelCore/GeoModelHelpers/src/MaterialManager.cxx
index e3179074e3501ffe7de019d1cc0c69bb4ef07d49..02eeb3c4364cb029f6bf5bb5f944c90f44f406f5 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/MaterialManager.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/MaterialManager.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "GeoModelFuncSnippets/MaterialManager.h"
+#include "GeoModelHelpers/MaterialManager.h"
 
 
 #include "GeoModelKernel/GeoIntrusivePtr.h"
@@ -10,8 +10,8 @@
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/Units.h"
 
-#include "GeoModelFuncSnippets/throwExcept.h"
-#include "GeoModelFuncSnippets/StringUtils.h"
+#include "GeoModelHelpers/throwExcept.h"
+#include "GeoModelHelpers/StringUtils.h"
 
 #include <cstdlib>
 #include <iomanip>
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/StringUtils.cxx b/GeoModelCore/GeoModelHelpers/src/StringUtils.cxx
similarity index 98%
rename from GeoModelCore/GeoModelFuncSnippets/src/StringUtils.cxx
rename to GeoModelCore/GeoModelHelpers/src/StringUtils.cxx
index c17fb500cdc2a0b85203ce32d64980eb9ce35c8c..557a33534a25fcb0bde40271ed1caf9e564a11f6 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/StringUtils.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/StringUtils.cxx
@@ -1,8 +1,8 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#include "GeoModelFuncSnippets/StringUtils.h"
-#include "GeoModelFuncSnippets/throwExcept.h"
+#include "GeoModelHelpers/StringUtils.h"
+#include "GeoModelHelpers/throwExcept.h"
 #include <limits>
 #include <array>
 #include <functional>
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/TransformSorter.cxx b/GeoModelCore/GeoModelHelpers/src/TransformSorter.cxx
similarity index 94%
rename from GeoModelCore/GeoModelFuncSnippets/src/TransformSorter.cxx
rename to GeoModelCore/GeoModelHelpers/src/TransformSorter.cxx
index 8ad2d05cf6244292b16a9086e1f0626b98b54b77..59567fc3c02c103dc99d7ad8b1b6b5077f9c5569 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/TransformSorter.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/TransformSorter.cxx
@@ -1,8 +1,8 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#include "GeoModelFuncSnippets/TransformSorter.h"
-#include "GeoModelFuncSnippets/throwExcept.h"
+#include "GeoModelHelpers/TransformSorter.h"
+#include "GeoModelHelpers/throwExcept.h"
 
 namespace GeoTrf {
     bool TransformSorter::operator()(const std::unique_ptr<Transform3D>& a, 
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/TransformToStringConverter.cxx b/GeoModelCore/GeoModelHelpers/src/TransformToStringConverter.cxx
similarity index 97%
rename from GeoModelCore/GeoModelFuncSnippets/src/TransformToStringConverter.cxx
rename to GeoModelCore/GeoModelHelpers/src/TransformToStringConverter.cxx
index cbf1150b7b7df66ec5b1ed1186398df9d0522f6b..13f5c885b0f6c14603af2a36abc9f360d774ee41 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/TransformToStringConverter.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/TransformToStringConverter.cxx
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#include "GeoModelFuncSnippets/TransformToStringConverter.h"
+#include "GeoModelHelpers/TransformToStringConverter.h"
 #include "GeoModelKernel/Units.h"
 
 namespace{
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/defineWorld.cxx b/GeoModelCore/GeoModelHelpers/src/defineWorld.cxx
similarity index 99%
rename from GeoModelCore/GeoModelFuncSnippets/src/defineWorld.cxx
rename to GeoModelCore/GeoModelHelpers/src/defineWorld.cxx
index e5185656f6f8364b770f7a39d7088a42675d00e8..b28b918a7a3256e75c41ef2523d96fb4ec491319 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/defineWorld.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/defineWorld.cxx
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#include "GeoModelFuncSnippets/defineWorld.h"
+#include "GeoModelHelpers/defineWorld.h"
 #include "GeoModelKernel/GeoElement.h"
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/GeoBox.h"
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/getChildNodesWithTrf.cxx b/GeoModelCore/GeoModelHelpers/src/getChildNodesWithTrf.cxx
similarity index 93%
rename from GeoModelCore/GeoModelFuncSnippets/src/getChildNodesWithTrf.cxx
rename to GeoModelCore/GeoModelHelpers/src/getChildNodesWithTrf.cxx
index 462ac8b684cd10e4a30b1ea00d5f4009d9100c59..cc16ee76af27c4f6934cefae40ab664a5fe2e2a1 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/getChildNodesWithTrf.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/getChildNodesWithTrf.cxx
@@ -1,10 +1,10 @@
 /*
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-#include "GeoModelFuncSnippets/getChildNodesWithTrf.h"
+#include "GeoModelHelpers/getChildNodesWithTrf.h"
 
-#include "GeoModelFuncSnippets/GeoPhysVolSorter.h"
-#include "GeoModelFuncSnippets/TransformSorter.h"
+#include "GeoModelHelpers/GeoPhysVolSorter.h"
+#include "GeoModelHelpers/TransformSorter.h"
 #include "GeoModelKernel/GeoVolumeCursor.h"
 #include "GeoModelKernel/GeoFullPhysVol.h"
 
diff --git a/GeoModelCore/GeoModelFuncSnippets/tests/testGeoShapeSet.cxx b/GeoModelCore/GeoModelHelpers/tests/testGeoShapeSet.cxx
similarity index 97%
rename from GeoModelCore/GeoModelFuncSnippets/tests/testGeoShapeSet.cxx
rename to GeoModelCore/GeoModelHelpers/tests/testGeoShapeSet.cxx
index b992be28432add14b12f0762dbf76e25406395f1..108c93c694aa4020817318037bef59f49a6d3527 100644
--- a/GeoModelCore/GeoModelFuncSnippets/tests/testGeoShapeSet.cxx
+++ b/GeoModelCore/GeoModelHelpers/tests/testGeoShapeSet.cxx
@@ -3,8 +3,8 @@
 */
 #include "GeoModelKernel/Units.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelFuncSnippets/GeoShapeSorter.h"
-#include "GeoModelFuncSnippets/GeoShapeUtils.h"
+#include "GeoModelHelpers/GeoShapeSorter.h"
+#include "GeoModelHelpers/GeoShapeUtils.h"
 
 #include "GeoModelKernel/GeoBox.h"
 #include "GeoModelKernel/GeoTube.h"
diff --git a/GeoModelCore/GeoModelFuncSnippets/tests/testStringUtils.cxx b/GeoModelCore/GeoModelHelpers/tests/testStringUtils.cxx
similarity index 90%
rename from GeoModelCore/GeoModelFuncSnippets/tests/testStringUtils.cxx
rename to GeoModelCore/GeoModelHelpers/tests/testStringUtils.cxx
index c21262be73bb4f01f4e606f3860dec4f7146055c..1fa425cc78555ca9c8e7ff0a46207365e5ecbc15 100644
--- a/GeoModelCore/GeoModelFuncSnippets/tests/testStringUtils.cxx
+++ b/GeoModelCore/GeoModelHelpers/tests/testStringUtils.cxx
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "GeoModelFuncSnippets/StringUtils.h"
-#include "GeoModelFuncSnippets/throwExcept.h"
+#include "GeoModelHelpers/StringUtils.h"
+#include "GeoModelHelpers/throwExcept.h"
 #include <iostream>
 #include <stdlib.h>
 using namespace GeoStrUtils;
diff --git a/GeoModelCore/GeoModelFuncSnippets/tests/testTransformSorter.cxx b/GeoModelCore/GeoModelHelpers/tests/testTransformSorter.cxx
similarity index 96%
rename from GeoModelCore/GeoModelFuncSnippets/tests/testTransformSorter.cxx
rename to GeoModelCore/GeoModelHelpers/tests/testTransformSorter.cxx
index 9889827c866c100495e6a1a278d155f85910d92f..d82df41a71c317527b0d6383f491d1e4ba81c7e6 100644
--- a/GeoModelCore/GeoModelFuncSnippets/tests/testTransformSorter.cxx
+++ b/GeoModelCore/GeoModelHelpers/tests/testTransformSorter.cxx
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "GeoModelFuncSnippets/TransformSorter.h"
-#include "GeoModelFuncSnippets/TransformToStringConverter.h"
+#include "GeoModelHelpers/TransformSorter.h"
+#include "GeoModelHelpers/TransformToStringConverter.h"
 #include "GeoModelKernel/Units.h"
 #include <stdlib.h>
 #include <iostream>
diff --git a/GeoModelTools/GMCAT/CMakeLists.txt b/GeoModelTools/GMCAT/CMakeLists.txt
index b3a2ab02cd9aca6715254d346afe956fb9ea7f46..2347c8588443e18daa07f73ef027bd528ce8a71d 100644
--- a/GeoModelTools/GMCAT/CMakeLists.txt
+++ b/GeoModelTools/GMCAT/CMakeLists.txt
@@ -3,7 +3,7 @@
 # Declare the package's executable.
 add_executable( gmcat src/gmcat.cxx src/publishMetaData.cpp)
 target_link_libraries( gmcat PRIVATE GeoModelCore::GeoModelKernel
-                                     GeoModelCore::GeoModelFuncSnippets
+                                     GeoModelCore::GeoModelHelpers
                                      GeoModelIO::GeoModelRead 
                                      GeoModelIO::GeoModelWrite
                                      GeoModelIO::GeoModelDBManager )
diff --git a/GeoModelTools/GMCAT/src/gmcat.cxx b/GeoModelTools/GMCAT/src/gmcat.cxx
index 467895fa269931040eb4759803a92fd7a9a17ee2..839140c39528f533825be5b53575c88c5edc4ed6 100644
--- a/GeoModelTools/GMCAT/src/gmcat.cxx
+++ b/GeoModelTools/GMCAT/src/gmcat.cxx
@@ -6,7 +6,7 @@
 #include "GeoModelDBManager/GMDBManager.h"
 #include "GeoModelRead/ReadGeoModel.h"
 #include "GeoModelWrite/WriteGeoModel.h"
-#include "GeoModelFuncSnippets/defineWorld.h"
+#include "GeoModelHelpers/defineWorld.h"
 
 #include "GeoModelKernel/GeoGeometryPluginLoader.h"
 #include "GeoModelKernel/GeoVolumeCursor.h"
diff --git a/GeoModelTools/GMSTATISTICS/CMakeLists.txt b/GeoModelTools/GMSTATISTICS/CMakeLists.txt
index 854b50f3ad6a6b929003510977d2bdc631ad7cd5..f371c62d1d82a0db547f3cab6d5a745a9779c293 100644
--- a/GeoModelTools/GMSTATISTICS/CMakeLists.txt
+++ b/GeoModelTools/GMSTATISTICS/CMakeLists.txt
@@ -6,7 +6,7 @@ target_link_libraries( gmstatistics PRIVATE GeoModelCore::GeoModelKernel
                                             GeoModelIO::GeoModelRead 
                                             GeoModelIO::GeoModelWrite
                                             GeoModelIO::GeoModelDBManager
-                                            GeoModelCore::GeoModelFuncSnippets )
+                                            GeoModelCore::GeoModelHelpers )
 
 # Tweak how debug information should be attached to the executable, in Debug
 # builds.
diff --git a/GeoModelTools/GMSTATISTICS/src/gmstatistics.cxx b/GeoModelTools/GMSTATISTICS/src/gmstatistics.cxx
index deb8b8327ce916ea5e4ee3e49a913b0ca3da4e28..1dac430b430e20c120e94b65fe48c16bec16d4b6 100644
--- a/GeoModelTools/GMSTATISTICS/src/gmstatistics.cxx
+++ b/GeoModelTools/GMSTATISTICS/src/gmstatistics.cxx
@@ -11,7 +11,7 @@
 #include "GeoModelKernel/GeoCountVolAction.h"
 #include "GeoModelKernel/GeoAccessVolumeAction.h"
 #include "GeoModelKernel/GeoNameTag.h"
-#include "GeoModelFuncSnippets/defineWorld.h"
+#include "GeoModelHelpers/defineWorld.h"
 #include "GeoInventoryGraphAction.h"
 #include <fstream>
 #include <iostream>
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt b/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt
index 67c34087f1161b1006d1895b35ec8f5449390562..8e9375ae0f4dc9b84b49efe26f725828f165c63b 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt
@@ -13,7 +13,7 @@ find_package( ZLIB REQUIRED )
 # Create the library.
 add_library( GeoModelXml SHARED ${HEADERS} ${SOURCES} )
 # link libraries
-target_link_libraries( GeoModelXml PUBLIC GeoModelCore::GeoModelKernel GeoModelCore::GeoModelFuncSnippets GeoModelTools::ExpressionEvaluator XercesC::XercesC PRIVATE ZLIB::ZLIB  )
+target_link_libraries( GeoModelXml PUBLIC GeoModelCore::GeoModelKernel GeoModelCore::GeoModelHelpers GeoModelTools::ExpressionEvaluator XercesC::XercesC PRIVATE ZLIB::ZLIB  )
 target_include_directories( GeoModelXml PUBLIC 
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    $<INSTALL_INTERFACE:include> )
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Element2GeoItem.h b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Element2GeoItem.h
index 86cd6ed8f5b0f42491dcc9baa647bce67d275bee..9ae11193d2d41053279358d2af64a05e5c90fee5 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Element2GeoItem.h
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Element2GeoItem.h
@@ -11,7 +11,7 @@
 #define GEO_MODEL_XML_ELEMENT2GEO_ITEM_H
 #include <xercesc/util/XercesDefs.hpp>
 
-#include "GeoModelFuncSnippets/GeoDeDuplicator.h"
+#include "GeoModelHelpers/GeoDeDuplicator.h"
 #include "GeoModelKernel/RCBase.h"
 #include "GeoModelKernel/GeoIntrusivePtr.h"
 
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/ElementProcessor.h b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/ElementProcessor.h
index 5b3a71c7e55ec8e5c6ce59f968abf6a3b59b04cf..231236a9274e95d6b2496a4e2e5a269b6face6fa 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/ElementProcessor.h
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/ElementProcessor.h
@@ -12,7 +12,7 @@
 #include <xercesc/util/XercesDefs.hpp>
 
 #include "GeoModelXml/GeoNodeList.h"
-#include "GeoModelFuncSnippets/GeoDeDuplicator.h"
+#include "GeoModelHelpers/GeoDeDuplicator.h"
 XERCES_CPP_NAMESPACE_BEGIN
 class DOMElement;
 XERCES_CPP_NAMESPACE_END
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/GmxUtil.h b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/GmxUtil.h
index ff53275924f839043d10077f0c9bcdeb39fda2ce..0a1912e85dfb2a788c556fc1d2be1c119dc88a7d 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/GmxUtil.h
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/GmxUtil.h
@@ -10,7 +10,7 @@
 //
 #include <string>
 #include "ExpressionEvaluator/Evaluator.h"
-#include "GeoModelFuncSnippets/MaterialManager.h"
+#include "GeoModelHelpers/MaterialManager.h"
 #include "GeoModelXml/ProcessorRegistry.h"
 #include "GeoModelXml/Element2GeoItemRegistry.h"
 
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/Element2GeoItem.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/Element2GeoItem.cxx
index d37668328a51cd26c9fcb40f390b451d3e5d08df..580b20989303b4eab2e41dc4b470a96d875804ad 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/Element2GeoItem.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/Element2GeoItem.cxx
@@ -12,7 +12,7 @@
 
 #include "GeoModelXml/GmxUtil.h"
 #include "GeoModelKernel/RCBase.h"
-#include "GeoModelFuncSnippets/throwExcept.h"
+#include "GeoModelHelpers/throwExcept.h"
 
 using namespace std;
 using namespace xercesc;
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
index 31fd4ebd824e7ed34b91025dd42341c3c0bb5c66..86f3e8811c358b7a46c983b69921d96daaef0513 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
@@ -28,7 +28,7 @@
 #include "GeoModelXml/GmxUtil.h"
 #include "GeoModelXml/GmxInterface.h"
 #include "GeoModelXml/createdomdocument.h"
-#include "GeoModelFuncSnippets/MaterialManager.h"
+#include "GeoModelHelpers/MaterialManager.h"
 
 using namespace std;
 using namespace xercesc;