diff --git a/src/plugins/minimizeall/package/contents/code/main.js b/src/plugins/minimizeall/package/contents/code/main.js
index d3da871378..da39723740 100644
--- a/src/plugins/minimizeall/package/contents/code/main.js
+++ b/src/plugins/minimizeall/package/contents/code/main.js
@@ -16,7 +16,7 @@ function isRelevant(client) {
 }
 
 function minimizeAllWindows() {
-    var allClients = workspace.clientList();
+    var allClients = workspace.windowList();
     var relevantClients = [];
     var minimize = false;
 
diff --git a/src/plugins/synchronizeskipswitcher/package/contents/code/main.js b/src/plugins/synchronizeskipswitcher/package/contents/code/main.js
index a675acc96f..f6b0cc0bad 100644
--- a/src/plugins/synchronizeskipswitcher/package/contents/code/main.js
+++ b/src/plugins/synchronizeskipswitcher/package/contents/code/main.js
@@ -17,7 +17,7 @@ function setupConnection(client) {
 
 workspace.windowAdded.connect(setupConnection);
 // connect all existing clients
-var clients = workspace.clientList();
+var clients = workspace.windowList();
 for (var i=0; i<clients.length; i++) {
     setupConnection(clients[i]);
 }
diff --git a/src/plugins/videowall/package/contents/code/main.js b/src/plugins/videowall/package/contents/code/main.js
index 656e55e761..d25daac62b 100644
--- a/src/plugins/videowall/package/contents/code/main.js
+++ b/src/plugins/videowall/package/contents/code/main.js
@@ -35,4 +35,4 @@ function setup(window) {
 }
 
 workspace.windowAdded.connect(setup);
-workspace.clientList().forEach(setup);
+workspace.windowList().forEach(setup);
diff --git a/src/scripting/workspace_wrapper.cpp b/src/scripting/workspace_wrapper.cpp
index 13650d7340..b89ede1562 100644
--- a/src/scripting/workspace_wrapper.cpp
+++ b/src/scripting/workspace_wrapper.cpp
@@ -408,22 +408,22 @@ QtScriptWorkspaceWrapper::QtScriptWorkspaceWrapper(QObject *parent)
 {
 }
 
-QList<KWin::Window *> QtScriptWorkspaceWrapper::clientList() const
+QList<KWin::Window *> QtScriptWorkspaceWrapper::windowList() const
 {
     return workspace()->windows();
 }
 
-QQmlListProperty<KWin::Window> DeclarativeScriptWorkspaceWrapper::clients()
+QQmlListProperty<KWin::Window> DeclarativeScriptWorkspaceWrapper::windows()
 {
-    return QQmlListProperty<KWin::Window>(this, nullptr, &DeclarativeScriptWorkspaceWrapper::countClientList, &DeclarativeScriptWorkspaceWrapper::atClientList);
+    return QQmlListProperty<KWin::Window>(this, nullptr, &DeclarativeScriptWorkspaceWrapper::countWindowList, &DeclarativeScriptWorkspaceWrapper::atWindowList);
 }
 
-qsizetype DeclarativeScriptWorkspaceWrapper::countClientList(QQmlListProperty<KWin::Window> *clients)
+qsizetype DeclarativeScriptWorkspaceWrapper::countWindowList(QQmlListProperty<KWin::Window> *windows)
 {
     return workspace()->windows().size();
 }
 
-KWin::Window *DeclarativeScriptWorkspaceWrapper::atClientList(QQmlListProperty<KWin::Window> *clients, qsizetype index)
+KWin::Window *DeclarativeScriptWorkspaceWrapper::atWindowList(QQmlListProperty<KWin::Window> *windows, qsizetype index)
 {
     return workspace()->windows().at(index);
 }
diff --git a/src/scripting/workspace_wrapper.h b/src/scripting/workspace_wrapper.h
index 39ae8be7c1..8ed3e3fd10 100644
--- a/src/scripting/workspace_wrapper.h
+++ b/src/scripting/workspace_wrapper.h
@@ -364,9 +364,9 @@ class QtScriptWorkspaceWrapper : public WorkspaceWrapper
     Q_OBJECT
 public:
     /**
-     * List of Clients currently managed by KWin.
+     * List of windows currently managed by KWin.
      */
-    Q_INVOKABLE QList<KWin::Window *> clientList() const;
+    Q_INVOKABLE QList<KWin::Window *> windowList() const;
 
     explicit QtScriptWorkspaceWrapper(QObject *parent = nullptr);
 };
@@ -375,11 +375,11 @@ class DeclarativeScriptWorkspaceWrapper : public WorkspaceWrapper
 {
     Q_OBJECT
 
-    Q_PROPERTY(QQmlListProperty<KWin::Window> clients READ clients)
+    Q_PROPERTY(QQmlListProperty<KWin::Window> windows READ windows)
 public:
-    QQmlListProperty<KWin::Window> clients();
-    static qsizetype countClientList(QQmlListProperty<KWin::Window> *clients);
-    static KWin::Window *atClientList(QQmlListProperty<KWin::Window> *clients, qsizetype index);
+    QQmlListProperty<KWin::Window> windows();
+    static qsizetype countWindowList(QQmlListProperty<KWin::Window> *window);
+    static KWin::Window *atWindowList(QQmlListProperty<KWin::Window> *windows, qsizetype index);
 
     explicit DeclarativeScriptWorkspaceWrapper(QObject *parent = nullptr);
 };