diff --git a/mediachanger/Frame.hpp b/mediachanger/Frame.hpp
index 5b03ae2fc0dea45cdea337be7e09b69c6cf65f62..4ae29ebc202c37a27110f00dbaff28ab794d3802 100644
--- a/mediachanger/Frame.hpp
+++ b/mediachanger/Frame.hpp
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "mediachanger/Header.pb.h"
+#include "mediachanger/MediaChangerHeader.pb.h"
 #include "mediachanger/ZmqMsg.hpp"
 
 #include <cxxabi.h>
@@ -39,7 +39,7 @@ struct Frame {
   /**
    * The header of the frame.
    */
-  Header header;
+  MediaChangerHeader header;
 
   /**
    * The body of the frame.
diff --git a/mediachanger/Header.proto b/mediachanger/MediaChangerHeader.proto
similarity index 98%
rename from mediachanger/Header.proto
rename to mediachanger/MediaChangerHeader.proto
index 38520213462804bc8c3e57fd86e88e945a871e92..bf43fb37b54d103283aebdd551e7b24287710037 100644
--- a/mediachanger/Header.proto
+++ b/mediachanger/MediaChangerHeader.proto
@@ -18,7 +18,7 @@
 
 package cta.mediachanger;
 
-message Header {
+message MediaChangerHeader {
  required uint32 magic = 1;
 
  //see castor::messages::protocolType's anonymous enum for values
diff --git a/mediachanger/messages.cpp b/mediachanger/messages.cpp
index acb138f22598cd0ce5764fe50a890eef63ebba1f..8a224014c9998bd92eb1d4a8379d9c8c54c79bb9 100644
--- a/mediachanger/messages.cpp
+++ b/mediachanger/messages.cpp
@@ -118,7 +118,7 @@ void connectZmqSocketToLocalhost(ZmqSocket &socket,
 //------------------------------------------------------------------------------
 // preFillHeader
 //------------------------------------------------------------------------------
-Header protoTapePreFillHeader() {
+MediaChangerHeader protoTapePreFillHeader() {
   return genericPreFillHeader<TPMAGIC, PROTOCOL_TYPE_TAPE,
     PROTOCOL_VERSION_1>();
 }
diff --git a/mediachanger/messages.hpp b/mediachanger/messages.hpp
index 77fd7e5c6a32dda0ddba5deef07cfd92d845d0d1..262f415026567b476d989e9909a4c46480a0306b 100644
--- a/mediachanger/messages.hpp
+++ b/mediachanger/messages.hpp
@@ -26,7 +26,7 @@
 #include "common/exception/Exception.hpp"
 #include "mediachanger/Constants.hpp"
 #include "mediachanger/Frame.hpp"
-#include "mediachanger/Header.pb.h"
+#include "mediachanger/MediaChangerHeader.pb.h"
 #include "mediachanger/ZmqMsg.hpp"
 #include "mediachanger/ZmqSocket.hpp"
 
@@ -96,8 +96,8 @@ void connectZmqSocketToLocalhost(ZmqSocket &socket, const int port);
  *  After, the only  fields left are reqtype, bodyhashvalue and bodyhashsignature
  * @return The header
  */
-template <int magic, int protocolType, int protocolVersion> Header genericPreFillHeader() {
-  Header header;
+template <int magic, int protocolType, int protocolVersion> MediaChangerHeader genericPreFillHeader() {
+  MediaChangerHeader header;
   header.set_magic(magic);
   header.set_protocoltype(protocolType);
   header.set_protocolversion(protocolVersion);
@@ -112,7 +112,7 @@ template <int magic, int protocolType, int protocolVersion> Header genericPreFil
  * protocolVersion = protocolVersion::prototype
  * @return 
  */
-Header protoTapePreFillHeader();
+MediaChangerHeader protoTapePreFillHeader();
 
 /**
  * Receives either a good-day reply-message or an exception message from the