diff --git a/Detector/CMakeLists.txt b/Detector/CMakeLists.txt
index d628d7ab5b402422bff9135b662a12688c56841f..e36d83ada704e5db05379fe1d617b525fcf5f8a8 100644
--- a/Detector/CMakeLists.txt
+++ b/Detector/CMakeLists.txt
@@ -5,6 +5,6 @@ add_subdirectory(DetDriftChamber)
 add_subdirectory(DetEcalMatrix)
 add_subdirectory(DetInterface)
 add_subdirectory(DetSegmentation)
-add_subdirectory(GeomSvc)
-add_subdirectory(Identifier)
+add_subdirectory(DetGeomSvc)
+add_subdirectory(DetIdentifier)
 add_subdirectory(MagneticFieldMap)
diff --git a/Detector/DetCRD/CMakeLists.txt b/Detector/DetCRD/CMakeLists.txt
index 1157f61a3abaf89748b76c1bebda4fe799a861a4..98b1a5c59c64d6269f319460e62ed3b6697fe5ef 100644
--- a/Detector/DetCRD/CMakeLists.txt
+++ b/Detector/DetCRD/CMakeLists.txt
@@ -29,7 +29,7 @@ gaudi_add_module(DetCRD
                          src/Tracker/SiTracker_otkendcap_v01_geo.cpp
 
 		 LINK ${DD4hep_COMPONENT_LIBRARIES}
-                      Identifier
+                      DetIdentifier
 )
 
 set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
