diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70e0afc7..28ac378c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,12 +37,12 @@ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAG
 
 include(CheckIncludeFiles)
 
-plasma_install_package(look-and-feel org.kde.satellite.phone look-and-feel)
-plasma_install_package(shell org.kde.satellite.phone shells)
-install(DIRECTORY wallpaper/ DESTINATION "${WALLPAPER_INSTALL_DIR}/org.kde.satellite.lockers")
+plasma_install_package(look-and-feel org.kde.plasma.phone look-and-feel)
+plasma_install_package(shell org.kde.plasma.phone shells)
+install(DIRECTORY wallpaper/ DESTINATION "${WALLPAPER_INSTALL_DIR}/org.kde.plasma.phone.lockers")
 
 install(DIRECTORY compositor/
-        DESTINATION ${DATA_INSTALL_DIR}/greenisland/org.kde.satellite.compositor.phone
+        DESTINATION ${DATA_INSTALL_DIR}/greenisland/org.kde.plasma.phone.compositor
         PATTERN .svn EXCLUDE
         PATTERN CMakeLists.txt EXCLUDE
         PATTERN Messages.sh EXCLUDE
diff --git a/README.md b/README.md
index f7137b63..ec7e46dc 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,6 @@ http://comments.gmane.org/gmane.comp.handhelds.ofono/12178
   phonesim -p 12345  -gui  /usr/share/phonesim/default.xml
 * from the oFono *source* directory, call /test/enable-modem to bring the modem up, the control UI should come up
 * call test/online-modem to activate the test phonesim modem
-* start plasma with plasmashell -w -p org.kde.satellite.phone to start the phone homescreen in a window
+* start plasma with plasmashell -w -p org.kde.plasma.phone to start the phone homescreen in a window
 
 Note that the oFono/phonesim part is necessary only if it's needed to test some part specific to telephony
diff --git a/applets/quicksettings/package/contents/ui/main.qml b/applets/quicksettings/package/contents/ui/main.qml
index 822858f5..d7cd163a 100644
--- a/applets/quicksettings/package/contents/ui/main.qml
+++ b/applets/quicksettings/package/contents/ui/main.qml
@@ -69,7 +69,7 @@ Item {
             text: "Wireless"
             icon: "network-wireless-on"
             enabled: true
-            settingsCommand: "active-settings -m org.kde.satellite.settings.wifi"
+            settingsCommand: "active-settings -m org.kde.plasma.phone.settings.wifi"
         }
         ListElement {
             text: "Alarms"
diff --git a/bin/plasma-phone.cmake b/bin/plasma-phone.cmake
index 0caae9a4..61c23cfc 100644
--- a/bin/plasma-phone.cmake
+++ b/bin/plasma-phone.cmake
@@ -39,4 +39,4 @@ init --user &
 mc-tool request ofono/ofono/account0 online
 paplay /usr/share/sounds/freedesktop/stereo/message.oga &
 
-exec /usr/bin/plasmashell -p org.kde.satellite.phone 2>/tmp/plasmashell_logs
+exec /usr/bin/plasmashell -p org.kde.plasma.phone 2>/tmp/plasmashell_logs
diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt
index 30124367..4120cdc7 100644
--- a/dbus/CMakeLists.txt
+++ b/dbus/CMakeLists.txt
@@ -1,9 +1,9 @@
-macro(satellite_install_dbus_service name)
+macro(plasma_phone_install_dbus_service name)
     install(FILES ${name}.service
             DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/session.d)
 endmacro()
 
-satellite_install_dbus_service(org.kde.kde5)
-satellite_install_dbus_service(org.kde.kglobalaccel)
-satellite_install_dbus_service(org.kde.klauncher5)
-satellite_install_dbus_service(org.kde.kuiserver)
+plasma_phone_install_dbus_service(org.kde.kde5)
+plasma_phone_install_dbus_service(org.kde.kglobalaccel)
+plasma_phone_install_dbus_service(org.kde.klauncher5)
+plasma_phone_install_dbus_service(org.kde.kuiserver)
diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop
index c6316e90..348a5490 100644
--- a/look-and-feel/metadata.desktop
+++ b/look-and-feel/metadata.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Satellite
+Name=Plasma Phone
 Comment=Plasma workspace for smartphones
 Keywords=Phone, Workspace, Look and Feel
 Type=Service
@@ -10,7 +10,7 @@ X-KDE-PluginInfo-Author=
 X-KDE-PluginInfo-Category=
 X-KDE-PluginInfo-Email=
 X-KDE-PluginInfo-License=GPLv2+
-X-KDE-PluginInfo-Name=org.kde.plasma.satellite
+X-KDE-PluginInfo-Name=org.kde.plasma.phone
 X-KDE-PluginInfo-Version=0.1
 X-KDE-PluginInfo-Website=
 X-Plasma-MainScript=defaults
diff --git a/packaging/plasma-phone-components.spec b/packaging/plasma-phone-components.spec
index 03d4b648..7e0b217c 100644
--- a/packaging/plasma-phone-components.spec
+++ b/packaging/plasma-phone-components.spec
@@ -106,7 +106,7 @@ EOF
 
 cat > %{buildroot}%{_kf5_configdir}/kdeglobals <<EOF
 [KDE]
-LookAndFeelPackage=org.kde.satellite.phone
+LookAndFeelPackage=org.kde.plasma.phone
 
 [General]
 desktopFont=Oxygen Sans,9,-1,5,50,0,0,0,0,0
diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
index 31561f17..e6f2facd 100644
--- a/services/CMakeLists.txt
+++ b/services/CMakeLists.txt
@@ -3,17 +3,17 @@ pkg_check_modules(SYSTEMD systemd REQUIRED)
 execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemduserunitdir systemd OUTPUT_VARIABLE SYSTEMD_USER_UNIT_DIR)
 string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_USER_UNIT_DIR ${SYSTEMD_USER_UNIT_DIR})
 
