diff --git a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationConfig.hpp b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationConfig.hpp
index 27dce13a787..bea13649440 100644
--- a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationConfig.hpp
+++ b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationConfig.hpp
@@ -25,11 +25,12 @@
 #include <algorithm>
 #include <cstddef>
 #include <functional>
-#include <unordered_map>
+#include <map>
 #include <memory>
 #include <stdexcept>
 #include <string>
 #include <system_error>
+#include <unordered_map>
 #include <utility>
 #include <vector>
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootMeasurementWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootMeasurementWriter.hpp
index c4ece6a7491..78dcf3e83ef 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootMeasurementWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootMeasurementWriter.hpp
@@ -27,7 +27,6 @@
 #include "ActsFatras/Digitization/Channelizer.hpp"
 
 #include <array>
-#include <unordered_map>
 #include <memory>
 #include <mutex>
 #include <string>
diff --git a/Examples/Python/python/acts/examples/simulation.py b/Examples/Python/python/acts/examples/simulation.py
index 61dc7890fcc..76cf0685aa8 100644
--- a/Examples/Python/python/acts/examples/simulation.py
+++ b/Examples/Python/python/acts/examples/simulation.py
@@ -616,7 +616,7 @@ def getG4DetectorConstructionFactory(
 def addGeant4(
     s: acts.examples.Sequencer,
     detector: Optional[Any],
-    recoGeometry: Union[acts.TrackingGeometry, acts.Detector],
+    trackingGeometry: Union[acts.TrackingGeometry, acts.Detector],
     field: acts.MagneticFieldProvider,
     rnd: acts.examples.RandomNumbers,
     g4DetectorConstructionFactory: Optional[Any] = None,
@@ -645,7 +645,7 @@ def addGeant4(
     ----------
     s: Sequencer
         the sequencer module to which we add the Geant4 steps (returned from addGeant4)
-    recoGeometry : tracking geometry or detector
+    trackingGeometry : tracking geometry or detector
     field : magnetic field
     rnd : RandomNumbers, None
         random number generator
@@ -696,7 +696,7 @@ def addGeant4(
     smmConfig.volumeMappings = volumeMappings
     smmConfig.materialMappings = materialMappings
     sensitiveMapper = SensitiveSurfaceMapper.create(
-        smmConfig, acts.logging.INFO, recoGeometry
+        smmConfig, acts.logging.INFO, trackingGeometry
     )
 
     # Simulation
@@ -766,7 +766,7 @@ def addGeant4(
 
 def addDigitization(
     s: acts.examples.Sequencer,
-    recoGeometry: Union[acts.TrackingGeometry, acts.Detector],
+    trackingGeometry: Union[acts.TrackingGeometry, acts.Detector],
     field: acts.MagneticFieldProvider,
     digiConfigFile: Union[Path, str],
     outputDirCsv: Optional[Union[Path, str]] = None,
@@ -782,7 +782,7 @@ def addDigitization(
     ----------
     s: Sequencer
         the sequencer module to which we add the Digitization steps (returned from addDigitization)
-    recoGeometry : tracking geometry or detector
+    trackingGeometry : tracking geometry or detector
     field : magnetic field
     digiConfigFile : Path|str, path
         Configuration (.json) file for digitization or smearing description
@@ -804,7 +804,7 @@ def addDigitization(
         acts.examples.readDigiConfigFromJson(
             str(digiConfigFile),
         ),
-        surfaceByIdentifier=recoGeometry.geoIdSurfaceMap(),
+        surfaceByIdentifier=trackingGeometry.geoIdSurfaceMap(),
         randomNumbers=rnd,
         inputSimHits="simhits",
         outputSourceLinks="sourcelinks",
@@ -832,7 +832,7 @@ def addDigitization(
             inputSimHits=digiAlg.config.inputSimHits,
             inputMeasurementSimHitsMap=digiAlg.config.outputMeasurementSimHitsMap,
             filePath=str(outputDirRoot / f"{digiAlg.config.outputMeasurements}.root"),
-            surfaceByIdentifier=recoGeometry.geoIdSurfaceMap(),
+            surfaceByIdentifier=trackingGeometry.geoIdSurfaceMap(),
         )
         rmwConfig.addBoundIndicesFromDigiConfig(digiAlg.config)
         s.addWriter(acts.examples.RootMeasurementWriter(rmwConfig, customLogLevel()))
diff --git a/Examples/Python/src/Geometry.cpp b/Examples/Python/src/Geometry.cpp
index 59c3ba9bac7..bb228ba2958 100644
--- a/Examples/Python/src/Geometry.cpp
+++ b/Examples/Python/src/Geometry.cpp
@@ -39,8 +39,8 @@
 #include "ActsExamples/Geometry/VolumeAssociationTest.hpp"
 
 #include <array>
-#include <unordered_map>
 #include <memory>
+#include <unordered_map>
 #include <vector>
 
 #include <pybind11/pybind11.h>