diff --git a/InnerDetector/InDetExample/InDetDetDescrExample/src/InDetUpdateCaches.cxx b/InnerDetector/InDetExample/InDetDetDescrExample/src/InDetUpdateCaches.cxx
index d3f02a54074ed28d5b7474238d1a94fec84e3cf8..f2635c70bfe283be733e6e84d51241deb9f53494 100755
--- a/InnerDetector/InDetExample/InDetDetDescrExample/src/InDetUpdateCaches.cxx
+++ b/InnerDetector/InDetExample/InDetDetDescrExample/src/InDetUpdateCaches.cxx
@@ -33,7 +33,7 @@ InDetUpdateCaches::initialize(){
   msg(MSG::INFO) << "initialize()" << endmsg;  
   StatusCode sc;
   // Retrieve GeoModel managers
-  const InDetDD::SiDetectorManager * sctManager = 0;
+  const InDetDD::SCT_DetectorManager * sctManager = 0;
   sc=detStore()->retrieve(sctManager, "SCT");
   if (sc.isFailure() || !sctManager) {
     msg(MSG::WARNING) << "Could not find the SCT_DetectorManager" << endmsg;
@@ -41,7 +41,7 @@ InDetUpdateCaches::initialize(){
     msg(MSG::DEBUG) << "SCT_DetectorManager found" << endmsg;
     m_detManagers.push_back(sctManager);
   }
-  const InDetDD::SiDetectorManager * pixelManager = 0;
+  const InDetDD::PixelDetectorManager * pixelManager = 0;
   sc=detStore()->retrieve(pixelManager, "Pixel");
   if (sc.isFailure() || !pixelManager) {
     msg(MSG::WARNING) << "Could not find the PixelDetectorManager" << endmsg;
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/MergedPixelsTool.h b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/MergedPixelsTool.h
index 4bb7207827fdda33013ac34432b754464300afe4..505308f983a5ae53179a8631014658c6c0ade58d 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/MergedPixelsTool.h
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/MergedPixelsTool.h
@@ -36,7 +36,6 @@ class PixelID;
 
 namespace InDetDD {
   class SiDetectorElement;
-  class SiDetectorManager;
 }
 
 namespace InDet {
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/MergedPixelsTool.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/MergedPixelsTool.cxx
index f4d44207067063c02496af160ceb76584d68f0a7..3e30dbe90c7a41e3dc57d2981b92f5e528e0b6db 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/MergedPixelsTool.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/MergedPixelsTool.cxx
@@ -26,7 +26,6 @@
 #include "InDetPrepRawData/PixelCluster.h"
 #include "InDetPrepRawData/PixelClusterParts.h"
 #include "InDetPrepRawData/PixelClusterSplitProb.h"
-#include "InDetReadoutGeometry/SiDetectorManager.h"
 #include "InDetReadoutGeometry/SiDetectorElement.h"
 #include "InDetReadoutGeometry/SiLocalPosition.h"
 #include "InDetRecToolInterfaces/IPixelClusterSplitProbTool.h"
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometrySvc.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometrySvc.h
index bb40f58ca77ecd806b882ae03228ebd72df7161e..36295ab3d7d6b687c26994bf690604bed9defd05 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometrySvc.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometrySvc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ACTSGEOMETRY_ACTSTRACKINGGEOMETRYSVC_H
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h b/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h
index 12c63c237eb02865d0cd4b1e21c7a37544cca2a6..6802600ea2b49db89ddacb87675d4280dc09d984 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h
@@ -16,7 +16,6 @@
 #include <string>
 
 namespace InDetDD {
-  class InDetDetectorManager;
   class PixelDetectorManager;
   class SCT_DetectorManager;
   class TRT_DetectorManager;
diff --git a/graphics/GeometryJiveXML/GeometryJiveXML/GeometryWriter.h b/graphics/GeometryJiveXML/GeometryJiveXML/GeometryWriter.h
index c8417499ea7285a61320e4f1fef2b7252ba9a336..02e76b49e0ff1daf34b47ad4b4c656eb95c7ef9b 100755
--- a/graphics/GeometryJiveXML/GeometryJiveXML/GeometryWriter.h
+++ b/graphics/GeometryJiveXML/GeometryJiveXML/GeometryWriter.h
@@ -23,7 +23,8 @@ class SCT_ID;
 class TRT_ID;
 
 namespace InDetDD {
-	class SiDetectorManager;
+	class PixelDetectorManager;
+	class SCT_DetectorManager;
 	class TRT_DetectorManager;
 }
 
@@ -152,11 +153,11 @@ namespace JiveXML{
     
     
     /** Pixel detector manager and ID helper */
-    const InDetDD::SiDetectorManager* m_pixel_manager;
+    const InDetDD::PixelDetectorManager* m_pixel_manager;
     const PixelID * m_pixelIdHelper;   
 
     /** Silicon detector manager and ID helper */
-    const InDetDD::SiDetectorManager* m_silicon_manager;
+    const InDetDD::SCT_DetectorManager* m_silicon_manager;
     const SCT_ID * m_sctIdHelper;
     
     /** TRT detector manager and ID helper */
diff --git a/graphics/GeometryJiveXML/src/GeometryWriter.cxx b/graphics/GeometryJiveXML/src/GeometryWriter.cxx
index f654f5951a2d4b164990cda7c382d55ea2fa74b5..709e15434f2fdcd0b2017cf4f60beff4b0f3d93c 100755
--- a/graphics/GeometryJiveXML/src/GeometryWriter.cxx
+++ b/graphics/GeometryJiveXML/src/GeometryWriter.cxx
@@ -20,7 +20,8 @@
 // #include "GeoModelKernel/GeoTube.h"
 // #include "GeoModelKernel/GeoTrd.h"
 
-#include "InDetReadoutGeometry/SiDetectorManager.h"
+#include "InDetReadoutGeometry/PixelDetectorManager.h"
+#include "InDetReadoutGeometry/SCT_DetectorManager.h"
 #include "InDetReadoutGeometry/SiDetectorElement.h"
 #include "InDetReadoutGeometry/SiDetectorElementCollection.h"
 #include "InDetReadoutGeometry/TRT_DetectorManager.h"
diff --git a/graphics/VP1/VP1Systems/VP12DGeometrySystems/VP12DGeometrySystems/StoreGateGeometryReader.h b/graphics/VP1/VP1Systems/VP12DGeometrySystems/VP12DGeometrySystems/StoreGateGeometryReader.h
index 0d89032b5e011bee09c988ce7475d81bbaaa6540..c3859c4b4cc7a1898f436d7b6da3b20c18f44321 100644
--- a/graphics/VP1/VP1Systems/VP12DGeometrySystems/VP12DGeometrySystems/StoreGateGeometryReader.h
+++ b/graphics/VP1/VP1Systems/VP12DGeometrySystems/VP12DGeometrySystems/StoreGateGeometryReader.h
@@ -21,7 +21,8 @@ class LArDetectorManager;
 
 namespace InDetDD
 {
-  class SiDetectorManager;
+  class PixelDetectorManager;
+  class SCT_DetectorManager;
   class TRT_DetectorManager;
 }
 
@@ -170,10 +171,10 @@ class StoreGateGeometryReader
 
  private:
   /** Pixel detector manager. */
-  const InDetDD::SiDetectorManager* m_pixel_manager;
+  const InDetDD::PixelDetectorManager* m_pixel_manager;
 
   /** Silicon detector manager. */
-  const InDetDD::SiDetectorManager* m_silicon_manager;
+  const InDetDD::SCT_DetectorManager* m_silicon_manager;
 
   /** TRT detector manager. */
   const InDetDD::TRT_DetectorManager* m_trt_manager;
diff --git a/graphics/VP1/VP1Systems/VP12DGeometrySystems/src/StoreGateGeometryReader.cxx b/graphics/VP1/VP1Systems/VP12DGeometrySystems/src/StoreGateGeometryReader.cxx
index f0bdaa16d8923959c2ac39a3a270afc33b169265..d804f34d9cc5131d36c53609debefde352c6ab0f 100644
--- a/graphics/VP1/VP1Systems/VP12DGeometrySystems/src/StoreGateGeometryReader.cxx
+++ b/graphics/VP1/VP1Systems/VP12DGeometrySystems/src/StoreGateGeometryReader.cxx
@@ -14,7 +14,8 @@
 #include "GeoModelKernel/GeoPVConstLink.h"
 #include "GeoModelKernel/GeoTrd.h"
 
-#include "InDetReadoutGeometry/SiDetectorManager.h"
+#include "InDetReadoutGeometry/PixelDetectorManager.h"
+#include "InDetReadoutGeometry/SCT_DetectorManager.h"
 #include "InDetReadoutGeometry/SiDetectorElement.h"
 #include "InDetReadoutGeometry/SiDetectorElementCollection.h"
 #include "InDetReadoutGeometry/TRT_DetectorManager.h"