diff --git a/LArCalorimeter/LArCnv/LArByteStream/CMakeLists.txt b/LArCalorimeter/LArCnv/LArByteStream/CMakeLists.txt
index 722e14bd87f45e3d0fbdb009062316b9fb263caa..e854e96478fa961edaeb421fc68d3cf1930df47d 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/CMakeLists.txt
+++ b/LArCalorimeter/LArCnv/LArByteStream/CMakeLists.txt
@@ -26,7 +26,7 @@ atlas_depends_on_subdirs(
    LArCalorimeter/LArRecConditions
    LArCalorimeter/LArRecEvent
    LArCalorimeter/LArRecUtils
-   LArCalorimeter/LArTools
+   LArCalorimeter/LArCabling
    PRIVATE
    Calorimeter/CaloInterface
    Control/CLIDSvc
@@ -47,7 +47,7 @@ atlas_add_library( LArByteStreamLib
    LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} CaloIdentifier AthenaBaseComps
    AthenaKernel ByteStreamData EventInfo GaudiKernel LArIdentifier LArRawEvent
    LArRecConditions LArRecEvent CaloDetDescrLib CaloUtilsLib StoreGateLib
-   ByteStreamCnvSvcBaseLib LArRODLib LArRawUtilsLib LArRecUtilsLib LArToolsLib
+   ByteStreamCnvSvcBaseLib LArRODLib LArRawUtilsLib LArRecUtilsLib LArCablingLib
    ByteStreamCnvSvcLib
    PRIVATE_LINK_LIBRARIES SGTools AtlasDetDescr Identifier LArRawConditions )
 
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/Hid2RESrcID.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/Hid2RESrcID.h
index 09634fd51b2fc637dd9c09e710fff8b1af6289d7..18df3634f08e8d3cadd4793274933ddd6df360fb 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/Hid2RESrcID.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/Hid2RESrcID.h
@@ -2,12 +2,12 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef __HID2RESRCID__
-#define __HID2RESRCID__
+#ifndef LARBYTESTREAM_HID2RESRCID_H
+#define LARBYTESTREAM_HID2RESRCID_H
 
 // #include "ByteStreamData/RESrcID.h" 
 #include "LArIdentifier/LArOnlineID.h" 
-#include "LArTools/LArCablingService.h" 
+#include "LArCabling/LArCablingService.h" 
 
 
 #include <stdint.h> 
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodDecoder.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodDecoder.h
index 5d3abcc1921b900dd248d20ed0af903da1b07534..7bfd0cd38080cdda89ed7c76b3bfe725c5203166 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodDecoder.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodDecoder.h
@@ -29,7 +29,7 @@
 #include "LArROD/LArCellBuilderDriver.h"
 
 
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
 #include "LArByteStream/LArRodBlockStructure.h"
 #include "LArRecUtils/MakeLArCellFromRaw.h"
 #include "LArRecConditions/ILArBadChannelMasker.h"
@@ -37,8 +37,6 @@
 
 #include "LArRawUtils/LArRoI_Map.h"
 
-#include "LArTools/LArCablingService.h"
-
 #include "ByteStreamData/RawEvent.h" 
 #include "LArRecEvent/LArFebEnergy.h" 
 #include "LArRecEvent/LArFebEnergyCollection.h" 
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodEncoder.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodEncoder.h
index 60e50cbade229c90d7c5c96d4c350328efdb06d0..d780a3e8a0b01f8ac0b0700097ff37d18f023e5e 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodEncoder.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodEncoder.h
@@ -41,7 +41,7 @@
 #include "LArRawEvent/LArCalibDigit.h"
 #include "LArRawEvent/LArCalibDigitContainer.h"
 
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
 #include "LArByteStream/LArRodBlockStructure.h"
 //#include "LArByteStream/LArRodBlockStructure_0.h"
 //#include "LArByteStream/LArRodBlockStructure_1.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/cmt/requirements b/LArCalorimeter/LArCnv/LArByteStream/cmt/requirements
