diff --git a/mea.pro b/mea.pro
index 93fe1b82..c96cc3d9 100644
--- a/mea.pro
+++ b/mea.pro
@@ -18,11 +18,11 @@ wininstaller.commands += windeployqt --compiler-runtime --qmldir mea\ui packagin
 BR=$$BRANDING
 equals(BR, "") {
     wininstaller.commands += copy packaging\windows\packages\io.guh.mea\logo-guh.ico packaging\windows\packages\io.guh.mea\data\logo.ico &&
-    wininstaller.commands += copy packaging\windows\packages\io.guh.mea\license-mea.txt packaging\windows\packages\io.guh.mea\meta\license.txt &&
+    wininstaller.commands += copy packaging\windows\packages\io.guh.mea\package-mea.xml packaging\windows\packages\io.guh.mea\meta\package.xml &&
     wininstaller.commands += binarycreator -c packaging\windows\config\config.xml -p packaging\windows\packages\ mea-win-installer
 } else {
     wininstaller.commands += copy packaging\windows\packages\io.guh.mea\logo-$${BR}.ico packaging\windows\packages\io.guh.mea\data\logo.ico &&
-    wininstaller.commands += copy packaging\windows\packages\io.guh.mea\license-$${BR}.txt packaging\windows\packages\io.guh.mea\meta\license.txt &&
+    wininstaller.commands += copy packaging\windows\packages\io.guh.mea\package-$${BR}.xml packaging\windows\packages\io.guh.mea\meta\package.xml &&
     wininstaller.commands += binarycreator -c packaging\windows\config\config.xml -p packaging\windows\packages\ mea-$${BR}-win-installer
 }
 QMAKE_EXTRA_TARGETS += wininstaller
