12 files changed, 26 insertions, 19 deletions
diff --git a/apps/NotAvailableYet.qml b/apps/NotAvailableYet.qml
index 87156ecc..f805d2be 100644
--- a/apps/NotAvailableYet.qml
+++ b/apps/NotAvailableYet.qml
@@ -35,7 +35,7 @@ import controls 1.0
 import com.pelagicore.styles.neptune 3.0
 import utils 1.0
 
-AppUIScreen {
+PrimaryWindow {
     id: root
 
     width: Style.hspan(24)
diff --git a/apps/com.luxoft.vehicle/Main.qml b/apps/com.luxoft.vehicle/Main.qml
index fcd0f89a..33839c50 100644
--- a/apps/com.luxoft.vehicle/Main.qml
+++ b/apps/com.luxoft.vehicle/Main.qml
@@ -32,7 +32,7 @@
 import QtQuick 2.2
 import utils 1.0
 
-AppUIScreen {
+PrimaryWindow {
     id: root
 
     Vehicle {
diff --git a/apps/com.pelagicore.apps.settings/Main.qml b/apps/com.pelagicore.apps.settings/Main.qml
index ef16c3b8..31a5a57b 100644
--- a/apps/com.pelagicore.apps.settings/Main.qml
+++ b/apps/com.pelagicore.apps.settings/Main.qml
@@ -38,7 +38,7 @@ import "views"
 import "store"
 import "assets"
 
-AppUIScreen {
+PrimaryWindow {
     id: root
 
     Image {
diff --git a/apps/com.pelagicore.appstore/Main.qml b/apps/com.pelagicore.appstore/Main.qml
index eb534878..fe189fcf 100644
--- a/apps/com.pelagicore.appstore/Main.qml
+++ b/apps/com.pelagicore.appstore/Main.qml
@@ -36,7 +36,7 @@ import QtQuick.Controls 2.2
 import "views"
 import "stores"
 
-AppUIScreen {
+PrimaryWindow {
     id: root
 
     Image {
diff --git a/apps/com.pelagicore.calendar/Main.qml b/apps/com.pelagicore.calendar/Main.qml
index 45c51834..01c9be2d 100644
--- a/apps/com.pelagicore.calendar/Main.qml
+++ b/apps/com.pelagicore.calendar/Main.qml
@@ -34,7 +34,7 @@ import utils 1.0
 import "stores"
 import "views"
 
-AppUIScreen {
+PrimaryWindow {
     id: root
 
     MultiPointTouchArea {
diff --git a/apps/com.pelagicore.map/Main.qml b/apps/com.pelagicore.map/Main.qml
index 7fce4ee0..7a866458 100644
--- a/apps/com.pelagicore.map/Main.qml
+++ b/apps/com.pelagicore.map/Main.qml
@@ -47,7 +47,7 @@ QtObject {
     // used for copying the offline DB
     readonly property var _mapsHelper: MapsHelper {}
 
-    property var mainWindow: AppUIScreen {
+    property var mainWindow: PrimaryWindow {
         id: mainWindow
 
         property var secondaryWindowObject
diff --git a/apps/com.pelagicore.music/Main.qml b/apps/com.pelagicore.music/Main.qml
index 17ee88a3..5dee9d34 100644
--- a/apps/com.pelagicore.music/Main.qml
+++ b/apps/com.pelagicore.music/Main.qml
@@ -41,7 +41,7 @@ import "views"
 import com.pelagicore.styles.neptune 3.0
 
 QtObject {
-    property var mainWindow: AppUIScreen {
+    property var mainWindow: PrimaryWindow {
         id: mainWindow
 
         MultiPointTouchArea {
diff --git a/apps/com.pelagicore.phone/Main.qml b/apps/com.pelagicore.phone/Main.qml
index c95e58f4..a1460ea4 100644
--- a/apps/com.pelagicore.phone/Main.qml
+++ b/apps/com.pelagicore.phone/Main.qml
@@ -41,7 +41,7 @@ import "views"
 import "controls"
 import "stores"
 
-AppUIScreen {
+PrimaryWindow {
     id: root
 
     MultiPointTouchArea {
diff --git a/apps/com.pelagicore.radio/Main.qml b/apps/com.pelagicore.radio/Main.qml
index d6e5a9ef..dd85a2c6 100644
--- a/apps/com.pelagicore.radio/Main.qml
+++ b/apps/com.pelagicore.radio/Main.qml
@@ -34,7 +34,7 @@ import utils 1.0
 import "stores"
 
 QtObject {
-    property var mainWindow: AppUIScreen {
+    property var mainWindow: PrimaryWindow {
         id: mainWindow
 
         MultiPointTouchArea {
diff --git a/dev/apps/com.pelagicore.sheets/Main.qml b/dev/apps/com.pelagicore.sheets/Main.qml
index 74f3c27e..1a52653a 100644
--- a/dev/apps/com.pelagicore.sheets/Main.qml
+++ b/dev/apps/com.pelagicore.sheets/Main.qml
@@ -32,7 +32,7 @@
 import QtQuick 2.8
 import utils 1.0
 
-AppUIScreen {
+PrimaryWindow {
     id: root
 
     SheetsContent {
diff --git a/imports/shared/utils/AppUIScreen.qml b/imports/shared/utils/PrimaryWindow.qml
index da019911..9c904154 100644
--- a/imports/shared/utils/AppUIScreen.qml
+++ b/imports/shared/utils/PrimaryWindow.qml
@@ -39,26 +39,33 @@ import com.pelagicore.settings 1.0
 import com.pelagicore.styles.neptune 3.0
 
 /*!
-    \qmltype AppUIScreen
+    \qmltype PrimaryWindow
     \inqmlmodule utils
     \inherits ApplicationManagerWindow
-    \brief A base QML item for developing applications.
+    \brief The primary window of a Neptune 3 application
 
-    AppUIScreen is a QML item which should be a root element in every
-    Neptune 3 UI application. It provides APIs for interacting with a system UI and
-    for positioning the application's visual elements.
+    The primary window of a Neptune 3 application is displayed on the Center Console.
+    This component also provides APIs for interacting with system UI and for positioning
+    the application's visual elements.
 
     See \l{Neptune 3 UI Application Development} for best practices on how to use the APIs.
 
     \section2 Example Usage
 
-    The following example uses \l{AppUIScreen} as a root element:
+    The following example uses \l{PrimaryWindow} as a root element:
 
     \qml
-    AppUIScreen {
-        Content {
+    PrimaryWindow {
+        id: root
+        Background {
             anchors.fill: parent
         }
+        Content {
+            x: root.exposedRect.x
+            y: root.exposedRect.x
+            width: root.exposedRect.width
+            height: root.exposedRect.height
+        }
 
     }
     \endqml
diff --git a/imports/shared/utils/qmldir b/imports/shared/utils/qmldir
index 6646b55f..3ce93147 100644
--- a/imports/shared/utils/qmldir
+++ b/imports/shared/utils/qmldir
@@ -1,5 +1,5 @@
 singleton Style 1.0 Style.qml
-AppUIScreen 1.0 AppUIScreen.qml
+PrimaryWindow 1.0 PrimaryWindow.qml
 MonitorOverlay 1.0 MonitorOverlay.qml
 StageLoader 1.0 StageLoader.qml
 Store 1.0 Store.qml