diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.cxx b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.cxx
index 547be166c22650ab0237131364004d90fa6be1aa..e4d988f4621044c42315ff588a5a8edd6ffa1280 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.cxx
@@ -8,7 +8,7 @@
 #include "GaudiKernel/PhysicalConstants.h"
 
 #include "MagFieldInterfaces/IMagFieldSvc.h"
-#include "InDetReadoutGeometry/SiDetectorManager.h"
+#include "InDetReadoutGeometry/PixelDetectorManager.h"
 #include "InDetReadoutGeometry/SiDetectorElement.h"
 #include "InDetReadoutGeometry/PixelModuleDesign.h"
 #include "SiPropertiesSvc/SiliconProperties.h"
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.h b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.h
index daae17abcf51a87236272c2b748e26efe0261e2d..8253c56259b85456d424fa2d00fc8454fb0ae16d 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.h
+++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.h
@@ -21,7 +21,7 @@
 
 // forward declarations
 namespace InDetDD {
-  class SiDetectorManager;
+  class PixelDetectorManager;
 }  
 
 namespace MagField {
@@ -38,7 +38,7 @@ class PixelSiLorentzAngleCondAlg: public AthAlgorithm {
 
   private:
     const PixelID* m_pixid;
-    const InDetDD::SiDetectorManager* m_detManager;
+    const InDetDD::PixelDetectorManager* m_detManager;
 
     ServiceHandle<ICondSvc> m_condSvc;
     ServiceHandle<MagField::IMagFieldSvc> m_magFieldSvc;
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/PixelClusterization.h b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/PixelClusterization.h
index f6b8f2968a8f51031b37e3949713910621638a80..a468c5787c30135ffa73a432c6d6ba2c70380a84 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/PixelClusterization.h
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/PixelClusterization.h
@@ -41,7 +41,7 @@ class PixelRDORawData;
 class PixelID;
 
 namespace InDetDD{
-  class SiDetectorManager;
+  class PixelDetectorManager;
 }
 namespace InDet {
   class PixelGangedAmbiguitiesFinder;
@@ -58,7 +58,6 @@ namespace InDet {
 class PixelClusterization : public AthAlgorithm {
 public:
   typedef InDetRawDataCollection<PixelRDORawData> COLLECTION;
-  typedef InDetDD::SiDetectorManager SiDetectorManager;
 
   /// Constructor with parameters:
   PixelClusterization(const std::string &name,ISvcLocator *pSvcLocator);
@@ -90,7 +89,7 @@ private:
   SG::WriteHandleKey<SiClusterContainer> m_clusterContainerLinkKey;
   SG::WriteHandleKey<PixelGangedClusterAmbiguities> m_ambiguitiesMapKey;
   SG::UpdateHandleKey<InDet::PixelClusterContainerCache> m_clusterContainercacheKey;
-  const SiDetectorManager* m_manager;
+  const InDetDD::PixelDetectorManager* m_manager;
 };
 
 }//end of ns
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx
index 8c0f55792c02ea8f461586dcd8d5008d08f8877f..37e961582d8e8729a1c9a5f1edb4a33422e8c3ba 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx
@@ -18,7 +18,7 @@
 #include "Identifier/Identifier.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "InDetIdentifier/PixelID.h"
-#include "InDetReadoutGeometry/SiDetectorManager.h"
+#include "InDetReadoutGeometry/PixelDetectorManager.h"
 #include "InDetPrepRawData/PixelClusterCollection.h"
 
 
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h b/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h
index bbfaae5807d2683f748fa317aa8a1d43b2ee59ec..7370fcaabe911758d5795d5a5e2e21b8c0b4ea1e 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h
@@ -17,7 +17,8 @@
 
 namespace InDetDD {
   class InDetDetectorManager;
-  class SiDetectorManager;
+  class PixelDetectorManager;
+  class SCT_DetectorManager;
   class TRT_DetectorManager;
 }
 
@@ -54,8 +55,8 @@ private:
   ServiceHandle<IActsTrackingGeometrySvc> m_trackingGeometrySvc;
 
   ServiceHandle<StoreGateSvc> m_detStore;
-  const InDetDD::SiDetectorManager* p_pixelManager;
-  const InDetDD::SiDetectorManager* p_SCTManager;
+  const InDetDD::PixelDetectorManager* p_pixelManager;
+  const InDetDD::SCT_DetectorManager* p_SCTManager;
   const InDetDD::TRT_DetectorManager* p_TRTManager;
 
   std::vector<const GeoAlignableTransform*> m_topAligns;
diff --git a/Tracking/Acts/ActsGeometry/src/GeomShiftCondAlg.cxx b/Tracking/Acts/ActsGeometry/src/GeomShiftCondAlg.cxx
index 977386546e6bec343f714c7f50a13c91e32844af..0042a2872b73eb0dc16111ede6f1afa635c2bab2 100644
--- a/Tracking/Acts/ActsGeometry/src/GeomShiftCondAlg.cxx
+++ b/Tracking/Acts/ActsGeometry/src/GeomShiftCondAlg.cxx
@@ -11,8 +11,8 @@
 #include "EventInfo/EventInfo.h"
 #include "EventInfo/EventID.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"
-#include "InDetReadoutGeometry/SiDetectorManager.h"
 #include "InDetReadoutGeometry/PixelDetectorManager.h"
+#include "InDetReadoutGeometry/SCT_DetectorManager.h"
 #include "InDetReadoutGeometry/TRT_DetectorManager.h"
 #include "GeoPrimitives/CLHEPtoEigenConverter.h"
 #include "InDetReadoutGeometry/ExtendedAlignableTransform.h"
@@ -129,12 +129,9 @@ StatusCode GeomShiftCondAlg::execute() {
 
     ActsAlignmentStore* alignStore = new ActsAlignmentStore();
     
-    const InDetDD::PixelDetectorManager* pixMgr 
-      = dynamic_cast<const InDetDD::PixelDetectorManager*>(p_pixelManager);
-
     InDetDD::PixelDetectorManager::AlignableTransformMap& atMatL1 
       = const_cast<InDetDD::PixelDetectorManager::AlignableTransformMap&>(
-          pixMgr->m_higherAlignableTransforms.at(1));
+          p_pixelManager->m_higherAlignableTransforms.at(1));
 
 
     PixelID idHelper;
diff --git a/Tracking/Acts/ActsGeometry/src/NominalAlignmentCondAlg.cxx b/Tracking/Acts/ActsGeometry/src/NominalAlignmentCondAlg.cxx
index 728a9df955a52b4ed26df8eace38e5953a212128..db58edd284671ab7f0a6e66df659bd05518fb259 100644
--- a/Tracking/Acts/ActsGeometry/src/NominalAlignmentCondAlg.cxx
+++ b/Tracking/Acts/ActsGeometry/src/NominalAlignmentCondAlg.cxx
@@ -9,7 +9,6 @@
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/EventIDBase.h"
 #include "GaudiKernel/EventIDRange.h"
-#include "InDetReadoutGeometry/SiDetectorManager.h"
 #include "InDetReadoutGeometry/PixelDetectorManager.h"
 #include "InDetReadoutGeometry/TRT_DetectorManager.h"
 
diff --git a/Trigger/TrigFTK/FTK_RecTools/src/FTK_HashIDTool.cxx b/Trigger/TrigFTK/FTK_RecTools/src/FTK_HashIDTool.cxx
index 584f6959c27d70558c45a98235df7b07c46509b4..cca2f1dcba46b86c8779714b75fde634cd1dec55 100644
--- a/Trigger/TrigFTK/FTK_RecTools/src/FTK_HashIDTool.cxx
+++ b/Trigger/TrigFTK/FTK_RecTools/src/FTK_HashIDTool.cxx
@@ -14,7 +14,6 @@
 #include "InDetIdentifier/SCT_ID.h"
 #include "InDetIdentifier/PixelID.h"
 #include "InDetReadoutGeometry/PixelDetectorManager.h"
-#include "InDetReadoutGeometry/SCT_DetectorManager.h"
 #include "InDetReadoutGeometry/PixelModuleDesign.h"
 #include "InDetReadoutGeometry/SCT_ModuleSideDesign.h"
 #include "InDetReadoutGeometry/SCT_BarrelModuleSideDesign.h"