diff --git a/src/DockRegistry.cpp b/src/DockRegistry.cpp
index 1d198f72..09e69217 100644
--- a/src/DockRegistry.cpp
+++ b/src/DockRegistry.cpp
@@ -67,10 +67,10 @@ DockRegistry *DockRegistry::self()
 
 void DockRegistry::registerDockWidget(DockWidgetBase *dock)
 {
-    if (dock->name().isEmpty()) {
+    if (dock->uniqueName().isEmpty()) {
         qWarning() << Q_FUNC_INFO << "DockWidget" << dock << " doesn't have an ID";
-    } else if (auto other = dockByName(dock->name())) {
-        qWarning() << Q_FUNC_INFO << "Another DockWidget" << other << "with name" << dock->name() << " already exists." << dock;
+    } else if (auto other = dockByName(dock->uniqueName())) {
+        qWarning() << Q_FUNC_INFO << "Another DockWidget" << other << "with name" << dock->uniqueName() << " already exists." << dock;
     }
 
     m_dockWidgets << dock;
@@ -84,10 +84,10 @@ void DockRegistry::unregisterDockWidget(DockWidgetBase *dock)
 
 void DockRegistry::registerMainWindow(MainWindow *mainWindow)
 {
-    if (mainWindow->name().isEmpty()) {
+    if (mainWindow->uniqueName().isEmpty()) {
         qWarning() << Q_FUNC_INFO << "MainWindow" << mainWindow << " doesn't have an ID";
-    } else if (auto other = mainWindowByName(mainWindow->name())) {
-        qWarning() << Q_FUNC_INFO << "Another MainWindow" << other << "with name" << mainWindow->name() << " already exists." << mainWindow;
+    } else if (auto other = mainWindowByName(mainWindow->uniqueName())) {
+        qWarning() << Q_FUNC_INFO << "Another MainWindow" << other << "with name" << mainWindow->uniqueName() << " already exists." << mainWindow;
     }
 
     m_mainWindows << mainWindow;
@@ -133,7 +133,7 @@ void DockRegistry::unregisterFrame(Frame *frame)
 DockWidgetBase *DockRegistry::dockByName(const QString &name) const
 {
     for (auto dock : qAsConst(m_dockWidgets)) {
-        if (dock->name() == name)
+        if (dock->uniqueName() == name)
             return dock;
     }
 
@@ -143,7 +143,7 @@ DockWidgetBase *DockRegistry::dockByName(const QString &name) const
 MainWindow *DockRegistry::mainWindowByName(const QString &name) const
 {
     for (auto mainWindow : qAsConst(m_mainWindows)) {
-        if (mainWindow->name() == name)
+        if (mainWindow->uniqueName() == name)
             return mainWindow;
     }
 
@@ -154,7 +154,7 @@ bool DockRegistry::isSane() const
 {
     QSet<QString> names;
     for (auto dock : qAsConst(m_dockWidgets)) {
-        const QString name = dock->name();
+        const QString name = dock->uniqueName();
         if (name.isEmpty()) {
             qWarning() << "DockRegistry::isSane: DockWidget" << dock << "is missing a name";
             return false;
@@ -168,7 +168,7 @@ bool DockRegistry::isSane() const
 
     names.clear();
     for (auto mainwindow : qAsConst(m_mainWindows)) {
-        const QString name = mainwindow->name();
+        const QString name = mainwindow->uniqueName();
         if (name.isEmpty()) {
             qWarning() << "DockRegistry::isSane: MainWindow" << mainwindow << "is missing a name";
             return false;
diff --git a/src/DockWidgetBase.cpp b/src/DockWidgetBase.cpp
index 88b1ce7d..455b3194 100644
--- a/src/DockWidgetBase.cpp
+++ b/src/DockWidgetBase.cpp
@@ -179,7 +179,7 @@ void DockWidgetBase::setWidget(QWidget *w)
 
     d->widget = w;
     Q_EMIT widgetChanged(w);
-    setWindowTitle(name());
+    setWindowTitle(uniqueName());
 }
 
 QWidget *DockWidgetBase::widget() const
@@ -235,7 +235,7 @@ QAction *DockWidgetBase::toggleAction() const
     return d->toggleAction;
 }
 
-QString DockWidgetBase::name() const
+QString DockWidgetBase::uniqueName() const
 {
     return d->name;
 }
@@ -557,6 +557,6 @@ DockWidgetBase *DockWidgetBase::createFromDataStream(QDataStream &ds)
 
 QDataStream &KDDockWidgets::operator<<(QDataStream &ds, DockWidgetBase *dw)
 {
-    ds << dw->name();
+    ds << dw->uniqueName();
     return ds;
 }
diff --git a/src/DockWidgetBase.h b/src/DockWidgetBase.h
index 8ae1f0db..ce4f2a3a 100644
--- a/src/DockWidgetBase.h
+++ b/src/DockWidgetBase.h
@@ -73,7 +73,7 @@ public:
      * There's no parent argument. The DockWidget is either parented to FloatingWindow or MainWindow
      * when visible, or stays without a parent when hidden.
      */
-    explicit DockWidgetBase(const QString &name, Options options = {});
+    explicit DockWidgetBase(const QString &uniqueName, Options options = {});
 
     ///@brief destructor
     ~DockWidgetBase() override;
@@ -132,7 +132,7 @@ public:
      * @return the dock widget's unique name.
      * @sa title
      */
-    QString name() const;
+    QString uniqueName() const;
 
     /**
      * @brief the dock widget's title.
diff --git a/src/LastPosition.cpp b/src/LastPosition.cpp
index c93f259e..c36d5c17 100644
--- a/src/LastPosition.cpp
+++ b/src/LastPosition.cpp
@@ -206,7 +206,7 @@ QDataStream &KDDockWidgets::operator<<(QDataStream &ds, LastPosition *lp)
             ds << (fw->beingDeleted() ? -1 : DockRegistry::self()->nestedwindows().indexOf(fw)); // TODO: Remove once we stop using deleteLater with FloatingWindow. delete would be better
         } else {
             ds << false;
-            const QString name = mainWindow->name();
+            const QString name = mainWindow->uniqueName();
             Q_ASSERT(!name.isEmpty());
             ds << name;
         }
diff --git a/src/LayoutSaver.cpp b/src/LayoutSaver.cpp
index 5dbe6610..dd3d28b3 100644
--- a/src/LayoutSaver.cpp
+++ b/src/LayoutSaver.cpp
@@ -128,7 +128,7 @@ QByteArray LayoutSaver::serializeLayout() const
     const MainWindow::List mainWindows = d->m_dockRegistry->mainwindows();
     ds << mainWindows.size();
     for (MainWindow *mainWindow : mainWindows) {
-        ds << mainWindow->name();
+        ds << mainWindow->uniqueName();
         d->serializeWindowGeometry(ds, mainWindow->window()); // window() as the MainWindow can be embedded
         ds << mainWindow;
     }
@@ -160,7 +160,7 @@ QByteArray LayoutSaver::serializeLayout() const
     const DockWidgetBase::List dockWidgets = d->m_dockRegistry->dockwidgets();
     ds << dockWidgets.size();
     for (DockWidgetBase *dw : dockWidgets) {
-        ds << dw->name();
+        ds << dw->uniqueName();
         ds << dw->lastPosition();
     }
 
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 87ee99b8..2c40a4fc 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -125,7 +125,7 @@ void MainWindow::addDockWidget(DockWidgetBase *dw, Location location, DockWidget
     d->m_dropArea->addDockWidget(dw, location, relativeTo, option);
 }
 
-QString MainWindow::name() const
+QString MainWindow::uniqueName() const
 {
     return d->name;
 }
diff --git a/src/MainWindow.h b/src/MainWindow.h
index d2a083f7..4fe1c6e6 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -48,13 +48,13 @@ class DOCKS_EXPORT MainWindow : public QMainWindow
     Q_OBJECT
 public:
     typedef QVector<MainWindow*> List;
-    explicit MainWindow(const QString &name, MainWindowOptions options = MainWindowOption_HasCentralFrame,
+    explicit MainWindow(const QString &uniqueName, MainWindowOptions options = MainWindowOption_HasCentralFrame,
                         QWidget *parent = nullptr, Qt::WindowFlags flags = {});
     ~MainWindow() override;
     void addDockWidgetAsTab(DockWidgetBase *);
     void addDockWidget(DockWidgetBase *, KDDockWidgets::Location, DockWidgetBase *relativeTo = nullptr, AddingOption = {});
 
-    QString name() const;
+    QString uniqueName() const;
     MainWindowOptions options() const;
 
     ///@internal
diff --git a/src/widgets/DockWidget.h b/src/widgets/DockWidget.h
index df23e71e..d17dc0e3 100644
--- a/src/widgets/DockWidget.h
+++ b/src/widgets/DockWidget.h
@@ -52,7 +52,7 @@ public:
      * There's no parent argument. The DockWidget is either parented to FloatingWindow or MainWindow
      * when visible, or stays without a parent when hidden.
      */
-    explicit DockWidget(const QString &name, Options options = {});
+    explicit DockWidget(const QString &uniqueName, Options options = {});
 
     ///@brief destructor
     ~DockWidget() override;
diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp
index dcbd454c..c5bc0d7b 100644
--- a/tests/tst_docks.cpp
+++ b/tests/tst_docks.cpp
@@ -480,7 +480,7 @@ void TestDocks::tst_createFloatingWindow()
     QVERIFY(dock);
     QVERIFY(dock->isFloating());
 
-    QCOMPARE(dock->name(), QLatin1String("doc1")); // 1.0 objectName() is inherited
+    QCOMPARE(dock->uniqueName(), QLatin1String("doc1")); // 1.0 objectName() is inherited
 
     QPointer<FloatingWindow> window = qobject_cast<FloatingWindow *>(dock->window());
     QVERIFY(window); // 1.1 DockWidget creates a FloatingWindow and is reparented