diff --git a/CMakeLists.txt b/CMakeLists.txt
index b210788ed7bf3d9161c006360c04d3d409a830e1..8c31c2ab89de660e0f5d2419b902442d5b320414 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,8 +24,8 @@ find_package( GeoModelCore REQUIRED )
 find_package( GeoModelIO REQUIRED )
 
 # Set up the build of the libraries of the project.
-add_subdirectory( XMLParser )
-add_subdirectory( JSONParser )
+add_subdirectory( GeoModelXMLParser )
+add_subdirectory( GeoModelJSONParser )
 add_subdirectory( ExpressionEvaluator )
 add_subdirectory( GMCAT )
 
diff --git a/JSONParser/CMakeLists.txt b/GeoModelJSONParser/CMakeLists.txt
similarity index 58%
rename from JSONParser/CMakeLists.txt
rename to GeoModelJSONParser/CMakeLists.txt
index 2cff1ec1c3bab1615ba891459abf00f68813069e..03f7a90fbcab87520a3540695df10b905b087ac1 100644
--- a/JSONParser/CMakeLists.txt
+++ b/GeoModelJSONParser/CMakeLists.txt
@@ -2,34 +2,34 @@
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
-file( GLOB HEADERS JSONParser/*.h )
+file( GLOB HEADERS GeoModelJSONParser/*.h )
 
 # Create the library.
-add_library( JSONParser SHARED ${HEADERS} ${SOURCES} )
-target_link_libraries( JSONParser PUBLIC nlohmann_json::nlohmann_json )
-target_include_directories( JSONParser PUBLIC
+add_library( GeoModelJSONParser SHARED ${HEADERS} ${SOURCES} )
+target_link_libraries( GeoModelJSONParser PUBLIC nlohmann_json::nlohmann_json )
+target_include_directories( GeoModelJSONParser PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
-source_group( "JSONParser" FILES ${HEADERS} )
+source_group( "GeoModelJSONParser" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} )
-set_target_properties( JSONParser PROPERTIES
+set_target_properties( GeoModelJSONParser PROPERTIES
    VERSION ${PROJECT_VERSION}
    SOVERSION ${PROJECT_VERSION_MAJOR} )
 if( GEOMODEL_USE_BUILTIN_JSON )
-   add_dependencies( JSONParser JSON )
+   add_dependencies( GeoModelJSONParser JSON )
 endif()
 
 # Install the library.
-install( TARGETS JSONParser
+install( TARGETS GeoModelJSONParser
    EXPORT ${PROJECT_NAME}-export
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
    COMPONENT Runtime
    NAMELINK_SKIP )
-install( TARGETS JSONParser
+install( TARGETS GeoModelJSONParser
    EXPORT ${PROJECT_NAME}-export
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
    COMPONENT Development
    NAMELINK_ONLY )
 install( FILES ${HEADERS}
-   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/JSONParser
+   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelJSONParser
    COMPONENT Development )
diff --git a/JSONParser/JSONParser/JSONHandler.h b/GeoModelJSONParser/GeoModelJSONParser/JSONHandler.h
similarity index 100%
rename from JSONParser/JSONParser/JSONHandler.h
rename to GeoModelJSONParser/GeoModelJSONParser/JSONHandler.h
diff --git a/JSONParser/JSONParser/JSONParser.h b/GeoModelJSONParser/GeoModelJSONParser/JSONParser.h
similarity index 91%
rename from JSONParser/JSONParser/JSONParser.h
rename to GeoModelJSONParser/GeoModelJSONParser/JSONParser.h
index 8bd7922b227e6d38d60b9f3d154c5dc3f17f5889..72e0cf8b75bdba580348ad958963697fd995a488 100644
--- a/JSONParser/JSONParser/JSONParser.h
+++ b/GeoModelJSONParser/GeoModelJSONParser/JSONParser.h
@@ -7,8 +7,8 @@
 #include <sstream>
 #include <string>
 
-#include "JSONParser/handlerStore.h"
-#include "JSONParser/JSONHandler.h"
+#include "GeoModelJSONParser/handlerStore.h"
+#include "GeoModelJSONParser/JSONHandler.h"
 
 using json = nlohmann::json;
 
diff --git a/JSONParser/JSONParser/handlerStore.h b/GeoModelJSONParser/GeoModelJSONParser/handlerStore.h
similarity index 100%
rename from JSONParser/JSONParser/handlerStore.h
rename to GeoModelJSONParser/GeoModelJSONParser/handlerStore.h
diff --git a/JSONParser/src/handlerStore.cxx b/GeoModelJSONParser/src/handlerStore.cxx
similarity index 88%
rename from JSONParser/src/handlerStore.cxx
rename to GeoModelJSONParser/src/handlerStore.cxx
index 227e5a09b2232277b718d08c6785acc7218363c7..bf609211df0be53dceda57436b1dd3d4b1ca56e6 100644
--- a/JSONParser/src/handlerStore.cxx
+++ b/GeoModelJSONParser/src/handlerStore.cxx
@@ -1,5 +1,5 @@
-#include "JSONParser/handlerStore.h"
-#include "JSONParser/JSONHandler.h"
+#include "GeoModelJSONParser/handlerStore.h"
+#include "GeoModelJSONParser/JSONHandler.h"
 
 handlerStore* handlerStore::getHandlerStore() 
 {
diff --git a/XMLParser/CMakeLists.txt b/GeoModelXMLParser/CMakeLists.txt
similarity index 58%
rename from XMLParser/CMakeLists.txt
rename to GeoModelXMLParser/CMakeLists.txt
index f5f10c3ff921e596cfa1b6e4cc5008e1030853e7..47d12c2623b2eea3f023dbdbc3663f8a9636f8cd 100644
--- a/XMLParser/CMakeLists.txt
+++ b/GeoModelXMLParser/CMakeLists.txt
@@ -2,35 +2,35 @@
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
-file( GLOB HEADERS XMLParser/*.h )
+file( GLOB HEADERS GeoModelXMLParser/*.h )
 
 # Create the library.
-add_library( XMLParser SHARED ${HEADERS} ${SOURCES} )
-target_link_libraries( XMLParser PUBLIC XercesC::XercesC ExpressionEvaluator )
-target_include_directories( XMLParser SYSTEM PUBLIC )
-target_include_directories( XMLParser PUBLIC
+add_library( GeoModelXMLParser SHARED ${HEADERS} ${SOURCES} )
+target_link_libraries( GeoModelXMLParser PUBLIC XercesC::XercesC
+   ExpressionEvaluator )
+target_include_directories( GeoModelXMLParser PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
-source_group( "XMLParser" FILES ${HEADERS} )
+source_group( "GeoModelXMLParser" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} )
-set_target_properties( XMLParser PROPERTIES
+set_target_properties( GeoModelXMLParser PROPERTIES
    VERSION ${PROJECT_VERSION}
    SOVERSION ${PROJECT_VERSION_MAJOR} )
 if( GEOMODEL_USE_BUILTIN_XERCESC )
-   add_dependencies( XMLParser XercesC )
+   add_dependencies( GeoModelXMLParser XercesC )
 endif()
 
 # Install the library.
-install( TARGETS XMLParser
+install( TARGETS GeoModelXMLParser
    EXPORT ${PROJECT_NAME}-export
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
    COMPONENT Runtime
    NAMELINK_SKIP )
-install( TARGETS XMLParser
+install( TARGETS GeoModelXMLParser
    EXPORT ${PROJECT_NAME}-export
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
    COMPONENT Development
    NAMELINK_ONLY )
 install( FILES ${HEADERS}
-   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/XMLParser
+   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelXMLParser
    COMPONENT Development )
diff --git a/XMLParser/XMLParser/IAGDDParser.h b/GeoModelXMLParser/GeoModelXMLParser/IAGDDParser.h
similarity index 100%
rename from XMLParser/XMLParser/IAGDDParser.h
rename to GeoModelXMLParser/GeoModelXMLParser/IAGDDParser.h
diff --git a/XMLParser/XMLParser/XMLHandler.h b/GeoModelXMLParser/GeoModelXMLParser/XMLHandler.h
similarity index 100%
rename from XMLParser/XMLParser/XMLHandler.h
rename to GeoModelXMLParser/GeoModelXMLParser/XMLHandler.h
diff --git a/XMLParser/XMLParser/XMLHandlerStore.h b/GeoModelXMLParser/GeoModelXMLParser/XMLHandlerStore.h
similarity index 100%
rename from XMLParser/XMLParser/XMLHandlerStore.h
rename to GeoModelXMLParser/GeoModelXMLParser/XMLHandlerStore.h
diff --git a/XMLParser/XMLParser/XercesParser.h b/GeoModelXMLParser/GeoModelXMLParser/XercesParser.h
similarity index 95%
rename from XMLParser/XMLParser/XercesParser.h
rename to GeoModelXMLParser/GeoModelXMLParser/XercesParser.h
index d8c8ee3207ada431f8d468989ad65e69be9fb837..7039375f28a4641ebcd7a437e0d9d768ac5c9d1c 100644
--- a/XMLParser/XMLParser/XercesParser.h
+++ b/GeoModelXMLParser/GeoModelXMLParser/XercesParser.h
@@ -6,7 +6,7 @@
 #define XercesParser_H
 
 #include <string>
-#include "XMLParser/IAGDDParser.h"
+#include "GeoModelXMLParser/IAGDDParser.h"
 
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/parsers/XercesDOMParser.hpp>
diff --git a/XMLParser/src/XMLHandler.cxx b/GeoModelXMLParser/src/XMLHandler.cxx
similarity index 98%
rename from XMLParser/src/XMLHandler.cxx
rename to GeoModelXMLParser/src/XMLHandler.cxx
index 46b86c3e68bdc456f33214791fb850c829222e69..073290f2ac934a665ae59adf2348710114f96592 100644
--- a/XMLParser/src/XMLHandler.cxx
+++ b/GeoModelXMLParser/src/XMLHandler.cxx
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "XMLParser/XMLHandler.h"
-#include "XMLParser/XMLHandlerStore.h"
+#include "GeoModelXMLParser/XMLHandler.h"
+#include "GeoModelXMLParser/XMLHandlerStore.h"
 
 #include "ExpressionEvaluator/ExpressionEvaluator.h"
 
diff --git a/XMLParser/src/XMLHandlerStore.cxx b/GeoModelXMLParser/src/XMLHandlerStore.cxx
similarity index 93%
rename from XMLParser/src/XMLHandlerStore.cxx
rename to GeoModelXMLParser/src/XMLHandlerStore.cxx
index fc56a04b2662ff6c491eab3aa9fa55bb0017ccae..ce93bb1c7a897141754e44968c3e07f69dccd2c2 100644
--- a/XMLParser/src/XMLHandlerStore.cxx
+++ b/GeoModelXMLParser/src/XMLHandlerStore.cxx
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "XMLParser/XMLHandlerStore.h"
-#include "XMLParser/XMLHandler.h"
+#include "GeoModelXMLParser/XMLHandlerStore.h"
+#include "GeoModelXMLParser/XMLHandler.h"
 
 #include <iostream>
 
diff --git a/XMLParser/src/XercesParser.cxx b/GeoModelXMLParser/src/XercesParser.cxx
similarity index 98%
rename from XMLParser/src/XercesParser.cxx
rename to GeoModelXMLParser/src/XercesParser.cxx
index 89ae10f44051123396fd9153e166e7eb3a249686..97c0e224545bfc1d4b6511d807b71dfae515ea61 100644
--- a/XMLParser/src/XercesParser.cxx
+++ b/GeoModelXMLParser/src/XercesParser.cxx
@@ -4,9 +4,9 @@
 
 #include <iostream>
 
-#include "XMLParser/XercesParser.h"
-#include "XMLParser/XMLHandler.h"
-#include "XMLParser/XMLHandlerStore.h"
+#include "GeoModelXMLParser/XercesParser.h"
+#include "GeoModelXMLParser/XMLHandler.h"
+#include "GeoModelXMLParser/XMLHandlerStore.h"
 
 #include "xercesc/util/PlatformUtils.hpp"
 #include "xercesc/util/XMLException.hpp"
diff --git a/README.md b/README.md
index d687fbab66729a2c97dce1244b2c3d2800aa253c..ba6b30136152b27b3df6bc1bb58d7ee3626afd47 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
 # GeoModelTools 
 
 Tools and utilities for GeoModel-based detector description projects
+
+