diff --git a/compositor/DBus.vala b/compositor/DBus.vala
index 398454df8..73b5cfd3b 100644
--- a/compositor/DBus.vala
+++ b/compositor/DBus.vala
@@ -16,30 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-[DBus (name="org.pantheon.greeter")]
 public class GreeterCompositor.DBus {
-    public static DBus? instance;
-    static WindowManager wm;
-
-    [DBus (visible = false)]
-    public static void init (WindowManager _wm) {
-        wm = _wm;
-
-        Bus.own_name (BusType.SESSION, "org.pantheon.greeter", BusNameOwnerFlags.NONE,
-            (connection) => {
-                if (instance == null)
-                    instance = new DBus ();
-
-                try {
-                    connection.register_object ("/org/pantheon/greeter", instance);
-                } catch (Error e) {
-                    warning (e.message);
-                }
-            },
-            () => {},
-            () => warning ("Could not acquire name\n")
-        );
-
+    public static void init (WindowManager wm) {
         Bus.own_name (BusType.SESSION, "org.gnome.Shell", BusNameOwnerFlags.NONE,
             (connection) => {
                 try {
@@ -52,15 +30,4 @@ public class GreeterCompositor.DBus {
             () => critical ("Could not acquire name")
         );
     }
-
-    [DBus (visible = false)]
-    public signal void change_wallpaper (string path);
-
-    public void set_wallpaper (string path) throws GLib.Error {
-        change_wallpaper (path);
-    }
-
-    private DBus () {
-
-    }
 }
diff --git a/compositor/WingpanelManager/DBusWingpanelManager.vala b/compositor/WingpanelManager/DBusWingpanelManager.vala
index 9a41ebcfd..037e991e4 100644
--- a/compositor/WingpanelManager/DBusWingpanelManager.vala
+++ b/compositor/WingpanelManager/DBusWingpanelManager.vala
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-[DBus (name = "org.pantheon.gala.WingpanelInterface")]
+[DBus (name = "io.elementary.gala.WingpanelInterface")]
 public class GreeterCompositor.DBusWingpanelManager : GLib.Object {
     private static DBusWingpanelManager? instance;
     private static WindowManager wm;
@@ -15,19 +15,19 @@ public class GreeterCompositor.DBusWingpanelManager : GLib.Object {
     public static void init (WindowManager _wm) {
         wm = _wm;
 
-        Bus.own_name (BusType.SESSION, "org.pantheon.gala.WingpanelInterface", BusNameOwnerFlags.NONE,
+        Bus.own_name (BusType.SESSION, "io.elementary.gala.WingpanelInterface", BusNameOwnerFlags.NONE,
             (connection) => {
                 if (instance == null)
                     instance = new DBusWingpanelManager ();
 
                 try {
-                    connection.register_object ("/org/pantheon/gala/WingpanelInterface", instance);
+                    connection.register_object ("/io/elementary/gala/WingpanelInterface", instance);
                 } catch (Error e) {
                     warning (e.message);
                 }
             },
             () => {},
-            () => warning ("Could not acquire name\n")
+            () => warning ("Could not acquire name")
         );
     }