diff --git a/Detector/DetCRD/scripts/CRD-Sim.py b/Detector/DetCRD/scripts/CRD-Sim.py
index e658c12772b0d2a8e304055eafae7ad1e5c7a56f..e7906fe2b06455b268a1e87c710329e0880b385a 100644
--- a/Detector/DetCRD/scripts/CRD-Sim.py
+++ b/Detector/DetCRD/scripts/CRD-Sim.py
@@ -30,8 +30,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Detector/DetCRD/scripts/CRD_VXD_MOST2-sim.py b/Detector/DetCRD/scripts/CRD_VXD_MOST2-sim.py
index cb3ceeb761e542e1cf6e43c2a469db62a0feac3f..dbf72a114848caff0e43b18ff971bd39c0ff0c6c 100644
--- a/Detector/DetCRD/scripts/CRD_VXD_MOST2-sim.py
+++ b/Detector/DetCRD/scripts/CRD_VXD_MOST2-sim.py
@@ -30,8 +30,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py b/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py
index e267c61eaffc2d994ce860575b17b4d806be0c4a..a466cbf5e3be15ae76b1aac39b71db64942bb45e 100644
--- a/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py
+++ b/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py
@@ -31,8 +31,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Detector/DetCRD/scripts/CRD_o1_v02-SimRec.py b/Detector/DetCRD/scripts/CRD_o1_v02-SimRec.py
index 05844c9f8d5e2a2e94ae13349a12dda57d0cfcc2..0c0a6e8a7cde31b37c52aa1c0ec5116eab8de9a4 100644
--- a/Detector/DetCRD/scripts/CRD_o1_v02-SimRec.py
+++ b/Detector/DetCRD/scripts/CRD_o1_v02-SimRec.py
@@ -31,8 +31,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Detector/DetCRD/scripts/CRD_o1_v05-Sim.py b/Detector/DetCRD/scripts/CRD_o1_v05-Sim.py
index 0be7a76f061bee6561794b7024a8ee630a2f73d2..42c09a09a0531ed9364cf10fcb3331ce035512d6 100644
--- a/Detector/DetCRD/scripts/CRD_o1_v05-Sim.py
+++ b/Detector/DetCRD/scripts/CRD_o1_v05-Sim.py
@@ -29,8 +29,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 from Configurables import NTupleSvc
diff --git a/Detector/DetCRD/scripts/Standalone-Sim-RotCrystal.py b/Detector/DetCRD/scripts/Standalone-Sim-RotCrystal.py
index c2d88fdebb76f8b3a70d029979009f2bc2212365..2c47a776924dbb72123dec2d92759f7849c8704a 100644
--- a/Detector/DetCRD/scripts/Standalone-Sim-RotCrystal.py
+++ b/Detector/DetCRD/scripts/Standalone-Sim-RotCrystal.py
@@ -29,8 +29,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Detector/DetCRD/scripts/TDR_o1_v01/calodigi.py b/Detector/DetCRD/scripts/TDR_o1_v01/calodigi.py
index bff27594109f154b3eb450f102ba44a46154594b..2b48aae46419d49c26e6c886e1b09d6f30023852 100644
--- a/Detector/DetCRD/scripts/TDR_o1_v01/calodigi.py
+++ b/Detector/DetCRD/scripts/TDR_o1_v01/calodigi.py
@@ -26,8 +26,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 from Configurables import MarlinEvtSeeder
diff --git a/Detector/DetCRD/scripts/TDR_o1_v01/sim.py b/Detector/DetCRD/scripts/TDR_o1_v01/sim.py
index acf8c8a07cd76728a6bd1678b9630a3d0f30c97b..8e871ed17df2183c993e5b7f84fa3c7cc1f4180c 100644
--- a/Detector/DetCRD/scripts/TDR_o1_v01/sim.py
+++ b/Detector/DetCRD/scripts/TDR_o1_v01/sim.py
@@ -28,8 +28,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Detector/DetCRD/scripts/TDR_o1_v01/tracking-oldVersion.py b/Detector/DetCRD/scripts/TDR_o1_v01/tracking-oldVersion.py
index 884cd89d82148db7bc81e867a7fc4b4ed2c16a2e..ff5ef49872d71ae1a61bbc7efca0760e79ada7a3 100644
--- a/Detector/DetCRD/scripts/TDR_o1_v01/tracking-oldVersion.py
+++ b/Detector/DetCRD/scripts/TDR_o1_v01/tracking-oldVersion.py
@@ -27,8 +27,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 from Configurables import MarlinEvtSeeder
diff --git a/Detector/DetCRD/scripts/TDR_o1_v01/tracking.py b/Detector/DetCRD/scripts/TDR_o1_v01/tracking.py
index 5c9b07cd8bce345471a6fa4f92c422410523b344..8f8b262c87b1ce7e9567f32f4db5d1da6e9fc666 100644
--- a/Detector/DetCRD/scripts/TDR_o1_v01/tracking.py
+++ b/Detector/DetCRD/scripts/TDR_o1_v01/tracking.py
@@ -26,8 +26,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 from Configurables import MarlinEvtSeeder
diff --git a/Detector/DetCRD/scripts/TDR_o1_v02/sim.py b/Detector/DetCRD/scripts/TDR_o1_v02/sim.py
index 61f893006dc6861c0bef8ff151981f0e371076e7..c1e91891d6b60fd78f065731e9721e3901253c08 100644
--- a/Detector/DetCRD/scripts/TDR_o1_v02/sim.py
+++ b/Detector/DetCRD/scripts/TDR_o1_v02/sim.py
@@ -27,8 +27,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Detector/DetCRD/scripts/TDR_o1_v02/tracking.py b/Detector/DetCRD/scripts/TDR_o1_v02/tracking.py
index 3bcb7d186fbbe5e2dc1773199ffc9d6e3491f9b0..4207f87ae53ba967d4dc1ebc92d87b40e7faa91d 100644
--- a/Detector/DetCRD/scripts/TDR_o1_v02/tracking.py
+++ b/Detector/DetCRD/scripts/TDR_o1_v02/tracking.py
@@ -26,8 +26,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 from Configurables import MarlinEvtSeeder
diff --git a/Detector/DetCRD/scripts/TDR_o2_v01/sim.py b/Detector/DetCRD/scripts/TDR_o2_v01/sim.py
index 53241da11372d8fdc22d199d8c9f01f0aa18a41b..53f9173d0aad6b2c2617927abe25ccdee425d71e 100644
--- a/Detector/DetCRD/scripts/TDR_o2_v01/sim.py
+++ b/Detector/DetCRD/scripts/TDR_o2_v01/sim.py
@@ -27,8 +27,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Detector/DetCRD/scripts/TDR_o2_v01/tracking.py b/Detector/DetCRD/scripts/TDR_o2_v01/tracking.py
index 785f49eff505a740a1373622a669410d226f6514..38bb7888134eaf11ab3ce3d684cc68d9ca4091ec 100644
--- a/Detector/DetCRD/scripts/TDR_o2_v01/tracking.py
+++ b/Detector/DetCRD/scripts/TDR_o2_v01/tracking.py
@@ -26,8 +26,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 from Configurables import MarlinEvtSeeder
diff --git a/Detector/DetCRD/scripts/TDR_o2_v02/sim.py b/Detector/DetCRD/scripts/TDR_o2_v02/sim.py
index cbfb47e85046913ec69da4a1afb2df0558b1fbeb..df16f1661a478d60b4ffe1afbabff7937fade810 100644
--- a/Detector/DetCRD/scripts/TDR_o2_v02/sim.py
+++ b/Detector/DetCRD/scripts/TDR_o2_v02/sim.py
@@ -27,8 +27,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Detector/DetCRD/scripts/TDR_o2_v02/tracking.py b/Detector/DetCRD/scripts/TDR_o2_v02/tracking.py
index ea2ca6a18282444c5cbdb392843111dcdb9cc292..a87b89f88fbcddbd42b0d4f405f292271c659622 100644
--- a/Detector/DetCRD/scripts/TDR_o2_v02/tracking.py
+++ b/Detector/DetCRD/scripts/TDR_o2_v02/tracking.py
@@ -26,8 +26,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 from Configurables import MarlinEvtSeeder
diff --git a/Detector/DetCRD/src/Tracker/SiTrackerComposite_v01_geo.cpp b/Detector/DetCRD/src/Tracker/SiTrackerComposite_v01_geo.cpp
index 5bd1172b8c33390259988875282323440f584465..971df5d333ad22eaafbead3eb875e3b738a81479 100644
--- a/Detector/DetCRD/src/Tracker/SiTrackerComposite_v01_geo.cpp
+++ b/Detector/DetCRD/src/Tracker/SiTrackerComposite_v01_geo.cpp
@@ -14,7 +14,7 @@
 #include "XML/Utilities.h"
 #include <cmath>
 
-#include "Identifier/CEPCDetectorData.h"
+#include "DetIdentifier/CEPCDetectorData.h"
 
 using namespace std;
 
