diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d1c78076bd4f4197a0f53698d12518d17521d41..230e550554aa06f6010d74b91d0cfcbd744e4e8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,7 +116,7 @@ ELSE(DEFINED PackageOnly)
     add_subdirectory(catalogue)
     add_subdirectory(cmdline)
     add_subdirectory(common)
-    add_subdirectory(disk)
+    add_subdirectory(eos)
     add_subdirectory(mediachanger)
     add_subdirectory(objectstore)
     add_subdirectory(rdbms)
diff --git a/disk/CMakeLists.txt b/eos/CMakeLists.txt
similarity index 97%
rename from disk/CMakeLists.txt
rename to eos/CMakeLists.txt
index 35ecab854fb5b3da6cbedddd90d2eb25e9009d8d..1e1f31958a9ae9cdb976b4ec0dae3f75f1ad3001 100644
--- a/disk/CMakeLists.txt
+++ b/eos/CMakeLists.txt
@@ -19,7 +19,7 @@ cmake_minimum_required (VERSION 2.6)
 find_package (xrootdclient REQUIRED)
 include_directories (${XROOTD_INCLUDE_DIR} ${CMAKE_SOURCE_DIR})
 
-add_library (ctadisk
+add_library (ctaeos
   DiskReporter.cpp
   DiskReporterFactory.cpp
   EOSReporter.cpp)
diff --git a/disk/DiskReporter.cpp b/eos/DiskReporter.cpp
similarity index 100%
rename from disk/DiskReporter.cpp
rename to eos/DiskReporter.cpp
diff --git a/disk/DiskReporter.hpp b/eos/DiskReporter.hpp
similarity index 96%
rename from disk/DiskReporter.hpp
rename to eos/DiskReporter.hpp
index f9d778d2aa49e9fa37566b1be542774c20dad39a..affaf001de8d8cf8f6cc57084ea6950e6d2c3378 100644
--- a/disk/DiskReporter.hpp
+++ b/eos/DiskReporter.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-namespace cta { namespace disk {
+namespace cta { namespace eos {
 
 class DiskReporter {
 public:
diff --git a/disk/DiskReporterFactory.cpp b/eos/DiskReporterFactory.cpp
similarity index 97%
rename from disk/DiskReporterFactory.cpp
rename to eos/DiskReporterFactory.cpp
index 11908c76f9953f057818dae2be248b36b8749a8c..a49735eb03c1e171225c726c0695e705ab4d9cfc 100644
--- a/disk/DiskReporterFactory.cpp
+++ b/eos/DiskReporterFactory.cpp
@@ -22,7 +22,7 @@
 #include "common/exception/Exception.hpp"
 #include "common/threading/MutexLocker.hpp"
 
-namespace cta { namespace disk {
+namespace cta { namespace eos {
 
 DiskReporter* DiskReporterFactory::createDiskReporter(const std::string URL) {
   threading::MutexLocker ml(m_mutex);
diff --git a/disk/DiskReporterFactory.hpp b/eos/DiskReporterFactory.hpp
similarity index 98%
rename from disk/DiskReporterFactory.hpp
rename to eos/DiskReporterFactory.hpp
index 09e2be841e20ad6f34c882b64e57f845e50faf56..3c52eb459675a3c0838bc692c6b3a9dbb51a9d25 100644
--- a/disk/DiskReporterFactory.hpp
+++ b/eos/DiskReporterFactory.hpp
@@ -24,7 +24,7 @@
 
 #include <string>
 
-namespace cta { namespace disk {
+namespace cta { namespace eos {
 
 class DiskReporterFactory {
 public:
diff --git a/disk/EOSReporter.cpp b/eos/EOSReporter.cpp
similarity index 97%
rename from disk/EOSReporter.cpp
rename to eos/EOSReporter.cpp
index 38669bce050dacbfcdbe9a116433d64d3a0aeb89..d4607d7a3667ee423f3bc165ec43d084282f387b 100644
--- a/disk/EOSReporter.cpp
+++ b/eos/EOSReporter.cpp
@@ -19,7 +19,7 @@
 #include "EOSReporter.hpp"
 #include "common/exception/XrootCl.hpp"
 
-namespace cta { namespace disk {
+namespace cta { namespace eos {
 
 EOSReporter::EOSReporter(const std::string& hostURL, const std::string& queryValue):
   m_fs(hostURL), m_query(queryValue) {}
diff --git a/disk/EOSReporter.hpp b/eos/EOSReporter.hpp
similarity index 96%
rename from disk/EOSReporter.hpp
rename to eos/EOSReporter.hpp
index 6e05b78f8b1ccbfd1a20e2e76b001886ddadd9d1..c3c78de642ea5099dcf31080199e9668f13cc587 100644
--- a/disk/EOSReporter.hpp
+++ b/eos/EOSReporter.hpp
@@ -21,7 +21,7 @@
 #include "DiskReporter.hpp"
 #include <XrdCl/XrdClFileSystem.hh>
 
-namespace cta { namespace disk {
+namespace cta { namespace eos {
 
 class EOSReporter: public DiskReporter {
 public:
diff --git a/disk/NullReporter.hpp b/eos/NullReporter.hpp
similarity index 96%
rename from disk/NullReporter.hpp
rename to eos/NullReporter.hpp
index 1b2bdd8e89c19149d5ce3f60b449ec3ec876dc45..e4d66ebc2239ef2ffcec2e7e24b039e2f7356ce4 100644
--- a/disk/NullReporter.hpp
+++ b/eos/NullReporter.hpp
@@ -20,7 +20,7 @@
 
 #include "DiskReporter.hpp"
 
-namespace cta { namespace disk {
+namespace cta { namespace eos {
 
 class NullReporter: public DiskReporter {
 public:
diff --git a/scheduler/ArchiveJob.cpp b/scheduler/ArchiveJob.cpp
index ad9babf3a745c771300705a319365cfae9d04dff..47e44df24b78f51190cd35fd05effe43d1133451 100644
--- a/scheduler/ArchiveJob.cpp
+++ b/scheduler/ArchiveJob.cpp
@@ -18,7 +18,7 @@
 
 #include "scheduler/ArchiveJob.hpp"
 #include "scheduler/ArchiveMount.hpp"
-#include "disk/DiskReporterFactory.hpp"
+#include "eos/DiskReporterFactory.hpp"
 #include <limits>
 
 //------------------------------------------------------------------------------
@@ -89,7 +89,7 @@ bool cta::ArchiveJob::complete() {
   // We can now record the success for the job in the database.
   // If this is the last job of the request, we also report the success to the client.
   if (m_dbJob->succeed()) {
-    std::unique_ptr<disk::DiskReporter> reporter(m_mount.createDiskReporter(m_dbJob->archiveReportURL));
+    std::unique_ptr<eos::DiskReporter> reporter(m_mount.createDiskReporter(m_dbJob->archiveReportURL));
     reporter->reportArchiveFullyComplete();
     return true;
   }
diff --git a/scheduler/ArchiveMount.cpp b/scheduler/ArchiveMount.cpp
index 0250c4520f54a7b813b4c12888f1dc9d5a9aee5b..27f898bb409df31c47228bed35c1f6ee11c7e07c 100644
--- a/scheduler/ArchiveMount.cpp
+++ b/scheduler/ArchiveMount.cpp
@@ -77,7 +77,7 @@ uint32_t cta::ArchiveMount::getNbFiles() const {
 //------------------------------------------------------------------------------
 // createDiskReporter
 //------------------------------------------------------------------------------
-cta::disk::DiskReporter* cta::ArchiveMount::createDiskReporter(std::string& URL) {
+cta::eos::DiskReporter* cta::ArchiveMount::createDiskReporter(std::string& URL) {
   return m_reporterFactory.createDiskReporter(URL);
 }
 
diff --git a/scheduler/ArchiveMount.hpp b/scheduler/ArchiveMount.hpp
index f2d22ed09db7a812af554a173c789181b0ab0f4e..1ef2c800ea99cee58d893faa66eeece7799f994d 100644
--- a/scheduler/ArchiveMount.hpp
+++ b/scheduler/ArchiveMount.hpp
@@ -23,7 +23,7 @@
 #include "scheduler/SchedulerDatabase.hpp"
 #include "scheduler/TapeMount.hpp"
 #include "catalogue/Catalogue.hpp"
-#include "disk/DiskReporterFactory.hpp"
+#include "eos/DiskReporterFactory.hpp"
 
 #include <memory>
 #include <atomic>
@@ -131,7 +131,7 @@ namespace cta {
      * @param URL: report address
      * @return poitner to the reporter created.
      */
-    disk::DiskReporter * createDiskReporter(std::string & URL);
+    eos::DiskReporter * createDiskReporter(std::string & URL);
     
     /**
      * Destructor.
@@ -157,7 +157,7 @@ namespace cta {
     
   private:
     /** An initialized-once factory for archive reports (indirectly used by ArchiveJobs) */
-    disk::DiskReporterFactory m_reporterFactory;
+    eos::DiskReporterFactory m_reporterFactory;
   }; // class ArchiveMount
 
 } // namespace cta
diff --git a/scheduler/CMakeLists.txt b/scheduler/CMakeLists.txt
index 56c2673575728786b9accc47bb8a9686bb723197..ff457587bb2e29f9187e234683d7b2a806686ee8 100644
--- a/scheduler/CMakeLists.txt
+++ b/scheduler/CMakeLists.txt
@@ -25,7 +25,7 @@ add_library (ctascheduler SHARED
   ${CTA_SCHEDULER_SRC_FILES})
 install (TARGETS ctascheduler DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
 
-target_link_libraries (ctascheduler ctacommon ctaobjectstore protobuf ctautils ctadisk)
+target_link_libraries (ctascheduler ctacommon ctaobjectstore protobuf ctautils ctaeos)
 
 #add_library (ctaschedulerutils SHARED
 #  _old_prototype_DummyScheduler.cpp)