diff --git a/Alignment/APEEstimation/plugins/ApeEstimator.cc b/Alignment/APEEstimation/plugins/ApeEstimator.cc
index 9062fe00246e6..0a09ece451736 100644
--- a/Alignment/APEEstimation/plugins/ApeEstimator.cc
+++ b/Alignment/APEEstimation/plugins/ApeEstimator.cc
@@ -66,13 +66,13 @@
 #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h"
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
 #include "Geometry/CommonTopologies/interface/RadialStripTopology.h"
 //added by Ajay 6Nov 2014
 //.......................
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 
 #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"
 
diff --git a/Alignment/CommonAlignment/BuildFile.xml b/Alignment/CommonAlignment/BuildFile.xml
index f92b0edf853e7..11de5eeeebe71 100644
--- a/Alignment/CommonAlignment/BuildFile.xml
+++ b/Alignment/CommonAlignment/BuildFile.xml
@@ -9,7 +9,7 @@
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="Geometry/CommonTopologies"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="TrackingTools/TransientTrackingRecHit"/>
diff --git a/Alignment/CommonAlignment/interface/AlignableDetUnit.h b/Alignment/CommonAlignment/interface/AlignableDetUnit.h
index f5bcf2f891c27..4f7cc94cbd616 100644
--- a/Alignment/CommonAlignment/interface/AlignableDetUnit.h
+++ b/Alignment/CommonAlignment/interface/AlignableDetUnit.h
@@ -2,7 +2,7 @@
 #define Alignment_CommonAlignment_AlignableDetUnit_H
 
 #include "Alignment/CommonAlignment/interface/Alignable.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 
 /// A concrete class that allows to (mis)align a DetUnit.
 ///
diff --git a/Alignment/CommonAlignment/src/AlignableComposite.cc b/Alignment/CommonAlignment/src/AlignableComposite.cc
index 243a71f5e38ed..e239149c1987b 100644
--- a/Alignment/CommonAlignment/src/AlignableComposite.cc
+++ b/Alignment/CommonAlignment/src/AlignableComposite.cc
@@ -7,7 +7,7 @@
 #include "CondFormats/Alignment/interface/Alignments.h"
 #include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 
 #include "Alignment/CommonAlignment/interface/AlignableComposite.h"
 
diff --git a/Alignment/CommonAlignment/src/AlignableDet.cc b/Alignment/CommonAlignment/src/AlignableDet.cc
index d686c4ecaf48e..a0a8983594ab2 100644
--- a/Alignment/CommonAlignment/src/AlignableDet.cc
+++ b/Alignment/CommonAlignment/src/AlignableDet.cc
@@ -3,7 +3,7 @@
 #include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
 #include "CLHEP/Vector/RotationInterfaces.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 
 #include "Alignment/CommonAlignment/interface/AlignableDet.h"
 
diff --git a/Alignment/CommonAlignment/src/AlignableDetUnit.cc b/Alignment/CommonAlignment/src/AlignableDetUnit.cc
index 0b6436e9af97b..8a32bfcb8f5d3 100644
--- a/Alignment/CommonAlignment/src/AlignableDetUnit.cc
+++ b/Alignment/CommonAlignment/src/AlignableDetUnit.cc
@@ -1,6 +1,6 @@
 #include "Alignment/CommonAlignment/interface/AlignableDetUnit.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 
 #include "CondFormats/Alignment/interface/Alignments.h"
 #include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/BuildFile.xml b/Alignment/CommonAlignmentAlgorithm/plugins/BuildFile.xml
index 3a528f9c74eaa..1e5f20191d6a7 100644
--- a/Alignment/CommonAlignmentAlgorithm/plugins/BuildFile.xml
+++ b/Alignment/CommonAlignmentAlgorithm/plugins/BuildFile.xml
@@ -16,7 +16,7 @@
   <use name="DataFormats/SiStripDetId"/>
   <use name="MagneticField/Engine"/>
   <use name="MagneticField/Records"/>
-  <use name="Geometry/CommonDetUnit" source_only="1"/>
+  <use name="Geometry/CommonTopologies" source_only="1"/>
   <use name="TrackingTools/TransientTrackingRecHit"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/SiPixelLorentzAngleCalibration.cc b/Alignment/CommonAlignmentAlgorithm/plugins/SiPixelLorentzAngleCalibration.cc
index aa30f3e2ac925..9f0ad82278caa 100644
--- a/Alignment/CommonAlignmentAlgorithm/plugins/SiPixelLorentzAngleCalibration.cc
+++ b/Alignment/CommonAlignmentAlgorithm/plugins/SiPixelLorentzAngleCalibration.cc
@@ -32,7 +32,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterSelector.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h"
diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripBackplaneCalibration.cc b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripBackplaneCalibration.cc
index 864d4fac718bc..eadc464b574f2 100644
--- a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripBackplaneCalibration.cc
+++ b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripBackplaneCalibration.cc
@@ -34,7 +34,7 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h"
diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripLorentzAngleCalibration.cc b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripLorentzAngleCalibration.cc
index 787e8982c8941..8e1c8f3962008 100644
--- a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripLorentzAngleCalibration.cc
+++ b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripLorentzAngleCalibration.cc
@@ -34,7 +34,7 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h"
diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorGeneric.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorGeneric.cc
index ba716d32136f5..d969c3c67cc81 100644
--- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorGeneric.cc
+++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorGeneric.cc
@@ -3,7 +3,7 @@
 
 #include "Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorGeneric.h"
 #include <DataFormats/GeometrySurface/interface/LocalError.h>
-#include "Geometry/CommonDetUnit/interface/TrackerGeomDet.h"
+#include "Geometry/CommonTopologies/interface/TrackerGeomDet.h"
 #include "TObject.h"
 
 #include <TString.h>
diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonResiduals.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonResiduals.cc
index f80fb78e59b60..7ceb528f6fb90 100644
--- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonResiduals.cc
+++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonResiduals.cc
@@ -21,7 +21,7 @@
 #include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
 #include "DataFormats/MuonDetId/interface/DTChamberId.h"
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
-#include "Geometry/CommonDetUnit/interface/TrackerGeomDet.h"
+#include "Geometry/CommonTopologies/interface/TrackerGeomDet.h"
 #include "TH1F.h"
 #include "TTree.h"
 
diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc
index ce4703de884ed..b000400e1a38e 100644
--- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc
+++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc
@@ -19,7 +19,7 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
 
 #include "TH1F.h"
diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc
index 0bc5dc043cdf7..c4a0ca2dae97e 100644
--- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc
+++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc
@@ -16,7 +16,7 @@
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
 
 #include <sstream>
diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc
index 9abd676356b8b..379b6713e62fb 100644
--- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc
+++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc
@@ -19,7 +19,7 @@
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
 
 #include <sstream>
diff --git a/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml b/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml
index 2b33f505eab91..c4c88fb709017 100644
--- a/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml
+++ b/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml
@@ -36,7 +36,7 @@
 <library name="AlignmentMonitorSegmentDifferences" file="AlignmentMonitorSegmentDifferences.cc">
   <use name="Alignment/MuonAlignmentAlgorithms"/>
   <use name="Alignment/CommonAlignmentMonitor"/>
-  <use name="Geometry/CommonDetUnit" source_only="1"/>
+  <use name="Geometry/CommonTopologies" source_only="1"/>
   <use name="Geometry/Records"/>
   <flags EDM_PLUGIN="1"/>
 </library>
@@ -44,7 +44,7 @@
 <library name="AlignmentMonitorMuonVsCurvature" file="AlignmentMonitorMuonVsCurvature.cc">
   <use name="Alignment/MuonAlignmentAlgorithms"/>
   <use name="Alignment/CommonAlignmentMonitor"/>
-  <use name="Geometry/CommonDetUnit" source_only="1"/>
+  <use name="Geometry/CommonTopologies" source_only="1"/>
   <use name="Geometry/Records"/>
   <use name="MagneticField/Engine"/>
   <use name="MagneticField/Records"/>
@@ -54,7 +54,7 @@
 <library name="AlignmentMonitorMuonSystemMap1D" file="AlignmentMonitorMuonSystemMap1D.cc">
   <use name="Alignment/MuonAlignmentAlgorithms"/>
   <use name="Alignment/CommonAlignmentMonitor"/>
-  <use name="Geometry/CommonDetUnit" source_only="1"/>
+  <use name="Geometry/CommonTopologies" source_only="1"/>
   <use name="Geometry/Records"/>
   <flags EDM_PLUGIN="1"/>
 </library>
@@ -90,7 +90,7 @@
   <use name="DataFormats/TrackingRecHit"/>
   <use name="Geometry/DTGeometry"/>
   <use name="Geometry/CSCGeometry"/>
-  <use name="Geometry/CommonDetUnit" source_only="1"/>
+  <use name="Geometry/CommonTopologies" source_only="1"/>
   <use name="Geometry/Records"/>
   <use name="MagneticField/Engine"/>
   <use name="MagneticField/Records"/>
diff --git a/Alignment/CommonAlignmentMonitor/plugins/TrackerToMuonPropagator.cc b/Alignment/CommonAlignmentMonitor/plugins/TrackerToMuonPropagator.cc
index 9faabc963da96..0f9aeae2085b1 100644
--- a/Alignment/CommonAlignmentMonitor/plugins/TrackerToMuonPropagator.cc
+++ b/Alignment/CommonAlignmentMonitor/plugins/TrackerToMuonPropagator.cc
@@ -52,7 +52,7 @@
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
 #include "RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHitBuilder.h"
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
 #include "TrackingTools/TrackRefitter/interface/TrackTransformer.h"
 
diff --git a/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml b/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml
index 85514a6481a94..577bfc5549217 100644
--- a/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml
+++ b/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml
@@ -35,7 +35,7 @@
   <use name="root"/>
   <use name="FWCore/ServiceRegistry"/>
   <use name="Geometry/Records"/>
-  <use name="Geometry/CommonDetUnit" source_only="1"/>
+  <use name="Geometry/CommonTopologies" source_only="1"/>
   <use name="MagneticField/Engine"/>
   <use name="MagneticField/Records"/>
   <use name="TrackingTools/GeomPropagators"/>
diff --git a/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc b/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc
index 45d7367ea275e..2d4a456063e8c 100644
--- a/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc
+++ b/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc
@@ -51,7 +51,7 @@
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/GeometrySurface/interface/TangentPlane.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
diff --git a/Alignment/LaserAlignment/plugins/TkLasBeamFitter.cc b/Alignment/LaserAlignment/plugins/TkLasBeamFitter.cc
index 37f1db750e34c..e97b5abdb5618 100644
--- a/Alignment/LaserAlignment/plugins/TkLasBeamFitter.cc
+++ b/Alignment/LaserAlignment/plugins/TkLasBeamFitter.cc
@@ -25,7 +25,7 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
 