diff --git a/Detector/DetCRD/src/Tracker/SiTrackerStitching_v01_geo.cpp b/Detector/DetCRD/src/Tracker/SiTrackerStitching_v01_geo.cpp
index 1ac541b8517bfb9265f42f2192d1bfa51e89ad4c..af9bd28e9564418cb48d1d11fb80271b33c5530e 100644
--- a/Detector/DetCRD/src/Tracker/SiTrackerStitching_v01_geo.cpp
+++ b/Detector/DetCRD/src/Tracker/SiTrackerStitching_v01_geo.cpp
@@ -13,7 +13,7 @@
 #include "XML/Utilities.h"
 #include <cmath>
 
-#include "Identifier/CEPCDetectorData.h"
+#include "DetIdentifier/CEPCDetectorData.h"
 
 using namespace std;
 
diff --git a/Detector/GeomSvc/CMakeLists.txt b/Detector/DetGeomSvc/CMakeLists.txt
similarity index 82%
rename from Detector/GeomSvc/CMakeLists.txt
rename to Detector/DetGeomSvc/CMakeLists.txt
index 997f9e97f1ab2683391f93464f83f3def84c70a9..075bee7b5792b3d22f97d9bcf0b6aa8793cdc883 100644
--- a/Detector/GeomSvc/CMakeLists.txt
+++ b/Detector/DetGeomSvc/CMakeLists.txt
@@ -4,8 +4,8 @@
 #    Desc: implement the IGeomSvc interface.
 ##############################################################################
 
