diff --git a/Base/etc/WindowServer.ini b/Base/etc/WindowServer.ini
index 1cd11cfeb6..aad19480cd 100644
--- a/Base/etc/WindowServer.ini
+++ b/Base/etc/WindowServer.ini
@@ -34,6 +34,6 @@ Mode=stretch
 [Applet]
 Order=DesktopPicker,CPUGraph,MemoryGraph,Network,ClipboardHistory,Audio
 
-[VirtualDesktops]
+[Workspaces]
 Rows=2
 Columns=2
diff --git a/Userland/Applets/DesktopPicker/DesktopStatusWindow.cpp b/Userland/Applets/DesktopPicker/DesktopStatusWindow.cpp
index acc4442128..437fa7ff52 100644
--- a/Userland/Applets/DesktopPicker/DesktopStatusWindow.cpp
+++ b/Userland/Applets/DesktopPicker/DesktopStatusWindow.cpp
@@ -23,8 +23,8 @@ public:
     {
         auto& desktop = GUI::Desktop::the();
 
-        auto vcols = desktop.virtual_desktop_columns();
-        auto vrows = desktop.virtual_desktop_rows();
+        auto vcols = desktop.workspace_columns();
+        auto vrows = desktop.workspace_rows();
 
         auto desktop_width = (width() - gap() * (vcols - 1)) / vcols;
         auto desktop_height = (height() - gap() * (vrows - 1)) / vrows;
@@ -48,8 +48,8 @@ public:
         auto active_color = palette().active_window_border1();
         auto inactive_color = palette().inactive_window_border1();
 
-        for (unsigned row = 0; row < desktop.virtual_desktop_rows(); ++row) {
-            for (unsigned col = 0; col < desktop.virtual_desktop_columns(); ++col) {
+        for (unsigned row = 0; row < desktop.workspace_rows(); ++row) {
+            for (unsigned col = 0; col < desktop.workspace_columns(); ++col) {
                 painter.fill_rect(rect_for_desktop(row, col),
                     (row == current_row() && col == current_col()) ? active_color : inactive_color);
             }
@@ -64,7 +64,7 @@ public:
 
         // Handle case where divider is clicked.
         if (rect_for_desktop(row, col).contains(event.position()))
-            GUI::WindowManagerServerConnection::the().async_set_virtual_desktop(row, col);
+            GUI::WindowManagerServerConnection::the().async_set_workspace(row, col);
     }
 
     virtual void mousewheel_event(GUI::MouseEvent& event) override
@@ -74,8 +74,8 @@ public:
         auto col = current_col();
         auto row = current_row();
 
-        auto vcols = desktop.virtual_desktop_columns();
-        auto vrows = desktop.virtual_desktop_rows();
+        auto vcols = desktop.workspace_columns();
+        auto vrows = desktop.workspace_rows();
         auto direction = event.wheel_delta() < 0 ? 1 : -1;
 
         if (event.modifiers() & Mod_Shift)
@@ -83,7 +83,7 @@ public:
         else
             row = abs((int)row + direction) % vrows;
 
-        GUI::WindowManagerServerConnection::the().async_set_virtual_desktop(row, col);
+        GUI::WindowManagerServerConnection::the().async_set_workspace(row, col);
     }
 
     unsigned current_row() const { return m_current_row; }
@@ -120,8 +120,8 @@ DesktopStatusWindow::~DesktopStatusWindow()
 
 void DesktopStatusWindow::wm_event(GUI::WMEvent& event)
 {
-    if (event.type() == GUI::Event::WM_VirtualDesktopChanged) {
-        auto& changed_event = static_cast<GUI::WMVirtualDesktopChangedEvent&>(event);
+    if (event.type() == GUI::Event::WM_WorkspaceChanged) {
+        auto& changed_event = static_cast<GUI::WMWorkspaceChangedEvent&>(event);
         m_widget->set_current_row(changed_event.current_row());
         m_widget->set_current_col(changed_event.current_column());
         update();
diff --git a/Userland/Applets/DesktopPicker/main.cpp b/Userland/Applets/DesktopPicker/main.cpp
index 66dd261ab0..57b203b3c6 100644
--- a/Userland/Applets/DesktopPicker/main.cpp
+++ b/Userland/Applets/DesktopPicker/main.cpp
@@ -33,7 +33,7 @@ int main(int argc, char** argv)
     window->set_title("DesktopPicker");
     window->resize(28, 16);
     window->show();
-    window->make_window_manager(WindowServer::WMEventMask::VirtualDesktopChanges);
+    window->make_window_manager(WindowServer::WMEventMask::WorkspaceChanges);
 
     return app->exec();
 }
diff --git a/Userland/Applications/DisplaySettings/DesktopSettings.gml b/Userland/Applications/DisplaySettings/DesktopSettings.gml
index 1a9dc86c12..58477d596e 100644
--- a/Userland/Applications/DisplaySettings/DesktopSettings.gml
+++ b/Userland/Applications/DisplaySettings/DesktopSettings.gml
@@ -26,7 +26,7 @@
             }
 
             @GUI::SpinBox {
-                name: "virtual_desktop_rows_spinbox"
+                name: "workspace_rows_spinbox"
                 min: 1
                 max: 16
                 orientation: "Horizontal"
@@ -38,7 +38,7 @@
             }
 
             @GUI::SpinBox {
-                name: "virtual_desktop_columns_spinbox"
+                name: "workspace_columns_spinbox"
                 min: 1
                 max: 16
                 orientation: "Horizontal"
diff --git a/Userland/Applications/DisplaySettings/DesktopSettingsWidget.cpp b/Userland/Applications/DisplaySettings/DesktopSettingsWidget.cpp
index 920f23a0fc..bb4b984685 100644
--- a/Userland/Applications/DisplaySettings/DesktopSettingsWidget.cpp
+++ b/Userland/Applications/DisplaySettings/DesktopSettingsWidget.cpp
@@ -32,26 +32,26 @@ void DesktopSettingsWidget::create_frame()
     auto& light_bulb_label = *find_descendant_of_type_named<GUI::Label>("light_bulb_label");
     light_bulb_label.set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/32x32/app-welcome.png").release_value_but_fixme_should_propagate_errors());
 
-    m_virtual_desktop_rows_spinbox = *find_descendant_of_type_named<GUI::SpinBox>("virtual_desktop_rows_spinbox");
-    m_virtual_desktop_columns_spinbox = *find_descendant_of_type_named<GUI::SpinBox>("virtual_desktop_columns_spinbox");
+    m_workspace_rows_spinbox = *find_descendant_of_type_named<GUI::SpinBox>("workspace_rows_spinbox");
+    m_workspace_columns_spinbox = *find_descendant_of_type_named<GUI::SpinBox>("workspace_columns_spinbox");
 }
 
 void DesktopSettingsWidget::load_current_settings()
 {
     auto& desktop = GUI::Desktop::the();
-    m_virtual_desktop_rows_spinbox->set_value(desktop.virtual_desktop_rows());
-    m_virtual_desktop_columns_spinbox->set_value(desktop.virtual_desktop_columns());
+    m_workspace_rows_spinbox->set_value(desktop.workspace_rows());
+    m_workspace_columns_spinbox->set_value(desktop.workspace_columns());
 }
 
 void DesktopSettingsWidget::apply_settings()
 {
-    auto virtual_desktop_rows = (unsigned)m_virtual_desktop_rows_spinbox->value();
-    auto virtual_desktop_columns = (unsigned)m_virtual_desktop_columns_spinbox->value();
+    auto workspace_rows = (unsigned)m_workspace_rows_spinbox->value();
+    auto workspace_columns = (unsigned)m_workspace_columns_spinbox->value();
     auto& desktop = GUI::Desktop::the();
-    if (virtual_desktop_rows != desktop.virtual_desktop_rows() || virtual_desktop_columns != desktop.virtual_desktop_columns()) {
-        if (!GUI::WindowServerConnection::the().apply_virtual_desktop_settings(virtual_desktop_rows, virtual_desktop_columns, true)) {
-            GUI::MessageBox::show(window(), String::formatted("Error applying virtual desktop settings"),
-                "Virtual desktop settings", GUI::MessageBox::Type::Error);
+    if (workspace_rows != desktop.workspace_rows() || workspace_columns != desktop.workspace_columns()) {
+        if (!GUI::WindowServerConnection::the().apply_workspace_settings(workspace_rows, workspace_columns, true)) {
+            GUI::MessageBox::show(window(), String::formatted("Error applying workspace settings"),
+                "Workspace settings", GUI::MessageBox::Type::Error);
         }
     }
 }
diff --git a/Userland/Applications/DisplaySettings/DesktopSettingsWidget.h b/Userland/Applications/DisplaySettings/DesktopSettingsWidget.h
index d894756cc5..1c3c965f76 100644
--- a/Userland/Applications/DisplaySettings/DesktopSettingsWidget.h
+++ b/Userland/Applications/DisplaySettings/DesktopSettingsWidget.h
@@ -25,8 +25,8 @@ private:
     void create_frame();
     void load_current_settings();
 
-    RefPtr<GUI::SpinBox> m_virtual_desktop_rows_spinbox;
-    RefPtr<GUI::SpinBox> m_virtual_desktop_columns_spinbox;
+    RefPtr<GUI::SpinBox> m_workspace_rows_spinbox;
+    RefPtr<GUI::SpinBox> m_workspace_columns_spinbox;
 };
 
 }
diff --git a/Userland/Libraries/LibGUI/Desktop.cpp b/Userland/Libraries/LibGUI/Desktop.cpp
index 0fcf69dc23..f9b23a320f 100644
--- a/Userland/Libraries/LibGUI/Desktop.cpp
+++ b/Userland/Libraries/LibGUI/Desktop.cpp
@@ -26,7 +26,7 @@ Desktop::Desktop()
 {
 }
 
-void Desktop::did_receive_screen_rects(Badge<WindowServerConnection>, const Vector<Gfx::IntRect, 4>& rects, size_t main_screen_index, unsigned virtual_desktop_rows, unsigned virtual_desktop_columns)
+void Desktop::did_receive_screen_rects(Badge<WindowServerConnection>, const Vector<Gfx::IntRect, 4>& rects, size_t main_screen_index, unsigned workspace_rows, unsigned workspace_columns)
 {
     m_main_screen_index = main_screen_index;
     m_rects = rects;
@@ -38,8 +38,8 @@ void Desktop::did_receive_screen_rects(Badge<WindowServerConnection>, const Vect
         m_bounding_rect = {};
     }
 
-    m_virtual_desktop_rows = virtual_desktop_rows;
-    m_virtual_desktop_columns = virtual_desktop_columns;
+    m_workspace_rows = workspace_rows;
+    m_workspace_columns = workspace_columns;
 
     for (auto& callback : m_receive_rects_callbacks)
         callback(*this);
diff --git a/Userland/Libraries/LibGUI/Desktop.h b/Userland/Libraries/LibGUI/Desktop.h
index 9dc0842923..c29ec616b1 100644
--- a/Userland/Libraries/LibGUI/Desktop.h
+++ b/Userland/Libraries/LibGUI/Desktop.h
@@ -36,8 +36,8 @@ public:
     const Vector<Gfx::IntRect, 4>& rects() const { return m_rects; }
     size_t main_screen_index() const { return m_main_screen_index; }
 
-    unsigned virtual_desktop_rows() const { return m_virtual_desktop_rows; }
-    unsigned virtual_desktop_columns() const { return m_virtual_desktop_columns; }
+    unsigned workspace_rows() const { return m_workspace_rows; }
+    unsigned workspace_columns() const { return m_workspace_columns; }
 
     int taskbar_height() const { return TaskbarWindow::taskbar_height(); }
 
@@ -53,8 +53,8 @@ private:
     Vector<Gfx::IntRect, default_screen_rect_count> m_rects;
     size_t m_main_screen_index { 0 };
     Gfx::IntRect m_bounding_rect;
-    unsigned m_virtual_desktop_rows { 1 };
-    unsigned m_virtual_desktop_columns { 1 };
+    unsigned m_workspace_rows { 1 };
+    unsigned m_workspace_columns { 1 };
     Vector<Function<void(Desktop&)>> m_receive_rects_callbacks;
 };
 
diff --git a/Userland/Libraries/LibGUI/Event.h b/Userland/Libraries/LibGUI/Event.h
index 13e7b3953b..52c3993b27 100644
--- a/Userland/Libraries/LibGUI/Event.h
+++ b/Userland/Libraries/LibGUI/Event.h
@@ -66,7 +66,7 @@ public:
         WM_AppletAreaSizeChanged,
         WM_SuperKeyPressed,
         WM_SuperSpaceKeyPressed,
-        WM_VirtualDesktopChanged,
+        WM_WorkspaceChanged,
         __End_WM_Events,
     };
 
@@ -138,15 +138,15 @@ public:
 
 class WMWindowStateChangedEvent : public WMEvent {
 public:
-    WMWindowStateChangedEvent(int client_id, int window_id, int parent_client_id, int parent_window_id, StringView title, const Gfx::IntRect& rect, unsigned virtual_desktop_row, unsigned virtual_desktop_column, bool is_active, bool is_modal, WindowType window_type, bool is_minimized, bool is_frameless, Optional<int> progress)
+    WMWindowStateChangedEvent(int client_id, int window_id, int parent_client_id, int parent_window_id, StringView title, const Gfx::IntRect& rect, unsigned workspace_row, unsigned workspace_column, bool is_active, bool is_modal, WindowType window_type, bool is_minimized, bool is_frameless, Optional<int> progress)
         : WMEvent(Event::Type::WM_WindowStateChanged, client_id, window_id)
         , m_parent_client_id(parent_client_id)
         , m_parent_window_id(parent_window_id)
         , m_title(title)
         , m_rect(rect)
         , m_window_type(window_type)
-        , m_virtual_desktop_row(virtual_desktop_row)
-        , m_virtual_desktop_column(virtual_desktop_column)
+        , m_workspace_row(workspace_row)
+        , m_workspace_column(workspace_column)
         , m_active(is_active)
         , m_modal(is_modal)
         , m_minimized(is_minimized)
@@ -165,8 +165,8 @@ public:
     bool is_minimized() const { return m_minimized; }
     bool is_frameless() const { return m_frameless; }
     Optional<int> progress() const { return m_progress; }
-    unsigned virtual_desktop_row() const { return m_virtual_desktop_row; }
-    unsigned virtual_desktop_column() const { return m_virtual_desktop_column; }
+    unsigned workspace_row() const { return m_workspace_row; }
+    unsigned workspace_column() const { return m_workspace_column; }
 
 private:
     int m_parent_client_id;
@@ -174,8 +174,8 @@ private:
     String m_title;
     Gfx::IntRect m_rect;
     WindowType m_window_type;
-    unsigned m_virtual_desktop_row;
-    unsigned m_virtual_desktop_column;
+    unsigned m_workspace_row;
+    unsigned m_workspace_column;
     bool m_active;
     bool m_modal;
     bool m_minimized;
@@ -211,10 +211,10 @@ private:
     RefPtr<Gfx::Bitmap> m_bitmap;
 };
 
-class WMVirtualDesktopChangedEvent : public WMEvent {
+class WMWorkspaceChangedEvent : public WMEvent {
 public:
-    explicit WMVirtualDesktopChangedEvent(int client_id, unsigned current_row, unsigned current_column)
-        : WMEvent(Event::Type::WM_VirtualDesktopChanged, client_id, 0)
+    explicit WMWorkspaceChangedEvent(int client_id, unsigned current_row, unsigned current_column)
+        : WMEvent(Event::Type::WM_WorkspaceChanged, client_id, 0)
         , m_current_row(current_row)
         , m_current_column(current_column)
     {
diff --git a/Userland/Libraries/LibGUI/WindowManagerServerConnection.cpp b/Userland/Libraries/LibGUI/WindowManagerServerConnection.cpp
index 35f5505e3b..bf6912fbcc 100644
--- a/Userland/Libraries/LibGUI/WindowManagerServerConnection.cpp
+++ b/Userland/Libraries/LibGUI/WindowManagerServerConnection.cpp
@@ -19,12 +19,12 @@ WindowManagerServerConnection& WindowManagerServerConnection::the()
 }
 
 void WindowManagerServerConnection::window_state_changed(i32 wm_id, i32 client_id, i32 window_id,
-    i32 parent_client_id, i32 parent_window_id, u32 virtual_desktop_row, u32 virtual_desktop_column,
+    i32 parent_client_id, i32 parent_window_id, u32 workspace_row, u32 workspace_column,
     bool is_active, bool is_minimized, bool is_modal, bool is_frameless, i32 window_type,
     String const& title, Gfx::IntRect const& rect, Optional<i32> const& progress)
 {
     if (auto* window = Window::from_window_id(wm_id))
-        Core::EventLoop::current().post_event(*window, make<WMWindowStateChangedEvent>(client_id, window_id, parent_client_id, parent_window_id, title, rect, virtual_desktop_row, virtual_desktop_column, is_active, is_modal, static_cast<WindowType>(window_type), is_minimized, is_frameless, progress));
+        Core::EventLoop::current().post_event(*window, make<WMWindowStateChangedEvent>(client_id, window_id, parent_client_id, parent_window_id, title, rect, workspace_row, workspace_column, is_active, is_modal, static_cast<WindowType>(window_type), is_minimized, is_frameless, progress));
 }
 
 void WindowManagerServerConnection::applet_area_size_changed(i32 wm_id, const Gfx::IntSize& size)
@@ -64,10 +64,10 @@ void WindowManagerServerConnection::super_space_key_pressed(i32 wm_id)
         Core::EventLoop::current().post_event(*window, make<WMSuperSpaceKeyPressedEvent>(wm_id));
 }
 
-void WindowManagerServerConnection::virtual_desktop_changed(i32 wm_id, u32 row, u32 column)
+void WindowManagerServerConnection::workspace_changed(i32 wm_id, u32 row, u32 column)
 {
     if (auto* window = Window::from_window_id(wm_id))
-        Core::EventLoop::current().post_event(*window, make<WMVirtualDesktopChangedEvent>(wm_id, row, column));
+        Core::EventLoop::current().post_event(*window, make<WMWorkspaceChangedEvent>(wm_id, row, column));
 }
 
 }
diff --git a/Userland/Libraries/LibGUI/WindowManagerServerConnection.h b/Userland/Libraries/LibGUI/WindowManagerServerConnection.h
index 053c901564..620e3cd0aa 100644
--- a/Userland/Libraries/LibGUI/WindowManagerServerConnection.h
+++ b/Userland/Libraries/LibGUI/WindowManagerServerConnection.h
@@ -33,7 +33,7 @@ private:
     virtual void applet_area_size_changed(i32, Gfx::IntSize const&) override;
     virtual void super_key_pressed(i32) override;
     virtual void super_space_key_pressed(i32) override;
-    virtual void virtual_desktop_changed(i32, u32, u32) override;
+    virtual void workspace_changed(i32, u32, u32) override;
 };
 
 }
