diff --git a/LArCalorimeter/LArTest/LArEventTest/CMakeLists.txt b/LArCalorimeter/LArTest/LArEventTest/CMakeLists.txt
index 48e9bb505957d5fed8b6f7eb82f10aa70bfd0612..e1d3ba697d3d12cc33efcc7506595b3023950982 100644
--- a/LArCalorimeter/LArTest/LArEventTest/CMakeLists.txt
+++ b/LArCalorimeter/LArTest/LArEventTest/CMakeLists.txt
@@ -14,7 +14,7 @@ atlas_depends_on_subdirs( PUBLIC
                           LArCalorimeter/LArIdentifier
                           LArCalorimeter/LArRawConditions
                           LArCalorimeter/LArRawEvent
-                          LArCalorimeter/LArTools
+                          LArCalorimeter/LArCabling
                           TestBeam/TBEvent
                           PRIVATE
                           Calorimeter/CaloEvent
@@ -30,7 +30,7 @@ atlas_add_component( LArEventTest
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloIdentifier AthenaBaseComps StoreGateLib SGtests GaudiKernel LArIdentifier LArRawConditions LArRawEvent LArToolsLib TBEvent CaloEvent CxxUtils xAODEventInfo )
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloIdentifier AthenaBaseComps StoreGateLib SGtests GaudiKernel LArIdentifier LArRawConditions LArRawEvent LArCablingLib TBEvent CaloEvent CxxUtils xAODEventInfo )
 
 # Install files from the package:
 atlas_install_headers( LArEventTest )
diff --git a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArDigits.h b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArDigits.h
index c988311514ebab1380ec6ab564cb2fc8d8052358..e3bcf598aef7f05c5f109e0065f03d14d470a5cb 100755
--- a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArDigits.h
+++ b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArDigits.h
@@ -6,8 +6,7 @@
 #define DUMPLARDIGITS_H
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "LArRawEvent/LArDigitContainer.h"
-//#include "LArRawEvent/LArDigitCollection.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
 #include "CaloIdentifier/LArEM_ID.h"
 #include "LArIdentifier/LArOnlineID.h"
 
diff --git a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArRawChannels.h b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArRawChannels.h
index 6f9fa472431f5876bdf1197eb196bfcf405fda1f..0a607c604baeb023e3b7049b1001c5de1e52f1c6 100755
--- a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArRawChannels.h
+++ b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArRawChannels.h
@@ -6,7 +6,7 @@
 #define DUMPLARRAWCHANNEL_H
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "LArRawEvent/LArRawChannelContainer.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
 #include "CaloIdentifier/LArEM_ID.h"
 #include "LArIdentifier/LArOnlineID.h"
 
diff --git a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/FindDuplicatedLArDigits.h b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/FindDuplicatedLArDigits.h
index e7cc8bff876c5de1afaaf7c0859e32a4562f9bfd..25a3133ebaaa765f39e1e99211027cbd9be686fb 100755
--- a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/FindDuplicatedLArDigits.h
+++ b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/FindDuplicatedLArDigits.h
@@ -23,15 +23,10 @@
 #include "GaudiKernel/MsgStream.h"
 #include  "StoreGate/StoreGateSvc.h"
 #include "LArIdentifier/LArOnlineID.h"
-//#include <vector>
 #include <string>
 #include <map>
 
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IToolSvc.h"
-
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
 #include "CaloIdentifier/LArEM_ID.h"
 #include "CaloIdentifier/LArHEC_ID.h"
 #include "CaloIdentifier/LArFCAL_ID.h"
diff --git a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/LArDigitsToNtuple.h b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/LArDigitsToNtuple.h
index 7a41d31bc3259e1d39c2f13897a885fb67f34091..94497edf21dbc545b0ab0e9961f003db6557d540 100755
--- a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/LArDigitsToNtuple.h
+++ b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/LArDigitsToNtuple.h
@@ -21,15 +21,10 @@
 #define LARDIGITSTONTUPLE_H
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "LArIdentifier/LArOnlineID.h"
-//#include <vector>
 #include <string>
 #include <map>
 
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IToolSvc.h"
-
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
 #include "CaloIdentifier/LArEM_ID.h"
 #include "CaloIdentifier/LArHEC_ID.h"
 #include "CaloIdentifier/LArFCAL_ID.h"
