diff --git a/DCHdigi/CMakeLists.txt b/DCHdigi/CMakeLists.txt
index a94c0dc..267afdb 100644
--- a/DCHdigi/CMakeLists.txt
+++ b/DCHdigi/CMakeLists.txt
@@ -39,5 +39,5 @@ install(TARGETS DCHdigi
 
 install(FILES ${scripts} DESTINATION test)
 
-SET(test_name "test_DCHdigitizer")
-ADD_TEST(NAME t_${test_name} COMMAND k4run test/runDCHdigitizer.py)
+SET(test_name "test_DCHsimpleDigitizer")
+ADD_TEST(NAME t_${test_name} COMMAND k4run test/runDCHsimpleDigitizer.py)
diff --git a/DCHdigi/include/DCHdigitizer.h b/DCHdigi/include/DCHsimpleDigitizer.h
similarity index 93%
rename from DCHdigi/include/DCHdigitizer.h
rename to DCHdigi/include/DCHsimpleDigitizer.h
index 022f69f..1cc55b4 100644
--- a/DCHdigi/include/DCHdigitizer.h
+++ b/DCHdigi/include/DCHsimpleDigitizer.h
@@ -18,7 +18,7 @@
 #include "DD4hep/Detector.h"  // for dd4hep::VolumeManager
 #include "DDSegmentation/BitFieldCoder.h"
 
-/** @class DCHdigitizer
+/** @class DCHsimpleDigitizer
  *
  *  Algorithm for creating digitized drift chamber hits (still based on edm4hep::TrackerHit) from edm4hep::SimTrackerHit.
  *  You have to specify the expected resolution in z and in xy (distance to the wire). The smearing is applied in the wire reference frame.
@@ -28,10 +28,10 @@
  *
  */
 
-class DCHdigitizer : public GaudiAlgorithm {
+class DCHsimpleDigitizer : public GaudiAlgorithm {
 public:
-  explicit DCHdigitizer(const std::string&, ISvcLocator*);
-  virtual ~DCHdigitizer();
+  explicit DCHsimpleDigitizer(const std::string&, ISvcLocator*);
+  virtual ~DCHsimpleDigitizer();
   /**  Initialize.
    *   @return status code
    */
diff --git a/DCHdigi/src/DCHdigitizer.cpp b/DCHdigi/src/DCHsimpleDigitizer.cpp
similarity index 93%
rename from DCHdigi/src/DCHdigitizer.cpp
rename to DCHdigi/src/DCHsimpleDigitizer.cpp
index 3268a91..6968287 100644
--- a/DCHdigi/src/DCHdigitizer.cpp
+++ b/DCHdigi/src/DCHsimpleDigitizer.cpp
@@ -1,4 +1,4 @@
-#include "DCHdigitizer.h"
+#include "DCHsimpleDigitizer.h"
 
 // DD4hep
 #include "DD4hep/Detector.h"
@@ -7,17 +7,17 @@
 // ROOT
 #include "Math/Cylindrical3D.h"
 
-DECLARE_COMPONENT(DCHdigitizer)
+DECLARE_COMPONENT(DCHsimpleDigitizer)
 
-DCHdigitizer::DCHdigitizer(const std::string& aName, ISvcLocator* aSvcLoc)
-    : GaudiAlgorithm(aName, aSvcLoc), m_geoSvc("GeoSvc", "DCHdigitizer") {
+DCHsimpleDigitizer::DCHsimpleDigitizer(const std::string& aName, ISvcLocator* aSvcLoc)
+    : GaudiAlgorithm(aName, aSvcLoc), m_geoSvc("GeoSvc", "DCHsimpleDigitizer") {
   declareProperty("inputSimHits", m_input_sim_hits, "Input sim tracker hit collection name");
   declareProperty("outputDigiHits", m_output_digi_hits, "Output digitized tracker hit collection name");
 }
 
-DCHdigitizer::~DCHdigitizer() {}
+DCHsimpleDigitizer::~DCHsimpleDigitizer() {}
 
-StatusCode DCHdigitizer::initialize() {
+StatusCode DCHsimpleDigitizer::initialize() {
   // Initialize random services
   if (service("RndmGenSvc", m_randSvc).isFailure()) {
     error() << "Couldn't get RndmGenSvc!" << endmsg;
@@ -45,7 +45,7 @@ StatusCode DCHdigitizer::initialize() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode DCHdigitizer::execute() {
+StatusCode DCHsimpleDigitizer::execute() {
   // Get the input collection with Geant4 hits
   const edm4hep::SimTrackerHitCollection* input_sim_hits = m_input_sim_hits.get();
   debug() << "Input Sim Hit collection size: " << input_sim_hits->size() << endmsg;
@@ -111,4 +111,4 @@ StatusCode DCHdigitizer::execute() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode DCHdigitizer::finalize() { return StatusCode::SUCCESS; }
+StatusCode DCHsimpleDigitizer::finalize() { return StatusCode::SUCCESS; }
diff --git a/DCHdigi/test/runDCHdigitizer.py b/DCHdigi/test/runDCHsimpleDigitizer.py
similarity index 98%
rename from DCHdigi/test/runDCHdigitizer.py
rename to DCHdigi/test/runDCHsimpleDigitizer.py
index 0458fac..765e387 100644
--- a/DCHdigi/test/runDCHdigitizer.py
+++ b/DCHdigi/test/runDCHsimpleDigitizer.py
@@ -100,8 +100,8 @@
                        eventProvider=particle_converter,
                        OutputLevel=DEBUG)
 # Digitize tracker hits
-from Configurables import DCHdigitizer
-dch_digitizer = DCHdigitizer("DCHdigitizer",
+from Configurables import DCHsimpleDigitizer
+dch_digitizer = DCHsimpleDigitizer("DCHsimpleDigitizer",
     inputSimHits = savetrackertool.SimTrackHits.Path,
     outputDigiHits = savetrackertool.SimTrackHits.Path.replace("sim", "digi"),
     readoutName = "CDCHHits",
diff --git a/README.md b/README.md
index 0bad0c5..a9c9c5c 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ make get_data
 ## Execute Examples 
 
 ```bash
-k4run DCHdigi/test/runDCHdigitizer.py
+k4run DCHdigi/test/runDCHsimpleDigitizer.py
 ```
 
 ```bash
diff --git a/Tracking/test/runGenFitTrackingOnSimplifiedDriftChamber.py b/Tracking/test/runGenFitTrackingOnSimplifiedDriftChamber.py
index 6100098..5344fa7 100644
--- a/Tracking/test/runGenFitTrackingOnSimplifiedDriftChamber.py
+++ b/Tracking/test/runGenFitTrackingOnSimplifiedDriftChamber.py
@@ -120,8 +120,8 @@
 )
 
 dch_reco_hit_name = saveDCHsimHitTool.SimTrackHits.Path.replace("sim", "reco")
-from Configurables import DCHdigitizer
-dch_digitizer = DCHdigitizer("DCHdigitizer",
+from Configurables import DCHsimpleDigitizer
+dch_digitizer = DCHsimpleDigitizer("DCHsimpleDigitizer",
     inputSimHits = saveDCHsimHitTool.SimTrackHits.Path,
     outputDigiHits = dch_reco_hit_name
 )
diff --git a/VTXdigi/test/runVTXdigitizer.py b/VTXdigi/test/runVTXdigitizer.py
index 43e14d5..9ca50fa 100644
--- a/VTXdigi/test/runVTXdigitizer.py
+++ b/VTXdigi/test/runVTXdigitizer.py
@@ -100,8 +100,8 @@
                        eventProvider=particle_converter,
                        OutputLevel=INFO)
 # Digitize tracker hits
-from Configurables import DCHdigitizer
-dch_digitizer = DCHdigitizer("DCHdigitizer",
+from Configurables import DCHsimpleDigitizer
+dch_digitizer = DCHsimpleDigitizer("DCHsimpleDigitizer",
     inputSimHits = savetrackertool.SimTrackHits.Path,
     outputDigiHits = savetrackertool.SimTrackHits.Path.replace("sim", "digi")
 )