diff --git a/Userland/Libraries/LibGUI/WindowServerConnection.cpp b/Userland/Libraries/LibGUI/WindowServerConnection.cpp
index 402b52461c..c3ba84086e 100644
--- a/Userland/Libraries/LibGUI/WindowServerConnection.cpp
+++ b/Userland/Libraries/LibGUI/WindowServerConnection.cpp
@@ -47,7 +47,7 @@ WindowServerConnection::WindowServerConnection()
     //       All we have to do is wait for it to arrive. This avoids a round-trip during application startup.
     auto message = wait_for_specific_message<Messages::WindowClient::FastGreet>();
     set_system_theme_from_anonymous_buffer(message->theme_buffer());
-    Desktop::the().did_receive_screen_rects({}, message->screen_rects(), message->main_screen_index(), message->virtual_desktop_rows(), message->virtual_desktop_columns());
+    Desktop::the().did_receive_screen_rects({}, message->screen_rects(), message->main_screen_index(), message->workspace_rows(), message->workspace_columns());
     Gfx::FontDatabase::set_default_font_query(message->default_font_query());
     Gfx::FontDatabase::set_fixed_width_font_query(message->fixed_width_font_query());
     m_client_id = message->client_id();
@@ -314,9 +314,9 @@ void WindowServerConnection::menu_item_left(i32 menu_id, u32 identifier)
     Core::EventLoop::current().post_event(*app, make<ActionEvent>(GUI::Event::ActionLeave, *action));
 }
 