-#include <Geometry/CommonDetUnit/interface/GeomDet.h>
+#include <Geometry/CommonTopologies/interface/GeomDet.h>
 #include <Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h>
 #include <Geometry/Records/interface/TrackerDigiGeometryRecord.h>
 #include <MagneticField/Engine/interface/MagneticField.h>
diff --git a/Alignment/LaserAlignmentSimulation/test/BuildFile.xml b/Alignment/LaserAlignmentSimulation/test/BuildFile.xml
index d9f31b26db394..ecb3719ad75e3 100644
--- a/Alignment/LaserAlignmentSimulation/test/BuildFile.xml
+++ b/Alignment/LaserAlignmentSimulation/test/BuildFile.xml
@@ -2,7 +2,7 @@
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/MessageLogger"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="DataFormats/SiStripDetId"/>
 <use name="DataFormats/DetId"/>
 <use name="SimDataFormats/TrackingHit"/>
diff --git a/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc b/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc
index 3b1b0eee4159c..f13d29e0f2fd0 100644
--- a/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc
+++ b/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc
@@ -18,7 +18,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
diff --git a/Alignment/MillePedeAlignmentAlgorithm/BuildFile.xml b/Alignment/MillePedeAlignmentAlgorithm/BuildFile.xml
index d0b8007a72ab9..90bc8fba863a6 100644
--- a/Alignment/MillePedeAlignmentAlgorithm/BuildFile.xml
+++ b/Alignment/MillePedeAlignmentAlgorithm/BuildFile.xml
@@ -13,7 +13,7 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/PluginManager"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="rootcore"/>
 <use name="mille"/>
 <export>
diff --git a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeAlignmentAlgorithm.cc b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeAlignmentAlgorithm.cc
index eef21aeb3262d..a9656ebac2cea 100644
--- a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeAlignmentAlgorithm.cc
+++ b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeAlignmentAlgorithm.cc
@@ -54,8 +54,8 @@
 #include "DataFormats/Alignment/interface/TkFittedLasBeam.h"
 #include "Alignment/LaserAlignment/interface/TsosVectorCollection.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 
 #include "DataFormats/TrackerRecHit2D/interface/ProjectedSiStripRecHit2D.h"
diff --git a/Alignment/MillePedeAlignmentAlgorithm/src/MillePedeMonitor.cc b/Alignment/MillePedeAlignmentAlgorithm/src/MillePedeMonitor.cc
index 5ed91b9fcb74a..f4c6205dc2d80 100644
--- a/Alignment/MillePedeAlignmentAlgorithm/src/MillePedeMonitor.cc
+++ b/Alignment/MillePedeAlignmentAlgorithm/src/MillePedeMonitor.cc
@@ -16,8 +16,8 @@
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
-#include <Geometry/CommonDetUnit/interface/GeomDet.h>
-#include <Geometry/CommonDetUnit/interface/GeomDetType.h>
+#include <Geometry/CommonTopologies/interface/GeomDet.h>
+#include <Geometry/CommonTopologies/interface/GeomDetType.h>
 
 #include "Alignment/CommonAlignment/interface/Alignable.h"
 #include "Alignment/CommonAlignment/interface/AlignableBeamSpot.h"
diff --git a/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc b/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc
index 7c84226eff637..e24a6d8145673 100644
--- a/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc
+++ b/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc
@@ -30,8 +30,8 @@
 #include "Alignment/CommonAlignment/interface/AlignableExtras.h"
 // GF doubts the need of these includes from include checker campaign:
 #include <FWCore/Framework/interface/EventSetup.h>
-#include <Geometry/CommonDetUnit/interface/GeomDet.h>
-#include <Geometry/CommonDetUnit/interface/GeomDetType.h>
+#include <Geometry/CommonTopologies/interface/GeomDet.h>
+#include <Geometry/CommonTopologies/interface/GeomDetType.h>
 #include <DataFormats/GeometrySurface/interface/LocalError.h>
 #include <Geometry/DTGeometry/interface/DTLayer.h>
 // end of doubt
diff --git a/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteererWeakModeConstraints.cc b/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteererWeakModeConstraints.cc
index 65beec15b95b6..7fa967cba0e06 100644
--- a/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteererWeakModeConstraints.cc
+++ b/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteererWeakModeConstraints.cc
@@ -30,8 +30,8 @@
 #include "Alignment/CommonAlignment/interface/AlignableExtras.h"
 // GF doubts the need of these includes from include checker campaign:
 #include <FWCore/Framework/interface/EventSetup.h>
-#include <Geometry/CommonDetUnit/interface/GeomDet.h>
-#include <Geometry/CommonDetUnit/interface/GeomDetType.h>
+#include <Geometry/CommonTopologies/interface/GeomDet.h>
+#include <Geometry/CommonTopologies/interface/GeomDetType.h>
 #include <DataFormats/GeometrySurface/interface/LocalError.h>
 #include <Geometry/DTGeometry/interface/DTLayer.h>
 // end of doubt
diff --git a/Alignment/MuonAlignment/interface/AlignableCSCChamber.h b/Alignment/MuonAlignment/interface/AlignableCSCChamber.h
index 94c55a4087679..ede4df5afc53e 100644
--- a/Alignment/MuonAlignment/interface/AlignableCSCChamber.h
+++ b/Alignment/MuonAlignment/interface/AlignableCSCChamber.h
@@ -16,7 +16,7 @@
 #include "Alignment/CommonAlignment/interface/StructureType.h"
 #include "Alignment/CommonAlignment/interface/AlignableDet.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Alignment/CommonAlignment/interface/AlignableComposite.h"
 
 /// A muon CSC Chamber( an AlignableDet )
diff --git a/Alignment/MuonAlignment/interface/AlignableDTChamber.h b/Alignment/MuonAlignment/interface/AlignableDTChamber.h
index 03627c71718c1..8db655e29e401 100644
--- a/Alignment/MuonAlignment/interface/AlignableDTChamber.h
+++ b/Alignment/MuonAlignment/interface/AlignableDTChamber.h
@@ -16,7 +16,7 @@
 #include "Alignment/CommonAlignment/interface/StructureType.h"
 #include "Alignment/CommonAlignment/interface/AlignableDet.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Alignment/CommonAlignment/interface/AlignableComposite.h"
 
 /// A muon DT Chamber( an AlignableDet )
diff --git a/Alignment/MuonAlignment/interface/AlignableDTSuperLayer.h b/Alignment/MuonAlignment/interface/AlignableDTSuperLayer.h
index 0ece57bd12d3b..7839725c3a7d4 100644
--- a/Alignment/MuonAlignment/interface/AlignableDTSuperLayer.h
+++ b/Alignment/MuonAlignment/interface/AlignableDTSuperLayer.h
@@ -16,7 +16,7 @@
 #include "Alignment/CommonAlignment/interface/StructureType.h"
 #include "Alignment/CommonAlignment/interface/AlignableDet.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Alignment/CommonAlignment/interface/AlignableComposite.h"
 
 /// A muon DT SuperLayer ( an AlignableDet )
