diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba96443a3b5830b4168d7091caddc296ddb69dea..fbf1f1f00f7fa767af030bcc4370995989e0b57a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,7 @@ include(cmake/CEPCSWDependencies.cmake)
 
 add_subdirectory(Analysis)
 add_subdirectory(Detector)
-add_subdirectory(Digitisers)
+add_subdirectory(Digitization)
 add_subdirectory(Examples)
 add_subdirectory(Generator)
 add_subdirectory(Reconstruction)
diff --git a/Digitisers/CMakeLists.txt b/Digitization/CMakeLists.txt
similarity index 50%
rename from Digitisers/CMakeLists.txt
rename to Digitization/CMakeLists.txt
index 77de90cc5fc9b7100ca2ba66c491765ee90d8a6e..ae43bd3ec6bcf002b88c7cfb7606deec734411ca 100644
--- a/Digitisers/CMakeLists.txt
+++ b/Digitization/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(DigiTool)
-add_subdirectory(DCHDigi)
+add_subdirectory(DigiDCH)
 add_subdirectory(G2CDArbor)
 add_subdirectory(SimHitMerge)
-add_subdirectory(SimpleDigi)
-add_subdirectory(CaloDigi)
+add_subdirectory(DigiSimple)
+add_subdirectory(DigiCalo)
diff --git a/Digitisers/CaloDigi/CMakeLists.txt b/Digitization/DigiCalo/CMakeLists.txt
similarity index 100%
rename from Digitisers/CaloDigi/CMakeLists.txt
rename to Digitization/DigiCalo/CMakeLists.txt
diff --git a/Digitisers/CaloDigi/src/CaloBar.h b/Digitization/DigiCalo/src/CaloBar.h
similarity index 100%
rename from Digitisers/CaloDigi/src/CaloBar.h
rename to Digitization/DigiCalo/src/CaloBar.h
diff --git a/Digitisers/CaloDigi/src/CaloHit.h b/Digitization/DigiCalo/src/CaloHit.h
similarity index 100%
rename from Digitisers/CaloDigi/src/CaloHit.h
rename to Digitization/DigiCalo/src/CaloHit.h
diff --git a/Digitisers/CaloDigi/src/EcalDigiAlg.cpp b/Digitization/DigiCalo/src/EcalDigiAlg.cpp
similarity index 100%
rename from Digitisers/CaloDigi/src/EcalDigiAlg.cpp
rename to Digitization/DigiCalo/src/EcalDigiAlg.cpp
diff --git a/Digitisers/CaloDigi/src/EcalDigiAlg.h b/Digitization/DigiCalo/src/EcalDigiAlg.h
similarity index 100%
rename from Digitisers/CaloDigi/src/EcalDigiAlg.h
rename to Digitization/DigiCalo/src/EcalDigiAlg.h
diff --git a/Digitisers/CaloDigi/src/HcalDigiAlg.cpp b/Digitization/DigiCalo/src/HcalDigiAlg.cpp
similarity index 100%
rename from Digitisers/CaloDigi/src/HcalDigiAlg.cpp
rename to Digitization/DigiCalo/src/HcalDigiAlg.cpp
diff --git a/Digitisers/CaloDigi/src/HcalDigiAlg.h b/Digitization/DigiCalo/src/HcalDigiAlg.h
similarity index 100%
rename from Digitisers/CaloDigi/src/HcalDigiAlg.h
rename to Digitization/DigiCalo/src/HcalDigiAlg.h
diff --git a/Digitisers/CaloDigi/src/HitStep.h b/Digitization/DigiCalo/src/HitStep.h
similarity index 100%
rename from Digitisers/CaloDigi/src/HitStep.h
rename to Digitization/DigiCalo/src/HitStep.h
diff --git a/Digitisers/DCHDigi/CMakeLists.txt b/Digitization/DigiDCH/CMakeLists.txt
similarity index 100%
rename from Digitisers/DCHDigi/CMakeLists.txt
rename to Digitization/DigiDCH/CMakeLists.txt
diff --git a/Digitisers/DCHDigi/src/DCHDigiAlg.cpp b/Digitization/DigiDCH/src/DCHDigiAlg.cpp
similarity index 100%
rename from Digitisers/DCHDigi/src/DCHDigiAlg.cpp
rename to Digitization/DigiDCH/src/DCHDigiAlg.cpp
diff --git a/Digitisers/DCHDigi/src/DCHDigiAlg.h b/Digitization/DigiDCH/src/DCHDigiAlg.h
similarity index 100%
rename from Digitisers/DCHDigi/src/DCHDigiAlg.h
rename to Digitization/DigiDCH/src/DCHDigiAlg.h
diff --git a/Digitisers/SimpleDigi/CMakeLists.txt b/Digitization/DigiSimple/CMakeLists.txt
similarity index 100%
rename from Digitisers/SimpleDigi/CMakeLists.txt
rename to Digitization/DigiSimple/CMakeLists.txt
diff --git a/Digitisers/SimpleDigi/src/CylinderDigiAlg.cpp b/Digitization/DigiSimple/src/CylinderDigiAlg.cpp
similarity index 100%
rename from Digitisers/SimpleDigi/src/CylinderDigiAlg.cpp
rename to Digitization/DigiSimple/src/CylinderDigiAlg.cpp
diff --git a/Digitisers/SimpleDigi/src/CylinderDigiAlg.h b/Digitization/DigiSimple/src/CylinderDigiAlg.h
similarity index 100%
rename from Digitisers/SimpleDigi/src/CylinderDigiAlg.h
rename to Digitization/DigiSimple/src/CylinderDigiAlg.h
diff --git a/Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp b/Digitization/DigiSimple/src/PlanarDigiAlg.cpp
similarity index 100%
rename from Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp
rename to Digitization/DigiSimple/src/PlanarDigiAlg.cpp
diff --git a/Digitisers/SimpleDigi/src/PlanarDigiAlg.h b/Digitization/DigiSimple/src/PlanarDigiAlg.h
similarity index 100%
rename from Digitisers/SimpleDigi/src/PlanarDigiAlg.h
rename to Digitization/DigiSimple/src/PlanarDigiAlg.h
diff --git a/Digitisers/SimpleDigi/src/SiTrackerDigiAlg.cpp b/Digitization/DigiSimple/src/SiTrackerDigiAlg.cpp
similarity index 100%
rename from Digitisers/SimpleDigi/src/SiTrackerDigiAlg.cpp
rename to Digitization/DigiSimple/src/SiTrackerDigiAlg.cpp
diff --git a/Digitisers/SimpleDigi/src/SiTrackerDigiAlg.h b/Digitization/DigiSimple/src/SiTrackerDigiAlg.h
similarity index 100%
rename from Digitisers/SimpleDigi/src/SiTrackerDigiAlg.h
rename to Digitization/DigiSimple/src/SiTrackerDigiAlg.h
diff --git a/Digitisers/SimpleDigi/src/SmearDigiTool.cpp b/Digitization/DigiSimple/src/SmearDigiTool.cpp
similarity index 100%
rename from Digitisers/SimpleDigi/src/SmearDigiTool.cpp
rename to Digitization/DigiSimple/src/SmearDigiTool.cpp
diff --git a/Digitisers/SimpleDigi/src/SmearDigiTool.h b/Digitization/DigiSimple/src/SmearDigiTool.h
similarity index 100%
rename from Digitisers/SimpleDigi/src/SmearDigiTool.h
rename to Digitization/DigiSimple/src/SmearDigiTool.h
diff --git a/Digitisers/SimpleDigi/src/TPCDigiAlg.cpp b/Digitization/DigiSimple/src/TPCDigiAlg.cpp
similarity index 100%
rename from Digitisers/SimpleDigi/src/TPCDigiAlg.cpp
rename to Digitization/DigiSimple/src/TPCDigiAlg.cpp
diff --git a/Digitisers/SimpleDigi/src/TPCDigiAlg.h b/Digitization/DigiSimple/src/TPCDigiAlg.h
similarity index 100%
rename from Digitisers/SimpleDigi/src/TPCDigiAlg.h
rename to Digitization/DigiSimple/src/TPCDigiAlg.h
diff --git a/Digitisers/SimpleDigi/src/voxel.cpp b/Digitization/DigiSimple/src/voxel.cpp
similarity index 100%
rename from Digitisers/SimpleDigi/src/voxel.cpp
rename to Digitization/DigiSimple/src/voxel.cpp
diff --git a/Digitisers/SimpleDigi/src/voxel.h b/Digitization/DigiSimple/src/voxel.h
similarity index 100%
rename from Digitisers/SimpleDigi/src/voxel.h
rename to Digitization/DigiSimple/src/voxel.h
diff --git a/Digitisers/DigiTool/CMakeLists.txt b/Digitization/DigiTool/CMakeLists.txt
similarity index 100%
rename from Digitisers/DigiTool/CMakeLists.txt
rename to Digitization/DigiTool/CMakeLists.txt
diff --git a/Digitisers/DigiTool/include/DigiTool/IDigiTool.h b/Digitization/DigiTool/include/DigiTool/IDigiTool.h
similarity index 100%
rename from Digitisers/DigiTool/include/DigiTool/IDigiTool.h
rename to Digitization/DigiTool/include/DigiTool/IDigiTool.h
diff --git a/Digitisers/G2CDArbor/CMakeLists.txt b/Digitization/G2CDArbor/CMakeLists.txt
similarity index 100%
rename from Digitisers/G2CDArbor/CMakeLists.txt
rename to Digitization/G2CDArbor/CMakeLists.txt
diff --git a/Digitisers/G2CDArbor/src/G2CDArborAlg.cpp b/Digitization/G2CDArbor/src/G2CDArborAlg.cpp
similarity index 100%
rename from Digitisers/G2CDArbor/src/G2CDArborAlg.cpp
rename to Digitization/G2CDArbor/src/G2CDArborAlg.cpp
diff --git a/Digitisers/G2CDArbor/src/G2CDArborAlg.h b/Digitization/G2CDArbor/src/G2CDArborAlg.h
similarity index 100%
rename from Digitisers/G2CDArbor/src/G2CDArborAlg.h
rename to Digitization/G2CDArbor/src/G2CDArborAlg.h
diff --git a/Digitisers/G2CDArbor/src/cellIDDecoder.h b/Digitization/G2CDArbor/src/cellIDDecoder.h
similarity index 100%
rename from Digitisers/G2CDArbor/src/cellIDDecoder.h
rename to Digitization/G2CDArbor/src/cellIDDecoder.h
diff --git a/Digitisers/SimHitMerge/CMakeLists.txt b/Digitization/SimHitMerge/CMakeLists.txt
similarity index 100%
rename from Digitisers/SimHitMerge/CMakeLists.txt
rename to Digitization/SimHitMerge/CMakeLists.txt
diff --git a/Digitisers/SimHitMerge/src/SimHitMergeAlg.cpp b/Digitization/SimHitMerge/src/SimHitMergeAlg.cpp
similarity index 100%
rename from Digitisers/SimHitMerge/src/SimHitMergeAlg.cpp
rename to Digitization/SimHitMerge/src/SimHitMergeAlg.cpp
diff --git a/Digitisers/SimHitMerge/src/SimHitMergeAlg.h b/Digitization/SimHitMerge/src/SimHitMergeAlg.h
similarity index 100%
rename from Digitisers/SimHitMerge/src/SimHitMergeAlg.h
rename to Digitization/SimHitMerge/src/SimHitMergeAlg.h