diff --git a/mediachanger/AcsProxyZmq.cpp b/mediachanger/AcsProxyZmq.cpp
index 3a2ea7399a51272977d4c0de07ea5a680bb388ab..f52437c6183123021a1baa395d3b8deaef3a4004 100644
--- a/mediachanger/AcsProxyZmq.cpp
+++ b/mediachanger/AcsProxyZmq.cpp
@@ -19,13 +19,13 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 
-#include "mediachanger/AcsMountTapeReadOnly.pb.h"
-#include "mediachanger/AcsMountTapeReadWrite.pb.h"
 #include "mediachanger/AcsDismountTape.pb.h"
 #include "mediachanger/AcsForceDismountTape.pb.h"
-#include "mediachanger/ReturnValue.pb.h"
+#include "mediachanger/AcsMountTapeReadOnly.pb.h"
+#include "mediachanger/AcsMountTapeReadWrite.pb.h"
 #include "mediachanger/AcsProxyZmq.hpp"
 #include "mediachanger/Constants.hpp"
+#include "mediachanger/MediaChangerReturnValue.pb.h"
 #include "mediachanger/messages.hpp"
 
 namespace cta {
@@ -188,7 +188,7 @@ void AcsProxyZmq::mountTapeReadOnly(const std::string &vid,
     const Frame rqst = createAcsMountTapeReadOnlyFrame(vid, librarySlot);
     sendFrame(m_serverSocket, rqst);
 
-    ReturnValue reply;
+    MediaChangerReturnValue reply;
     recvTapeReplyOrEx(m_serverSocket, reply);
     if(0 != reply.value()) {
       // Should never get here
@@ -217,7 +217,7 @@ void AcsProxyZmq::mountTapeReadWrite(const std::string &vid,
     const Frame rqst = createAcsMountTapeReadWriteFrame(vid, librarySlot);
     sendFrame(m_serverSocket, rqst);
 
-    ReturnValue reply;
+    MediaChangerReturnValue reply;
     recvTapeReplyOrEx(m_serverSocket, reply);
     if(0 != reply.value()) {
       // Should never get here
@@ -246,7 +246,7 @@ void AcsProxyZmq::dismountTape(const std::string &vid,
     const Frame rqst = createAcsDismountTapeFrame(vid, librarySlot);
     sendFrame(m_serverSocket, rqst);
 
-    ReturnValue reply;
+    MediaChangerReturnValue reply;
     recvTapeReplyOrEx(m_serverSocket, reply);
     if(0 != reply.value()) {
       // Should never get here
@@ -275,7 +275,7 @@ void AcsProxyZmq::forceDismountTape(const std::string &vid,
     const Frame rqst = createAcsForceDismountTapeFrame(vid, librarySlot);
     sendFrame(m_serverSocket, rqst);
 
-    ReturnValue reply;
+    MediaChangerReturnValue reply;
     recvTapeReplyOrEx(m_serverSocket, reply);
     if(0 != reply.value()) {
       // Should never get here
diff --git a/mediachanger/ReturnValue.proto b/mediachanger/MediaChangerReturnValue.proto
similarity index 96%
rename from mediachanger/ReturnValue.proto
rename to mediachanger/MediaChangerReturnValue.proto
index 1d75c0e4b688d1821a36cc3dda24ca517be8fe4f..fef2e35fa0b25fbe332f553ec64c7d1584af0f45 100644
--- a/mediachanger/ReturnValue.proto
+++ b/mediachanger/MediaChangerReturnValue.proto
@@ -18,6 +18,6 @@
 
 package cta.mediachanger;
 
-message ReturnValue {
+message MediaChangerReturnValue {
   required uint32 value = 1;
 }