diff --git a/mea/styles/maveo/ApplicationWindow.qml b/mea/styles/maveo/ApplicationWindow.qml
index 2feffd5a..b68d836f 100644
--- a/mea/styles/maveo/ApplicationWindow.qml
+++ b/mea/styles/maveo/ApplicationWindow.qml
@@ -6,6 +6,8 @@ ApplicationWindow {
     property color guhAccent: "#ffcc00"
     property string systemName: "maveo"
 
+    title: qsTr("Maveo Pro Box Dashboard")
+
     Material.theme: Material.Light
     Material.accent: guhAccent
     Material.primary: Material.Grey
diff --git a/mea/ui/ConnectPage.qml b/mea/ui/ConnectPage.qml
index e83a8743..c4d54859 100644
--- a/mea/ui/ConnectPage.qml
+++ b/mea/ui/ConnectPage.qml
@@ -39,7 +39,7 @@ Page {
 
         Page {
             header: GuhHeader {
-                text: qsTr("Connect nymea")
+                text: qsTr("Connect %1").arg(app.systemName)
                 backButtonVisible: false
                 menuButtonVisible: true
                 onMenuPressed: connectionMenu.open()
@@ -90,9 +90,9 @@ Page {
                     Label {
                         Layout.fillWidth: true
                         text: root.haveHosts ?
-                                  qsTr("There are %1 nymea boxes in your network! Which one would you like to use?").arg(discovery.discoveryModel.count)
-                                : startupTimer.running ? qsTr("We haven't found any nymea boxes in your network yet.")
-                                                       : qsTr("There doesn't seem to be a nymea box installed in your network. Please make sure your nymea box is correctly set up and connected.")
+                                  qsTr("There are %1 %2 boxes in your network! Which one would you like to use?").arg(discovery.discoveryModel.count).arg(app.systemName)
+                                : startupTimer.running ? qsTr("We haven't found any %1 boxes in your network yet.").arg(app.systemName)
+                                                       : qsTr("There doesn't seem to be a %1 box installed in your network. Please make sure your %1 box is correctly set up and connected.").arg(app.systemName)
                         wrapMode: Text.WordWrap
                     }
                 }
@@ -136,7 +136,7 @@ Page {
                         visible: !root.haveHosts
 
                         Label {
-                            text: qsTr("Searching for nymea boxes...")
+                            text: qsTr("Searching for %1 boxes...").arg(app.systemName)
                         }
 
                         BusyIndicator {
@@ -333,7 +333,7 @@ Page {
             Label {
                 Layout.fillWidth: true
                 wrapMode: Text.WordWrap
-                text: qsTr("The authenticity of this nymea box cannot be verified.")
+                text: qsTr("The authenticity of this %1 box cannot be verified.").arg(app.systemName)
             }
 
             Label {
diff --git a/mea/ui/LoginPage.qml b/mea/ui/LoginPage.qml
index 6bb940d7..28d0d1a6 100644
--- a/mea/ui/LoginPage.qml
+++ b/mea/ui/LoginPage.qml
@@ -9,7 +9,7 @@ Page {
     signal backPressed();
 
     header: GuhHeader {
-        text: qsTr("Welcome to nymea!")
+        text: qsTr("Welcome to %1!").arg(app.systemName)
         backButtonVisible: true
         onBackPressed: root.backPressed()
     }
@@ -49,8 +49,8 @@ Page {
         Label {
             Layout.fillWidth: true
             text: Engine.jsonRpcClient.initialSetupRequired ?
-                      qsTr("In order to use your nymea system, please enter your email address and set a password for your nymea box.")
-                    : qsTr("In order to use your nymea system, please log in.")
+                      qsTr("In order to use your %1 system, please enter your email address and set a password for your nymea box.").arg(app.systemName)
+                    : qsTr("In order to use your %1 system, please log in.").arg(app.systemName)
             wrapMode: Text.WordWrap
         }
 
diff --git a/mea/ui/MainPage.qml b/mea/ui/MainPage.qml
index ec8d006f..38dc9e80 100644
--- a/mea/ui/MainPage.qml
+++ b/mea/ui/MainPage.qml
@@ -150,7 +150,7 @@ Page {
                 spacing: app.margins
                 visible: Engine.deviceManager.devices.count === 0 && !Engine.deviceManager.fetchingData
                 Label {
-                    text: qsTr("Welcome to nymea!")
+                    text: qsTr("Welcome to %1!").arg(app.systemName)
                     font.pixelSize: app.largeFont
                     Layout.fillWidth: true
                     wrapMode: Text.WordWrap
diff --git a/mea/ui/PushButtonAuthPage.qml b/mea/ui/PushButtonAuthPage.qml
index ec3e3d4e..6db9fa49 100644
--- a/mea/ui/PushButtonAuthPage.qml
+++ b/mea/ui/PushButtonAuthPage.qml
@@ -9,7 +9,7 @@ Page {
     signal backPressed();
 
     header: GuhHeader {
-        text: qsTr("Welcome to nymea!")
+        text: qsTr("Welcome to %1!").arg(app.systemName)
         backButtonVisible: true
         onBackPressed: {
             root.backPressed();
@@ -58,7 +58,7 @@ Page {
 
         Label {
             Layout.fillWidth: true
-            text: qsTr("Please press the button on your nymea box to authenticate this device.")
+            text: qsTr("Please press the button on your %1 box to authenticate this device.").arg(app.systemName)
             wrapMode: Text.WordWrap
         }
 
diff --git a/mea/ui/main.qml b/mea/ui/main.qml
index 88e81454..2becd7b0 100644
--- a/mea/ui/main.qml
+++ b/mea/ui/main.qml
@@ -12,14 +12,6 @@ ApplicationWindow {
     height: 580
     visibility: settings.viewMode
     font: Qt.application.font
-    title: {
-        switch (appBranding) {
-        case "maveo":
-            return qsTr("Maveo Pro Box Dashboard")
-        default:
-            return "Mea";
-        }
-    }
 
     property int margins: 14
     property int bigMargins: 20
@@ -250,7 +242,7 @@ ApplicationWindow {
                     font.pixelSize: app.largeFont
                 }
                 Label {
-                    text: qsTr("Sorry, the version of the nymea box you are trying to connect to is too old. This app requires at least version %1 but the nymea box only supports %2").arg(popup.minimumVersion).arg(popup.actualVersion)
+                    text: qsTr("Sorry, the version of the %1 box you are trying to connect to is too old. This app requires at least version %2 but the %1 box only supports %3").arg(app.systemName).arg(popup.minimumVersion).arg(popup.actualVersion)
                     wrapMode: Text.WordWrap
                     Layout.fillWidth: true
                 }
diff --git a/mea/ui/system/LogViewerPage.qml b/mea/ui/system/LogViewerPage.qml
index eddb7537..15858f71 100644
--- a/mea/ui/system/LogViewerPage.qml
+++ b/mea/ui/system/LogViewerPage.qml
@@ -134,7 +134,7 @@ Page {
 
             Label {
                 width: listView.column2Width
-                text: model.source === LogEntry.LoggingSourceSystem ? qsTr("Nymea Server") : delegate.device.name
+                text: model.source === LogEntry.LoggingSourceSystem ? qsTr("%1 Server").arg(app.systemName) : delegate.device.name
                 elide: Text.ElideRight
             }
             Label {
diff --git a/packaging/windows/packages/io.guh.mea/license-maveo.txt b/packaging/windows/packages/io.guh.mea/meta/license-maveo.txt
similarity index 100%
rename from packaging/windows/packages/io.guh.mea/license-maveo.txt
rename to packaging/windows/packages/io.guh.mea/meta/license-maveo.txt
diff --git a/packaging/windows/packages/io.guh.mea/license-mea.txt b/packaging/windows/packages/io.guh.mea/meta/license-mea.txt
similarity index 100%
rename from packaging/windows/packages/io.guh.mea/license-mea.txt
rename to packaging/windows/packages/io.guh.mea/meta/license-mea.txt
diff --git a/packaging/windows/packages/io.guh.mea/package-maveo.xml b/packaging/windows/packages/io.guh.mea/package-maveo.xml
new file mode 100644
index 00000000..fda4dc7e
--- /dev/null
+++ b/packaging/windows/packages/io.guh.mea/package-maveo.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package>
+    <DisplayName>Maveo Pro Box Dashboard</DisplayName>
+    <Description>Install the Maveo Pro Box Dashboard application.</Description>
+    <Version>0.1.0-1</Version>
+    <ReleaseDate>2018-05-16</ReleaseDate>
+    <Licenses>
+        <License name="Marantec License Agreement" file="license-maveo.txt" />
+    </Licenses>
+    <Default>true</Default>
+    <Script>installscript.qs</Script>
+</Package>
diff --git a/packaging/windows/packages/io.guh.mea/meta/package.xml b/packaging/windows/packages/io.guh.mea/package-mea.xml
similarity index 78%
rename from packaging/windows/packages/io.guh.mea/meta/package.xml
rename to packaging/windows/packages/io.guh.mea/package-mea.xml
index c7824b8d..20ddae5c 100644
--- a/packaging/windows/packages/io.guh.mea/meta/package.xml
+++ b/packaging/windows/packages/io.guh.mea/package-mea.xml
@@ -5,7 +5,7 @@
     <Version>0.1.0-1</Version>
     <ReleaseDate>2018-05-16</ReleaseDate>
     <Licenses>
-        <License name="Beer Public License Agreement" file="license.txt" />
+        <License name="GNU General Public License Agreement v2" file="license-mea.txt" />
     </Licenses>
     <Default>true</Default>
     <Script>installscript.qs</Script>