diff --git a/tapeserver/castor/exception/EndOfFile.hpp b/common/exception/EndOfFile.hpp
similarity index 98%
rename from tapeserver/castor/exception/EndOfFile.hpp
rename to common/exception/EndOfFile.hpp
index e39c0dec87f6b89ccb638de2fce07e065a704b58..59ffa06625c776827c62116a4ecc59bd3831503c 100644
--- a/tapeserver/castor/exception/EndOfFile.hpp
+++ b/common/exception/EndOfFile.hpp
@@ -26,7 +26,7 @@
 #include "common/exception/Exception.hpp"
 #include <string>
 
-namespace castor { 
+namespace cta { 
 namespace exception {
   
   class EndOfFile: public cta::exception::Exception {
diff --git a/tapeserver/castor/tape/tapeserver/daemon/Payload.hpp b/tapeserver/castor/tape/tapeserver/daemon/Payload.hpp
index b5cf593f68bd34e78ee3d9892aa973eec62b60a2..14dae21d75eb86faee4792875f9da99e011d167d 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/Payload.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/Payload.hpp
@@ -24,7 +24,7 @@
 #include "castor/tape/tapeserver/file/DiskFile.hpp"
 #include "castor/tape/tapeserver/file/File.hpp"
 #include "castor/exception/MemException.hpp"
-#include "castor/exception/EndOfFile.hpp"
+#include "common/exception/EndOfFile.hpp"
 #pragma once 
 
 namespace castor {
@@ -110,7 +110,7 @@ public:
     try {
       readSize = from.read(m_data + m_size, from.getBlockSize());
     } catch (castor::tape::tapeFile::EndOfFile&) {
-      throw castor::exception::EndOfFile("In castor::tape::tapeserver::daemon::Payload::append: reached end of file");
+      throw cta::exception::EndOfFile("In castor::tape::tapeserver::daemon::Payload::append: reached end of file");
     }
     m_size += readSize;
     return  from.getBlockSize() <= remainingFreeSpace();
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeReadTask.hpp b/tapeserver/castor/tape/tapeserver/daemon/TapeReadTask.hpp
index a8fd7e2f1b2228e304fc891a2b393c1c215d8771..5309855dddb97ff1b8412a5672367b77cfb60e28 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeReadTask.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeReadTask.hpp
@@ -122,7 +122,7 @@ public:
           while (mb->m_payload.append(*rf)) {
             tapeBlock++;
           }
-        } catch (const castor::exception::EndOfFile&) {
+        } catch (const cta::exception::EndOfFile&) {
           // append() signaled the end of the file.
           stillReading = false;
         }