-void WindowServerConnection::screen_rects_changed(Vector<Gfx::IntRect> const& rects, u32 main_screen_index, u32 virtual_desktop_rows, u32 virtual_desktop_columns)
+void WindowServerConnection::screen_rects_changed(Vector<Gfx::IntRect> const& rects, u32 main_screen_index, u32 workspace_rows, u32 workspace_columns)
 {
-    Desktop::the().did_receive_screen_rects({}, rects, main_screen_index, virtual_desktop_rows, virtual_desktop_columns);
+    Desktop::the().did_receive_screen_rects({}, rects, main_screen_index, workspace_rows, workspace_columns);
     Window::for_each_window({}, [&](auto& window) {
         Core::EventLoop::current().post_event(window, make<ScreenRectsChangeEvent>(rects, main_screen_index));
     });
diff --git a/Userland/Services/Taskbar/TaskbarWindow.cpp b/Userland/Services/Taskbar/TaskbarWindow.cpp
index deddc328cc..e2a5555039 100644
--- a/Userland/Services/Taskbar/TaskbarWindow.cpp
+++ b/Userland/Services/Taskbar/TaskbarWindow.cpp
@@ -227,7 +227,7 @@ void TaskbarWindow::update_window_button(::Window& window, bool show_as_active)
     button->set_text(window.title());
     button->set_tooltip(window.title());
     button->set_checked(show_as_active);
-    button->set_visible(is_window_on_current_virtual_desktop(window));
+    button->set_visible(is_window_on_current_workspace(window));
 }
 
 ::Window* TaskbarWindow::find_window_owner(::Window& window) const
