diff --git a/src/private/DropArea.cpp b/src/private/DropArea.cpp
index 3f0ceb63..24673273 100644
--- a/src/private/DropArea.cpp
+++ b/src/private/DropArea.cpp
@@ -62,7 +62,7 @@ Frame *DropArea::frameContainingPos(QPoint globalPos) const
 {
     const Layouting::Item::List &items = m_layout->items();
     for (Layouting::Item *item : items) {
-        auto frame = static_cast<Frame*>(item->widget());
+        auto frame = static_cast<Frame*>(item->guestAsQObject());
         if (!frame || !frame->QWidget::isVisible()) {
             continue;
         }
@@ -76,7 +76,7 @@ Frame *DropArea::frameContainingPos(QPoint globalPos) const
 Layouting::Item *DropArea::centralFrame() const
 {
     for (Layouting::Item *item : m_layout->items()) {
-        if (auto f = static_cast<Frame*>(item->widget())) {
+        if (auto f = static_cast<Frame*>(item->guestAsQObject())) {
             if (f->isCentralFrame())
                 return item;
         }
diff --git a/src/private/multisplitter/Item.cpp b/src/private/multisplitter/Item.cpp
index d44a05c8..165dfeae 100644
--- a/src/private/multisplitter/Item.cpp
+++ b/src/private/multisplitter/Item.cpp
@@ -154,16 +154,16 @@ int Item::mapFromRoot(int p, Qt::Orientation o) const
     return mapFromRoot(QPoint(p, 0)).x();
 }
 
-QObject *Item::widget() const
+QObject *Item::guestAsQObject() const
 {
     return m_guest ? m_guest->asQObject() : nullptr;
 }
 
-void Item::setGuest(Widget *guest)
+void Item::setGuestWidget(Widget *guest)
 {   
     Q_ASSERT(!guest || !m_guest);
     QObject *newWidget = guest ? guest->asQObject() : nullptr;
-    QObject *oldWidget = widget();
+    QObject *oldWidget = guestAsQObject();
 
     if (oldWidget) {
         oldWidget->removeEventFilter(this);
@@ -226,7 +226,7 @@ void Item::fillFromVariantMap(const QVariantMap &map, const QHash<QString, Widge
     const QString guestId = map.value(QStringLiteral("guestId")).toString();
     if (!guestId.isEmpty()) {
         if (Widget *guest = widgets.value(guestId)) {
-            setGuest(guest);
+            setGuestWidget(guest);
             m_guest->setParent(hostWidget());
         } else if (hostWidget()) {
             qWarning() << Q_FUNC_INFO << "Couldn't find frame to restore for" << this;
@@ -275,11 +275,11 @@ QObject *Item::host() const
 
 void Item::restore(Widget *guest)
 {
-    Q_ASSERT(!isVisible() && !widget());
+    Q_ASSERT(!isVisible() && !guestAsQObject());
     if (isContainer()) {
         qWarning() << Q_FUNC_INFO << "Containers can't be restored";
     } else {
-        setGuest(guest);
+        setGuestWidget(guest);
         parentContainer()->restoreChild(this, NeighbourSqueezeStrategy::ImmediateNeighboursFirst);
 
         // When we restore to previous positions, we only still from the immediate neighbours.
@@ -732,7 +732,7 @@ void Item::dumpLayout(int level)
     if (m_sizingInfo.isBeingInserted)
         dbg << QStringLiteral(";beingInserted;");
 
-    dbg << this << "; guest=" << widget();
+    dbg << this << "; guest=" << guestAsQObject();
 }
 
 Item::Item(Widget *hostWidget, ItemContainer *parent)
@@ -788,7 +788,7 @@ void Item::updateObjectName()
     if (isContainer())
         return;
 
-    if (auto w = widget()) {
+    if (auto w = guestAsQObject()) {
         setObjectName(w->objectName().isEmpty() ? QStringLiteral("widget") : w->objectName());
     } else if (!isVisible()) {
         setObjectName(QStringLiteral("hidden"));
@@ -812,7 +812,7 @@ void Item::onWidgetDestroyed()
 
 void Item::onWidgetLayoutRequested()
 {
-    if (Widget *w = guest()) {
+    if (Widget *w = guestWidget()) {
         if (w->size() != size()) {
             qDebug() << Q_FUNC_INFO << "TODO: Not implemented yet. Widget can't just decide to resize yet"
                        << w->size()
@@ -1155,7 +1155,7 @@ void ItemContainer::removeItem(Item *item, bool hardRemove)
             Q_EMIT root()->numItemsChanged();
     } else {
         item->setIsVisible(false);
-        item->setGuest(nullptr);
+        item->setGuestWidget(nullptr);
 
         if (!wasVisible && !isContainer) {
             // Was already hidden
@@ -1540,7 +1540,7 @@ Item *ItemContainer::itemForWidget(const Widget *w) const
         if (item->isContainer()) {
             if (Item *result = item->asContainer()->itemForWidget(w))
                 return result;
-        } else if (item->guest() == w) {
+        } else if (item->guestWidget() == w) {
             return item;
         }
     }
@@ -3134,7 +3134,7 @@ void ItemContainer::Private::updateWidgets_recursive()
             c->d->updateWidgets_recursive();
         } else {
             if (item->isVisible()) {
-                if (Widget *widget = item->guest()) {
+                if (Widget *widget = item->guestWidget()) {
                     widget->setGeometry(q->mapToRoot(item->geometry()));
                     widget->setVisible(true);
                 } else {
diff --git a/src/private/multisplitter/Item_p.h b/src/private/multisplitter/Item_p.h
index 62a0da8a..108ecbc7 100644
--- a/src/private/multisplitter/Item_p.h
+++ b/src/private/multisplitter/Item_p.h
@@ -282,9 +282,9 @@ public:
     QPoint mapFromParent(QPoint) const;
     int mapFromRoot(int p, Qt::Orientation) const;
 
-    QObject *widget() const;
-    Widget *guest() const { return m_guest; }
-    void setGuest(Widget *);
+    QObject *guestAsQObject() const;
+    Widget *guestWidget() const { return m_guest; }
+    void setGuestWidget(Widget *);
 
     void ref();
     void unref();
@@ -294,7 +294,7 @@ public:
 
     QObject *host() const;
     Widget *hostWidget() const;
-    void restore(Widget *guest);
+    void restore(Widget *guestWidget);
 
     QVector<int> pathFromRoot() const;
 
diff --git a/src/private/multisplitter/tests/tst_multisplitter.cpp b/src/private/multisplitter/tests/tst_multisplitter.cpp
index 68c20113..d89d56ea 100644
--- a/src/private/multisplitter/tests/tst_multisplitter.cpp
+++ b/src/private/multisplitter/tests/tst_multisplitter.cpp
@@ -217,7 +217,7 @@ static bool serializeDeserializeTest(const std::unique_ptr<ItemContainer> &root)
     QHash<QString, Widget*> widgets;
     const Item::List originalItems = root->items_recursive();
     for (Item *item : originalItems)
-        if (auto w = static_cast<MyGuestWidget*>(item->widget()))
+        if (auto w = static_cast<MyGuestWidget*>(item->guestAsQObject()))
             widgets.insert(QString::number(qint64(w)), w);
 
     root2.fillFromVariantMap(serialized, widgets);
@@ -249,7 +249,7 @@ static Item* createItem(QSize minSz = {})
     if (!minSz.isNull())
         guest->setMinSize(minSz);
     guest->setObjectName(item->objectName());
-    item->setGuest(guest);
+    item->setGuestWidget(guest);
     return item;
 }
 
@@ -1107,7 +1107,7 @@ void TestMultiSplitter::tst_minSizeChanges()
     root->setSize_recursive(QSize(200, 200));
     QVERIFY(root->checkSanity());
 
-    auto w1 = static_cast<MyGuestWidget*>(item1->widget()); // TODO: Static cast not required ?
+    auto w1 = static_cast<MyGuestWidget*>(item1->guestAsQObject()); // TODO: Static cast not required ?
     w1->setMinSize(QSize(300, 300));
     QVERIFY(root->checkSanity());
     QCOMPARE(root->size(), QSize(300, 300));
@@ -1467,7 +1467,7 @@ void TestMultiSplitter::tst_closeAndRestorePreservesPosition()
     const int oldW3 = item3->width();
     const int oldW4 = item4->width();
 
-    auto guest3 = item3->guest();
+    auto guest3 = item3->guestWidget();
     item3->turnIntoPlaceholder();
 
     // Test that both sides reclaimed the space equally
@@ -1493,7 +1493,7 @@ void TestMultiSplitter::tst_minSizeChangedBeforeRestore()
     root->insertItem(item2, Item::Location_OnBottom);
     const QSize originalSize2 = item2->size();
 
-    auto guest2 = qobject_cast<MyGuestWidget*>(item2->guest()->asQWidget());
+    auto guest2 = qobject_cast<MyGuestWidget*>(item2->guestWidget()->asQWidget());
     const QSize newMinSize = originalSize2 + QSize(10, 10);
 
     item2->turnIntoPlaceholder();
diff --git a/src/private/widgets/MultiSplitterLayout.cpp b/src/private/widgets/MultiSplitterLayout.cpp
index 0901d9e0..cfa8577d 100644
--- a/src/private/widgets/MultiSplitterLayout.cpp
+++ b/src/private/widgets/MultiSplitterLayout.cpp
@@ -150,11 +150,11 @@ void MultiSplitterLayout::addWidget(QWidgetOrQuick *w, Location location,
 
     if (frame) {
         newItem = new Layouting::Item(m_multiSplitter);
-        newItem->setGuest(frame);
+        newItem->setGuestWidget(frame);
     } else if (dw) {
         newItem = new Layouting::Item(m_multiSplitter);
         frame = new Frame();
-        newItem->setGuest(frame);
+        newItem->setGuestWidget(frame);
         frame->addWidget(dw, option);
     } else if (auto ms = qobject_cast<MultiSplitter*>(w)) {
         newItem = ms->multiSplitterLayout()->rootItem();
@@ -269,7 +269,7 @@ Frame::List MultiSplitterLayout::frames() const
     result.reserve(items.size());
 
     for (Layouting::Item *item : items) {
-        if (auto f = static_cast<Frame*>(item->widget()))
+        if (auto f = static_cast<Frame*>(item->guestAsQObject()))
             result.push_back(f);
     }
 
@@ -283,7 +283,7 @@ void MultiSplitterLayout::restorePlaceholder(DockWidgetBase *dw, Layouting::Item
         item->restore(newFrame);
     }
 
-    auto frame = qobject_cast<Frame*>(item->widget());
+    auto frame = qobject_cast<Frame*>(item->guestAsQObject());
     Q_ASSERT(frame);
 
     if (tabIndex != -1 && frame->dockWidgetCount() >= tabIndex) {
@@ -415,7 +415,7 @@ LayoutSaver::MultiSplitterLayout MultiSplitterLayout::serialize() const
     l.frames.reserve(items.size());
     for (Layouting::Item *item : items) {
         if (!item->isContainer()) {
-            if (auto frame = qobject_cast<Frame*>(item->widget()))
+            if (auto frame = qobject_cast<Frame*>(item->guestAsQObject()))
                 l.frames.insert(QString::number(qint64(frame)), frame->serialize());
         }
     }
diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp
index 5b118ab8..8f83d636 100644
--- a/tests/tst_docks.cpp
+++ b/tests/tst_docks.cpp
@@ -934,7 +934,7 @@ void TestDocks::tst_mainWindowAlwaysHasCentralWidget()
     auto dropArea = m->dropArea();
     QVERIFY(dropArea);
 
-    QPointer<Frame> centralFrame = static_cast<Frame*>(dropArea->centralFrame()->widget());
+    QPointer<Frame> centralFrame = static_cast<Frame*>(dropArea->centralFrame()->guestAsQObject());
     QVERIFY(central);
     QVERIFY(dropArea);
     QCOMPARE(dropArea->multiSplitterLayout()->count(), 1);
@@ -994,7 +994,7 @@ void TestDocks::tst_dockInternal()
     auto dock1 = createDockWidget("dock1", new QPushButton("one"));
     auto dropArea = m->dropArea();
 
-    auto centralWidget = static_cast<Frame*>(dropArea->multiSplitterLayout()->items()[0]->widget());
+    auto centralWidget = static_cast<Frame*>(dropArea->multiSplitterLayout()->items()[0]->guestAsQObject());
     nestDockWidget(dock1, dropArea, centralWidget, KDDockWidgets::Location_OnRight);
 
     QVERIFY(dock1->width() < dropArea->width() - centralWidget->width());
@@ -1283,7 +1283,7 @@ void TestDocks::tst_restoreCentralFrame()
     QCOMPARE(layout->count(), 1);
     Item *item = m->dropArea()->centralFrame();
     QVERIFY(item);
-    auto frame = static_cast<Frame *>(item->widget());
+    auto frame = static_cast<Frame *>(item->guestAsQObject());
     QCOMPARE(frame->options(), FrameOption_IsCentralFrame | FrameOption_AlwaysShowsTabs);
     QVERIFY(!frame->titleBar()->isVisible());
 
@@ -1294,7 +1294,7 @@ void TestDocks::tst_restoreCentralFrame()
     QCOMPARE(layout->count(), 1);
     item = m->dropArea()->centralFrame();
     QVERIFY(item);
-    frame = static_cast<Frame *>(item->widget());
+    frame = static_cast<Frame *>(item->guestAsQObject());
     QCOMPARE(frame->options(), FrameOption_IsCentralFrame | FrameOption_AlwaysShowsTabs);
     QVERIFY(!frame->titleBar()->isVisible());
 }
@@ -4042,7 +4042,7 @@ void TestDocks::tst_availableSizeWithPlaceholders()
     Item *item30 = layout3->itemForFrame(docks2.at(0).createdDock->frame());
 
     QCOMPARE(item10->geometry(), item30->geometry());
-    QCOMPARE(item10->guest()->minSize(), item10->guest()->minSize());
+    QCOMPARE(item10->guestWidget()->minSize(), item10->guestWidget()->minSize());
     QCOMPARE(item10->minSize(), item30->minSize());
     QCOMPARE(layout1->availableSize(), layout3->availableSize());