diff --git a/Alignment/MuonAlignment/interface/AlignableGEMChamber.h b/Alignment/MuonAlignment/interface/AlignableGEMChamber.h
index e7dc8e2194b4c..97ca283b21fd8 100644
--- a/Alignment/MuonAlignment/interface/AlignableGEMChamber.h
+++ b/Alignment/MuonAlignment/interface/AlignableGEMChamber.h
@@ -12,7 +12,7 @@
 #include "Alignment/CommonAlignment/interface/StructureType.h"
 #include "Alignment/CommonAlignment/interface/AlignableDet.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Alignment/CommonAlignment/interface/AlignableComposite.h"
 
 class AlignableGEMChamber : public AlignableDet {
diff --git a/Alignment/MuonAlignment/interface/AlignableGEMSuperChamber.h b/Alignment/MuonAlignment/interface/AlignableGEMSuperChamber.h
index 8c2bb1986ff22..4a9341f1f3a07 100644
--- a/Alignment/MuonAlignment/interface/AlignableGEMSuperChamber.h
+++ b/Alignment/MuonAlignment/interface/AlignableGEMSuperChamber.h
@@ -12,7 +12,7 @@
 #include "Alignment/CommonAlignment/interface/StructureType.h"
 #include "Alignment/CommonAlignment/interface/AlignableDet.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Alignment/CommonAlignment/interface/AlignableComposite.h"
 
 class AlignableGEMSuperChamber : public AlignableDet {
diff --git a/Alignment/MuonAlignment/plugins/MuonGeometrySanityCheck.cc b/Alignment/MuonAlignment/plugins/MuonGeometrySanityCheck.cc
index 6010da76f0166..69e8e477d8362 100644
--- a/Alignment/MuonAlignment/plugins/MuonGeometrySanityCheck.cc
+++ b/Alignment/MuonAlignment/plugins/MuonGeometrySanityCheck.cc
@@ -30,7 +30,7 @@
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
diff --git a/Alignment/MuonAlignment/src/AlignableMuon.cc b/Alignment/MuonAlignment/src/AlignableMuon.cc
index b080f22a3ecba..5510c96bc1f28 100644
--- a/Alignment/MuonAlignment/src/AlignableMuon.cc
+++ b/Alignment/MuonAlignment/src/AlignableMuon.cc
@@ -15,7 +15,7 @@
 #include <Geometry/DTGeometry/interface/DTLayer.h>
 #include "CondFormats/Alignment/interface/Alignments.h"
 #include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 // Muon  components
 #include "Alignment/MuonAlignment/interface/AlignableDTBarrel.h"
 #include "Alignment/MuonAlignment/interface/AlignableDTStation.h"
diff --git a/Alignment/MuonAlignmentAlgorithms/BuildFile.xml b/Alignment/MuonAlignmentAlgorithms/BuildFile.xml
index 0793b069ff76f..13944b538b220 100644
--- a/Alignment/MuonAlignmentAlgorithms/BuildFile.xml
+++ b/Alignment/MuonAlignmentAlgorithms/BuildFile.xml
@@ -4,7 +4,7 @@
 <use name="FWCore/Utilities"/>
 <use name="DataFormats/TrackReco"/>
 <use name="Geometry/CSCGeometry"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="TrackingTools/TrackFitters"/>
 <use name="Alignment/CommonAlignment"/>
 <use name="RecoMuon/TransientTrackingRecHit"/>
diff --git a/Alignment/MuonAlignmentAlgorithms/interface/MuonChamberResidual.h b/Alignment/MuonAlignmentAlgorithms/interface/MuonChamberResidual.h
index 95fb73577ce11..9b30652a73198 100644
--- a/Alignment/MuonAlignmentAlgorithms/interface/MuonChamberResidual.h
+++ b/Alignment/MuonAlignmentAlgorithms/interface/MuonChamberResidual.h
@@ -13,7 +13,7 @@
 #include "Alignment/CommonAlignment/interface/AlignableNavigator.h"
 #include "Alignment/CommonAlignment/interface/Alignable.h"
 #include "Alignment/CommonAlignment/interface/AlignmentParameters.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
 #include "TrackingTools/PatternTools/interface/Trajectory.h"
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h"
diff --git a/Alignment/MuonAlignmentAlgorithms/interface/MuonHitsChamberResidual.h b/Alignment/MuonAlignmentAlgorithms/interface/MuonHitsChamberResidual.h
index 6a5929d5a72c1..a917fededaecf 100644
--- a/Alignment/MuonAlignmentAlgorithms/interface/MuonHitsChamberResidual.h
+++ b/Alignment/MuonAlignmentAlgorithms/interface/MuonHitsChamberResidual.h
@@ -16,7 +16,7 @@
 #include "Alignment/CommonAlignment/interface/AlignableNavigator.h"
 #include "Alignment/CommonAlignment/interface/Alignable.h"
 #include "Alignment/CommonAlignment/interface/AlignmentParameters.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
 #include "DataFormats/DetId/interface/DetId.h"
 
 class MuonHitsChamberResidual : public MuonChamberResidual {
diff --git a/Alignment/MuonAlignmentAlgorithms/interface/MuonResidualsFromTrack.h b/Alignment/MuonAlignmentAlgorithms/interface/MuonResidualsFromTrack.h
index 69f9a0c20b971..6591fe053b39e 100644
--- a/Alignment/MuonAlignmentAlgorithms/interface/MuonResidualsFromTrack.h
+++ b/Alignment/MuonAlignmentAlgorithms/interface/MuonResidualsFromTrack.h
@@ -9,7 +9,7 @@
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Utilities/interface/Exception.h"
 #include "Alignment/CommonAlignment/interface/AlignableNavigator.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
 #include "TrackingTools/PatternTools/interface/Trajectory.h"
 #include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h"
 #include "DataFormats/DetId/interface/DetId.h"
diff --git a/Alignment/MuonAlignmentAlgorithms/interface/SegmentToTrackAssociator.h b/Alignment/MuonAlignmentAlgorithms/interface/SegmentToTrackAssociator.h
index 3e490b2fc27df..2e21eb37c3df1 100644
--- a/Alignment/MuonAlignmentAlgorithms/interface/SegmentToTrackAssociator.h
+++ b/Alignment/MuonAlignmentAlgorithms/interface/SegmentToTrackAssociator.h
@@ -23,7 +23,7 @@
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
 
 namespace edm {
   class EventSetup;
diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/BuildFile.xml b/Alignment/MuonAlignmentAlgorithms/plugins/BuildFile.xml
index 180582dd62b31..9b1ccb6c13aaf 100644
--- a/Alignment/MuonAlignmentAlgorithms/plugins/BuildFile.xml
+++ b/Alignment/MuonAlignmentAlgorithms/plugins/BuildFile.xml
@@ -3,7 +3,7 @@
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
 <library name="CSCOverlapsAlignmentAlgorithm" file="CSCOverlapsAlignmentAlgorithm.cc,CSCOverlapsTrackPreparation.cc,CSCOverlapsBeamSplashCut.cc,CSCPairResidualsConstraint.cc,CSCChamberFitter.cc,CSCAlignmentCorrections.cc">
-  <use name="Geometry/CommonDetUnit" source_only="1"/>
+  <use name="Geometry/CommonTopologies" source_only="1"/>
   <use name="Geometry/Records"/>
   <use name="Geometry/CSCGeometry"/>
   <use name="MagneticField/Engine"/>
@@ -38,7 +38,7 @@
   <use name="CommonTools/UtilAlgos"/>
   <use name="DataFormats/MuonDetId"/>
   <use name="DataFormats/TrackReco"/>
-  <use name="Geometry/CommonDetUnit" source_only="1"/>
+  <use name="Geometry/CommonTopologies" source_only="1"/>
   <use name="Geometry/Records"/>
   <use name="TrackingTools/PatternTools"/>
   <use name="root"/>
diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsTrackPreparation.cc b/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsTrackPreparation.cc
index 5cd1c881e6193..5a5f71ae9b617 100644
--- a/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsTrackPreparation.cc
+++ b/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsTrackPreparation.cc
@@ -43,7 +43,7 @@
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
 #include "RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHitBuilder.h"
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
 #include "CondFormats/Alignment/interface/Definitions.h"
 #include "DataFormats/GeometrySurface/interface/Surface.h"
diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/MuonAlignmentFromReference.cc b/Alignment/MuonAlignmentAlgorithms/plugins/MuonAlignmentFromReference.cc
index 2f21d768d67b8..5d0fac452d3c3 100644
--- a/Alignment/MuonAlignmentAlgorithms/plugins/MuonAlignmentFromReference.cc
+++ b/Alignment/MuonAlignmentAlgorithms/plugins/MuonAlignmentFromReference.cc
@@ -27,7 +27,7 @@ Description: <one line class summary>
 
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
 
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
diff --git a/Alignment/MuonAlignmentAlgorithms/src/SegmentToTrackAssociator.cc b/Alignment/MuonAlignmentAlgorithms/src/SegmentToTrackAssociator.cc
index 7097877d3c530..d56f6502e2f69 100644
--- a/Alignment/MuonAlignmentAlgorithms/src/SegmentToTrackAssociator.cc
+++ b/Alignment/MuonAlignmentAlgorithms/src/SegmentToTrackAssociator.cc
@@ -23,8 +23,8 @@
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 
 #include "Alignment/MuonAlignmentAlgorithms/interface/SegmentToTrackAssociator.h"
 
diff --git a/Alignment/OfflineValidation/BuildFile.xml b/Alignment/OfflineValidation/BuildFile.xml
index 8ed570cb4abba..6dbd783defdff 100644
--- a/Alignment/OfflineValidation/BuildFile.xml
+++ b/Alignment/OfflineValidation/BuildFile.xml
@@ -15,7 +15,7 @@
 <use name="DataFormats/SiStripDetId"/>
 <use name="DataFormats/TrackerRecHit2D"/>
 <use name="FWCore/MessageLogger"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="Geometry/CommonTopologies"/>
 <use name="Geometry/Records"/>
 <use name="MagneticField/Records"/>
diff --git a/Alignment/OfflineValidation/plugins/BuildFile.xml b/Alignment/OfflineValidation/plugins/BuildFile.xml
index 89382be76225d..432c1adcba8fd 100644
--- a/Alignment/OfflineValidation/plugins/BuildFile.xml
+++ b/Alignment/OfflineValidation/plugins/BuildFile.xml
@@ -33,7 +33,7 @@
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
 <use name="Geometry/CaloGeometry"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="Geometry/TrackerNumberingBuilder"/>
diff --git a/Alignment/OfflineValidation/plugins/DiMuonValidation.cc b/Alignment/OfflineValidation/plugins/DiMuonValidation.cc
index d4884d4b9428e..886e790215fad 100644
--- a/Alignment/OfflineValidation/plugins/DiMuonValidation.cc
+++ b/Alignment/OfflineValidation/plugins/DiMuonValidation.cc
@@ -17,7 +17,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 
diff --git a/Alignment/OfflineValidation/plugins/MuonAlignmentAnalyzer.cc b/Alignment/OfflineValidation/plugins/MuonAlignmentAnalyzer.cc
index 923e9d9e58936..084c17511a41f 100644
--- a/Alignment/OfflineValidation/plugins/MuonAlignmentAnalyzer.cc
+++ b/Alignment/OfflineValidation/plugins/MuonAlignmentAnalyzer.cc
@@ -15,7 +15,7 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/Event.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "DataFormats/Math/interface/deltaR.h"
 
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
diff --git a/Alignment/OfflineValidation/plugins/MuonAlignmentAnalyzer.h b/Alignment/OfflineValidation/plugins/MuonAlignmentAnalyzer.h
index 0d9ccbcdabacf..4f7c3cbca55e9 100644
--- a/Alignment/OfflineValidation/plugins/MuonAlignmentAnalyzer.h
+++ b/Alignment/OfflineValidation/plugins/MuonAlignmentAnalyzer.h
@@ -30,8 +30,8 @@
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
diff --git a/Alignment/OfflineValidation/plugins/OverlapValidation.cc b/Alignment/OfflineValidation/plugins/OverlapValidation.cc
index 7a928ec1ebb82..4f32c581eb2ee 100644
--- a/Alignment/OfflineValidation/plugins/OverlapValidation.cc
+++ b/Alignment/OfflineValidation/plugins/OverlapValidation.cc
@@ -48,11 +48,11 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
-#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GluedGeomDet.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetType.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
diff --git a/Alignment/OfflineValidation/plugins/PrimaryVertexValidation.cc b/Alignment/OfflineValidation/plugins/PrimaryVertexValidation.cc
index 484c8109ed700..b229b48fb1e3c 100644
--- a/Alignment/OfflineValidation/plugins/PrimaryVertexValidation.cc
+++ b/Alignment/OfflineValidation/plugins/PrimaryVertexValidation.cc
@@ -49,7 +49,7 @@
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/TrackerGeometryBuilder/interface/PixelTopologyMap.h"
diff --git a/Alignment/OfflineValidation/plugins/PrimaryVertexValidation.h b/Alignment/OfflineValidation/plugins/PrimaryVertexValidation.h
index 3146a04cdd1cb..39feb8f1d1865 100644
--- a/Alignment/OfflineValidation/plugins/PrimaryVertexValidation.h
+++ b/Alignment/OfflineValidation/plugins/PrimaryVertexValidation.h
@@ -41,7 +41,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "RecoVertex/AdaptiveVertexFit/interface/AdaptiveVertexFitter.h"
@@ -56,7 +56,7 @@
 #include "Alignment/OfflineValidation/interface/PVValidationHelpers.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
 #include "CondFormats/RunInfo/interface/RunInfo.h"
 #include "TrackingTools/Records/interface/TransientTrackRecord.h"
diff --git a/Alignment/OfflineValidation/plugins/ResidualRefitting.cc b/Alignment/OfflineValidation/plugins/ResidualRefitting.cc
index ad0c6c054f384..74cfc476dff3f 100644
--- a/Alignment/OfflineValidation/plugins/ResidualRefitting.cc
+++ b/Alignment/OfflineValidation/plugins/ResidualRefitting.cc
@@ -17,9 +17,9 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetEnumerators.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetEnumerators.h"
 
 #include "RecoMuon/DetLayers/interface/MuonDetLayerGeometry.h"
 #include "RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHitBuilder.h"
diff --git a/Alignment/OfflineValidation/plugins/ResidualRefitting.h b/Alignment/OfflineValidation/plugins/ResidualRefitting.h
index 202f4e9c6a7dc..c8b395228c16a 100644
--- a/Alignment/OfflineValidation/plugins/ResidualRefitting.h
+++ b/Alignment/OfflineValidation/plugins/ResidualRefitting.h
@@ -19,7 +19,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
 
 #include "MagneticField/Engine/interface/MagneticField.h"
diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc b/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc
index 1dd1d5a2e3b58..78a264359271c 100644
--- a/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc
+++ b/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc
@@ -64,7 +64,7 @@
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
 // To access kinks and bows
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Geometry/CommonTopologies/interface/SurfaceDeformation.h"
 
 #include "CLHEP/Matrix/SymMatrix.h"
diff --git a/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc b/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc
index 794367cc4f786..c38bf9c09ae36 100644
--- a/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc
+++ b/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc
@@ -58,7 +58,7 @@
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 
diff --git a/Alignment/OfflineValidation/plugins/TrackerOfflineValidationSummary.cc b/Alignment/OfflineValidation/plugins/TrackerOfflineValidationSummary.cc
index 705cb5f1ab978..83243dad89d64 100644
--- a/Alignment/OfflineValidation/plugins/TrackerOfflineValidationSummary.cc
+++ b/Alignment/OfflineValidation/plugins/TrackerOfflineValidationSummary.cc
@@ -43,7 +43,7 @@
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "DataFormats/GeometrySurface/interface/Surface.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "DataFormats/Math/interface/deltaPhi.h"
 #include "TH1.h"
 #include "TMath.h"
diff --git a/Alignment/OfflineValidation/plugins/ValidationMisalignedTracker.h b/Alignment/OfflineValidation/plugins/ValidationMisalignedTracker.h
index 7a2f364e79a0d..7e8a300c3130b 100644
--- a/Alignment/OfflineValidation/plugins/ValidationMisalignedTracker.h
+++ b/Alignment/OfflineValidation/plugins/ValidationMisalignedTracker.h
@@ -14,7 +14,7 @@
 //
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "DataFormats/GeometryVector/interface/GlobalVector.h"
diff --git a/Alignment/OfflineValidation/src/TrackerValidationVariables.cc b/Alignment/OfflineValidation/src/TrackerValidationVariables.cc
index 4eb8b6cd2247b..41e599996dea5 100644
--- a/Alignment/OfflineValidation/src/TrackerValidationVariables.cc
+++ b/Alignment/OfflineValidation/src/TrackerValidationVariables.cc
@@ -8,8 +8,8 @@
 
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
 #include "Geometry/CommonTopologies/interface/RadialStripTopology.h"
 
 #include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h"
diff --git a/Alignment/ReferenceTrajectories/BuildFile.xml b/Alignment/ReferenceTrajectories/BuildFile.xml
index 26be81664cc1c..a23cd0e737ad4 100644
--- a/Alignment/ReferenceTrajectories/BuildFile.xml
+++ b/Alignment/ReferenceTrajectories/BuildFile.xml
@@ -6,7 +6,7 @@
 <use name="DataFormats/TrajectoryState"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/PluginManager"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="TrackingTools/AnalyticalJacobians"/>
 <use name="TrackingTools/GeomPropagators"/>
 <use name="TrackingTools/MaterialEffects"/>
diff --git a/Alignment/ReferenceTrajectories/interface/BeamSpotGeomDet.h b/Alignment/ReferenceTrajectories/interface/BeamSpotGeomDet.h
index ba6653a3a9690..fe99453c3e5c7 100644
--- a/Alignment/ReferenceTrajectories/interface/BeamSpotGeomDet.h
+++ b/Alignment/ReferenceTrajectories/interface/BeamSpotGeomDet.h
@@ -17,7 +17,7 @@
 
 #include "Alignment/CommonAlignment/interface/AlignableBeamSpot.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 
 class BeamSpotGeomDet : public GeomDet {
 public:
diff --git a/Alignment/ReferenceTrajectories/plugins/TwoBodyDecayTrajectoryFactory.cc b/Alignment/ReferenceTrajectories/plugins/TwoBodyDecayTrajectoryFactory.cc
index 24c8bfaed960e..50df04ef74c88 100644
--- a/Alignment/ReferenceTrajectories/plugins/TwoBodyDecayTrajectoryFactory.cc
+++ b/Alignment/ReferenceTrajectories/plugins/TwoBodyDecayTrajectoryFactory.cc
@@ -8,7 +8,7 @@
 
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
-#include "Geometry/CommonDetUnit/interface/TrackerGeomDet.h"
+#include "Geometry/CommonTopologies/interface/TrackerGeomDet.h"
 
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 
diff --git a/Alignment/ReferenceTrajectories/src/ReferenceTrajectory.cc b/Alignment/ReferenceTrajectories/src/ReferenceTrajectory.cc
index 488683aff2446..2c51973ce3fd1 100644
--- a/Alignment/ReferenceTrajectories/src/ReferenceTrajectory.cc
+++ b/Alignment/ReferenceTrajectories/src/ReferenceTrajectory.cc
@@ -18,7 +18,7 @@
 #include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 #include "DataFormats/GeometrySurface/interface/LocalError.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
-#include "Geometry/CommonDetUnit/interface/TrackerGeomDet.h"
+#include "Geometry/CommonTopologies/interface/TrackerGeomDet.h"
 
 #include "DataFormats/TrajectoryState/interface/LocalTrajectoryParameters.h"
 #include "DataFormats/TrackingRecHit/interface/KfComponentsHolder.h"
diff --git a/Alignment/ReferenceTrajectories/src/TwoBodyDecayTrajectory.cc b/Alignment/ReferenceTrajectories/src/TwoBodyDecayTrajectory.cc
index b1bc46858f8ff..bdbd98f0783d7 100644
--- a/Alignment/ReferenceTrajectories/src/TwoBodyDecayTrajectory.cc
+++ b/Alignment/ReferenceTrajectories/src/TwoBodyDecayTrajectory.cc
@@ -7,7 +7,7 @@
 #include "DataFormats/Math/interface/Error.h"
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecayParameters.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 
diff --git a/Alignment/SurveyAnalysis/test/TestConverter2.cpp b/Alignment/SurveyAnalysis/test/TestConverter2.cpp
index 57aa3b903a27d..98a0919ddf88d 100644
--- a/Alignment/SurveyAnalysis/test/TestConverter2.cpp
+++ b/Alignment/SurveyAnalysis/test/TestConverter2.cpp
@@ -26,7 +26,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
diff --git a/Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp b/Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp
index 0c2f359432951..e43b8c90d2982 100644
--- a/Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp
+++ b/Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp
@@ -24,7 +24,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 /* #include "CondFormats/Alignment/interface/Alignments.h"
diff --git a/Alignment/TrackerAlignment/BuildFile.xml b/Alignment/TrackerAlignment/BuildFile.xml
index 3215d0908cf74..cb8e3e74250e3 100644
--- a/Alignment/TrackerAlignment/BuildFile.xml
+++ b/Alignment/TrackerAlignment/BuildFile.xml
@@ -9,7 +9,7 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <export>
diff --git a/Alignment/TrackerAlignment/interface/AlignableStackDet.h b/Alignment/TrackerAlignment/interface/AlignableStackDet.h
index c5dd7f6d8608b..6d8b4a0303f75 100644
--- a/Alignment/TrackerAlignment/interface/AlignableStackDet.h
+++ b/Alignment/TrackerAlignment/interface/AlignableStackDet.h
@@ -12,7 +12,7 @@
  */
 
 #include "Alignment/CommonAlignment/interface/AlignableDet.h"
-#include "Geometry/CommonDetUnit/interface/StackGeomDet.h"
+#include "Geometry/CommonTopologies/interface/StackGeomDet.h"
 
 class AlignTransformErrorExtended;
 class Bounds;
diff --git a/Alignment/TrackerAlignment/interface/AlignableTrackerBuilder.h b/Alignment/TrackerAlignment/interface/AlignableTrackerBuilder.h
index 97338ec4bc204..ed4864adfc536 100644
--- a/Alignment/TrackerAlignment/interface/AlignableTrackerBuilder.h
+++ b/Alignment/TrackerAlignment/interface/AlignableTrackerBuilder.h
@@ -7,7 +7,7 @@
 // topology and geometry
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/TrackingGeometry.h"
 
 // alignment
 #include "Alignment/CommonAlignment/interface/Utilities.h"
diff --git a/Alignment/TrackerAlignment/plugins/BuildFile.xml b/Alignment/TrackerAlignment/plugins/BuildFile.xml
index 80f283bd6dd47..ecc081499db06 100644
--- a/Alignment/TrackerAlignment/plugins/BuildFile.xml
+++ b/Alignment/TrackerAlignment/plugins/BuildFile.xml
@@ -41,7 +41,7 @@
   <use name="Geometry/Records"/>
   <use name="Geometry/TrackerNumberingBuilder"/>
   <use name="Geometry/TrackerGeometryBuilder"/>
-  <use name="Geometry/CommonDetUnit" source_only="1"/>
+  <use name="Geometry/CommonTopologies" source_only="1"/>
   <use name="Geometry/CommonTopologies"/>
   <use name="root"/>
   <flags EDM_PLUGIN="1"/>
diff --git a/Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc b/Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc
index c8ccbe4113513..6d4282459f926 100644
--- a/Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc
+++ b/Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc
@@ -49,8 +49,8 @@
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h"
 #include "Geometry/Records/interface/PTrackerParametersRcd.h"
 #include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h"
-#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/TrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 
diff --git a/Alignment/TrackerAlignment/src/AlignableSiStripDet.cc b/Alignment/TrackerAlignment/src/AlignableSiStripDet.cc
index 407576681b615..3818ffef5f702 100644
--- a/Alignment/TrackerAlignment/src/AlignableSiStripDet.cc
+++ b/Alignment/TrackerAlignment/src/AlignableSiStripDet.cc
@@ -15,7 +15,7 @@
 #include "DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h"
 #include "DataFormats/GeometrySurface/interface/BoundPlane.h"
 #include "Geometry/TrackerGeometryBuilder/interface/PlaneBuilderForGluedDet.h"
-#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
+#include "Geometry/CommonTopologies/interface/GluedGeomDet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 
 #include "FWCore/Utilities/interface/Exception.h"
diff --git a/Alignment/TrackerAlignment/src/AlignableStackDet.cc b/Alignment/TrackerAlignment/src/AlignableStackDet.cc
index a6d3b8ec84db9..c23245a157253 100644
--- a/Alignment/TrackerAlignment/src/AlignableStackDet.cc
+++ b/Alignment/TrackerAlignment/src/AlignableStackDet.cc
@@ -13,7 +13,7 @@
 #include "DataFormats/GeometrySurface/interface/Bounds.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "Geometry/CommonDetUnit/interface/StackGeomDet.h"
+#include "Geometry/CommonTopologies/interface/StackGeomDet.h"
 #include <cmath>
 
 AlignableStackDet::AlignableStackDet(const StackGeomDet* stackedDet)
diff --git a/Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc b/Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc
index c3f71f06d32ef..3be19bcb8269b 100644
--- a/Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc
+++ b/Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc
@@ -4,8 +4,8 @@
 //         Created:  Thu, 13 Jan 2016 10:22:57 CET
 
 // geometry
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GluedGeomDet.h"
 #include "Geometry/CommonTopologies/interface/StackGeomDet.h"
 
 // alignment
diff --git a/Alignment/TrackerAlignment/test/BuildFile.xml b/Alignment/TrackerAlignment/test/BuildFile.xml
index f7b33b10889bb..b1b59b9990953 100644
--- a/Alignment/TrackerAlignment/test/BuildFile.xml
+++ b/Alignment/TrackerAlignment/test/BuildFile.xml
@@ -6,7 +6,7 @@
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <library name="AlignmentTrackerAlignment_test" file="*.cpp">
-  <use name="Geometry/CommonDetUnit" source_only="1"/>
+  <use name="Geometry/CommonTopologies" source_only="1"/>
   <use name="CondCore/DBOutputService"/>
   <use name="CondFormats/Alignment"/>
   <use name="CondFormats/AlignmentRecord"/>
diff --git a/Alignment/TrackerAlignment/test/TestAnalyzer.cpp b/Alignment/TrackerAlignment/test/TestAnalyzer.cpp
index 8ffdc98074ffe..facf66be77c89 100644
--- a/Alignment/TrackerAlignment/test/TestAnalyzer.cpp
+++ b/Alignment/TrackerAlignment/test/TestAnalyzer.cpp
@@ -27,7 +27,7 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
diff --git a/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.cc b/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.cc
index 8ac39e91b12eb..bc0753bb4c579 100644
--- a/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.cc
+++ b/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.cc
@@ -14,8 +14,8 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h"
diff --git a/CalibTracker/SiPhase2TrackerESProducers/plugins/BuildFile.xml b/CalibTracker/SiPhase2TrackerESProducers/plugins/BuildFile.xml
index ad88ade26ed03..2295aae4d28fb 100644
--- a/CalibTracker/SiPhase2TrackerESProducers/plugins/BuildFile.xml
+++ b/CalibTracker/SiPhase2TrackerESProducers/plugins/BuildFile.xml
@@ -6,7 +6,7 @@
 <use name="FWCore/AbstractServices"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerNumberingBuilder"/>
 <library file="*.cc" name="CalibTrackerSiPhase2TrackerESProducersPlugins">
diff --git a/CalibTracker/SiPhase2TrackerESProducers/plugins/SiPhase2BadStripConfigurableFakeESSource.cc b/CalibTracker/SiPhase2TrackerESProducers/plugins/SiPhase2BadStripConfigurableFakeESSource.cc
index d063a724fdeab..64ce008b5c50b 100644
--- a/CalibTracker/SiPhase2TrackerESProducers/plugins/SiPhase2BadStripConfigurableFakeESSource.cc
+++ b/CalibTracker/SiPhase2TrackerESProducers/plugins/SiPhase2BadStripConfigurableFakeESSource.cc
@@ -30,7 +30,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
diff --git a/CalibTracker/SiPhase2TrackerESProducers/plugins/SiPhase2OuterTrackerFakeLorentzAngleESSource.cc b/CalibTracker/SiPhase2TrackerESProducers/plugins/SiPhase2OuterTrackerFakeLorentzAngleESSource.cc
index ff9ffaeb111f8..428541f97f65b 100644
--- a/CalibTracker/SiPhase2TrackerESProducers/plugins/SiPhase2OuterTrackerFakeLorentzAngleESSource.cc
+++ b/CalibTracker/SiPhase2TrackerESProducers/plugins/SiPhase2OuterTrackerFakeLorentzAngleESSource.cc
@@ -17,7 +17,7 @@
 // user include files
 #include "CondFormats/DataRecord/interface/SiPhase2OuterTrackerLorentzAngleRcd.h"
 #include "CondFormats/SiPhase2TrackerObjects/interface/SiPhase2OuterTrackerLorentzAngle.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "CalibTracker/SiPhase2TrackerESProducers/interface/SiPhase2OuterTrackerFakeLorentzAngleESSource.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
diff --git a/CalibTracker/SiPixelConnectivity/BuildFile.xml b/CalibTracker/SiPixelConnectivity/BuildFile.xml
index deb418a002a76..0ac4cafe5f1da 100644
--- a/CalibTracker/SiPixelConnectivity/BuildFile.xml
+++ b/CalibTracker/SiPixelConnectivity/BuildFile.xml
@@ -4,7 +4,7 @@
 <use name="CondFormats/SiPixelObjects"/>
 <use name="DataFormats/SiPixelDetId"/>
 <use name="DataFormats/TrackerCommon"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc b/CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc
index 41b63acd3cf28..c311b55855712 100644
--- a/CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc
+++ b/CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc
@@ -1,7 +1,7 @@
 #include <iostream>
 
 #include "CalibTracker/SiPixelConnectivity/interface/SiPixelFedCablingMapBuilder.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 
 #include <ostream>
@@ -14,7 +14,7 @@
 #include "CalibTracker/SiPixelConnectivity/interface/PixelBarrelLinkMaker.h"
 #include "CalibTracker/SiPixelConnectivity/interface/PixelEndcapLinkMaker.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
diff --git a/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc b/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc
index 89775aad50224..3d62aae34996d 100644
--- a/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc
+++ b/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc
@@ -16,8 +16,8 @@
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CalibTracker/SiPixelESProducers/plugins/alpaka/SiPixelGainCalibrationForHLTSoAESProducer.cc b/CalibTracker/SiPixelESProducers/plugins/alpaka/SiPixelGainCalibrationForHLTSoAESProducer.cc
index 246bacbdca50f..f4b2189167df8 100644
--- a/CalibTracker/SiPixelESProducers/plugins/alpaka/SiPixelGainCalibrationForHLTSoAESProducer.cc
+++ b/CalibTracker/SiPixelESProducers/plugins/alpaka/SiPixelGainCalibrationForHLTSoAESProducer.cc
@@ -10,7 +10,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
 
 #include "HeterogeneousCore/AlpakaCore/interface/alpaka/ESProducer.h"
 #include "HeterogeneousCore/AlpakaCore/interface/alpaka/ModuleFactory.h"
diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc
index a6aa47dcce4eb..499b8027b2855 100644
--- a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc
+++ b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc
@@ -26,7 +26,7 @@
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc
index 8ad61b8c89ef7..83e2a58973e6f 100644
--- a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc
+++ b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc
@@ -26,7 +26,7 @@
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc
index 545e5da60067b..bae3fad8810ab 100644
--- a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc
+++ b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc
@@ -26,7 +26,7 @@
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CalibTracker/SiPixelErrorEstimation/BuildFile.xml b/CalibTracker/SiPixelErrorEstimation/BuildFile.xml
index 4172af54b1192..567333afa9908 100644
--- a/CalibTracker/SiPixelErrorEstimation/BuildFile.xml
+++ b/CalibTracker/SiPixelErrorEstimation/BuildFile.xml
@@ -9,7 +9,7 @@
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/TrajectorySeed"/>
 <use name="FWCore/MessageLogger"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="Geometry/CommonTopologies"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
diff --git a/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h b/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h
index 90eea1b17e323..88ecb00b0c57b 100644
--- a/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h
+++ b/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h
@@ -36,14 +36,14 @@
 #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GluedGeomDet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetType.h"
 
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc
index 77d2a89cb3d09..51fdc4e0cf185 100644
--- a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc
+++ b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc
@@ -12,8 +12,8 @@
 #include "DataFormats/GeometryVector/interface/GlobalVector.h"
 #include "DataFormats/GeometryVector/interface/LocalVector.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
 #include "DataFormats/TrackReco/interface/TrackExtra.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
@@ -24,7 +24,7 @@
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 
 #include "TrackingTools/Records/interface/TransientRecHitRecord.h"
-#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
+#include "Geometry/CommonTopologies/interface/GluedGeomDet.h"
 #include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h"
 #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.h b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.h
index f8982504b17a7..8bda89e7c6b2b 100644
--- a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.h
+++ b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.h
@@ -24,7 +24,7 @@
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include <Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h>
+#include <Geometry/CommonTopologies/interface/PixelGeomDetUnit.h>
 #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
 #include <TROOT.h>
diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLWorker.cc b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLWorker.cc
index 75decdd6eae5a..77a57d07c82bb 100644
--- a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLWorker.cc
+++ b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLWorker.cc
@@ -42,7 +42,7 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
diff --git a/CalibTracker/SiPixelQuality/BuildFile.xml b/CalibTracker/SiPixelQuality/BuildFile.xml
index b9bd7df0e31b8..dad845f5c0259 100644
--- a/CalibTracker/SiPixelQuality/BuildFile.xml
+++ b/CalibTracker/SiPixelQuality/BuildFile.xml
@@ -12,7 +12,7 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="Geometry/CommonTopologies"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="rootcling"/>
diff --git a/CalibTracker/SiPixelQuality/plugins/BuildFile.xml b/CalibTracker/SiPixelQuality/plugins/BuildFile.xml
index a99b0da9344b6..995ae495f6499 100644
--- a/CalibTracker/SiPixelQuality/plugins/BuildFile.xml
+++ b/CalibTracker/SiPixelQuality/plugins/BuildFile.xml
@@ -16,7 +16,7 @@
  <use name="FWCore/ParameterSet"/>
  <use name="FWCore/Utilities"/>
  <use name="FWCore/Concurrency"/>
- <use name="Geometry/CommonDetUnit" source_only="1"/>
+ <use name="Geometry/CommonTopologies" source_only="1"/>
  <use name="Geometry/Records"/>
  <use name="Geometry/TrackerGeometryBuilder"/>
  <use name="rootcling"/>
@@ -36,7 +36,7 @@
  <use name="FWCore/ParameterSet"/>
  <use name="FWCore/ServiceRegistry"/>
  <use name="FWCore/Utilities"/>
- <use name="Geometry/CommonDetUnit" source_only="1"/>
+ <use name="Geometry/CommonTopologies" source_only="1"/>
  <use name="Geometry/Records"/>
  <use name="Geometry/TrackerGeometryBuilder"/>
  <use name="rootcling"/>
diff --git a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc
index e6d8bbda02b51..014ea4e2dcc54 100644
--- a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc
+++ b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc
@@ -19,7 +19,7 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/Transition.h"
 // Pixel geometry and cabling map
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
 // Condition Format
 #include "CondFormats/DataRecord/interface/SiPixelQualityRcd.h"
diff --git a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc
index 086ff92c85f9c..9ab7904cb6ade 100644
--- a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc
+++ b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc
@@ -21,7 +21,7 @@
 #include "CondFormats/RunInfo/interface/RunInfo.h"
 #include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
 // Header file
diff --git a/CalibTracker/SiPixelQuality/src/SiPixelTopoFinder.cc b/CalibTracker/SiPixelQuality/src/SiPixelTopoFinder.cc
index 7764f2752daef..7d0dad3f550eb 100644
--- a/CalibTracker/SiPixelQuality/src/SiPixelTopoFinder.cc
+++ b/CalibTracker/SiPixelQuality/src/SiPixelTopoFinder.cc
@@ -1,7 +1,7 @@
 
 #include "CalibTracker/SiPixelQuality/interface/SiPixelTopoFinder.h"
 
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "DataFormats/TrackerCommon/interface/PixelBarrelName.h"
 #include "DataFormats/TrackerCommon/interface/PixelEndcapName.h"
diff --git a/CalibTracker/SiPixelTools/BuildFile.xml b/CalibTracker/SiPixelTools/BuildFile.xml
index 9903dec59d6f7..883d9299ca149 100644
--- a/CalibTracker/SiPixelTools/BuildFile.xml
+++ b/CalibTracker/SiPixelTools/BuildFile.xml
@@ -5,7 +5,7 @@
 <use name="CondFormats/SiPixelObjects"/>
 <use name="Geometry/Records"/>
 <use name="root"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="DQM/SiPixelCommon"/>
 <use name="DQMServices/Core"/>
diff --git a/CalibTracker/SiPixelTools/plugins/BuildFile.xml b/CalibTracker/SiPixelTools/plugins/BuildFile.xml
index 2c0696d01a924..8e282dead6beb 100644
--- a/CalibTracker/SiPixelTools/plugins/BuildFile.xml
+++ b/CalibTracker/SiPixelTools/plugins/BuildFile.xml
@@ -9,7 +9,7 @@
   <use name="CondFormats/SiPixelObjects"/>
   <use name="DQM/SiPixelCommon"/>
   <use name="Geometry/Records"/>
-  <use name="Geometry/CommonDetUnit" source_only="1"/>
+  <use name="Geometry/CommonTopologies" source_only="1"/>
   <use name="Geometry/TrackerGeometryBuilder"/>
   <use name="CommonTools/UtilAlgos"/>
   <library file="*.cc" name="CalibTrackerSiPixelToolsPlugin">
diff --git a/CalibTracker/SiPixelTools/plugins/SiPixelErrorsDigisToCalibDigis.h b/CalibTracker/SiPixelTools/plugins/SiPixelErrorsDigisToCalibDigis.h
index 15df93f3a6c23..2b50bd677d0bb 100644
--- a/CalibTracker/SiPixelTools/plugins/SiPixelErrorsDigisToCalibDigis.h
+++ b/CalibTracker/SiPixelTools/plugins/SiPixelErrorsDigisToCalibDigis.h
@@ -31,8 +31,8 @@ Description: Create monitorElements for the Errors in created in the reduction o
 #include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"
 
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetType.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
diff --git a/CalibTracker/SiPixelTools/src/SiPixelOfflineCalibAnalysisBase.cc b/CalibTracker/SiPixelTools/src/SiPixelOfflineCalibAnalysisBase.cc
index c3fa27c669c1a..ed5c8e136fe33 100644
--- a/CalibTracker/SiPixelTools/src/SiPixelOfflineCalibAnalysisBase.cc
+++ b/CalibTracker/SiPixelTools/src/SiPixelOfflineCalibAnalysisBase.cc
@@ -21,8 +21,8 @@
 
 #include "CalibTracker/SiPixelTools/interface/SiPixelOfflineCalibAnalysisBase.h"
 
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetType.h"
 
 #include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"
 #include "CondFormats/SiPixelObjects/interface/ElectronicIndex.h"
diff --git a/CalibTracker/SiStripChannelGain/BuildFile.xml b/CalibTracker/SiStripChannelGain/BuildFile.xml
index 2ea22599811b7..9f41457d31e1c 100644
--- a/CalibTracker/SiStripChannelGain/BuildFile.xml
+++ b/CalibTracker/SiStripChannelGain/BuildFile.xml
@@ -13,7 +13,7 @@
 <use name="DataFormats/SiStripDetId"/>
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/TrackerRecHit2D"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="Geometry/CommonTopologies"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
diff --git a/CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h b/CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h
index 02de606dc05b2..473864b1fccb8 100644
--- a/CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h
+++ b/CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h
@@ -49,12 +49,12 @@
 #include "FWCore/Utilities/interface/EDGetToken.h"
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/Framework/interface/ESWatcher.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/TrackingGeometry.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
diff --git a/CalibTracker/SiStripChannelGain/plugins/DeDxDiscriminatorLearner.cc b/CalibTracker/SiStripChannelGain/plugins/DeDxDiscriminatorLearner.cc
index ba9a44f8024e3..2e920c505daf0 100644
--- a/CalibTracker/SiStripChannelGain/plugins/DeDxDiscriminatorLearner.cc
+++ b/CalibTracker/SiStripChannelGain/plugins/DeDxDiscriminatorLearner.cc
@@ -23,7 +23,7 @@
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
 
-#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
+#include "Geometry/CommonTopologies/interface/GluedGeomDet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc
index 310cd7468c148..f5387c244f96a 100644
--- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc
+++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc
@@ -6,16 +6,16 @@
 #include "CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h"
 #include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 #include "CLHEP/Random/RandFlat.h"
 #include "CLHEP/Random/RandGauss.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetType.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc
index b1f2754d1495d..8cc10c60f948a 100644
--- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc
+++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc
@@ -14,8 +14,8 @@
 
 #include "CondFormats/RunInfo/interface/RunInfo.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h"
 #include "DataFormats/GeometrySurface/interface/RectangularPlaneBounds.h"
@@ -24,9 +24,9 @@
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
-#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/TrackingGeometry.h"
 
 #include "DataFormats/SiStripCluster/interface/SiStripClusterCollection.h"
 
diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc
index 59aea96d958b5..170a80ebb2f68 100644
--- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc
+++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc
@@ -34,10 +34,10 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
-#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/TrackingGeometry.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainRandomCalculator.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainRandomCalculator.cc
index 4664230cdb98b..9f6e14bc757b8 100644
--- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainRandomCalculator.cc
+++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainRandomCalculator.cc
@@ -8,7 +8,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 
diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainsCalibTreeWorker.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainsCalibTreeWorker.cc
index 040e34526340b..26f36d2658712 100644
--- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainsCalibTreeWorker.cc
+++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainsCalibTreeWorker.cc
@@ -17,12 +17,12 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/TrackingGeometry.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 
diff --git a/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc b/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc
index 0d3aec7540b32..035a66a8a4048 100644
--- a/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc
+++ b/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc
@@ -12,8 +12,8 @@
 #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit1D.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
-#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/TrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
 
diff --git a/CalibTracker/SiStripCommon/plugins/ShallowGainCalibration.h b/CalibTracker/SiStripCommon/plugins/ShallowGainCalibration.h
index ecbb3e22ff0c9..e730c06800eaf 100644
--- a/CalibTracker/SiStripCommon/plugins/ShallowGainCalibration.h
+++ b/CalibTracker/SiStripCommon/plugins/ShallowGainCalibration.h
@@ -25,16 +25,16 @@
 #include "DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h"
 #include "DataFormats/GeometrySurface/interface/RectangularPlaneBounds.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
-#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/TrackingGeometry.h"
 
 #include "CalibFormats/SiStripObjects/interface/SiStripGain.h"
 #include "CalibTracker/Records/interface/SiStripGainRcd.h"
diff --git a/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc b/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc
index cd9ea67120d4f..e64845f968112 100644
--- a/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc
+++ b/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc
@@ -26,7 +26,7 @@
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
diff --git a/CalibTracker/SiStripCommon/plugins/SiStripGainCalibTableProducer.cc b/CalibTracker/SiStripCommon/plugins/SiStripGainCalibTableProducer.cc
index 8a56dcfc9e1cd..2f7ddffd2d88a 100644
--- a/CalibTracker/SiStripCommon/plugins/SiStripGainCalibTableProducer.cc
+++ b/CalibTracker/SiStripCommon/plugins/SiStripGainCalibTableProducer.cc
@@ -5,7 +5,7 @@
 #include "DataFormats/GeometrySurface/interface/RectangularPlaneBounds.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 
 #include "CalibFormats/SiStripObjects/interface/SiStripGain.h"
 #include "CalibTracker/Records/interface/SiStripGainRcd.h"
diff --git a/CalibTracker/SiStripESProducers/plugins/geom/SiStripRegionConnectivity.cc b/CalibTracker/SiStripESProducers/plugins/geom/SiStripRegionConnectivity.cc
index a2d21b9cc1241..11de0de600389 100644
--- a/CalibTracker/SiStripESProducers/plugins/geom/SiStripRegionConnectivity.cc
+++ b/CalibTracker/SiStripESProducers/plugins/geom/SiStripRegionConnectivity.cc
@@ -5,7 +5,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
 #include "CalibTracker/Records/interface/SiStripRegionCablingRcd.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
diff --git a/CalibTracker/SiStripHitEfficiency/BuildFile.xml b/CalibTracker/SiStripHitEfficiency/BuildFile.xml
index 6c99624abf7e9..8a7796ca96ce9 100644
--- a/CalibTracker/SiStripHitEfficiency/BuildFile.xml
+++ b/CalibTracker/SiStripHitEfficiency/BuildFile.xml
@@ -1,6 +1,6 @@
 <use name="DataFormats/SiStripDetId"/>
 <use name="DQM/SiStripCommon"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="RecoTracker/TransientTrackingRecHit"/>
 <use name="TrackingTools/TrackFitters"/>
 <export>
diff --git a/CalibTracker/SiStripHitEfficiency/plugins/BuildFile.xml b/CalibTracker/SiStripHitEfficiency/plugins/BuildFile.xml
index ecd1fe2f7c64b..f1e5cc98ea99d 100644
--- a/CalibTracker/SiStripHitEfficiency/plugins/BuildFile.xml
+++ b/CalibTracker/SiStripHitEfficiency/plugins/BuildFile.xml
@@ -14,7 +14,7 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="MagneticField/Engine"/>
diff --git a/CalibTracker/SiStripHitEfficiency/plugins/HitEff.cc b/CalibTracker/SiStripHitEfficiency/plugins/HitEff.cc
index 5baf58195c21e..9c7f453189b77 100644
--- a/CalibTracker/SiStripHitEfficiency/plugins/HitEff.cc
+++ b/CalibTracker/SiStripHitEfficiency/plugins/HitEff.cc
@@ -44,9 +44,9 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
-#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GluedGeomDet.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc
index 99a7781c67ffb..9da56b8c2ff2d 100644
--- a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc
+++ b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc
@@ -45,8 +45,8 @@
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEfficiencyHarvester.cc b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEfficiencyHarvester.cc
index 526aae56bab30..667ef212a1f1c 100644
--- a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEfficiencyHarvester.cc
+++ b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEfficiencyHarvester.cc
@@ -16,7 +16,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
diff --git a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEfficiencyWorker.cc b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEfficiencyWorker.cc
index 847c7f07dc9a7..4576a3ca1ceee 100644
--- a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEfficiencyWorker.cc
+++ b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEfficiencyWorker.cc
@@ -43,8 +43,8 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CalibTracker/SiStripHitEfficiency/src/TrajectoryAtInvalidHit.cc b/CalibTracker/SiStripHitEfficiency/src/TrajectoryAtInvalidHit.cc
index 2cdf53304a72d..a68a3a28ab80f 100644
--- a/CalibTracker/SiStripHitEfficiency/src/TrajectoryAtInvalidHit.cc
+++ b/CalibTracker/SiStripHitEfficiency/src/TrajectoryAtInvalidHit.cc
@@ -4,8 +4,8 @@
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GluedGeomDet.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "RecoTracker/TransientTrackingRecHit/interface/ProjectedRecHit2D.h"
diff --git a/CalibTracker/SiStripHitResolution/BuildFile.xml b/CalibTracker/SiStripHitResolution/BuildFile.xml
index b6ed1eb625ba9..13b183d6fdda8 100644
--- a/CalibTracker/SiStripHitResolution/BuildFile.xml
+++ b/CalibTracker/SiStripHitResolution/BuildFile.xml
@@ -7,7 +7,7 @@
 <use name="DataFormats/TrackingRecHit"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/CommonTopologies"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="MagneticField/Engine"/>
diff --git a/CalibTracker/SiStripHitResolution/plugins/BuildFile.xml b/CalibTracker/SiStripHitResolution/plugins/BuildFile.xml
index 40f4b0ef33e31..27dc4cb8ace01 100644
--- a/CalibTracker/SiStripHitResolution/plugins/BuildFile.xml
+++ b/CalibTracker/SiStripHitResolution/plugins/BuildFile.xml
@@ -11,7 +11,7 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
-<use name="Geometry/CommonDetUnit" source_only="1"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="RecoLocalTracker/ClusterParameterEstimator"/>
diff --git a/CalibTracker/SiStripHitResolution/plugins/SiStripHitResolFromCalibTree.cc b/CalibTracker/SiStripHitResolution/plugins/SiStripHitResolFromCalibTree.cc
index 1eabbd15d1c72..e8d571c55cbb9 100644
--- a/CalibTracker/SiStripHitResolution/plugins/SiStripHitResolFromCalibTree.cc
+++ b/CalibTracker/SiStripHitResolution/plugins/SiStripHitResolFromCalibTree.cc
@@ -34,8 +34,8 @@
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CalibTracker/SiStripHitResolution/src/HitResol.cc b/CalibTracker/SiStripHitResolution/src/HitResol.cc
index 02c4833313ffc..b8b40e982355e 100644
--- a/CalibTracker/SiStripHitResolution/src/HitResol.cc
+++ b/CalibTracker/SiStripHitResolution/src/HitResol.cc
@@ -44,9 +44,9 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
-#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GluedGeomDet.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CalibTracker/SiStripLorentzAngle/plugins/BuildFile.xml b/CalibTracker/SiStripLorentzAngle/plugins/BuildFile.xml
index 1d34dbaeefab1..9dc2a2d63480f 100644
--- a/CalibTracker/SiStripLorentzAngle/plugins/BuildFile.xml
+++ b/CalibTracker/SiStripLorentzAngle/plugins/BuildFile.xml
@@ -12,7 +12,6 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
-<use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/CommonTopologies"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
diff --git a/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc b/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc
index c4a87b1562b0f..866ca972eedda 100644
--- a/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc
+++ b/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc
@@ -13,8 +13,8 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GluedGeomDet.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 
 #include "DataFormats/Common/interface/Handle.h"
diff --git a/CalibTracker/StandaloneTrackerTopology/test/BuildFile.xml b/CalibTracker/StandaloneTrackerTopology/test/BuildFile.xml
index 2e31ca71dc10c..dc0cee332e7a4 100644
--- a/CalibTracker/StandaloneTrackerTopology/test/BuildFile.xml
+++ b/CalibTracker/StandaloneTrackerTopology/test/BuildFile.xml
@@ -1,6 +1,6 @@
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="Geometry/TrackerNumberingBuilder"/>
-<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/CommonTopologies"/>
 <use name="FWCore/Framework"/>
 
 <library file="StandaloneTrackerTopologyTest.cc" name="StandaloneTrackerTopologyTest">
diff --git a/CalibTracker/StandaloneTrackerTopology/test/StandaloneTrackerTopologyTest.cc b/CalibTracker/StandaloneTrackerTopology/test/StandaloneTrackerTopologyTest.cc
index 19ca9be23c096..c5d3ec44ad70d 100644
--- a/CalibTracker/StandaloneTrackerTopology/test/StandaloneTrackerTopologyTest.cc
+++ b/CalibTracker/StandaloneTrackerTopology/test/StandaloneTrackerTopologyTest.cc
@@ -33,7 +33,7 @@
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "CalibTracker/StandaloneTrackerTopology/interface/StandaloneTrackerTopology.h"
 
 //
diff --git a/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc b/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc
index 9cb3008946063..7f2b1eed2356e 100644
--- a/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc
+++ b/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc
@@ -45,7 +45,7 @@ See the twiki page for details:
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/Records/interface/CaloTopologyRecord.h"
 #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "CondFormats/HcalObjects/interface/HcalRespCorrs.h"
 #include "CondFormats/DataRecord/interface/HcalRespCorrsRcd.h"
 
diff --git a/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersAnalyzer.cc b/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersAnalyzer.cc
index f6b99eee911b3..e9664de9b9cbe 100644
--- a/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersAnalyzer.cc
+++ b/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersAnalyzer.cc
@@ -37,7 +37,7 @@
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/StreamID.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersProducer.cc b/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersProducer.cc
index 42250ba02de6d..c288697a2db7d 100644
--- a/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersProducer.cc
+++ b/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersProducer.cc
@@ -39,7 +39,7 @@
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/StreamID.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CondFormats/SiPixelObjects/BuildFile.xml b/CondFormats/SiPixelObjects/BuildFile.xml
index 9f8fe0199a9f6..b0fd13f86a93c 100644
--- a/CondFormats/SiPixelObjects/BuildFile.xml
+++ b/CondFormats/SiPixelObjects/BuildFile.xml
@@ -14,7 +14,6 @@
 <use name="DataFormats/TrackerCommon"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/Utilities"/>
-<use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/CommonTopologies"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="HeterogeneousCore/AlpakaCore"/>
diff --git a/CondFormats/SiPixelObjects/src/SiPixelFrameReverter.cc b/CondFormats/SiPixelObjects/src/SiPixelFrameReverter.cc
index 14f5d0cf5bd90..73c575a199d44 100644
--- a/CondFormats/SiPixelObjects/src/SiPixelFrameReverter.cc
+++ b/CondFormats/SiPixelObjects/src/SiPixelFrameReverter.cc
@@ -11,7 +11,7 @@
 #include "DataFormats/TrackerCommon/interface/PixelEndcapName.h"
 // Geometry
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 
 using namespace std;
diff --git a/CondFormats/SiPixelObjects/src/SiPixelQuality.cc b/CondFormats/SiPixelObjects/src/SiPixelQuality.cc
index df9f0b118f0dc..26b1cd9130cae 100644
--- a/CondFormats/SiPixelObjects/src/SiPixelQuality.cc
+++ b/CondFormats/SiPixelObjects/src/SiPixelQuality.cc
@@ -13,7 +13,7 @@
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h"
 #include "CondFormats/SiPixelObjects/interface/PixelROC.h"
 #include "CondFormats/SiPixelObjects/interface/LocalPixel.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 
 #include <algorithm>
diff --git a/CondFormats/SiPixelObjects/test/SiPixelTestSummary.cc b/CondFormats/SiPixelObjects/test/SiPixelTestSummary.cc
index f22a8052fcbba..6b9aa8a6f7d2c 100644
--- a/CondFormats/SiPixelObjects/test/SiPixelTestSummary.cc
+++ b/CondFormats/SiPixelObjects/test/SiPixelTestSummary.cc
@@ -12,7 +12,7 @@
 
 #include "CondFormats/SiPixelObjects/interface/SiPixelDetSummary.h"
 
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
diff --git a/CondTools/SiPhase2Tracker/plugins/SiPhase2BadStripChannelBuilder.cc b/CondTools/SiPhase2Tracker/plugins/SiPhase2BadStripChannelBuilder.cc
index 9850abab0ea5b..835efbf63a058 100644
--- a/CondTools/SiPhase2Tracker/plugins/SiPhase2BadStripChannelBuilder.cc
+++ b/CondTools/SiPhase2Tracker/plugins/SiPhase2BadStripChannelBuilder.cc
@@ -18,7 +18,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
diff --git a/CondTools/SiPhase2Tracker/plugins/SiPhase2OuterTrackerLorentzAngleWriter.cc b/CondTools/SiPhase2Tracker/plugins/SiPhase2OuterTrackerLorentzAngleWriter.cc
index 251793f91fd0e..af7303e7bc21d 100644
--- a/CondTools/SiPhase2Tracker/plugins/SiPhase2OuterTrackerLorentzAngleWriter.cc
+++ b/CondTools/SiPhase2Tracker/plugins/SiPhase2OuterTrackerLorentzAngleWriter.cc
@@ -27,7 +27,7 @@
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "CondFormats/DataRecord/interface/SiPhase2OuterTrackerLorentzAngleRcd.h"
 #include "CondFormats/SiPhase2TrackerObjects/interface/SiPhase2OuterTrackerLorentzAngle.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
diff --git a/CondTools/SiPixel/plugins/SiPixelBadModuleReader.cc b/CondTools/SiPixel/plugins/SiPixelBadModuleReader.cc
index 09ad7683a0be4..51e35acea5b80 100644
--- a/CondTools/SiPixel/plugins/SiPixelBadModuleReader.cc
+++ b/CondTools/SiPixel/plugins/SiPixelBadModuleReader.cc
@@ -31,7 +31,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 
diff --git a/CondTools/SiPixel/plugins/SiPixelCondObjAllPayloadsReader.cc b/CondTools/SiPixel/plugins/SiPixelCondObjAllPayloadsReader.cc
index 9c62cb64aa167..a758d63a69aca 100644
--- a/CondTools/SiPixel/plugins/SiPixelCondObjAllPayloadsReader.cc
+++ b/CondTools/SiPixel/plugins/SiPixelCondObjAllPayloadsReader.cc
@@ -34,7 +34,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CondTools/SiPixel/plugins/SiPixelCondObjBuilder.cc b/CondTools/SiPixel/plugins/SiPixelCondObjBuilder.cc
index 81e3ede1eb743..6c6ac2aa06b72 100644
--- a/CondTools/SiPixel/plugins/SiPixelCondObjBuilder.cc
+++ b/CondTools/SiPixel/plugins/SiPixelCondObjBuilder.cc
@@ -34,7 +34,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CondTools/SiPixel/plugins/SiPixelCondObjForHLTBuilder.cc b/CondTools/SiPixel/plugins/SiPixelCondObjForHLTBuilder.cc
index 05bf3ff5938bc..9a62b6406f22b 100644
--- a/CondTools/SiPixel/plugins/SiPixelCondObjForHLTBuilder.cc
+++ b/CondTools/SiPixel/plugins/SiPixelCondObjForHLTBuilder.cc
@@ -36,7 +36,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CondTools/SiPixel/plugins/SiPixelCondObjForHLTReader.cc b/CondTools/SiPixel/plugins/SiPixelCondObjForHLTReader.cc
index ed270bc359a63..350a345ed7972 100644
--- a/CondTools/SiPixel/plugins/SiPixelCondObjForHLTReader.cc
+++ b/CondTools/SiPixel/plugins/SiPixelCondObjForHLTReader.cc
@@ -34,7 +34,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CondTools/SiPixel/plugins/SiPixelCondObjOfflineBuilder.cc b/CondTools/SiPixel/plugins/SiPixelCondObjOfflineBuilder.cc
index 3ff142a672f43..2bba6ad432bb0 100644
--- a/CondTools/SiPixel/plugins/SiPixelCondObjOfflineBuilder.cc
+++ b/CondTools/SiPixel/plugins/SiPixelCondObjOfflineBuilder.cc
@@ -36,7 +36,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CondTools/SiPixel/plugins/SiPixelCondObjOfflineReader.cc b/CondTools/SiPixel/plugins/SiPixelCondObjOfflineReader.cc
index ef63aed3e03a7..80a9307f59019 100644
--- a/CondTools/SiPixel/plugins/SiPixelCondObjOfflineReader.cc
+++ b/CondTools/SiPixel/plugins/SiPixelCondObjOfflineReader.cc
@@ -33,7 +33,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CondTools/SiPixel/plugins/SiPixelCondObjReader.cc b/CondTools/SiPixel/plugins/SiPixelCondObjReader.cc
index ea9848fb4fd02..f6494e6d67306 100644
--- a/CondTools/SiPixel/plugins/SiPixelCondObjReader.cc
+++ b/CondTools/SiPixel/plugins/SiPixelCondObjReader.cc
@@ -21,7 +21,7 @@
 #include <memory>
 
 // user includes
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
diff --git a/CondTools/SiPixel/plugins/SiPixelDynamicInefficiencyDB.cc b/CondTools/SiPixel/plugins/SiPixelDynamicInefficiencyDB.cc
index a61bcb0af8a3a..8b301eb47697a 100644
--- a/CondTools/SiPixel/plugins/SiPixelDynamicInefficiencyDB.cc
+++ b/CondTools/SiPixel/plugins/SiPixelDynamicInefficiencyDB.cc
@@ -21,7 +21,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 
diff --git a/CondTools/SiPixel/plugins/SiPixelDynamicInefficiencyReader.cc b/CondTools/SiPixel/plugins/SiPixelDynamicInefficiencyReader.cc
index 400bcf87731ef..c3f69d9fbb19b 100644
--- a/CondTools/SiPixel/plugins/SiPixelDynamicInefficiencyReader.cc
+++ b/CondTools/SiPixel/plugins/SiPixelDynamicInefficiencyReader.cc
@@ -20,7 +20,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 
diff --git a/CondTools/SiPixel/plugins/SiPixelGainCalibScaler.cc b/CondTools/SiPixel/plugins/SiPixelGainCalibScaler.cc
index 565084b4f088b..dcaa8307e2ae6 100644
--- a/CondTools/SiPixel/plugins/SiPixelGainCalibScaler.cc
+++ b/CondTools/SiPixel/plugins/SiPixelGainCalibScaler.cc
@@ -40,7 +40,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
diff --git a/CondTools/SiPixel/plugins/SiPixelGainCalibrationReadDQMFile.cc b/CondTools/SiPixel/plugins/SiPixelGainCalibrationReadDQMFile.cc
index d38a9ad363d4b..803de4be3dcc0 100644
--- a/CondTools/SiPixel/plugins/SiPixelGainCalibrationReadDQMFile.cc
+++ b/CondTools/SiPixel/plugins/SiPixelGainCalibrationReadDQMFile.cc
@@ -37,7 +37,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CondTools/SiPixel/plugins/SiPixelGainCalibrationRejectNoisyAndDead.cc b/CondTools/SiPixel/plugins/SiPixelGainCalibrationRejectNoisyAndDead.cc
index 07e897105889f..c980a7ea53e41 100644
--- a/CondTools/SiPixel/plugins/SiPixelGainCalibrationRejectNoisyAndDead.cc
+++ b/CondTools/SiPixel/plugins/SiPixelGainCalibrationRejectNoisyAndDead.cc
@@ -41,7 +41,7 @@
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CondTools/SiPixel/plugins/SiPixelLorentzAngleDB.cc b/CondTools/SiPixel/plugins/SiPixelLorentzAngleDB.cc
index 674865cd0aa88..bcf404917f7e5 100644
--- a/CondTools/SiPixel/plugins/SiPixelLorentzAngleDB.cc
+++ b/CondTools/SiPixel/plugins/SiPixelLorentzAngleDB.cc
@@ -18,7 +18,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CondTools/SiPixel/plugins/SiPixelLorentzAngleReader.cc b/CondTools/SiPixel/plugins/SiPixelLorentzAngleReader.cc
index fe3f0501d6cb6..d24ead71ccee7 100644
--- a/CondTools/SiPixel/plugins/SiPixelLorentzAngleReader.cc
+++ b/CondTools/SiPixel/plugins/SiPixelLorentzAngleReader.cc
@@ -20,7 +20,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
 // ROOT includes
diff --git a/CondTools/SiPixel/plugins/SiPixelPerformanceSummaryBuilder.cc b/CondTools/SiPixel/plugins/SiPixelPerformanceSummaryBuilder.cc
index aba10b9613f8b..45d4235756631 100644
--- a/CondTools/SiPixel/plugins/SiPixelPerformanceSummaryBuilder.cc
+++ b/CondTools/SiPixel/plugins/SiPixelPerformanceSummaryBuilder.cc
@@ -16,8 +16,8 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CondTools/SiPixel/plugins/SiPixelVCalDB.cc b/CondTools/SiPixel/plugins/SiPixelVCalDB.cc
index 4657ef1d6fcfd..716187095c726 100644
--- a/CondTools/SiPixel/plugins/SiPixelVCalDB.cc
+++ b/CondTools/SiPixel/plugins/SiPixelVCalDB.cc
@@ -19,7 +19,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
diff --git a/CondTools/SiStrip/plugins/SiStripApvGainInspector.cc b/CondTools/SiStrip/plugins/SiStripApvGainInspector.cc
index 46286e129df8b..4c59ca0d10d53 100644
--- a/CondTools/SiStrip/plugins/SiStripApvGainInspector.cc
+++ b/CondTools/SiStrip/plugins/SiStripApvGainInspector.cc
@@ -45,7 +45,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
+#include "Geometry/CommonTopologies/interface/TrackingGeometry.h"
 #include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
diff --git a/CondTools/SiStrip/plugins/SiStripBadStripFromASCIIFile.cc b/CondTools/SiStrip/plugins/SiStripBadStripFromASCIIFile.cc
index 33b7a2c85706a..8276cf9348be9 100644
--- a/CondTools/SiStrip/plugins/SiStripBadStripFromASCIIFile.cc
+++ b/CondTools/SiStrip/plugins/SiStripBadStripFromASCIIFile.cc
@@ -12,8 +12,8 @@
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDetType.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h"
diff --git a/CondTools/SiStrip/plugins/SiStripDetVOffFakeBuilder.cc b/CondTools/SiStrip/plugins/SiStripDetVOffFakeBuilder.cc
index 5bca723ce18fa..799fab412b98c 100644
--- a/CondTools/SiStrip/plugins/SiStripDetVOffFakeBuilder.cc
+++ b/CondTools/SiStrip/plugins/SiStripDetVOffFakeBuilder.cc
@@ -12,7 +12,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"