@@ -351,7 +351,7 @@ void TaskbarWindow::wm_event(GUI::WMEvent& event)
         window.set_active(changed_event.is_active());
         window.set_minimized(changed_event.is_minimized());
         window.set_progress(changed_event.progress());
-        window.set_virtual_desktop(changed_event.virtual_desktop_row(), changed_event.virtual_desktop_column());
+        window.set_workspace(changed_event.workspace_row(), changed_event.workspace_column());
 
         auto* window_owner = find_window_owner(window);
         if (window_owner == &window) {
@@ -384,9 +384,9 @@ void TaskbarWindow::wm_event(GUI::WMEvent& event)
             warnln("failed to spawn 'Assistant' when requested via Super+Space");
         break;
     }
-    case GUI::Event::WM_VirtualDesktopChanged: {
-        auto& changed_event = static_cast<GUI::WMVirtualDesktopChangedEvent&>(event);
-        virtual_desktop_change_event(changed_event.current_row(), changed_event.current_column());
+    case GUI::Event::WM_WorkspaceChanged: {
+        auto& changed_event = static_cast<GUI::WMWorkspaceChangedEvent&>(event);
+        workspace_change_event(changed_event.current_row(), changed_event.current_column());
         break;
     }
     default:
@@ -399,19 +399,19 @@ void TaskbarWindow::screen_rects_change_event(GUI::ScreenRectsChangeEvent& event
     on_screen_rects_change(event.rects(), event.main_screen_index());
 }
 
-bool TaskbarWindow::is_window_on_current_virtual_desktop(::Window& window) const
+bool TaskbarWindow::is_window_on_current_workspace(::Window& window) const
 {
-    return window.virtual_desktop_row() == m_current_virtual_desktop_row && window.virtual_desktop_column() == m_current_virtual_desktop_column;
+    return window.workspace_row() == m_current_workspace_row && window.workspace_column() == m_current_workspace_column;
 }
 
-void TaskbarWindow::virtual_desktop_change_event(unsigned current_row, unsigned current_column)
+void TaskbarWindow::workspace_change_event(unsigned current_row, unsigned current_column)
 {
-    m_current_virtual_desktop_row = current_row;
-    m_current_virtual_desktop_column = current_column;
+    m_current_workspace_row = current_row;
+    m_current_workspace_column = current_column;
 
     WindowList::the().for_each_window([&](auto& window) {
         if (auto* button = window.button())
-            button->set_visible(is_window_on_current_virtual_desktop(window));
+            button->set_visible(is_window_on_current_workspace(window));
     });
 }
 
diff --git a/Userland/Services/Taskbar/TaskbarWindow.h b/Userland/Services/Taskbar/TaskbarWindow.h
index a7464a925b..424241f6ad 100644
--- a/Userland/Services/Taskbar/TaskbarWindow.h
+++ b/Userland/Services/Taskbar/TaskbarWindow.h
@@ -37,8 +37,8 @@ private:
 
     void update_applet_area();
 
-    bool is_window_on_current_virtual_desktop(::Window&) const;
-    void virtual_desktop_change_event(unsigned, unsigned);
+    bool is_window_on_current_workspace(::Window&) const;
+    void workspace_change_event(unsigned, unsigned);
 
     void set_start_button_font(Gfx::Font const&);
 
@@ -53,6 +53,6 @@ private:
 
     RefPtr<Desktop::AppFile> m_assistant_app_file;
 
-    unsigned m_current_virtual_desktop_row { 0 };
-    unsigned m_current_virtual_desktop_column { 0 };
+    unsigned m_current_workspace_row { 0 };
+    unsigned m_current_workspace_column { 0 };
 };