-gaudi_add_module(GeomSvc
-                 SOURCES src/GeomSvc.cpp
+gaudi_add_module(DetGeomSvc
+                 SOURCES src/DetGeomSvc.cpp
                  LINK
                    DetInterface
                    ${DD4hep_COMPONENT_LIBRARIES} 
@@ -14,11 +14,11 @@ gaudi_add_module(GeomSvc
                    ${ROOT_LIBRARIES}
 )
 
-target_include_directories(GeomSvc
+target_include_directories(DetGeomSvc
   PUBLIC ${GEAR_INCLUDE_DIRS}
 )
 
-install(TARGETS GeomSvc
+install(TARGETS DetGeomSvc
   EXPORT CEPCSWTargets
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
diff --git a/Detector/GeomSvc/src/GeomSvc.cpp b/Detector/DetGeomSvc/src/DetGeomSvc.cpp
similarity index 88%
rename from Detector/GeomSvc/src/GeomSvc.cpp
rename to Detector/DetGeomSvc/src/DetGeomSvc.cpp
index a35dc650e06695e258b0fa5bcf03b00c1d591a9f..72009ab29d83cb1fd9f48ae0311c7d723dd42486 100644
--- a/Detector/GeomSvc/src/GeomSvc.cpp
+++ b/Detector/DetGeomSvc/src/DetGeomSvc.cpp
@@ -1,4 +1,4 @@
-#include "GeomSvc.h"
+#include "DetGeomSvc.h"
 #include "gearimpl/GearParametersImpl.h"
 #include "TMath.h"
 #include "TMaterial.h"
@@ -19,19 +19,19 @@
 #include <iomanip>
 #include <iostream>
 
-DECLARE_COMPONENT(GeomSvc)
+DECLARE_COMPONENT(DetGeomSvc)
 
-GeomSvc::GeomSvc(const std::string& name, ISvcLocator* svc)
+DetGeomSvc::DetGeomSvc(const std::string& name, ISvcLocator* svc)
 : base_class(name, svc), m_dd4hep_geo(nullptr){
 
 }
 
-GeomSvc::~GeomSvc() {
+DetGeomSvc::~DetGeomSvc() {
 
 }
 
 StatusCode
-GeomSvc::initialize() {
+DetGeomSvc::initialize() {
   StatusCode sc = Service::initialize();
 
   m_dd4hep_geo = &(dd4hep::Detector::getInstance());
@@ -46,7 +46,7 @@ GeomSvc::initialize() {
 }
 
 StatusCode
-GeomSvc::finalize() {
+DetGeomSvc::finalize() {
   StatusCode sc;
 
   // m_surface_manager has added as extension of Detector, so not delete?
@@ -57,7 +57,7 @@ GeomSvc::finalize() {
 }
 
 dd4hep::DetElement
-GeomSvc::getDD4HepGeo() {
+DetGeomSvc::getDD4HepGeo() {
     if (lcdd()) {
         return lcdd()->world();
     }
@@ -65,13 +65,13 @@ GeomSvc::getDD4HepGeo() {
 }
 
 dd4hep::Detector*
-GeomSvc::lcdd() {
+DetGeomSvc::lcdd() {
     return m_dd4hep_geo;
 }
 
 
 IGeomSvc::Decoder*
-GeomSvc::getDecoder(const std::string& readout_name) {
+DetGeomSvc::getDecoder(const std::string& readout_name) {
 
     IGeomSvc::Decoder* decoder = nullptr;
 
@@ -103,7 +103,7 @@ GeomSvc::getDecoder(const std::string& readout_name) {
 }
 
 const dd4hep::rec::SurfaceMap*
-GeomSvc::getSurfaceMap(const std::string& det_name) {
+DetGeomSvc::getSurfaceMap(const std::string& det_name) {
   if (m_surface_manager == nullptr) {
     dd4hep::rec::SurfaceManager* surfaceMgr = nullptr;
     // first check whether exist
diff --git a/Detector/GeomSvc/src/GeomSvc.h b/Detector/DetGeomSvc/src/DetGeomSvc.h
similarity index 86%
rename from Detector/GeomSvc/src/GeomSvc.h
rename to Detector/DetGeomSvc/src/DetGeomSvc.h
index fb253bb189e5f00ff28b9cfd51fed1fec460d4d7..85c2401a37f0b619d7d0285914cf65ebb7de1b6e 100644
--- a/Detector/GeomSvc/src/GeomSvc.h
+++ b/Detector/DetGeomSvc/src/DetGeomSvc.h
@@ -1,5 +1,5 @@
-#ifndef GeomSvc_h
-#define GeomSvc_h
+#ifndef DetGeomSvc_h
+#define DetGeomSvc_h
 
 // Interface
 #include "DetInterface/IGeomSvc.h"
@@ -21,10 +21,10 @@
 
 class TGeoNode;
 
-class GeomSvc: public extends<Service, IGeomSvc> {
+class DetGeomSvc: public extends<Service, IGeomSvc> {
  public:
-  GeomSvc(const std::string& name, ISvcLocator* svc);
-  ~GeomSvc();
+  DetGeomSvc(const std::string& name, ISvcLocator* svc);
+  ~DetGeomSvc();
   
   // Service
   StatusCode initialize() override;
diff --git a/Detector/Identifier/CMakeLists.txt b/Detector/DetIdentifier/CMakeLists.txt
similarity index 82%
rename from Detector/Identifier/CMakeLists.txt
rename to Detector/DetIdentifier/CMakeLists.txt
index b2ededab37a089078e47a6e22c7e9bedc711b60b..0e50013a328b563f527812172a707a09d7738392 100644
--- a/Detector/Identifier/CMakeLists.txt
+++ b/Detector/DetIdentifier/CMakeLists.txt
@@ -2,9 +2,9 @@
 # Package: Identifier
 ################################################################################
 
-gaudi_add_header_only_library(Identifier)
+gaudi_add_header_only_library(DetIdentifier)
 
-install(TARGETS Identifier
+install(TARGETS DetIdentifier
   EXPORT CEPCSWTargets
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
diff --git a/Detector/Identifier/include/Identifier/CEPCConf.h b/Detector/DetIdentifier/include/DetIdentifier/CEPCConf.h
similarity index 100%
rename from Detector/Identifier/include/Identifier/CEPCConf.h
rename to Detector/DetIdentifier/include/DetIdentifier/CEPCConf.h
diff --git a/Detector/Identifier/include/Identifier/CEPCDetectorData.h b/Detector/DetIdentifier/include/DetIdentifier/CEPCDetectorData.h
similarity index 100%
rename from Detector/Identifier/include/Identifier/CEPCDetectorData.h
rename to Detector/DetIdentifier/include/DetIdentifier/CEPCDetectorData.h
diff --git a/Digitisers/SimpleDigi/src/CylinderDigiAlg.cpp b/Digitisers/SimpleDigi/src/CylinderDigiAlg.cpp
index 7cf254961a68af65350e2ac376d7d7c02468b637..12dac308d01d4c169c9e264125ec325105787d86 100644
--- a/Digitisers/SimpleDigi/src/CylinderDigiAlg.cpp
+++ b/Digitisers/SimpleDigi/src/CylinderDigiAlg.cpp
@@ -1,6 +1,6 @@
 #include "CylinderDigiAlg.h"
 
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
 
 #include "edm4hep/Vector3f.h"
 
diff --git a/Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp b/Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp
index 913009e18885ccc962558c586b178d37ed12713f..29083e3f9c432034f711724c56a6c53f3b05c84e 100644
--- a/Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp
+++ b/Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp
@@ -17,7 +17,7 @@
 #include "UTIL/CellIDEncoder.h"
 #include <UTIL/Operators.h>
 */
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
 #include "UTIL/ILDConf.h"
 
 // STUFF needed for GEAR
diff --git a/Digitisers/SimpleDigi/src/SiTrackerDigiAlg.cpp b/Digitisers/SimpleDigi/src/SiTrackerDigiAlg.cpp
index e24a65293aec26e57d5fb1daa57b8c96b81333b4..4a2d537f5f7514efa22a0da202987e091b6a1d00 100644
--- a/Digitisers/SimpleDigi/src/SiTrackerDigiAlg.cpp
+++ b/Digitisers/SimpleDigi/src/SiTrackerDigiAlg.cpp
@@ -1,6 +1,6 @@
 #include "SiTrackerDigiAlg.h"
 
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
 
 #include "edm4hep/Vector3f.h"
 
diff --git a/Digitisers/SimpleDigi/src/SmearDigiTool.cpp b/Digitisers/SimpleDigi/src/SmearDigiTool.cpp
index ea9091807d8838871b938f655afe1e4dc8f7ec13..e3fa7c00bea3991b1ca13ab16ab0c50a4112f191 100644
--- a/Digitisers/SimpleDigi/src/SmearDigiTool.cpp
+++ b/Digitisers/SimpleDigi/src/SmearDigiTool.cpp
@@ -1,7 +1,7 @@
 #include "SmearDigiTool.h"
 
 #include "DataHelper/TrackerHitHelper.h"
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
 #include "DetInterface/IGeomSvc.h"
 
 #include "edm4hep/Vector3f.h"
diff --git a/Digitisers/SimpleDigi/src/TPCDigiAlg.cpp b/Digitisers/SimpleDigi/src/TPCDigiAlg.cpp
index 6b0d042abfc556ef0bc96152e60d3b87cec94138..50a3ec9640af6688da4b293af214950dceb92b05 100644
--- a/Digitisers/SimpleDigi/src/TPCDigiAlg.cpp
+++ b/Digitisers/SimpleDigi/src/TPCDigiAlg.cpp
@@ -33,7 +33,7 @@
 #include <gear/BField.h>
 //
 #include "UTIL/ILDConf.h"
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
 
 #define TRKHITNCOVMATRIX 6
 
diff --git a/Examples/options/CEPCV4_simu_reco_Arbor.py b/Examples/options/CEPCV4_simu_reco_Arbor.py
index dbd5e7212b64f3b4851cb3f99c490b7d8501a87f..4dadbbd04c4551ebbbe2e76d9f8ac01ff9aa54ca 100644
--- a/Examples/options/CEPCV4_simu_reco_Arbor.py
+++ b/Examples/options/CEPCV4_simu_reco_Arbor.py
@@ -28,8 +28,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 from Configurables import GearSvc
diff --git a/Examples/options/LCIO_read_Arbor.py b/Examples/options/LCIO_read_Arbor.py
index df01a342338a7e5b7411cc2a490e958e9ed648c1..0e5108dc29a930a285561363dfb3b828ce4d1d50 100644
--- a/Examples/options/LCIO_read_Arbor.py
+++ b/Examples/options/LCIO_read_Arbor.py
@@ -63,8 +63,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 ########################################################################
 from Configurables import GearSvc
diff --git a/Examples/options/LCIO_read_G2CD.py b/Examples/options/LCIO_read_G2CD.py
index f4ea25ac957f53864131ddd02ad23db5c95aba34..66e61812d0ef8ac4033deeab7f6dddc980f6e057 100644
--- a/Examples/options/LCIO_read_G2CD.py
+++ b/Examples/options/LCIO_read_G2CD.py
@@ -54,8 +54,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 ########################################################################
 from Configurables import GearSvc
diff --git a/Examples/options/detsim_tracker.py b/Examples/options/detsim_tracker.py
index 9c19536a248e79f379a1ee0b1a3810f8a3f0a5a0..4dbf71c8a11460bd01a751e2304e3d83330c8f08 100644
--- a/Examples/options/detsim_tracker.py
+++ b/Examples/options/detsim_tracker.py
@@ -37,7 +37,7 @@ geometry_option = "CepC_v4_onlyTracker.xml"
 # geometry_option = "CepC_v4.xml"
 
 geometry_path = os.path.join(os.getenv("DETCEPCV4ROOT"), "compact", geometry_option)
-geosvc = GeomSvc("GeomSvc")
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 #Previously I do not have these 2 lines
diff --git a/Examples/options/dump_simhit.py b/Examples/options/dump_simhit.py
index 1c699b7a4f98ca5860e6f7a77763f2c91e16eb07..46a4a5043ec0f395306f4ac320f6b4adb5bad932 100644
--- a/Examples/options/dump_simhit.py
+++ b/Examples/options/dump_simhit.py
@@ -19,8 +19,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Examples/options/dumpid.py b/Examples/options/dumpid.py
index f4111bc1cb14914bce220c5bfa0d552fe784b79f..705f1f15c8b1e3c1d1abc971d4d0aabf274f890c 100644
--- a/Examples/options/dumpid.py
+++ b/Examples/options/dumpid.py
@@ -19,8 +19,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Examples/options/sim-rec-trackerecal.py b/Examples/options/sim-rec-trackerecal.py
index 49e79a931fdc1350f51dd89de6f88fcc9700a78b..8eb4691ac4e8b3504da9be9ccab2586e5781c582 100644
--- a/Examples/options/sim-rec-trackerecal.py
+++ b/Examples/options/sim-rec-trackerecal.py
@@ -28,8 +28,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 from Configurables import GenAlgo
diff --git a/Examples/options/sim_beambkg.py b/Examples/options/sim_beambkg.py
index e53127f8cf7fc05c88d85323fdb8b86a5f377817..cea73c11ff16dfbe60b45274322282c605a6a213 100755
--- a/Examples/options/sim_beambkg.py
+++ b/Examples/options/sim_beambkg.py
@@ -31,8 +31,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 from Configurables import NTupleSvc
diff --git a/Examples/options/tut_detrec_SDT.py b/Examples/options/tut_detrec_SDT.py
index ab6cd199650c43dff176514bc5e05565672a18ea..fe55a3c130f4aaae9cc03375abe4ee2ad03a810d 100644
--- a/Examples/options/tut_detrec_SDT.py
+++ b/Examples/options/tut_detrec_SDT.py
@@ -34,8 +34,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Examples/options/tut_detsim.py b/Examples/options/tut_detsim.py
index ededb9965cfeb4b78a928de4633b20d8952f8bbd..6b82a5f3b1ed4369e58b6a0f7b4405730e7fa7bb 100644
--- a/Examples/options/tut_detsim.py
+++ b/Examples/options/tut_detsim.py
@@ -45,8 +45,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Examples/options/tut_detsim_G2CD.py b/Examples/options/tut_detsim_G2CD.py
index b78da615681e0d1fa83222b351937e7f5ac79d22..c4a10c6f156b3a32d1985240331b3eaa95a9e86d 100644
--- a/Examples/options/tut_detsim_G2CD.py
+++ b/Examples/options/tut_detsim_G2CD.py
@@ -17,8 +17,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 ########################################################################
 
diff --git a/Examples/options/tut_detsim_SDT.py b/Examples/options/tut_detsim_SDT.py
index 268e317b2a206775ceea32e72b8bd566143b5cd2..a5dc22a2276d5d390738f2e51a312b5ed1c821a4 100644
--- a/Examples/options/tut_detsim_SDT.py
+++ b/Examples/options/tut_detsim_SDT.py
@@ -45,8 +45,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Examples/options/tut_detsim_SDT_Heed.py b/Examples/options/tut_detsim_SDT_Heed.py
index d994ae61418c40c14afcd40640223c872ba810c9..179ac68c6cb10717b1e0b6c9fc420bed43d5a408 100644
--- a/Examples/options/tut_detsim_SDT_Heed.py
+++ b/Examples/options/tut_detsim_SDT_Heed.py
@@ -47,8 +47,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 print('geometry_path=',geometry_path)
 geosvc.compact = geometry_path
 
diff --git a/Examples/options/tut_detsim_digi_SDT.py b/Examples/options/tut_detsim_digi_SDT.py
index 1dfd75ec1872c0300903afe6d1cdf5fd30318445..5431461d29f50b28158c082f92b11c88f6a52489 100644
--- a/Examples/options/tut_detsim_digi_SDT.py
+++ b/Examples/options/tut_detsim_digi_SDT.py
@@ -46,8 +46,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Examples/options/tut_detsim_digi_fit_DC.py b/Examples/options/tut_detsim_digi_fit_DC.py
index aec8695f5714de62ab4413f5ef9fc90d397dde7e..efdfe66c9660d651bf63160a752cbe6c8167ae5b 100644
--- a/Examples/options/tut_detsim_digi_fit_DC.py
+++ b/Examples/options/tut_detsim_digi_fit_DC.py
@@ -46,8 +46,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Examples/options/tut_detsim_digi_truthTracker_SDT.py b/Examples/options/tut_detsim_digi_truthTracker_SDT.py
index cbef316570dd61d203d7dfc4885eb5be2af070f0..4ea9485fe36153fe4207e173cfa6f0b0fea5092f 100644
--- a/Examples/options/tut_detsim_digi_truthTracker_SDT.py
+++ b/Examples/options/tut_detsim_digi_truthTracker_SDT.py
@@ -46,8 +46,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Examples/options/tut_detsim_digi_truthTracker_SDT_dedx.py b/Examples/options/tut_detsim_digi_truthTracker_SDT_dedx.py
index 84bf326d6d3a887ca7515f6dc3a4cd61e3b65964..2743861e6cefc0081cd20edadfa5b4c8486d6d1b 100644
--- a/Examples/options/tut_detsim_digi_truthTracker_SDT_dedx.py
+++ b/Examples/options/tut_detsim_digi_truthTracker_SDT_dedx.py
@@ -46,8 +46,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 #geosvc.compact = "/workfs/higgs/fangwx/fork_DedxAlg_20201217/CEPCSW/Detector/DetCRD/compact/CRD_o1_v01/CRD_o1_v01.xml"
 #geosvc.compact = "/workfs/higgs/fangwx/fork_DedxAlg_20201217/CEPCSW/Detector/DetCRD/compact/CRD_o1_v01/CRD_o1_v01_DCH.xml"
diff --git a/Examples/options/tut_detsim_pan_matrix.py b/Examples/options/tut_detsim_pan_matrix.py
index 7340454f1055e011ad561f40be130acba0acc4f6..1d22d1f932e9f1c5f05ec09aeee572c14e8e838d 100644
--- a/Examples/options/tut_detsim_pan_matrix.py
+++ b/Examples/options/tut_detsim_pan_matrix.py
@@ -42,8 +42,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 #geosvc.compact = geometry_path
 geosvc.compact = "./Detector/DetEcalMatrix/compact/det.xml"
 
diff --git a/Examples/options/tut_detsim_pandora.py b/Examples/options/tut_detsim_pandora.py
index d6be9779536ca104ede45df6114aece9411b5625..a6bd147dcad61dc53bff7c959365f7fba3b09d95 100644
--- a/Examples/options/tut_detsim_pandora.py
+++ b/Examples/options/tut_detsim_pandora.py
@@ -43,8 +43,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Examples/options/tut_dosesim.py b/Examples/options/tut_dosesim.py
index 90d0e218f249bf385ed85e764b5778129abe3f36..51f3833adce8a0440ed8eba65a9f4725bf2dfae8 100644
--- a/Examples/options/tut_dosesim.py
+++ b/Examples/options/tut_dosesim.py
@@ -46,8 +46,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Reconstruction/PFA/CyberPFA/script/digi.py b/Reconstruction/PFA/CyberPFA/script/digi.py
index 6605e2166e33b7335c083b92d788adf0f3d31b68..8402b2ce64e70fcabab925c35b788c2f71c78e5b 100644
--- a/Reconstruction/PFA/CyberPFA/script/digi.py
+++ b/Reconstruction/PFA/CyberPFA/script/digi.py
@@ -26,8 +26,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 from Configurables import MarlinEvtSeeder
diff --git a/Reconstruction/PFA/CyberPFA/script/rec.py b/Reconstruction/PFA/CyberPFA/script/rec.py
index 285014010200a69c7af3839248e3156d7e8ab578..fd1de01db1f48229fb0ab16e7687788a73409c5b 100644
--- a/Reconstruction/PFA/CyberPFA/script/rec.py
+++ b/Reconstruction/PFA/CyberPFA/script/rec.py
@@ -13,8 +13,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geomsvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geomsvc = DetGeomSvc("GeomSvc")
 geomsvc.compact = geometry_path
 #######################################
 
diff --git a/Reconstruction/PFA/CyberPFA/script/sim.py b/Reconstruction/PFA/CyberPFA/script/sim.py
index ae9cbd3197c686a54d304c16e4ce7c73706dde0e..057642463c141ac31f610c395246d243cdbb6575 100644
--- a/Reconstruction/PFA/CyberPFA/script/sim.py
+++ b/Reconstruction/PFA/CyberPFA/script/sim.py
@@ -27,8 +27,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 ##############################################################################
diff --git a/Reconstruction/PFA/CyberPFA/script/tracking.py b/Reconstruction/PFA/CyberPFA/script/tracking.py
index dea774cada721039b31d0588d9fba18964b5bd7a..69af563e0af67b1661b3891455edd8a5756dc3f4 100644
--- a/Reconstruction/PFA/CyberPFA/script/tracking.py
+++ b/Reconstruction/PFA/CyberPFA/script/tracking.py
@@ -26,8 +26,8 @@ if not os.path.exists(geometry_path):
     print("Can't find the compact geometry file: %s"%geometry_path)
     sys.exit(-1)
 
-from Configurables import GeomSvc
-geosvc = GeomSvc("GeomSvc")
+from Configurables import DetGeomSvc
+geosvc = DetGeomSvc("GeomSvc")
 geosvc.compact = geometry_path
 
 from Configurables import MarlinEvtSeeder
diff --git a/Reconstruction/ParticleID/src/TofRecAlg.cpp b/Reconstruction/ParticleID/src/TofRecAlg.cpp
index db36ee1e3e09beab09749d81a04a7816dbc1d6fa..3dce6848fa43d070afabbcf9a1bf9e196a66840d 100644
--- a/Reconstruction/ParticleID/src/TofRecAlg.cpp
+++ b/Reconstruction/ParticleID/src/TofRecAlg.cpp
@@ -13,7 +13,7 @@
 #include "CLHEP/Units/SystemOfUnits.h"
 #include <math.h>
 #include "UTIL/ILDConf.h"
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
 #include "UTIL/CellIDEncoder.h"
 
 DECLARE_COMPONENT( TofRecAlg )
diff --git a/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp b/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp
index 7921fd3e1fa5d27ae41d235c90298b58c1ad221f..d2b5e8b7d9f911544be1bf486927244560600dcb 100644
--- a/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp
+++ b/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp
@@ -1,6 +1,6 @@
 #include "SiliconTrackingAlg.h"
 
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
 #include "GearSvc/IGearSvc.h"
 #include "EventSeeder/IEventSeeder.h"
 #include "TrackSystemSvc/ITrackSystemSvc.h"
diff --git a/Reconstruction/Tracking/include/Tracking/TrackingHelper.h b/Reconstruction/Tracking/include/Tracking/TrackingHelper.h
index 7dd90d7869bb0b49cb299f05634c42ae89ed0783..b0319e61f3b95150a9572328464ff8730b5b97fc 100644
--- a/Reconstruction/Tracking/include/Tracking/TrackingHelper.h
+++ b/Reconstruction/Tracking/include/Tracking/TrackingHelper.h
@@ -6,7 +6,7 @@
 #include "UTIL/BitField64.h"
 #include "UTIL/CellIDDecoder.h"
 #include "UTIL/ILDConf.h"
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
 #include "lcio.h"
 #include <array>
 
diff --git a/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp b/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
index 66282d7cceb0ac824ddfdbeb525d4cfde7f8fcfe..8e732aed84563ed7fa8d5f7285074487aa8808d7 100644
--- a/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
+++ b/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
@@ -4,7 +4,7 @@
 
 #include <UTIL/BitField64.h>
 #include <UTIL/ILDConf.h>
-#include <Identifier/CEPCConf.h>
+#include <DetIdentifier/CEPCConf.h>
 #include <UTIL/BitSet32.h>
 
 ///---- GEAR ----
diff --git a/Service/GearSvc/CMakeLists.txt b/Service/GearSvc/CMakeLists.txt
index 13b502dd4e5ae5544afc5dd27733089e616cb820..5ce9f33703584d574326e6b46cb4d41db981f22d 100644
--- a/Service/GearSvc/CMakeLists.txt
+++ b/Service/GearSvc/CMakeLists.txt
@@ -9,7 +9,7 @@ gaudi_add_module(GearSvcPlugins
                       ${DD4hep_COMPONENT_LIBRARIES}
                       DetInterface
                       DetSegmentation
-                      Identifier
+                      DetIdentifier
 )
 
 target_include_directories(GearSvcPlugins
diff --git a/Service/GearSvc/src/GearSvc.cpp b/Service/GearSvc/src/GearSvc.cpp
index 871725fff15b5a5a778432f556c4909c4e442d44..c8ddfc05bd0817e35183e8a75846de2aecf07b63 100644
--- a/Service/GearSvc/src/GearSvc.cpp
+++ b/Service/GearSvc/src/GearSvc.cpp
@@ -1,7 +1,7 @@
 #include "GearSvc.h"
 #include "DetInterface/IGeomSvc.h"
 #include "DetSegmentation/GridDriftChamber.h"
-#include "Identifier/CEPCDetectorData.h"
+#include "DetIdentifier/CEPCDetectorData.h"
 
 #include "gearxml/GearXML.h"
 #include "gearimpl/GearMgrImpl.h"
diff --git a/Utilities/DataHelper/CMakeLists.txt b/Utilities/DataHelper/CMakeLists.txt
index 2cc021c0ab8e9ddd51e95db8adf6bce24d8e31b0..e5ed8e533bf0efba85351824ba27f4a0cb46e618 100644
--- a/Utilities/DataHelper/CMakeLists.txt
+++ b/Utilities/DataHelper/CMakeLists.txt
@@ -25,10 +25,9 @@ gaudi_add_library(DataHelperLib
                              Gaudi::GaudiKernel
                              ${GSL_LIBRARIES}
                              ${CLHEP_LIBRARIES}
-                             Identifier
+                             DetIdentifier
                              DetSegmentation
                              DetInterface
-                             Identifier
 )
 
 install(TARGETS DataHelperLib
diff --git a/Utilities/DataHelper/src/GeomeryHelper.cpp b/Utilities/DataHelper/src/GeomeryHelper.cpp
index 8dbefbb8c69ce50b251d0e9aa0781823fb9061dc..7b7c1c59dc91a598ced7b4c7130e6de1d67be8b3 100644
--- a/Utilities/DataHelper/src/GeomeryHelper.cpp
+++ b/Utilities/DataHelper/src/GeomeryHelper.cpp
@@ -1,5 +1,5 @@
 #include "DataHelper/GeomeryHelper.h"
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
 
 
 //Externals
diff --git a/Utilities/DataHelper/src/TrackerHitHelper.cpp b/Utilities/DataHelper/src/TrackerHitHelper.cpp
index c3e8a64fa95b2468090014f0bd8f1d277a08e167..fa8cd72f8d83b6167d75ae575d008f68921f8e70 100644
--- a/Utilities/DataHelper/src/TrackerHitHelper.cpp
+++ b/Utilities/DataHelper/src/TrackerHitHelper.cpp
@@ -1,5 +1,5 @@
 #include "DataHelper/TrackerHitHelper.h"
-#include "Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
 
 #include "TMatrixF.h"
 #include "CLHEP/Matrix/SymMatrix.h"
diff --git a/Utilities/KalDet/CMakeLists.txt b/Utilities/KalDet/CMakeLists.txt
index b584868258eb8237af72b869ad0a338b979e872f..8511f2378df384b1241510f672208cc56e625967 100644
--- a/Utilities/KalDet/CMakeLists.txt
+++ b/Utilities/KalDet/CMakeLists.txt
@@ -64,6 +64,7 @@ set( KalDetLib_srcs ${LIB_SOURCES} ${COMMON_SOURCES} )
 gaudi_add_library(KalDetLib
                   SOURCES ${KalDetLib_srcs}
                   LINK DetInterface
+                       DetIdentifier
                        KalTestLib
                        Gaudi::GaudiKernel
                        ${ROOT_LIBRARIES}
diff --git a/Utilities/KalDet/src/ild/tpc/ILDTPCKalDetector.cc b/Utilities/KalDet/src/ild/tpc/ILDTPCKalDetector.cc
index ba1f21f85907432c10d1e51064f8b0905a360eca..3344de26e266234fa97e3e05d8435e10fa8e4cf2 100644
--- a/Utilities/KalDet/src/ild/tpc/ILDTPCKalDetector.cc
+++ b/Utilities/KalDet/src/ild/tpc/ILDTPCKalDetector.cc
@@ -25,7 +25,7 @@
 
 #include <UTIL/BitField64.h>
 #include <UTIL/ILDConf.h>
-#include "../../../../../Detector/Identifier/include/Identifier/CEPCConf.h"
+#include "DetIdentifier/CEPCConf.h"
 
 // #include "streamlog/streamlog.h"
 
diff --git a/cmake/CEPCSWConfig.cmake b/cmake/CEPCSWConfig.cmake
index 4f9445ac3683765653b333811ce5ca8803cec5c6..771a23896e2768ce1d85d8ae0501966945dad62b 100644
--- a/cmake/CEPCSWConfig.cmake
+++ b/cmake/CEPCSWConfig.cmake
@@ -9,5 +9,5 @@ find_dependency(ROOT REQUIRED)
 # link to (libraries) or execute (programs)
 include("${CMAKE_CURRENT_LIST_DIR}/CEPCSWTargets.cmake")
 
-get_property(TEST_CEPCSW_LIBRARY TARGET CEPCSW::GeomSvc PROPERTY LOCATION)
+get_property(TEST_CEPCSW_LIBRARY TARGET CEPCSW::DetGeomSvc PROPERTY LOCATION)
 find_package_handle_standard_args(CEPCSW DEFAULT_MSG CMAKE_CURRENT_LIST_FILE TEST_CEPCSW_LIBRARY)