diff --git a/src/workspace.cpp b/src/workspace.cpp
index f072fd52cb..302475c22d 100644
--- a/src/workspace.cpp
+++ b/src/workspace.cpp
@@ -731,7 +731,7 @@ void Workspace::removeX11Window(X11Window *window)
     if (group != nullptr) {
         group->lostLeader();
     }
-    removeAbstractClient(window);
+    removeWindow(window);
 }
 
 void Workspace::removeUnmanaged(Unmanaged *window)
@@ -799,10 +799,10 @@ void Workspace::addWaylandWindow(Window *window)
 void Workspace::removeWaylandWindow(Window *window)
 {
     windowHidden(window);
-    removeAbstractClient(window);
+    removeWindow(window);
 }
 
-void Workspace::removeAbstractClient(Window *window)
+void Workspace::removeWindow(Window *window)
 {
     if (window == m_activePopupWindow) {
         closeActivePopup();
diff --git a/src/workspace.h b/src/workspace.h
index 8eaf2a1512..c9d957f8ff 100644
--- a/src/workspace.h
+++ b/src/workspace.h
@@ -585,7 +585,7 @@ private:
     void updateWindowVisibilityOnDesktopChange(VirtualDesktop *newDesktop);
     void activateWindowOnNewDesktop(VirtualDesktop *desktop);
     Window *findWindowToActivateOnDesktop(VirtualDesktop *desktop);
-    void removeAbstractClient(Window *client);
+    void removeWindow(Window *window);
 
     struct Constraint
     {