diff --git a/Userland/Services/Taskbar/WindowList.h b/Userland/Services/Taskbar/WindowList.h
index 6a0eb427f3..a297db1939 100644
--- a/Userland/Services/Taskbar/WindowList.h
+++ b/Userland/Services/Taskbar/WindowList.h
@@ -48,13 +48,13 @@ public:
     void set_modal(bool modal) { m_modal = modal; }
     bool is_modal() const { return m_modal; }
 
-    void set_virtual_desktop(unsigned row, unsigned column)
+    void set_workspace(unsigned row, unsigned column)
     {
-        m_virtual_desktop_row = row;
-        m_virtual_desktop_column = column;
+        m_workspace_row = row;
+        m_workspace_column = column;
     }
-    unsigned virtual_desktop_row() const { return m_virtual_desktop_row; }
-    unsigned virtual_desktop_column() const { return m_virtual_desktop_column; }
+    unsigned workspace_row() const { return m_workspace_row; }
+    unsigned workspace_column() const { return m_workspace_column; }
 
     void set_progress(Optional<int> progress)
     {
@@ -76,8 +76,8 @@ private:
     Gfx::IntRect m_rect;
     RefPtr<GUI::Button> m_button;
     RefPtr<Gfx::Bitmap> m_icon;
-    unsigned m_virtual_desktop_row { 0 };
-    unsigned m_virtual_desktop_column { 0 };
+    unsigned m_workspace_row { 0 };
+    unsigned m_workspace_column { 0 };
     bool m_active { false };
     bool m_minimized { false };
     bool m_modal { false };
diff --git a/Userland/Services/Taskbar/main.cpp b/Userland/Services/Taskbar/main.cpp
index e0cd1d73ba..780f415b09 100644
--- a/Userland/Services/Taskbar/main.cpp
+++ b/Userland/Services/Taskbar/main.cpp
@@ -63,7 +63,7 @@ int main(int argc, char** argv)
         WindowServer::WMEventMask::WindowStateChanges
         | WindowServer::WMEventMask::WindowRemovals
         | WindowServer::WMEventMask::WindowIconChanges
-        | WindowServer::WMEventMask::VirtualDesktopChanges);
+        | WindowServer::WMEventMask::WorkspaceChanges);
 
     return app->exec();
 }