diff --git a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/TriggerPatternCount.h b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/TriggerPatternCount.h
index cf62c0d03e8f4c8781f7074473062ebe22c11ff3..b111927ec1f46da71692475b53a41f300224197e 100755
--- a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/TriggerPatternCount.h
+++ b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/TriggerPatternCount.h
@@ -21,15 +21,10 @@
 #define TRIGGERPATTERNCOUNT_H
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "LArIdentifier/LArOnlineID.h"
-//#include <vector>
 #include <string>
 #include <map>
 
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IToolSvc.h"
-
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
 #include "CaloIdentifier/LArEM_ID.h"
 #include "CaloIdentifier/LArHEC_ID.h"
 #include "CaloIdentifier/LArFCAL_ID.h"
diff --git a/LArCalorimeter/LArTest/LArEventTest/cmt/requirements b/LArCalorimeter/LArTest/LArEventTest/cmt/requirements
index 27aa9eaf7c2c0580ec35e25df0f5e93730673e53..8dda7bcef9a9193663ce90f75ff17c28dcba6562 100755
--- a/LArCalorimeter/LArTest/LArEventTest/cmt/requirements
+++ b/LArCalorimeter/LArTest/LArEventTest/cmt/requirements
@@ -7,7 +7,7 @@ use GaudiInterface   GaudiInterface-*      External
 use LArIdentifier    LArIdentifier-*       LArCalorimeter
 use LArRawConditions LArRawConditions-*    LArCalorimeter
 use LArRawEvent      LArRawEvent-*         LArCalorimeter
-use LArTools         LArTools-*            LArCalorimeter
+use LArCabling       LArCabling-*          LArCalorimeter
 use StoreGate        StoreGate-*           Control
 use AthenaBaseComps  AthenaBaseComps-*     Control
 use TBEvent          TBEvent-*             TestBeam
diff --git a/LArCalorimeter/LArTest/LArEventTest/share/DumpLArDigits_eformatOnly.py b/LArCalorimeter/LArTest/LArEventTest/share/DumpLArDigits_eformatOnly.py
index bced285ba7f999570d4e6f6017079bd8f13b6c02..3ff769e98af7acedcca6b9cb964350add5b515bb 100755
--- a/LArCalorimeter/LArTest/LArEventTest/share/DumpLArDigits_eformatOnly.py
+++ b/LArCalorimeter/LArTest/LArEventTest/share/DumpLArDigits_eformatOnly.py
@@ -21,11 +21,6 @@ MessageSvc.OutputLevel =DEBUG
 AthenaEventLoopMgr = Service ("AthenaEventLoopMgr")
 AthenaEventLoopMgr.OutputLevel=4
 
-#Necessary DLL's 
-theApp.Dlls += [ "LArRawUtils","LArTools"]
-theApp.Dlls += [ "LArByteStream"]
-#theApp.Dlls += [ "CaloDetMgrDetDescrCnv" ]
-
 theApp.Dlls += [ "LArEventTest"]
 theApp.topAlg+=["DumpLArDigits"]
 DumpLArDigits=Algorithm("DumpLArDigits")
diff --git a/LArCalorimeter/LArTest/LArEventTest/share/DumpLArRawChannels.py b/LArCalorimeter/LArTest/LArEventTest/share/DumpLArRawChannels.py
index 469368f036a8b04dcd17368f3ccb72291b9991d4..5e1c4e558ff501b582f902258e7d783cb2aaec34 100755
--- a/LArCalorimeter/LArTest/LArEventTest/share/DumpLArRawChannels.py
+++ b/LArCalorimeter/LArTest/LArEventTest/share/DumpLArRawChannels.py
@@ -34,11 +34,6 @@ MessageSvc.OutputLevel =3
 AthenaEventLoopMgr = Service ("AthenaEventLoopMgr")
 AthenaEventLoopMgr.OutputLevel=4
 
-#Necessary DLL's 
-theApp.Dlls += [ "LArRawUtils","LArTools"]
-theApp.Dlls += [ "LArByteStream"]
-#theApp.Dlls += [ "CaloDetMgrDetDescrCnv" ]
-
 theApp.Dlls += [ "LArEventTest"]
 theApp.topAlg+=["DumpLArRawChannels"]
 DumpLArRawChannels=Algorithm("DumpLArRawChannels")
diff --git a/LArCalorimeter/LArTest/LArEventTest/share/DumpLArRawChannels_eformatOnly.py b/LArCalorimeter/LArTest/LArEventTest/share/DumpLArRawChannels_eformatOnly.py
index f0fc3360e1f8fa5c29da7e468db8d6bd05fe4ec7..170a4422272f812ddae190a3ae26569f2ae460de 100755
--- a/LArCalorimeter/LArTest/LArEventTest/share/DumpLArRawChannels_eformatOnly.py
+++ b/LArCalorimeter/LArTest/LArEventTest/share/DumpLArRawChannels_eformatOnly.py
@@ -21,11 +21,6 @@ MessageSvc.OutputLevel =DEBUG
 AthenaEventLoopMgr = Service ("AthenaEventLoopMgr")
 AthenaEventLoopMgr.OutputLevel=4
 