-macro(satellite_install_service name)
+macro(plasma_phone_install_service name)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${name}.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/${name}.service)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.service
             DESTINATION ${SYSTEMD_USER_UNIT_DIR})
 endmacro()
 
-satellite_install_service(kactivitymanagerd)
-satellite_install_service(kded5)
-satellite_install_service(kdeinit5)
-satellite_install_service(kglobalaccel5)
-satellite_install_service(kuiserver5)
-satellite_install_service(plasma-phone-compositor)
-satellite_install_service(plasma-phone-ui)
-satellite_install_service(plasma-phone)
+plasma_phone_install_service(kactivitymanagerd)
+plasma_phone_install_service(kded5)
+plasma_phone_install_service(kdeinit5)
+plasma_phone_install_service(kglobalaccel5)
+plasma_phone_install_service(kuiserver5)
+plasma_phone_install_service(plasma-phone-compositor)
+plasma_phone_install_service(plasma-phone-ui)
+plasma_phone_install_service(plasma-phone)
diff --git a/services/plasma-phone-compositor.service.cmake b/services/plasma-phone-compositor.service.cmake
index aa886a13..a10f52a8 100644
--- a/services/plasma-phone-compositor.service.cmake
+++ b/services/plasma-phone-compositor.service.cmake
@@ -15,7 +15,7 @@ Type=notify
 Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket
 EnvironmentFile=-/var/lib/environment/compositor/*.conf
 EnvironmentFile=-/var/lib/environment/greenisland/*.conf
-ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/greenisland $LIPSTICK_OPTIONS -p org.kde.satellite.compositor.phone
+ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/greenisland $LIPSTICK_OPTIONS -p org.kde.plasma.compositor.phone
 Restart=on-failure
 
 [Install]
diff --git a/services/plasma-phone-ui.service.cmake b/services/plasma-phone-ui.service.cmake
index e16d45bd..7c81c85c 100644
--- a/services/plasma-phone-ui.service.cmake
+++ b/services/plasma-phone-ui.service.cmake
@@ -12,7 +12,7 @@ After=plasma-phone-compositor.service
 [Service]
 Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket
 EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf
-ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/plasmashell -p org.kde.satellite.phone -n
+ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/plasmashell -p org.kde.plasma.phone -n
 ExecStop=@CMAKE_INSTALL_FULL_BINDIR@/kquitapp5 plasmashell
 Restart=on-failure
 BusName=org.kde.plasmashell
diff --git a/settingsmodules/CMakeLists.txt b/settingsmodules/CMakeLists.txt
index aa6f2d41..269ed3e3 100644
--- a/settingsmodules/CMakeLists.txt
+++ b/settingsmodules/CMakeLists.txt
@@ -1,4 +1,4 @@
-plasma_install_package(wireless org.kde.satellite.settings.wifi packages package)
+plasma_install_package(wireless org.kde.plasma.phone.settings.wifi packages package)
 
 
 
diff --git a/settingsmodules/wireless/metadata.desktop b/settingsmodules/wireless/metadata.desktop
index 1091da5a..13063ac0 100644
--- a/settingsmodules/wireless/metadata.desktop
+++ b/settingsmodules/wireless/metadata.desktop
@@ -8,7 +8,7 @@ Icon=network-wireless
 X-KDE-ServiceTypes=Active/SettingsModule
 X-KDE-PluginInfo-Author=Marco Martin
 X-KDE-PluginInfo-Email=mart@kde.org
-X-KDE-PluginInfo-Name=org.kde.satellite.settings.wifi
+X-KDE-PluginInfo-Name=org.kde.plasma.phone.settings.wifi
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-Website=
 X-KDE-PluginInfo-Category=Networking
diff --git a/shell/contents/defaults b/shell/contents/defaults
index 8dc05ec7..a2d8500d 100644
--- a/shell/contents/defaults
+++ b/shell/contents/defaults
@@ -1,5 +1,5 @@
 [kdeglobals][KDE]
-LookAndFeelPackage=org.kde.satellite.phone
+LookAndFeelPackage=org.kde.plasma.phone
 
 [Desktop]
 Containment=org.kde.phone.homescreen
diff --git a/shell/contents/layout.js b/shell/contents/layout.js
index c42e48f6..c1b48a5d 100644
--- a/shell/contents/layout.js
+++ b/shell/contents/layout.js
@@ -11,7 +11,7 @@ for (var j = 0; j < desktopsArray.length; j++) {
     desktopsArray[j].currentConfigGroup = ["Wallpaper",
                                            desktopsArray[j].wallpaperPlugin,
                                            "General"];
-    desktopsArray[j].writeConfig("Image", "org.kde.satellite.lockers");
+    desktopsArray[j].writeConfig("Image", "org.kde.plasma.phone.lockers");
 }
 
 desktopsForActivity(id)[0].addWidget("org.kde.phone.notifications");
diff --git a/shell/contents/loader.qml b/shell/contents/loader.qml
index 79546ccd..79e34f63 100644
--- a/shell/contents/loader.qml
+++ b/shell/contents/loader.qml
@@ -23,7 +23,7 @@ import QtQuick 2
 Item {
     id: main
 
-    property string shell  : "org.kde.satellite.phone"
+    property string shell  : "org.kde.plasma.phone"
     property bool willing  : true
     property int  priority : 10
 
diff --git a/shell/metadata.desktop b/shell/metadata.desktop
index c2a03e2c..e4027d15 100644
--- a/shell/metadata.desktop
+++ b/shell/metadata.desktop
@@ -8,7 +8,7 @@ X-KDE-PluginInfo-Author=Aaron Seigo
 X-KDE-PluginInfo-Category=
 X-KDE-PluginInfo-Email=aseigo@kde.org
 X-KDE-PluginInfo-License=GPLv2+
-X-KDE-PluginInfo-Name=org.kde.satellite.phone
+X-KDE-PluginInfo-Name=org.kde.plasma.phone
 X-KDE-PluginInfo-Version=0.1
 X-KDE-PluginInfo-Website=
 
diff --git a/wallpaper/metadata.desktop b/wallpaper/metadata.desktop
index d2ca3feb..efde647e 100644
--- a/wallpaper/metadata.desktop
+++ b/wallpaper/metadata.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
-Name=Satellite Lockers
+Name=Plasma Phone Lockers
 
-X-KDE-PluginInfo-Name=org.kde.satellite.lockers
+X-KDE-PluginInfo-Name=org.kde.plasma.phone.lockers
 X-KDE-PluginInfo-Author=Jens Reuterberg
 X-KDE-PluginInfo-Email=jens@ohyran.se
 X-KDE-PluginInfo-License=LGPLv3