diff --git a/Userland/Services/WindowServer/ClientConnection.cpp b/Userland/Services/WindowServer/ClientConnection.cpp
index 85e4929ff8..9979cc52c5 100644
--- a/Userland/Services/WindowServer/ClientConnection.cpp
+++ b/Userland/Services/WindowServer/ClientConnection.cpp
@@ -297,15 +297,15 @@ Messages::WindowServer::SaveScreenLayoutResponse ClientConnection::save_screen_l
     return { success, move(error_msg) };
 }
 
-Messages::WindowServer::ApplyVirtualDesktopSettingsResponse ClientConnection::apply_virtual_desktop_settings(u32 rows, u32 columns, bool save)
+Messages::WindowServer::ApplyWorkspaceSettingsResponse ClientConnection::apply_workspace_settings(u32 rows, u32 columns, bool save)
 {
     if (rows == 0 || columns == 0 || rows > WindowManager::max_window_stack_rows || columns > WindowManager::max_window_stack_columns)
         return { false };
 
-    return { WindowManager::the().apply_virtual_desktop_settings(rows, columns, save) };
+    return { WindowManager::the().apply_workspace_settings(rows, columns, save) };
 }
 
-Messages::WindowServer::GetVirtualDesktopSettingsResponse ClientConnection::get_virtual_desktop_settings()
+Messages::WindowServer::GetWorkspaceSettingsResponse ClientConnection::get_workspace_settings()
 {
     auto& wm = WindowManager::the();
     return { (unsigned)wm.window_stack_rows(), (unsigned)wm.window_stack_columns(), WindowManager::max_window_stack_rows, WindowManager::max_window_stack_columns };
diff --git a/Userland/Services/WindowServer/ClientConnection.h b/Userland/Services/WindowServer/ClientConnection.h
index 51d90777ea..5821bd95c9 100644
--- a/Userland/Services/WindowServer/ClientConnection.h
+++ b/Userland/Services/WindowServer/ClientConnection.h
@@ -129,8 +129,8 @@ private:
     virtual Messages::WindowServer::SetScreenLayoutResponse set_screen_layout(ScreenLayout const&, bool) override;
     virtual Messages::WindowServer::GetScreenLayoutResponse get_screen_layout() override;
     virtual Messages::WindowServer::SaveScreenLayoutResponse save_screen_layout() override;
-    virtual Messages::WindowServer::ApplyVirtualDesktopSettingsResponse apply_virtual_desktop_settings(u32, u32, bool) override;
-    virtual Messages::WindowServer::GetVirtualDesktopSettingsResponse get_virtual_desktop_settings() override;
+    virtual Messages::WindowServer::ApplyWorkspaceSettingsResponse apply_workspace_settings(u32, u32, bool) override;
+    virtual Messages::WindowServer::GetWorkspaceSettingsResponse get_workspace_settings() override;
     virtual void show_screen_numbers(bool) override;
     virtual void set_window_cursor(i32, i32) override;
     virtual void set_window_custom_cursor(i32, Gfx::ShareableBitmap const&) override;
diff --git a/Userland/Services/WindowServer/WMClientConnection.cpp b/Userland/Services/WindowServer/WMClientConnection.cpp
index 41866be218..3761af90e5 100644
--- a/Userland/Services/WindowServer/WMClientConnection.cpp
+++ b/Userland/Services/WindowServer/WMClientConnection.cpp
@@ -158,7 +158,7 @@ void WMClientConnection::set_manager_window(i32 window_id)
     WindowManager::the().greet_window_manager(*this);
 }
 
-void WMClientConnection::set_virtual_desktop(u32 row, u32 col)
+void WMClientConnection::set_workspace(u32 row, u32 col)
 {
     WindowManager::the().switch_to_window_stack(row, col);
 }
diff --git a/Userland/Services/WindowServer/WMClientConnection.h b/Userland/Services/WindowServer/WMClientConnection.h
index 834b733f30..98ae3aea25 100644
--- a/Userland/Services/WindowServer/WMClientConnection.h
+++ b/Userland/Services/WindowServer/WMClientConnection.h
@@ -30,7 +30,7 @@ public:
     virtual void set_applet_area_position(Gfx::IntPoint const&) override;
     virtual void set_event_mask(u32) override;
     virtual void set_manager_window(i32) override;
-    virtual void set_virtual_desktop(u32, u32) override;
+    virtual void set_workspace(u32, u32) override;
 
     unsigned event_mask() const { return m_event_mask; }
     int window_id() const { return m_window_id; }
