diff --git a/scheduler/ArchiveToDirRequest.cpp b/scheduler/ArchiveToDirRequest.cpp
index e44dc8f9b61028b237ba678c4f1e88f0afbf86a6..eff48eb93fd9b54a4fb70dc3e9ec4c10b6314290 100644
--- a/scheduler/ArchiveToDirRequest.cpp
+++ b/scheduler/ArchiveToDirRequest.cpp
@@ -39,7 +39,7 @@ cta::ArchiveToDirRequest::ArchiveToDirRequest(
   const std::list<ArchiveToFileRequest> &archiveToFileRequests,
   const uint64_t priority,
   const CreationLog & creationLog):
-  ArchiveRequest(priority, creationLog),
+  UserArchiveRequest(priority, creationLog),
   m_archiveDir(archiveDir),
   m_archiveToFileRequests(archiveToFileRequests) {
 }
diff --git a/scheduler/ArchiveToDirRequest.hpp b/scheduler/ArchiveToDirRequest.hpp
index 7597468ab86ea749947ab90b243928d0d4799bfd..305e9d8a737375e62fa59249192ae8970f569fee 100644
--- a/scheduler/ArchiveToDirRequest.hpp
+++ b/scheduler/ArchiveToDirRequest.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "scheduler/ArchiveRequest.hpp"
+#include "scheduler/UserArchiveRequest.hpp"
 
 #include <list>
 #include <string>
@@ -32,7 +32,7 @@ class ArchiveToFileRequest;
  * Class representing a user request to archive one or more remote files to an
  * archive directory.
  */