-#Necessary DLL's 
-theApp.Dlls += [ "LArRawUtils","LArTools"]
-theApp.Dlls += [ "LArByteStream"]
-#theApp.Dlls += [ "CaloDetMgrDetDescrCnv" ]
-
 theApp.Dlls += [ "LArEventTest"]
 theApp.topAlg+=["DumpLArRawChannels"]
 DumpLArRawChannels=Algorithm("DumpLArRawChannels")
diff --git a/LArCalorimeter/LArTest/LArEventTest/share/LArDigitsToNtuple.py b/LArCalorimeter/LArTest/LArEventTest/share/LArDigitsToNtuple.py
index dc6cc7a3e23c042c26bf65b7d86b3c711fbeb2f0..2c97478ba05914524ef9123825873a6720aac778 100755
--- a/LArCalorimeter/LArTest/LArEventTest/share/LArDigitsToNtuple.py
+++ b/LArCalorimeter/LArTest/LArEventTest/share/LArDigitsToNtuple.py
@@ -52,11 +52,6 @@ MessageSvc.OutputLevel = INFO
 #AthenaEventLoopMgr = Service ("AthenaEventLoopMgr")
 #AthenaEventLoopMgr.OutputLevel= INFO
 
-#Necessary DLL's 
-theApp.Dlls += [ "LArRawUtils","LArTools"]
-theApp.Dlls += [ "LArByteStream"]
-#theApp.Dlls += [ "CaloDetMgrDetDescrCnv" ]
-
 #----- JobOptions for Ntuple-output
 theApp.Dlls += [ "RootHistCnv" ]; 
 theApp.HistogramPersistency = "ROOT" 
diff --git a/LArCalorimeter/LArTest/LArEventTest/share/TBDumpLArRawChannels.py b/LArCalorimeter/LArTest/LArEventTest/share/TBDumpLArRawChannels.py
index ac3ed041938a1024ccd34bd60d2bc05abbd1fccd..2a3a83360612efe48ab976f31d20b8aefe0f1743 100755
--- a/LArCalorimeter/LArTest/LArEventTest/share/TBDumpLArRawChannels.py
+++ b/LArCalorimeter/LArTest/LArEventTest/share/TBDumpLArRawChannels.py
@@ -39,12 +39,6 @@ MessageSvc.OutputLevel = DEBUG
 AthenaEventLoopMgr = Service ("AthenaEventLoopMgr")
 AthenaEventLoopMgr.OutputLevel=4
 
-#Necessary DLL's 
-theApp.Dlls += [ "LArRawUtils","LArROD", "LArTools"]
-theApp.Dlls += [ "LArByteStream"]
-#theApp.Dlls += [ "CaloDetMgrDetDescrCnv" ]
-
-
 theApp.topAlg+=["LArRawChannelSimpleBuilder/TBLArRawChannelBuilder"]
 ### Liquid argon reco
 TBLArRawChannelBuilder = Algorithm("TBLArRawChannelBuilder");
diff --git a/LArCalorimeter/LArTest/LArEventTest/share/TriggerPatternCount.py b/LArCalorimeter/LArTest/LArEventTest/share/TriggerPatternCount.py
index f70370a293501ef06af5f8a8179cd638bc621850..ff281095d41c68ba066269e363f42ec3f3758135 100755
--- a/LArCalorimeter/LArTest/LArEventTest/share/TriggerPatternCount.py
+++ b/LArCalorimeter/LArTest/LArEventTest/share/TriggerPatternCount.py
@@ -33,8 +33,6 @@ ByteStreamInputSvc.FilePrefix  += [RawDataFilePrefix]
 ByteStreamInputSvc.RunNumber += [runnumber]
 ToolSvc = Service( "ToolSvc" )
 ToolSvc.LArRoI_Map.Print=FALSE
-theApp.Dlls += [ "LArRawUtils","LArTools"]
-theApp.Dlls += [ "LArByteStream"]
 include( "TBCnv/TBReadH8BS_jobOptions.py" )
 theApp.Dlls += [ "LArEventTest"]
 theApp.topAlg+=["TriggerPatternCount"]