diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index dd985fe5c3..cd24b8d5d1 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -46,7 +46,7 @@ UM.MainWindow
     {
         id: greyOutBackground
         anchors.fill: parent
-        visible: welcomeDialog.visible
+        visible: welcomeDialogItem.visible
         color: UM.Theme.getColor("window_disabled_background")
         opacity: 0.7
         z: stageMenu.z + 1
@@ -61,9 +61,9 @@ UM.MainWindow
         }
     }
 
-    WelcomeDialog
+    WelcomeDialogItem
     {
-        id: welcomeDialog
+        id: welcomeDialogItem
         visible: true  // True, so if somehow no preferences are found/loaded, it's shown anyway.
         z: greyOutBackground.z + 1
     }
@@ -86,11 +86,11 @@ UM.MainWindow
 
         if (CuraApplication.needToShowUserAgreement)
         {
-            welcomeDialog.visible = true
+            welcomeDialogItem.visible = true
         }
         else
         {
-            welcomeDialog.visible = false
+            welcomeDialogItem.visible = false
         }
         // TODO: While the new onboarding process contains the user-agreement,
         //       it should probably not entirely rely on 'needToShowUserAgreement' for show/hide.
diff --git a/resources/qml/WelcomePages/WelcomeDialog.qml b/resources/qml/WelcomePages/WelcomeDialogItem.qml
similarity index 88%
rename from resources/qml/WelcomePages/WelcomeDialog.qml
rename to resources/qml/WelcomePages/WelcomeDialogItem.qml
index c7832e1e56..1ab722598b 100644
--- a/resources/qml/WelcomePages/WelcomeDialog.qml
+++ b/resources/qml/WelcomePages/WelcomeDialogItem.qml
@@ -11,7 +11,7 @@ import Cura 1.1 as Cura
 
 
 //
-// This is a no-frame dialog that shows the welcome process.
+// This is an Item that tries to mimic a dialog for showing the welcome process.
 //
 Item
 {
@@ -38,7 +38,7 @@ Item
 
     WizardPanel
     {
-        id: stepPanel
+        id: wizardPanel
         anchors.fill: parent
         model: dialog.model
     }
@@ -48,8 +48,8 @@ Item
     {
         id: shadow
         radius: UM.Theme.getSize("first_run_shadow_radius").width
-        anchors.fill: stepPanel
-        source: stepPanel
+        anchors.fill: wizardPanel
+        source: wizardPanel
         horizontalOffset: shadowOffset
         verticalOffset: shadowOffset
         color: UM.Theme.getColor("first_run_shadow")