diff --git a/CMakeLists.txt b/CMakeLists.txt
index 132ad80944a5eb12f7f0fa5257d25e3ec8b4eb80..d652cac57704dd6337c053999c02dc157db9444e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ include_directories(${PROJECT_SOURCE_DIR})
 add_subdirectory(utils)
 add_subdirectory(objectstore)
 add_subdirectory(middletier)
-add_subdirectory(namespace)
+add_subdirectory(nameserver)
 add_subdirectory(tests)
 add_subdirectory(xroot_clients)
 add_subdirectory(xroot_plugins)
diff --git a/middletier/SQLite/SqliteMiddleTierAdmin.hpp b/middletier/SQLite/SqliteMiddleTierAdmin.hpp
index 78c158c0054d2c884285c78940c6b4b620cc49d7..950385d32ddad3baacea316c4babf0766386f38b 100644
--- a/middletier/SQLite/SqliteMiddleTierAdmin.hpp
+++ b/middletier/SQLite/SqliteMiddleTierAdmin.hpp
@@ -20,7 +20,7 @@
 
 #include "middletier/interface/MiddleTierAdmin.hpp"
 #include "middletier/SQLite/SqliteDatabase.hpp"
-#include "namespace/Vfs.hpp"
+#include "nameserver/Vfs.hpp"
 
 namespace cta {
 
diff --git a/middletier/SQLite/SqliteMiddleTierTest.cpp b/middletier/SQLite/SqliteMiddleTierTest.cpp
index 43f2b02d5e25edbbc658cab78959b4bbcb20befa..e990bc8e934360e38f551b0ecd42ac9fd09cd0f2 100644
--- a/middletier/SQLite/SqliteMiddleTierTest.cpp
+++ b/middletier/SQLite/SqliteMiddleTierTest.cpp
@@ -22,7 +22,7 @@
 #include "middletier/SQLite/SqliteDatabase.hpp"
 #include "middletier/SQLite/SqliteMiddleTierAdmin.hpp"
 #include "middletier/SQLite/SqliteMiddleTierUser.hpp"
-#include "namespace/Vfs.hpp"
+#include "nameserver/Vfs.hpp"
 
 
 namespace unitTests {
diff --git a/middletier/SQLite/SqliteMiddleTierUser.hpp b/middletier/SQLite/SqliteMiddleTierUser.hpp
index 36557dcb697cbfd825f284f321f4d9d7e7e1db51..9fe9271992217eb0cc532b17c26bdbc0fc68b5f2 100644
--- a/middletier/SQLite/SqliteMiddleTierUser.hpp
+++ b/middletier/SQLite/SqliteMiddleTierUser.hpp
@@ -23,7 +23,7 @@
 #include "middletier/interface/MiddleTierUser.hpp"
 #include "middletier/SQLite/SqliteDatabase.hpp"
 #include "middletier/interface/StorageClass.hpp"
-#include "namespace/Vfs.hpp"
+#include "nameserver/Vfs.hpp"
 
 namespace cta {
 
diff --git a/namespace/CMakeLists.txt b/nameserver/CMakeLists.txt
similarity index 100%
rename from namespace/CMakeLists.txt
rename to nameserver/CMakeLists.txt
diff --git a/namespace/MockNameServer.cpp b/nameserver/MockNameServer.cpp
similarity index 99%
rename from namespace/MockNameServer.cpp
rename to nameserver/MockNameServer.cpp
index cfd1ff320918bc2ed3e99401c11248a6654337a7..2977229e70c5b0f346fe9997d55384d52eaa4e40 100644
--- a/namespace/MockNameServer.cpp
+++ b/nameserver/MockNameServer.cpp
@@ -31,7 +31,7 @@
 #include "utils/exception/Exception.hpp"
 #include "utils/exception/Errnum.hpp"
 #include "utils/Utils.hpp"
-#include "namespace/MockNameServer.hpp"
+#include "nameserver/MockNameServer.hpp"
 using cta::exception::Exception;
 
 //------------------------------------------------------------------------------
diff --git a/namespace/MockNameServer.hpp b/nameserver/MockNameServer.hpp
similarity index 98%
rename from namespace/MockNameServer.hpp
rename to nameserver/MockNameServer.hpp
index 4cd07f18758b5601d12f81e90c6cbc87df0af0fd..d2e0beb65bfb5c2c713e476a1863c8d9f5aac0b8 100644
--- a/namespace/MockNameServer.hpp
+++ b/nameserver/MockNameServer.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "middletier/interface/DirIterator.hpp"
-#include "namespace/NameServer.hpp"
+#include "nameserver/NameServer.hpp"
 #include "middletier/interface/SecurityIdentity.hpp"
 
 #include <list>
diff --git a/namespace/MockNameServerTest.cpp b/nameserver/MockNameServerTest.cpp
similarity index 99%
rename from namespace/MockNameServerTest.cpp
rename to nameserver/MockNameServerTest.cpp
index 1f7b792d2472a08481fc64314f94945b1a6ae4d8..7e9c023ba4d64ead0134295c2f67a8ec40fb0dbc 100644
--- a/namespace/MockNameServerTest.cpp
+++ b/nameserver/MockNameServerTest.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "namespace/MockNameServer.hpp"
+#include "nameserver/MockNameServer.hpp"
 
 #include <gtest/gtest.h>
 #include <memory>
diff --git a/namespace/NameServer.cpp b/nameserver/NameServer.cpp
similarity index 96%
rename from namespace/NameServer.cpp
rename to nameserver/NameServer.cpp
index 9a3614f7237fb775c00dea7e07adce03019d1e7c..81fcec9ccaff22331144f134728c0ccdfbcfb8cd 100644
--- a/namespace/NameServer.cpp
+++ b/nameserver/NameServer.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "namespace/NameServer.hpp"
+#include "nameserver/NameServer.hpp"
 
 //------------------------------------------------------------------------------
 // destructor
diff --git a/namespace/NameServer.hpp b/nameserver/NameServer.hpp
similarity index 100%
rename from namespace/NameServer.hpp
rename to nameserver/NameServer.hpp
diff --git a/namespace/Vfs.cpp b/nameserver/Vfs.cpp
similarity index 99%
rename from namespace/Vfs.cpp
rename to nameserver/Vfs.cpp
index c0d7abd252664b58fb39c7d4ac819e6c9e3f4288..81be48b5f32d283b087632f3de48a7264f9ae489 100644
--- a/namespace/Vfs.cpp
+++ b/nameserver/Vfs.cpp
@@ -31,7 +31,7 @@
 #include "utils/exception/Exception.hpp"
 #include "utils/exception/Errnum.hpp"
 #include "utils/Utils.hpp"
-#include "namespace/Vfs.hpp"
+#include "nameserver/Vfs.hpp"
 
 using cta::exception::Exception;
 
diff --git a/namespace/Vfs.hpp b/nameserver/Vfs.hpp
similarity index 100%
rename from namespace/Vfs.hpp
rename to nameserver/Vfs.hpp
diff --git a/namespace/VfsTest.cpp b/nameserver/VfsTest.cpp
similarity index 99%
rename from namespace/VfsTest.cpp
rename to nameserver/VfsTest.cpp
index e0a63b74a27a1b85af0c50ffb2d410336a8a74cd..c968449f72569b80fdacf52b727f5f6647741ff7 100644
--- a/namespace/VfsTest.cpp
+++ b/nameserver/VfsTest.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "namespace/Vfs.hpp"
+#include "nameserver/Vfs.hpp"
 
 #include <gtest/gtest.h>