diff --git a/Userland/Services/WindowServer/Window.h b/Userland/Services/WindowServer/Window.h
index ea88cff971..3d796d196b 100644
--- a/Userland/Services/WindowServer/Window.h
+++ b/Userland/Services/WindowServer/Window.h
@@ -35,7 +35,7 @@ enum WMEventMask {
     WindowStateChanges = 1 << 1,
     WindowIconChanges = 1 << 2,
     WindowRemovals = 1 << 3,
-    VirtualDesktopChanges = 1 << 4,
+    WorkspaceChanges = 1 << 4,
 };
 
 enum class WindowTileType {
diff --git a/Userland/Services/WindowServer/WindowClient.ipc b/Userland/Services/WindowServer/WindowClient.ipc
index e9a6ac9bf3..29c5cacaf9 100644
--- a/Userland/Services/WindowServer/WindowClient.ipc
+++ b/Userland/Services/WindowServer/WindowClient.ipc
@@ -3,7 +3,7 @@
 
 endpoint WindowClient
 {
-    fast_greet(Vector<Gfx::IntRect> screen_rects, u32 main_screen_index, u32 virtual_desktop_rows, u32 virtual_desktop_columns, Core::AnonymousBuffer theme_buffer, String default_font_query, String fixed_width_font_query, i32 client_id) =|
+    fast_greet(Vector<Gfx::IntRect> screen_rects, u32 main_screen_index, u32 workspace_rows, u32 workspace_columns, Core::AnonymousBuffer theme_buffer, String default_font_query, String fixed_width_font_query, i32 client_id) =|
 
     paint(i32 window_id, Gfx::IntSize window_size, Vector<Gfx::IntRect> rects) =|
     mouse_move(i32 window_id, Gfx::IntPoint mouse_position, u32 button, u32 buttons, u32 modifiers, i32 wheel_delta, bool is_drag, Vector<String> mime_types) =|
@@ -28,7 +28,7 @@ endpoint WindowClient
     menu_item_left(i32 menu_id, u32 identifier) =|
     menu_visibility_did_change(i32 menu_id, bool visible) =|
 
-    screen_rects_changed(Vector<Gfx::IntRect> rects, u32 main_screen_index, u32 virtual_desktop_rows, u32 virtual_desktop_columns) =|
+    screen_rects_changed(Vector<Gfx::IntRect> rects, u32 main_screen_index, u32 workspace_rows, u32 workspace_columns) =|
 
     applet_area_rect_changed(Gfx::IntRect rect) =|
 
diff --git a/Userland/Services/WindowServer/WindowManager.cpp b/Userland/Services/WindowServer/WindowManager.cpp
index 6db0636a18..7f37ea7579 100644
--- a/Userland/Services/WindowServer/WindowManager.cpp
+++ b/Userland/Services/WindowServer/WindowManager.cpp
@@ -63,13 +63,13 @@ void WindowManager::reload_config()
 {
     m_config = Core::ConfigFile::open("/etc/WindowServer.ini", Core::ConfigFile::AllowWriting::Yes);
 
-    unsigned virtual_desktop_rows = (unsigned)m_config->read_num_entry("VirtualDesktop", "Rows", default_window_stack_rows);
-    unsigned virtual_desktop_columns = (unsigned)m_config->read_num_entry("VirtualDesktop", "Columns", default_window_stack_columns);
-    if (virtual_desktop_rows == 0 || virtual_desktop_columns == 0 || virtual_desktop_rows > max_window_stack_rows || virtual_desktop_columns > max_window_stack_columns) {
-        virtual_desktop_rows = default_window_stack_rows;
-        virtual_desktop_columns = default_window_stack_columns;
+    unsigned workspace_rows = (unsigned)m_config->read_num_entry("Workspace", "Rows", default_window_stack_rows);
+    unsigned workspace_columns = (unsigned)m_config->read_num_entry("Workspace", "Columns", default_window_stack_columns);
+    if (workspace_rows == 0 || workspace_columns == 0 || workspace_rows > max_window_stack_rows || workspace_columns > max_window_stack_columns) {
+        workspace_rows = default_window_stack_rows;
+        workspace_columns = default_window_stack_columns;
     }
-    apply_virtual_desktop_settings(virtual_desktop_rows, virtual_desktop_columns, false);
+    apply_workspace_settings(workspace_rows, workspace_columns, false);
 
     m_double_click_speed = m_config->read_num_entry("Input", "DoubleClickSpeed", 250);
     m_buttons_switched = m_config->read_bool_entry("Mouse", "ButtonsSwitched", false);
@@ -139,7 +139,7 @@ bool WindowManager::save_screen_layout(String& error_msg)
     return true;
 }
 
-bool WindowManager::apply_virtual_desktop_settings(unsigned rows, unsigned columns, bool save)
+bool WindowManager::apply_workspace_settings(unsigned rows, unsigned columns, bool save)
 {
     VERIFY(rows != 0);
     VERIFY(rows <= max_window_stack_rows);
@@ -230,7 +230,7 @@ bool WindowManager::apply_virtual_desktop_settings(unsigned rows, unsigned colum
         for (auto* window_moved : windows_moved)
             WindowManager::the().tell_wms_window_state_changed(*window_moved);
 
-        tell_wms_screen_rects_changed(); // updates the available virtual desktops
+        tell_wms_screen_rects_changed(); // updates the available workspaces
         if (current_stack_row != new_current_row || current_stack_column != new_current_column)
             tell_wms_current_window_stack_changed();
 
@@ -239,8 +239,8 @@ bool WindowManager::apply_virtual_desktop_settings(unsigned rows, unsigned colum
     }
 
     if (save) {
-        m_config->write_num_entry("VirtualDesktop", "Rows", window_stack_rows());
-        m_config->write_num_entry("VirtualDesktop", "Columns", window_stack_columns());
+        m_config->write_num_entry("Workspace", "Rows", window_stack_rows());
+        m_config->write_num_entry("Workspace", "Columns", window_stack_columns());
         return m_config->sync();
     }
     return true;
@@ -459,10 +459,10 @@ void WindowManager::tell_wm_about_current_window_stack(WMClientConnection& conn)
 {
     if (conn.window_id() < 0)
         return;
-    if (!(conn.event_mask() & WMEventMask::VirtualDesktopChanges))
+    if (!(conn.event_mask() & WMEventMask::WorkspaceChanges))
         return;
     auto& window_stack = current_window_stack();
-    conn.async_virtual_desktop_changed(conn.window_id(), window_stack.row(), window_stack.column());
+    conn.async_workspace_changed(conn.window_id(), window_stack.row(), window_stack.column());
 }
 
 void WindowManager::tell_wms_window_state_changed(Window& window)
diff --git a/Userland/Services/WindowServer/WindowManager.h b/Userland/Services/WindowServer/WindowManager.h
index 2e8977344a..d07ee34805 100644
--- a/Userland/Services/WindowServer/WindowManager.h
+++ b/Userland/Services/WindowServer/WindowManager.h
@@ -274,7 +274,7 @@ public:
     size_t window_stack_rows() const { return m_window_stacks.size(); }
     size_t window_stack_columns() const { return m_window_stacks[0].size(); }
 
-    bool apply_virtual_desktop_settings(unsigned rows, unsigned columns, bool save);
+    bool apply_workspace_settings(unsigned rows, unsigned columns, bool save);
 
     WindowStack& current_window_stack()
     {
diff --git a/Userland/Services/WindowServer/WindowManagerClient.ipc b/Userland/Services/WindowServer/WindowManagerClient.ipc
index 615f93e2a7..d422085eed 100644
--- a/Userland/Services/WindowServer/WindowManagerClient.ipc
+++ b/Userland/Services/WindowServer/WindowManagerClient.ipc
@@ -3,11 +3,11 @@
 endpoint WindowManagerClient
 {
     window_removed(i32 wm_id, i32 client_id, i32 window_id) =|
-    window_state_changed(i32 wm_id, i32 client_id, i32 window_id, i32 parent_client_id, i32 parent_window_id, u32 virtual_desktop_row, u32 virtual_desktop_column, bool is_active, bool is_minimized, bool is_modal, bool is_frameless, i32 window_type, [UTF8] String title, Gfx::IntRect rect, Optional<i32> progress) =|
+    window_state_changed(i32 wm_id, i32 client_id, i32 window_id, i32 parent_client_id, i32 parent_window_id, u32 workspace_row, u32 workspace_column, bool is_active, bool is_minimized, bool is_modal, bool is_frameless, i32 window_type, [UTF8] String title, Gfx::IntRect rect, Optional<i32> progress) =|
     window_icon_bitmap_changed(i32 wm_id, i32 client_id, i32 window_id, Gfx::ShareableBitmap bitmap) =|
     window_rect_changed(i32 wm_id, i32 client_id, i32 window_id, Gfx::IntRect rect) =|
     applet_area_size_changed(i32 wm_id, Gfx::IntSize size) =|
     super_key_pressed(i32 wm_id) =|
     super_space_key_pressed(i32 wm_id) =|
-    virtual_desktop_changed(i32 wm_id, u32 row, u32 column) =|
+    workspace_changed(i32 wm_id, u32 row, u32 column) =|
 }
diff --git a/Userland/Services/WindowServer/WindowManagerServer.ipc b/Userland/Services/WindowServer/WindowManagerServer.ipc
index fa3e4c6cd4..6d189fdbfb 100644
--- a/Userland/Services/WindowServer/WindowManagerServer.ipc
+++ b/Userland/Services/WindowServer/WindowManagerServer.ipc
@@ -12,5 +12,5 @@ endpoint WindowManagerServer
     popup_window_menu(i32 client_id, i32 window_id, Gfx::IntPoint screen_position) =|
     set_window_taskbar_rect(i32 client_id, i32 window_id, Gfx::IntRect rect) =|
     set_applet_area_position(Gfx::IntPoint position) =|
-    set_virtual_desktop(u32 row, u32 column) =|
+    set_workspace(u32 row, u32 column) =|
 }
diff --git a/Userland/Services/WindowServer/WindowServer.ipc b/Userland/Services/WindowServer/WindowServer.ipc
index c2f7fb6e3a..2307e77f2b 100644
--- a/Userland/Services/WindowServer/WindowServer.ipc
+++ b/Userland/Services/WindowServer/WindowServer.ipc
@@ -100,8 +100,8 @@ endpoint WindowServer
     save_screen_layout() => (bool success, String error_msg)
     show_screen_numbers(bool show) =|
 
-    apply_virtual_desktop_settings(u32 rows, u32 columns, bool save) => (bool success)
-    get_virtual_desktop_settings() => (u32 rows, u32 columns, u32 max_rows, u32 max_columns)
+    apply_workspace_settings(u32 rows, u32 columns, bool save) => (bool success)
+    get_workspace_settings() => (u32 rows, u32 columns, u32 max_rows, u32 max_columns)
 
     set_window_icon_bitmap(i32 window_id, Gfx::ShareableBitmap icon) =|