diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/DispatcherFileSystem.cpp
similarity index 98%
rename from src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.cpp
rename to src/add-ons/kernel/file_systems/userlandfs/server/DispatcherFileSystem.cpp
index cf41884637..1d9fc7c3a3 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.cpp
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/DispatcherFileSystem.cpp
@@ -1,5 +1,7 @@
 // FileSystem.cpp
 
+#include "DispatcherFileSystem.h"
+
 #include <Application.h>
 #include <Autolock.h>
 #include <Entry.h>
@@ -9,7 +11,6 @@
 
 #include "Debug.h"
 #include "DispatcherDefs.h"
-#include "FileSystem.h"
 #include "ServerDefs.h"
 
 // constructor
diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.h b/src/add-ons/kernel/file_systems/userlandfs/server/DispatcherFileSystem.h
similarity index 90%
rename from src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.h
rename to src/add-ons/kernel/file_systems/userlandfs/server/DispatcherFileSystem.h
index 47e62edb30..356462db31 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.h
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/DispatcherFileSystem.h
@@ -11,6 +11,7 @@
 #include "String.h"
 
 namespace UserlandFS {
+namespace Dispatcher {
 
 class FileSystem : public LazyInitializable, public Referencable {
 public:
@@ -39,8 +40,9 @@ private:
 	mutable	BLocker				fTeamLock;
 };
 
+}	// namespace Dispatcher
 }	// namespace UserlandFS
 
-using UserlandFS::FileSystem;
+using UserlandFS::Dispatcher::FileSystem;
 
 #endif	// USERLAND_FS_FILE_SYSTEM_H
diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSDispatcher.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSDispatcher.cpp
index 3fdfe6a6db..81584ecb29 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSDispatcher.cpp
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSDispatcher.cpp
@@ -13,7 +13,7 @@
 #include "Compatibility.h"
 #include "Debug.h"
 #include "DispatcherDefs.h"
-#include "FileSystem.h"
+#include "DispatcherFileSystem.h"
 #include "FSInfo.h"
 #include "RequestAllocator.h"
 #include "RequestPort.h"
diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSDispatcher.h b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSDispatcher.h
index 97059864f9..ebcaba04f9 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSDispatcher.h
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSDispatcher.h
@@ -21,7 +21,10 @@ using UserlandFSUtil::String;
 
 namespace UserlandFS {
 
+namespace Dispatcher {
 class FileSystem;
+}
+using Dispatcher::FileSystem;
 
 class UserlandFSDispatcher : public BApplication {
 public: