diff --git a/.gitignore b/.gitignore
index 48f1d351..1ab107d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ build
 .idea
 /cmake-build*
 .cache
+.vscode/
 
 .kdev4/
 *.kdev4
diff --git a/initialstart/initialstartmodule.cpp b/initialstart/initialstartmodule.cpp
index dcaf8770..29c90643 100644
--- a/initialstart/initialstartmodule.cpp
+++ b/initialstart/initialstartmodule.cpp
@@ -8,6 +8,20 @@ InitialStartModule::InitialStartModule(QObject *parent)
 {
 }
 
+QString InitialStartModule::name() const
+{
+    return m_name;
+}
+
+void InitialStartModule::setName(QString name)
+{
+    if (m_name == name) {
+        return;
+    }
+    m_name = name;
+    Q_EMIT nameChanged();
+}
+
 bool InitialStartModule::available() const
 {
     return m_available;
diff --git a/initialstart/initialstartmodule.h b/initialstart/initialstartmodule.h
index 276048e5..759c1fe9 100644
--- a/initialstart/initialstartmodule.h
+++ b/initialstart/initialstartmodule.h
@@ -13,6 +13,7 @@ class InitialStartModule : public QObject
     Q_OBJECT
     QML_ELEMENT
 
+    Q_PROPERTY(QString name READ name WRITE setName REQUIRED NOTIFY nameChanged)
     Q_PROPERTY(bool available READ available WRITE setAvailable NOTIFY availableChanged)
     Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem REQUIRED NOTIFY contentItemChanged)
     Q_PROPERTY(QQmlListProperty<QObject> children READ children CONSTANT)
@@ -21,6 +22,9 @@ class InitialStartModule : public QObject
 public:
     InitialStartModule(QObject *parent = nullptr);
 
+    QString name() const;
+    void setName(QString name);
+
     bool available() const;
     void setAvailable(bool available);
 
@@ -30,10 +34,12 @@ public:
     QQmlListProperty<QObject> children();
 
 Q_SIGNALS:
+    void nameChanged();
     void availableChanged();
     void contentItemChanged();
 
 private:
+    QString m_name;
     bool m_available{true};
     QQuickItem *m_contentItem{nullptr};
     QList<QObject *> m_children;
diff --git a/initialstart/modules/cellular/package/contents/ui/main.qml b/initialstart/modules/cellular/package/contents/ui/main.qml
index 1966bb35..ecc1d3c9 100644
--- a/initialstart/modules/cellular/package/contents/ui/main.qml
+++ b/initialstart/modules/cellular/package/contents/ui/main.qml
@@ -12,9 +12,10 @@ import org.kde.plasma.mm as PlasmaMM
 import org.kde.plasma.mobileinitialstart.initialstart
 
 InitialStartModule {
+    name: i18n("Cellular")
+    available: PlasmaMM.SignalIndicator.modemAvailable
     contentItem: Item {
         id: root
-        property string name: i18n("Cellular")
 
         readonly property real cardWidth: Math.min(Kirigami.Units.gridUnit * 30, root.width - Kirigami.Units.gridUnit * 2)
 
@@ -50,9 +51,7 @@ InitialStartModule {
                 wrapMode: Text.Wrap
                 horizontalAlignment: Text.AlignHCenter
                 text: {
-                    if (!PlasmaMM.SignalIndicator.modemAvailable) {
-                        return i18n("Your device does not have a modem available.");
-                    } else if (PlasmaMM.SignalIndicator.needsAPNAdded) {
+                    if (PlasmaMM.SignalIndicator.needsAPNAdded) {
                         return i18n("Please configure your APN below for mobile data, further information will be available with your carrier.");
                     } else if (PlasmaMM.SignalIndicator.mobileDataSupported) {
                         return i18n("You are connected to the mobile network.");
diff --git a/initialstart/modules/finished/contents/ui/main.qml b/initialstart/modules/finished/contents/ui/main.qml
index b46ee0fe..eebdaed1 100644
--- a/initialstart/modules/finished/contents/ui/main.qml
+++ b/initialstart/modules/finished/contents/ui/main.qml
@@ -10,10 +10,10 @@ import org.kde.kirigami 2.20 as Kirigami
 import org.kde.plasma.mobileinitialstart.initialstart
 
 InitialStartModule {
+    name: i18n("Complete!")
     contentItem: Item {
         id: root
 
-        property string name: i18n("Complete!")
 
         ColumnLayout {
             anchors.fill: parent
diff --git a/initialstart/modules/prepare/package/contents/ui/main.qml b/initialstart/modules/prepare/package/contents/ui/main.qml
index 8f466e66..f8141f7e 100644
--- a/initialstart/modules/prepare/package/contents/ui/main.qml
+++ b/initialstart/modules/prepare/package/contents/ui/main.qml
@@ -14,9 +14,9 @@ import org.kde.plasma.mobileinitialstart.initialstart
 
 InitialStartModule {
     id: module
+    name: i18n("Before we get started…")
     contentItem: Item {
         id: root
-        property string name: i18n("Before we get started…")
 
         readonly property real cardWidth: Math.min(Kirigami.Units.gridUnit * 30, root.width - Kirigami.Units.gridUnit * 2)
 
diff --git a/initialstart/modules/time/package/contents/ui/main.qml b/initialstart/modules/time/package/contents/ui/main.qml
index 7a5eab52..ef2cf0f2 100644
--- a/initialstart/modules/time/package/contents/ui/main.qml
+++ b/initialstart/modules/time/package/contents/ui/main.qml
@@ -12,9 +12,9 @@ import org.kde.plasma.mobileinitialstart.time 1.0 as Time
 import org.kde.plasma.mobileinitialstart.initialstart
 
 InitialStartModule {
+    name: i18n("Time and Date")
     contentItem: Item {
         id: root
-        property string name: i18n("Time and Date")
 
         readonly property real cardWidth: Math.min(Kirigami.Units.gridUnit * 30, root.width - Kirigami.Units.gridUnit * 2)
 
diff --git a/initialstart/modules/wifi/package/contents/ui/main.qml b/initialstart/modules/wifi/package/contents/ui/main.qml
index 58ac89f7..8c14e344 100644
--- a/initialstart/modules/wifi/package/contents/ui/main.qml
+++ b/initialstart/modules/wifi/package/contents/ui/main.qml
@@ -14,9 +14,9 @@ import org.kde.plasma.mobileinitialstart.wifi 1.0 as WiFi
 import org.kde.plasma.mobileinitialstart.initialstart
 
 InitialStartModule {
+    name: i18n("Network")
     contentItem: Item {
         id: root
-        property string name: i18n("Network")
 
         readonly property real cardWidth: Math.min(Kirigami.Units.gridUnit * 30, root.width - Kirigami.Units.gridUnit * 2)
 
diff --git a/initialstart/qml/Wizard.qml b/initialstart/qml/Wizard.qml
index 25549a14..a3f80d2a 100644
--- a/initialstart/qml/Wizard.qml
+++ b/initialstart/qml/Wizard.qml
@@ -229,7 +229,7 @@ Kirigami.Page {
                         anchors.fill: parent
 
                         // pass up the property
-                        property string name: contentItem.name
+                        property string name: modelData.name
                         property int currentIndex: model.index
 
                         function updateRootItems() {