index f9f0361d8c2149ddd4fb827d9cc3cf390284b2dc..123a3127028e7230ae559d047ce7b9f45d095904 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/cmt/requirements
+++ b/LArCalorimeter/LArCnv/LArByteStream/cmt/requirements
@@ -18,7 +18,7 @@ use LArRecEvent LArRecEvent-* LArCalorimeter
 use LArRecUtils LArRecUtils-* LArCalorimeter
 use LArROD LArROD-* LArCalorimeter
 use LArRecConditions	LArRecConditions-* LArCalorimeter
-use LArTools LArTools-* LArCalorimeter
+use LArCabling LArCabling-* LArCalorimeter
 use LArRecConditions	LArRecConditions-* LArCalorimeter
 use StoreGate StoreGate-* Control
 use AthenaBaseComps AthenaBaseComps-* Control
diff --git a/LArCalorimeter/LArCnv/LArByteStream/share/TBReadLArDigits_jobOptions.py b/LArCalorimeter/LArCnv/LArByteStream/share/TBReadLArDigits_jobOptions.py
index f2aca9be2644e4d6a34a91a7b9933a0eab82682f..1f8e37570309a50983758b13a8cc53aa91a8822e 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/share/TBReadLArDigits_jobOptions.py
+++ b/LArCalorimeter/LArCnv/LArByteStream/share/TBReadLArDigits_jobOptions.py
@@ -38,11 +38,6 @@ MessageSvc.OutputLevel =3
 AthenaEventLoopMgr = Service ("AthenaEventLoopMgr")
 AthenaEventLoopMgr.OutputLevel=4
 
-#Necessary DLL's 
-theApp.Dlls += [ "LArRawUtils","LArROD", "LArTools"]
-theApp.Dlls += [ "LArByteStream"]
-#theApp.Dlls += [ "CaloDetMgrDetDescrCnv" ]
-
 # The only TopAlg: ReadLArDigits 
 theApp.TopAlg += ["ReadLArDigits"]
 ReadLArDigits = Algorithm( "ReadLArDigits" )
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx
index 4987f3b0dedf3249cce880ac73716dd0170ed053..a43800b8b0e3165b36f1b983706cd5eb1d31b766 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx
@@ -11,7 +11,6 @@
 #include "LArRawEvent/LArRawChannel.h"
 #include "LArRawEvent/LArDigit.h"
 #include "LArIdentifier/LArOnlineID.h"
-//#include "LArTools/LArCablingService.h" 
 #include "GaudiKernel/Bootstrap.h"
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx
index 198d766e4b6484464815538ad40dd5c8a68bb087..2ded1e39c7098421ba4f9b8b2932a8c63d8ce840 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx
@@ -11,7 +11,6 @@
 #include "LArRawEvent/LArRawChannel.h"
 #include "LArRawEvent/LArDigit.h"
 #include "LArIdentifier/LArOnlineID.h"
-//#include "LArTools/LArCablingService.h" 
 #include "GaudiKernel/Bootstrap.h"
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx
index f1d673013cb8a823e8e655cd389f219c74db03e0..f101fe5fee022b21a562d168d366f8b8c4559bbc 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx
@@ -11,7 +11,6 @@
 #include "LArRawEvent/LArRawChannel.h"
 #include "LArRawEvent/LArDigit.h"
 #include "LArIdentifier/LArOnlineID.h"
-//#include "LArTools/LArCablingService.h" 
 #include "GaudiKernel/Bootstrap.h"
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx
index a79ea2ccc65d9833fc3af552d84fed5f84a06b92..81e0bead8928bb514ba0acfe9e0b4cfbf7b28df1 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx
@@ -11,7 +11,6 @@
 #include "LArRawEvent/LArRawChannel.h"
 #include "LArRawEvent/LArDigit.h"
 #include "LArIdentifier/LArOnlineID.h"
-//#include "LArTools/LArCablingService.h" 
 #include "GaudiKernel/Bootstrap.h"
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/IToolSvc.h"