-class ArchiveToDirRequest: public ArchiveRequest {
+class ArchiveToDirRequest: public UserArchiveRequest {
 public:
 
   /**
diff --git a/scheduler/ArchiveToFileRequest.cpp b/scheduler/ArchiveToFileRequest.cpp
index 2bc34ecb99f39c64916f4e358ea43d9edfc51983..25fd3c2086b699d4d3b3a0a09fe17c68e891642a 100644
--- a/scheduler/ArchiveToFileRequest.cpp
+++ b/scheduler/ArchiveToFileRequest.cpp
@@ -39,7 +39,7 @@ cta::ArchiveToFileRequest::ArchiveToFileRequest(
   const std::map<uint16_t, std::string> &copyNbToPoolMap,
   const uint64_t priority,
   const CreationLog & creationLog):
-  ArchiveRequest(priority, creationLog),
+  UserArchiveRequest(priority, creationLog),
   remoteFile(remoteFile),
   archiveFile(archiveFile),
   copyNbToPoolMap(copyNbToPoolMap) {
diff --git a/scheduler/ArchiveToFileRequest.hpp b/scheduler/ArchiveToFileRequest.hpp
index f9f172b987f60b35a5abb957f6011fa053804349..9adb91309ca04cd71ea8553c4ccb033de675fcc5 100644
--- a/scheduler/ArchiveToFileRequest.hpp
+++ b/scheduler/ArchiveToFileRequest.hpp
@@ -20,7 +20,7 @@
 
 #include "common/archiveNS/ArchiveFile.hpp"
 #include "common/remoteFS/RemotePathAndStatus.hpp"
-#include "scheduler/ArchiveRequest.hpp"
+#include "scheduler/UserArchiveRequest.hpp"
 #include "SchedulerDatabase.hpp"
 
 #include <map>
@@ -34,7 +34,7 @@ namespace cta {
  * Class representing a user request to archive to a single remote file to a
  * single destination archive file.
  */
-struct ArchiveToFileRequest: public ArchiveRequest {
+struct ArchiveToFileRequest: public UserArchiveRequest {
 
   /**
    * Constructor.
@@ -51,7 +51,7 @@ struct ArchiveToFileRequest: public ArchiveRequest {
    * @param other
    */
   ArchiveToFileRequest(const ArchiveToFileRequest & other):
-  ArchiveRequest(other)
+  UserArchiveRequest(other)
   {
     archiveFile = other.archiveFile;
     remoteFile = other.remoteFile;
diff --git a/scheduler/ArchiveToTapeCopyRequest.cpp b/scheduler/ArchiveToTapeCopyRequest.cpp
index 6916285ffa3a1c797a47130db39a8b0d8525f727..27fb0e87d4633f7cd731bf4247d4ea0b7c6620a6 100644
--- a/scheduler/ArchiveToTapeCopyRequest.cpp
+++ b/scheduler/ArchiveToTapeCopyRequest.cpp
@@ -40,7 +40,7 @@ cta::ArchiveToTapeCopyRequest::ArchiveToTapeCopyRequest(
   const std::string tapePoolName,
   const uint64_t priority,
   const CreationLog &creationLog):
-  ArchiveRequest(priority, creationLog),
+  UserArchiveRequest(priority, creationLog),
   remoteFile(remoteFile),
   archiveFile(archiveFile),
   copyNb(copyNb),
diff --git a/scheduler/ArchiveToTapeCopyRequest.hpp b/scheduler/ArchiveToTapeCopyRequest.hpp
index 1e4f9990fd816da4135b20d3583d7264f7fd8060..d1dfc3a5645de842d88b07134685b8985a9289c8 100644
--- a/scheduler/ArchiveToTapeCopyRequest.hpp
+++ b/scheduler/ArchiveToTapeCopyRequest.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "common/remoteFS/RemotePathAndStatus.hpp"
-#include "scheduler/ArchiveRequest.hpp"
+#include "scheduler/UserArchiveRequest.hpp"
 
 #include <stdint.h>
 #include <string>
@@ -29,7 +29,7 @@ namespace cta {
 /**
  * A user request to archive a remote file to a copy on tape.
  */
-struct ArchiveToTapeCopyRequest: public ArchiveRequest {
+struct ArchiveToTapeCopyRequest: public UserArchiveRequest {
 
   /**
    * Constructor.
diff --git a/scheduler/CMakeLists.txt b/scheduler/CMakeLists.txt
index c3441faa8ee5def6a7322a9d5e0a101b2c82d075..2c80ff20ae182b74b40db68f3b2d5d6aef17056f 100644
--- a/scheduler/CMakeLists.txt
+++ b/scheduler/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories (${SQLITE3_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
 set (CTA_SCHEDULER_SRC_FILES
   ArchiveJob.cpp
   ArchiveMount.cpp
-  ArchiveRequest.cpp
+  UserArchiveRequest.cpp
   ArchiveToDirRequest.cpp
   ArchiveToFileRequest.cpp
   ArchiveToTapeCopyRequest.cpp
@@ -21,7 +21,7 @@ set (CTA_SCHEDULER_SRC_FILES
   PositioningMethod.cpp
   RetrieveJob.cpp
   RetrieveMount.cpp
-  RetrieveRequest.cpp
+  UserRetrieveRequest.cpp
   RetrieveToDirRequest.cpp
   RetrieveToFileRequest.cpp
   Scheduler.cpp
diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index c1a55222c765a98213b0afeb2d78859367860eb9..4799717433ff142126b074dc30eea9d333f19814 100644
--- a/scheduler/OStoreDB/OStoreDB.cpp
+++ b/scheduler/OStoreDB/OStoreDB.cpp
@@ -28,7 +28,7 @@
 #include "common/admin/AdminHost.hpp"
 #include "common/admin/AdminUser.hpp"
 #include "common/archiveRoutes/ArchiveRoute.hpp"
-#include "scheduler/ArchiveRequest.hpp"
+#include "scheduler/UserArchiveRequest.hpp"
 #include "scheduler/ArchiveToFileRequest.hpp"
 #include "scheduler/LogicalLibrary.hpp"
 #include "scheduler/RetrieveToFileRequest.hpp"
diff --git a/scheduler/RetrieveToDirRequest.cpp b/scheduler/RetrieveToDirRequest.cpp
index 96d1ada449f0ea40c051817ece9ea3fb344ca68b..214ec913201f6e499af9d00dc0df27a9b0b6cbf7 100644
--- a/scheduler/RetrieveToDirRequest.cpp
+++ b/scheduler/RetrieveToDirRequest.cpp
@@ -37,7 +37,7 @@ cta::RetrieveToDirRequest::RetrieveToDirRequest(
   const std::string &remoteDir,
   const uint64_t priority,
   const CreationLog & creationLog):
-  RetrieveRequest(priority, creationLog),
+  UserRetrieveRequest(priority, creationLog),
   m_remoteDir(remoteDir) {
 }
 
diff --git a/scheduler/RetrieveToDirRequest.hpp b/scheduler/RetrieveToDirRequest.hpp
index 99809908b37543eb87d860a1694281c1e3b41f4b..782f5aff968105f49d80718181a1a60d2bc1e090 100644
--- a/scheduler/RetrieveToDirRequest.hpp
+++ b/scheduler/RetrieveToDirRequest.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "scheduler/RetrieveRequest.hpp"
+#include "scheduler/UserRetrieveRequest.hpp"
 #include "scheduler/RetrieveToFileRequest.hpp"
 
 #include <list>
@@ -30,7 +30,7 @@ namespace cta {
  * Class representing a user request to retrieve one or more archived files to a
  * remote directory.
  */
-class RetrieveToDirRequest: public RetrieveRequest {
+class RetrieveToDirRequest: public UserRetrieveRequest {
 public:
 
   /**
diff --git a/scheduler/RetrieveToFileRequest.cpp b/scheduler/RetrieveToFileRequest.cpp
index d8d6f3ff7f491f67227dc6eef0680877180a2942..f0f61b80a4f5da3a11a6ea091af2da152712e350 100644
--- a/scheduler/RetrieveToFileRequest.cpp
+++ b/scheduler/RetrieveToFileRequest.cpp
@@ -40,7 +40,7 @@ cta::RetrieveToFileRequest::RetrieveToFileRequest(
   const std::string &remoteFile,
   const uint64_t priority,
   const CreationLog & creationLog):
-  RetrieveRequest(priority, creationLog),
+  UserRetrieveRequest(priority, creationLog),
   m_archiveFile(archiveFile),
   m_tapeCopies(tapeCopies),
   m_remoteFile(remoteFile){
diff --git a/scheduler/RetrieveToFileRequest.hpp b/scheduler/RetrieveToFileRequest.hpp
index 30d3ab316a30e2929fb1c224ed5e0e1da0cf6aad..1fc2eaaeb0c9399a07a29dc7c4f73cc3158bf904 100644
--- a/scheduler/RetrieveToFileRequest.hpp
+++ b/scheduler/RetrieveToFileRequest.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "common/archiveNS/ArchiveFile.hpp"
-#include "scheduler/RetrieveRequest.hpp"
+#include "scheduler/UserRetrieveRequest.hpp"
 
 #include <list>
 #include <string>
@@ -33,7 +33,7 @@ class TapeFileLocation;
  * Class representing a user request to retrieve a single archived file to a
  * single remote file.
  */
-class RetrieveToFileRequest: public RetrieveRequest {
+class RetrieveToFileRequest: public UserRetrieveRequest {
 public:
 
   /**
diff --git a/scheduler/ArchiveRequest.cpp b/scheduler/UserArchiveRequest.cpp
similarity index 87%
rename from scheduler/ArchiveRequest.cpp
rename to scheduler/UserArchiveRequest.cpp
index 4808d576e937dc7b8bf90cd2c2613e12ec1ea02a..128de299131f9ec1d1e360421165fd7c6d34e941 100644
--- a/scheduler/ArchiveRequest.cpp
+++ b/scheduler/UserArchiveRequest.cpp
@@ -16,24 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/ArchiveRequest.hpp"
+#include "scheduler/UserArchiveRequest.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
 //------------------------------------------------------------------------------
-cta::ArchiveRequest::ArchiveRequest() {
+cta::UserArchiveRequest::UserArchiveRequest() {
 }
 
 //------------------------------------------------------------------------------
 // destructor
 //------------------------------------------------------------------------------
-cta::ArchiveRequest::~ArchiveRequest() throw() {
+cta::UserArchiveRequest::~UserArchiveRequest() throw() {
 }
 
 //------------------------------------------------------------------------------
 // constructor
 //------------------------------------------------------------------------------
-cta::ArchiveRequest::ArchiveRequest(
+cta::UserArchiveRequest::UserArchiveRequest(
   const uint64_t priority,
   const CreationLog &creationLog):
   UserRequest(priority, creationLog) {
diff --git a/scheduler/ArchiveRequest.hpp b/scheduler/UserArchiveRequest.hpp
similarity index 90%
rename from scheduler/ArchiveRequest.hpp
rename to scheduler/UserArchiveRequest.hpp
index 456e705b50f2385841e2c3ac06a5021550269c6b..b65845433f7160e53bdb23512b05ab40c63462fd 100644
--- a/scheduler/ArchiveRequest.hpp
+++ b/scheduler/UserArchiveRequest.hpp
@@ -28,18 +28,18 @@ namespace cta {
 /**
  * Abstract class representing a user request to archive some data.
  */
-class ArchiveRequest: public UserRequest {
+class UserArchiveRequest: public UserRequest {
 public:
 
   /**
    * Constructor.
    */
-  ArchiveRequest();
+  UserArchiveRequest();
 
   /**
    * Destructor.
    */
-  virtual ~ArchiveRequest() throw() = 0;
+  virtual ~UserArchiveRequest() throw() = 0;
 
   /**
    * Constructor.
@@ -49,7 +49,7 @@ public:
    * @param creationTime Optionally the absolute time at which the user request
    * was created.  If no value is given then the current time is used.
    */
-  ArchiveRequest(
+  UserArchiveRequest(
     const uint64_t priority,
     const CreationLog & creationLog);
 
diff --git a/scheduler/RetrieveRequest.cpp b/scheduler/UserRetrieveRequest.cpp
similarity index 87%
rename from scheduler/RetrieveRequest.cpp
rename to scheduler/UserRetrieveRequest.cpp
index 4ff8cfe7679ca28e7c7c03421ad33f6531b3fa43..0f27801d567170eda03d8f19f78439139229433b 100644
--- a/scheduler/RetrieveRequest.cpp
+++ b/scheduler/UserRetrieveRequest.cpp
@@ -16,24 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scheduler/RetrieveRequest.hpp"
+#include "scheduler/UserRetrieveRequest.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
 //------------------------------------------------------------------------------
-cta::RetrieveRequest::RetrieveRequest() {
+cta::UserRetrieveRequest::UserRetrieveRequest() {
 }
 
 //------------------------------------------------------------------------------
 // destructor
 //------------------------------------------------------------------------------
-cta::RetrieveRequest::~RetrieveRequest() throw() {
+cta::UserRetrieveRequest::~UserRetrieveRequest() throw() {
 }
 
 //------------------------------------------------------------------------------
 // constructor
 //------------------------------------------------------------------------------
-cta::RetrieveRequest::RetrieveRequest(
+cta::UserRetrieveRequest::UserRetrieveRequest(
   const uint64_t priority,
   const CreationLog & creationLog):
   UserRequest(priority, creationLog) {
diff --git a/scheduler/RetrieveRequest.hpp b/scheduler/UserRetrieveRequest.hpp
similarity index 90%
rename from scheduler/RetrieveRequest.hpp
rename to scheduler/UserRetrieveRequest.hpp
index e01d63d07542dac0051533869548c9e3fa46a414..cfc3aa14ddf7cf3de163664a227463dd9659b766 100644
--- a/scheduler/RetrieveRequest.hpp
+++ b/scheduler/UserRetrieveRequest.hpp
@@ -27,18 +27,18 @@ namespace cta {
 /**
  * Abstract class representing a user request to retrieve some data.
  */
-class RetrieveRequest: public UserRequest {
+class UserRetrieveRequest: public UserRequest {
 public:
 
   /**
    * Constructor.
    */
-  RetrieveRequest();
+  UserRetrieveRequest();
 
   /**
    * Destructor.
    */
-  virtual ~RetrieveRequest() throw() = 0;
+  virtual ~UserRetrieveRequest() throw() = 0;
 
   /**
    * Constructor.
@@ -48,7 +48,7 @@ public:
    * @param creationTime Optionally the absolute time at which the user request
    * was created.  If no value is given then the current time is used.
    */
-  RetrieveRequest(
+  UserRetrieveRequest(
     const uint64_t priority,
     const CreationLog &creationLog);