diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamReadV1V2Tool.h b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamReadV1V2Tool.h
index bad5dee644d2baca7765406526459494740f7edd..865e5545bb23cb8d050852d4bcf5073e29dc84e4 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamReadV1V2Tool.h
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamReadV1V2Tool.h
@@ -20,7 +20,6 @@
 #include "GaudiKernel/ServiceHandle.h"
 
 #include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
-//#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
 
 #include "xAODTrigL1Calo/TriggerTower.h"
 #include "xAODTrigL1Calo/TriggerTowerContainer.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloByteStream/CMakeLists.txt
index 66680ad01c32af01d4c36cdd2d0cfed3b02832a3..09334343f42559f5d558d1f92acf113f96a34b35 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/CMakeLists.txt
@@ -21,7 +21,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Event/EventInfo
                           ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream
                           Trigger/TrigT1/TrigT1CaloEvent
-                          Trigger/TrigT1/TrigT1CaloMappingToolInterfaces
+                          Trigger/TrigT1/TrigT1CaloToolInterfaces
                           Trigger/TrigT1/TrigT1CaloUtils
                           Trigger/TrigT1/TrigT1Interfaces )
 
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx
index 206890ac88dc95991a01148cae49fa175aeb6c62..b14ec65ac48cc579b6ddaa166de3de4331758a3a 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx
@@ -19,7 +19,7 @@
 #include "TrigT1CaloEvent/CPBSCollection.h"
 #include "TrigT1CaloUtils/DataError.h"
 #include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "CmmCpSubBlock.h"
 #include "CmmSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx
index f0e5e78582629b67bed6b238f5252c03ca575f2f..30e11fd588e54b5eb06aecd0646ed6397a8143d0 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx
@@ -19,7 +19,7 @@
 #include "TrigT1CaloEvent/CPBSCollectionV1.h"
 #include "TrigT1CaloUtils/DataError.h"
 #include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "CmmCpSubBlock.h"
 #include "CmmSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
index 7a4330c21e977ba9466ff1353a88f7ae729eb597..9dca2a78374baa360b7b3e764b0440bc8f6f9fb2 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
@@ -19,7 +19,7 @@
 #include "TrigT1CaloEvent/CPBSCollectionV2.h"
 #include "TrigT1CaloUtils/DataError.h"
 #include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "CmxCpSubBlock.h"
 #include "CmxSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx
index 87a9bd94b0d5400a9e9266e7b57d64b3a19e4a98..90c9f859ed060835c1bc013965f9699603fc2b17 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx
@@ -21,7 +21,7 @@
 #include "TrigT1CaloEvent/JetElement.h"
 #include "TrigT1CaloUtils/DataError.h"
 #include "TrigT1CaloUtils/JetElementKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "CmmEnergySubBlock.h"
 #include "CmmJetSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx
index 3c01bc8b1cf4f83a0e9145e5ffe1daf856cc6c2b..50c664bb8453d85c26b4f27b38179a1e5e98ca9d 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx
@@ -21,7 +21,7 @@
 #include "TrigT1CaloEvent/JetElement.h"
 #include "TrigT1CaloUtils/DataError.h"
 #include "TrigT1CaloUtils/JetElementKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "CmmEnergySubBlock.h"
 #include "CmmJetSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx
index 421ba532a0bab60f7ae49807910b83f360d9cf78..8fc573e0a89d68c70277bef1f62557501c638ba6 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx
@@ -21,7 +21,7 @@
 #include "TrigT1CaloEvent/JetElement.h"
 #include "TrigT1CaloUtils/DataError.h"
 #include "TrigT1CaloUtils/JetElementKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "CmxEnergySubBlock.h"
 #include "CmxJetSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx
index e2563bd1372a5fc832ca3a9e2e49d509ed1c0d39..5296aa3a451ca6551a16f4758063e252a995bc49 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx
@@ -17,7 +17,7 @@
 #include "TrigT1CaloEvent/TriggerTower.h"
 #include "TrigT1CaloUtils/DataError.h"
 #include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "CmmSubBlock.h"
 #include "L1CaloErrorByteStreamTool.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx
index 4ef8fb505b44f1adfb3bf8d670581dca2b96c962..b0d442f9c552afed5ddd65666aa94329b55f033c 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx
@@ -11,7 +11,7 @@
 #include "GaudiKernel/StatusCode.h"
 
 #include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "L1CaloSrcIdMap.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.h
