diff --git a/TestBeam/TBCnv/CMakeLists.txt b/TestBeam/TBCnv/CMakeLists.txt
index ea6e5d11682d54968819de1bc773901e6d833cac..fb06b96b456235566d62446ee76958a9861f12fa 100644
--- a/TestBeam/TBCnv/CMakeLists.txt
+++ b/TestBeam/TBCnv/CMakeLists.txt
@@ -18,7 +18,7 @@ atlas_depends_on_subdirs(
    Event/EventInfo
    GaudiKernel
    LArCalorimeter/LArIdentifier
-   LArCalorimeter/LArTools
+   LArCalorimeter/LArCabling
    TestBeam/TBEvent
    PRIVATE
    DetectorDescription/Identifier
@@ -34,7 +34,7 @@ atlas_add_library( TBCnvLib
    INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
    LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} CaloIdentifier AthenaBaseComps
    ByteStreamData EventInfo GaudiKernel LArIdentifier TBEvent StoreGateLib
-   ByteStreamCnvSvcLib ByteStreamCnvSvcBaseLib LArToolsLib
+   ByteStreamCnvSvcLib ByteStreamCnvSvcBaseLib LArCablingLib
    PRIVATE_LINK_LIBRARIES Identifier LArRawEvent )
 
 atlas_add_component( TBCnv
diff --git a/TestBeam/TBCnv/TBCnv/ReadTBLArDigits.h b/TestBeam/TBCnv/TBCnv/ReadTBLArDigits.h
index 73f9ddee03e555d1b1f77385066b1730bba70369..58c311a291c5337f5687165709d608f6688c7cbb 100644
--- a/TestBeam/TBCnv/TBCnv/ReadTBLArDigits.h
+++ b/TestBeam/TBCnv/TBCnv/ReadTBLArDigits.h
@@ -11,9 +11,7 @@
 #include "GaudiKernel/MsgStream.h"
 #include  "StoreGate/StoreGateSvc.h"
 #include "TBEvent/TBLArDigitContainer.h"
-// #include "LArRawEvent/LArRawChannelContainer.h"
-// #include "LArRawEvent/LArRawChannelCollection.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
 #include "CaloIdentifier/LArEM_ID.h"
 #include "CaloIdentifier/LArFCAL_ID.h"
 #include "CaloIdentifier/LArHEC_ID.h"
diff --git a/TestBeam/TBCnv/TBCnv/TBByteStreamCnvTool.h b/TestBeam/TBCnv/TBCnv/TBByteStreamCnvTool.h
index f859cea8d4cde87cf55844b8b80c483c610e2bbf..c5c5104a38cf7a93c622c5879b519fca6ad75a0d 100644
--- a/TestBeam/TBCnv/TBCnv/TBByteStreamCnvTool.h
+++ b/TestBeam/TBCnv/TBCnv/TBByteStreamCnvTool.h
@@ -29,7 +29,7 @@
 #include "TBEvent/TBEventInfo.h"
 #include "TBEvent/TBLArDigitContainer.h"
 #include "TBEvent/TBLArCalibDigitContainer.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
 
 #include "CaloIdentifier/CaloGain.h"
 
diff --git a/TestBeam/TBCnv/cmt/requirements b/TestBeam/TBCnv/cmt/requirements
index 5f085e4d2b22863f2c887288af1f06babfd2e40c..55531cb2e32a707c58f626008fcdc9c3a43332cb 100644
--- a/TestBeam/TBCnv/cmt/requirements
+++ b/TestBeam/TBCnv/cmt/requirements
@@ -14,7 +14,7 @@ use DataCollection        DataCollection-*       External
 use GaudiInterface        GaudiInterface-*          External
 use TBEvent               TBEvent-*              TestBeam
 use CaloIdentifier        CaloIdentifier-*       Calorimeter
-use LArTools              LArTools-*             LArCalorimeter
+use LArCabling            LArCabling-*           LArCalorimeter
 use LArIdentifier         LArIdentifier-*        LArCalorimeter
 
 private
diff --git a/TestBeam/TBCnv/share/TBH6ByteStream-Calib.py b/TestBeam/TBCnv/share/TBH6ByteStream-Calib.py
index 7c29366d55f228acf5e7c44f6e2ca7ad071edd7c..57e878ef6b912f2cb5a5905c61bc80827fb62892 100644
--- a/TestBeam/TBCnv/share/TBH6ByteStream-Calib.py
+++ b/TestBeam/TBCnv/share/TBH6ByteStream-Calib.py
@@ -105,13 +105,6 @@ IOVDbSvc.userPwd    = "conditions";
 # Reconstruction
 # non-ATLAS detectors
 
-theApp.Dlls += ["LArRawUtils"]
-theApp.Dlls += ["LArTools"]
-theApp.Dlls += ["LArROD"]
-theApp.Dlls += ["TBRec"]
-theApp.Dlls += [ "AthenaMonitoring"]
-theApp.Dlls += [ "LArMonitoring"]
-
 theApp.TopAlg += ["TBEventStreamer/EventInfoStreamer"]
 EventInfoStreamer = Algorithm( "EventInfoStreamer" )
 EventInfoStreamer.ToolNames += [ "TBEventInfoStreamerTool/EventTypeSelector" ]
diff --git a/TestBeam/TBCnv/share/TBH6ByteStream-Monitor-EventStorage.py b/TestBeam/TBCnv/share/TBH6ByteStream-Monitor-EventStorage.py
index f2e18886bca3c2de5d2354868cb6360ed9be216f..a69854d3dd2c4d2be17a6f69a5821bba14789e63 100644
--- a/TestBeam/TBCnv/share/TBH6ByteStream-Monitor-EventStorage.py
+++ b/TestBeam/TBCnv/share/TBH6ByteStream-Monitor-EventStorage.py
@@ -28,12 +28,6 @@ ToolSvc.LArRoI_Map.Print=FALSE
 ToolSvc.TBByteStreamCnvTool.Dump        = FALSE
 ToolSvc.TBByteStreamCnvTool.OutputLevel = WARNING
 
-theApp.Dlls += ["LArRawUtils"]
-theApp.Dlls += ["LArTools"]
-theApp.Dlls += ["LArROD"]
-theApp.Dlls += [ "TBRec" ]
-
-
 #--- Monitoring ---------------------------
 
 theApp.TopAlg += [ "TBAlgoSequencer/Seq1" ]
diff --git a/TestBeam/TBCnv/share/TBH6ByteStream-Monitor.py b/TestBeam/TBCnv/share/TBH6ByteStream-Monitor.py
index 7565b3a261aebdc06e1e70b4fa495f0f45c07776..89886d177d2f45ded889ba087776abe170fd3282 100644
--- a/TestBeam/TBCnv/share/TBH6ByteStream-Monitor.py
+++ b/TestBeam/TBCnv/share/TBH6ByteStream-Monitor.py
@@ -30,12 +30,6 @@ ToolSvc.LArRoI_Map.Print=FALSE
 ToolSvc.TBByteStreamCnvTool.Dump        = FALSE
 ToolSvc.TBByteStreamCnvTool.OutputLevel = WARNING
 
-theApp.Dlls += ["LArRawUtils"]
-theApp.Dlls += ["LArTools"]
-theApp.Dlls += ["LArROD"]
-theApp.Dlls += [ "TBRec" ]
-
-
 #--- Monitoring ---------------------------
 
 theApp.TopAlg += [ "TBAlgoSequencer/Seq1" ]
diff --git a/TestBeam/TBCnv/share/TBReadH6ByteStream-Print.py b/TestBeam/TBCnv/share/TBReadH6ByteStream-Print.py
index 7b9ca0203399a16adba2fe6b3dcd0594e3e77b8a..1428ab16510f9fc48c22773a57387cd7765ab1bc 100644
--- a/TestBeam/TBCnv/share/TBReadH6ByteStream-Print.py
+++ b/TestBeam/TBCnv/share/TBReadH6ByteStream-Print.py
@@ -30,9 +30,6 @@ ByteStreamInputSvc.inputFiles    = ["/afs/cern.ch/atlas/offline/data/testfile/ru
 ToolSvc.TBByteStreamCnvTool.Dump = TRUE
 ToolSvc.TBByteStreamCnvTool.SummaryPath = "lastrun.txt"
 
-theApp.Dlls += ["LArRawUtils"]
-theApp.Dlls += ["LArTools"]
-
 # --- TBRec --------------
 theApp.Dlls += [ "TBRec" ]