diff --git a/Servers/WindowServer/Makefile b/Servers/WindowServer/Makefile
index f92f14e230..a51fd588c8 100644
--- a/Servers/WindowServer/Makefile
+++ b/Servers/WindowServer/Makefile
@@ -27,7 +27,7 @@ WINDOWSERVER_OBJS = \
     WSButton.o \
     WSCPUMonitor.o \
     WSCompositor.o \
-    WSMenuBarKeeper.o \
+    WSMenuManager.o \
     main.o
 
 APP = WindowServer
diff --git a/Servers/WindowServer/WSMenuBarKeeper.cpp b/Servers/WindowServer/WSMenuManager.cpp
similarity index 100%
rename from Servers/WindowServer/WSMenuBarKeeper.cpp
rename to Servers/WindowServer/WSMenuManager.cpp
diff --git a/Servers/WindowServer/WSMenuBarKeeper.h b/Servers/WindowServer/WSMenuManager.h
similarity index 100%
rename from Servers/WindowServer/WSMenuBarKeeper.h
rename to Servers/WindowServer/WSMenuManager.h
diff --git a/Servers/WindowServer/WSWindowManager.h b/Servers/WindowServer/WSWindowManager.h
index 2e85a2b27f..eaadf75d57 100644
--- a/Servers/WindowServer/WSWindowManager.h
+++ b/Servers/WindowServer/WSWindowManager.h
@@ -13,7 +13,7 @@
 #include <WindowServer/WSCursor.h>
 #include <WindowServer/WSEvent.h>
 #include <WindowServer/WSMenuBar.h>
-#include <WindowServer/WSMenuBarKeeper.h>
+#include <WindowServer/WSMenuManager.h>
 #include <WindowServer/WSWindow.h>
 #include <WindowServer/WSWindowSwitcher.h>
 #include <WindowServer/WSWindowType.h>