index 7d97023455576423c8556a1866cd2f04a57688c6..456fc4dcd0f81e631fc7d501b216a40463728194 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.h
@@ -23,7 +23,7 @@
 #include "GaudiKernel/ServiceHandle.h"
 
 #include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "xAODTrigL1Calo/TriggerTower.h"
 #include "xAODTrigL1Calo/TriggerTowerContainer.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmMappingTester.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmMappingTester.cxx
index 83c0f6a17191b4087aa05fca690ea60425cd0d86..af298a66d551fe3879a94d11731e5cf69a4f05aa 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmMappingTester.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmMappingTester.cxx
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/StatusCode.h"
 
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "PpmMappingTester.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloMappingToolInterfaces/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloMappingToolInterfaces/CMakeLists.txt
deleted file mode 100644
index b5a9d38e10d0d3523d7bd60dda4606c5544b9246..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1CaloMappingToolInterfaces/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-# Package: TrigT1CaloMappingToolInterfaces
-################################################################################
-
-# Declare the package name:
-atlas_subdir( TrigT1CaloMappingToolInterfaces )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel )
-
-# Install files from the package:
-atlas_install_headers( TrigT1CaloMappingToolInterfaces )
-
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloMappingTools/CMakeLists.txt
index ab5492693d9064b1a831a22bfa504a73b5d2cb69..b93a3aaa75019078ec894d6c41798ebb94dbc0c1 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/CMakeLists.txt
@@ -13,7 +13,7 @@ atlas_depends_on_subdirs( PRIVATE
                           Control/StoreGate
                           DetectorDescription/Identifier
                           GaudiKernel
-                          Trigger/TrigT1/TrigT1CaloMappingToolInterfaces )
+                          Trigger/TrigT1/TrigT1CaloToolInterfaces )
 
 # Component(s) in the package:
 atlas_add_component( TrigT1CaloMappingTools
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/CpmMappingTool.h b/Trigger/TrigT1/TrigT1CaloMappingTools/src/CpmMappingTool.h
index a34894878bd317bfde5589f3169b6435bcc047d2..d6fc878ffc59567dc80a66ff8979f155a6fe61f9 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/CpmMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/CpmMappingTool.h
@@ -11,7 +11,7 @@
 
 #include "AthenaBaseComps/AthAlgTool.h"
 
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 class IInterface;
 class StatusCode;
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/JemMappingTool.h b/Trigger/TrigT1/TrigT1CaloMappingTools/src/JemMappingTool.h
index c438dfe954fd1ada9473634ccff9929fd175f278..b6466a239c1e1b4d32eb0f481c86c5fd09ab8ea1 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/JemMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/JemMappingTool.h
@@ -11,7 +11,7 @@
 
 #include "AthenaBaseComps/AthAlgTool.h"
 
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 class IInterface;
 class StatusCode;
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolMappingTool.h b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolMappingTool.h
index ce47e7a6f0d6706a018e163fd9a501592971ac4e..6afbbfe036d923058e6894fe7ecaf4649671b9e2 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolMappingTool.h
@@ -12,7 +12,7 @@
 #include "GaudiKernel/Incident.h"
 #include "GaudiKernel/ToolHandle.h"
 
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 class CaloLVL1_ID;
 class CaloTriggerTowerService;
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolOrBuiltinMappingTool.h b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolOrBuiltinMappingTool.h
index ed7bb2d95c20d24ee4414319cb826e459cb03ff9..fc8cb0ba1e27940757f1b6f0e8a50b3c5606b491 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolOrBuiltinMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolOrBuiltinMappingTool.h
@@ -10,7 +10,7 @@
 #include "AthenaBaseComps/AthAlgTool.h"
 #include "GaudiKernel/ToolHandle.h"
 
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 class IInterface;
 class StatusCode;
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmMappingTool.h b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmMappingTool.h
index 12b099065acd18ed57351adef1848571d133a252..0321ec2e05e25f08d79efa1b569d4b76a50c0acf 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmMappingTool.h
@@ -14,7 +14,7 @@
 
 #include "ChannelCoordinate.h"
 
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 class IInterface;
 class StatusCode;
diff --git a/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt
index 930c647a27cbfc2179752bbee2b5d272d00b7530..79960a5cedcf0f98646c643df9065b0a96730f23 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt
@@ -27,7 +27,7 @@ atlas_depends_on_subdirs(
    Trigger/TrigT1/TrigT1CaloCalibConditions
    Trigger/TrigT1/TrigT1CaloCalibToolInterfaces
    Trigger/TrigT1/TrigT1CaloEvent
-   Trigger/TrigT1/TrigT1CaloMappingToolInterfaces
+   Trigger/TrigT1/TrigT1CaloToolInterfaces
    Trigger/TrigT1/TrigT1CaloToolInterfaces
    Trigger/TrigT1/TrigT1CaloUtils
    Trigger/TrigT1/TrigT1Interfaces
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h
index 1308f46f2ca66139890593c36be81f04bca746e7..5b40ac012fb0eb3c9fe6432907533b5b3954a9e8 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h
@@ -32,7 +32,7 @@
 #include "TrigT1CaloEvent/TriggerTowerCollection.h"
 // #include "TrigT1CaloCalibTools/L1CaloTTIdTools.h"
 #include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 #include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h"
 
  namespace LVL1 {
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/TriggerTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/TriggerTowerMaker.h
index 0becb50408d457f357466b24ec5c6406fe5aacf3..951b7bac2112e1fd2be863bc6c2ede25993bd1ea 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/TriggerTowerMaker.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/TriggerTowerMaker.h
@@ -67,7 +67,7 @@
 #include "TrigT1CaloCalibToolInterfaces/IL1CaloTTIdTools.h"
 #include "TrigT1CaloCalibToolInterfaces/IL1CaloCells2TriggerTowers.h"
 #include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 #include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h"
 
 // Include for the configuration service:
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
index 2db59a212b0fbf3d38ee2610fef9de1ebeb9f620..f29d72bed4b2515ffe24fda6b69b5dfb7af7410e 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
@@ -14,7 +14,7 @@
 #include "TrigT1CaloCalibConditions/L1CaloDisabledTowersContainer.h"
 #include "TrigT1CaloCalibConditions/L1CaloPpmDeadChannelsContainer.h"
 #include "TrigT1CaloCondSvc/L1CaloCondSvc.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 #include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigConfL1Data/ThresholdConfig.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
index eb0a9f5d4a2c081052e7058c5e3c1b56d5b9dbef..46622cfc4d231af3095f49f2104789209d87984e 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
@@ -15,7 +15,7 @@
 #include "TrigT1CaloCalibConditions/L1CaloDisabledTowersContainer.h"
 #include "TrigT1CaloCalibConditions/L1CaloPpmDeadChannelsContainer.h"
 #include "TrigT1CaloCondSvc/L1CaloCondSvc.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 #include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigConfL1Data/ThresholdConfig.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx
index 0020eaa33587fd2e4267d30bce7a2bf4bc9ad58c..0f1ea96ee8ed77d53302195d75bd4502802571a9 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx
@@ -24,7 +24,6 @@
 #include <CLHEP/Random/Randomize.h>
 
 #include "TrigConfL1Data/ThresholdConfig.h"
-//#include "TrigT1CaloByteStream/IL1CaloMappingTool.h"
 #include "TrigT1CaloUtils/InternalTriggerTower_ClassDEF.h"
 #include "TrigT1CaloCalibConditions/L1CaloModuleType.h"
 #include "AthContainers/ConstDataVector.h"
diff --git a/Trigger/TrigT1/TrigT1CaloMappingToolInterfaces/TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CaloMappingTool.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloMappingToolInterfaces/TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h
rename to Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CaloMappingTool.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt
index 4aad8cec16972d20b987cb76431c93d946abb157..d0dab4f846974e7969b1b8990345f716f97a5045 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt
@@ -28,7 +28,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Trigger/TrigT1/TrigT1CaloCalibConditions
                           Trigger/TrigT1/TrigT1CaloCalibToolInterfaces
                           Trigger/TrigT1/TrigT1CaloCondSvc
-                          Trigger/TrigT1/TrigT1CaloMappingToolInterfaces )
+                          Trigger/TrigT1/TrigT1CaloToolInterfaces )
 
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
index 2f1744d6485d908856996295777dbe89269d451b..b1808efba1cc6e72ee9e48d22d35dcaa832702c0 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
@@ -42,7 +42,7 @@
 #include "TrigT1CaloCalibConditions/L1CaloRunParametersContainer.h"
 
 #include "TrigT1CaloCalibToolInterfaces/IL1CaloTTIdTools.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 #include "TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h"
 
 #include "StoreGate/ReadHandle.h"