diff --git a/tapeserver/castor/tape/tapeserver/Constants.hpp b/tapeserver/castor/tape/tapeserver/TapeBridgeConstants.hpp
similarity index 100%
rename from tapeserver/castor/tape/tapeserver/Constants.hpp
rename to tapeserver/castor/tape/tapeserver/TapeBridgeConstants.hpp
diff --git a/tapeserver/castor/tape/tapeserver/daemon/CatalogueConfig.cpp b/tapeserver/castor/tape/tapeserver/daemon/CatalogueConfig.cpp
index 9cbb3a409ae09a8a8f11ed7bbac5c9ea77d7717e..2c836dadead58d2e80fadb8f81d788ada02345b4 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/CatalogueConfig.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/CatalogueConfig.cpp
@@ -22,9 +22,9 @@
  *****************************************************************************/
 
 #include "castor/common/CastorConfiguration.hpp"
-#include "castor/tape/tapeserver/Constants.hpp"
 #include "castor/tape/tapeserver/daemon/Constants.hpp"
 #include "castor/tape/tapeserver/daemon/CatalogueConfig.hpp"
+#include "castor/tape/tapeserver/TapeBridgeConstants.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DataTransferConfig.cpp b/tapeserver/castor/tape/tapeserver/daemon/DataTransferConfig.cpp
index 7b50761cdaac02fdaf996394dcd2b9f9a26a91cb..094dce95f62d0a7bb73f411bc3cb8a169011b5d5 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DataTransferConfig.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DataTransferConfig.cpp
@@ -22,9 +22,9 @@
  *****************************************************************************/
 
 #include "castor/common/CastorConfiguration.hpp"
-#include "castor/tape/tapeserver/Constants.hpp"
 #include "castor/tape/tapeserver/daemon/DataTransferConfig.hpp"
 #include "castor/tape/tapeserver/daemon/Constants.hpp"
+#include "castor/tape/tapeserver/TapeBridgeConstants.hpp"
 #include "movers/moveropenclose.h"
 
 //------------------------------------------------------------------------------
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeDaemon.cpp b/tapeserver/castor/tape/tapeserver/daemon/TapeDaemon.cpp
index 4da951347a35b91a06698c2d10b70c29139c10e9..326ddd67711ab37c6d132e3238cfd90f08641dbe 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeDaemon.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeDaemon.cpp
@@ -27,7 +27,6 @@
 #include "castor/io/io.hpp"
 #include "castor/legacymsg/CommonMarshal.hpp"
 #include "castor/legacymsg/TapeMarshal.hpp"
-#include "castor/tape/tapeserver/Constants.hpp"
 #include "castor/tape/tapeserver/daemon/AdminAcceptHandler.hpp"
 #include "castor/tape/tapeserver/daemon/CleanerSession.hpp"
 #include "castor/tape/tapeserver/daemon/Constants.hpp"
@@ -41,6 +40,7 @@
 #include "castor/tape/tapeserver/daemon/TapeDaemonConfig.hpp"
 #include "castor/tape/tapeserver/daemon/TapeMessageHandler.hpp"
 #include "castor/tape/tapeserver/file/File.hpp"
+#include "castor/tape/tapeserver/TapeBridgeConstants.hpp"
 #include "castor/utils/SmartFd.hpp"
 #include "castor/utils/utils.hpp"
 #include "Ctape.h"
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeDaemonConfig.cpp b/tapeserver/castor/tape/tapeserver/daemon/TapeDaemonConfig.cpp
index 2040ad126977f922aedf47b120329b9bb0ca6ad1..b55bc5f26ac83760ea963a1e9d63facb889de142 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeDaemonConfig.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeDaemonConfig.cpp
@@ -21,9 +21,9 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 
-#include "castor/tape/tapeserver/Constants.hpp"
 #include "castor/tape/tapeserver/daemon/Constants.hpp"
 #include "castor/tape/tapeserver/daemon/TapeDaemonConfig.hpp"
+#include "castor/tape/tapeserver/TapeBridgeConstants.hpp"
 #include "rmc_constants.h"
 
 //------------------------------------------------------------------------------