7 files changed, 20 insertions, 20 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index d00c9ef..33bae7f 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -5,7 +5,7 @@
 
 install(
 FILES
-com.canonical.Unity.Greeter.Broadcast.xml
+org.ayatana.Desktop.Greeter.Broadcast.xml
 DESTINATION ${DBUSIFACEDIR}
 )
 
@@ -15,7 +15,7 @@ DESTINATION ${DBUSIFACEDIR}
 
 install(
 FILES
-com.canonical.Unity.Greeter.Broadcast.conf
+org.ayatana.Desktop.Greeter.Broadcast.conf
 DESTINATION ${DBUSSYSCONFDIR}/dbus-1/system.d
 )
 
@@ -24,11 +24,11 @@ DESTINATION ${DBUSSYSCONFDIR}/dbus-1/system.d
 ###########################
 
 set(BROADCAST_SERVICE
-"${CMAKE_CURRENT_BINARY_DIR}/com.canonical.Unity.Greeter.Broadcast.service"
+"${CMAKE_CURRENT_BINARY_DIR}/org.ayatana.Desktop.Greeter.Broadcast.service"
 )
 
-set(pkglibexecdir "${CMAKE_INSTALL_FULL_LIBEXECDIR}/unity-greeter-session-broadcast")
-configure_file("com.canonical.Unity.Greeter.Broadcast.service.in"
+set(pkglibexecdir "${CMAKE_INSTALL_FULL_LIBEXECDIR}/ayatana-greeter-session-broadcast")
+configure_file("org.ayatana.Desktop.Greeter.Broadcast.service.in"
   "${BROADCAST_SERVICE}"
   @ONLY
 )
@@ -44,7 +44,7 @@ DESTINATION ${DBUSSERVICEDIR}
 ###########################
 
 set(SESSION_UPSTART
-"${CMAKE_CURRENT_SOURCE_DIR}/unity-greeter-session-broadcast-session.conf"
+"${CMAKE_CURRENT_SOURCE_DIR}/ayatana-greeter-session-broadcast-session.conf"
 )
 
 install(
@@ -57,4 +57,4 @@ DESTINATION "/usr/share/upstart/sessions"
 # GSettings
 ###########################
 
-add_schema ("com.canonical.Unity.Greeter.Broadcast.gschema.xml")
+add_schema ("org.ayatana.Desktop.Greeter.Broadcast.gschema.xml")
diff --git a/data/unity-greeter-session-broadcast-session.conf b/data/ayatana-greeter-session-broadcast-session.conf
index 7f45187..db4257c 100644
--- a/data/unity-greeter-session-broadcast-session.conf
+++ b/data/ayatana-greeter-session-broadcast-session.conf
@@ -1,10 +1,10 @@
-description "Unity Greeter Session Broadcast Session Component"
+description "Desktop Greeter Session Broadcast Session Component"
 author "Ted Gould <ted@canonical.com>"
 
 task
 
 #TODO: Check GSettings Key
-start on dbus BUS=system SIGNAL="StartUrl" INTERFACE="com.canonical.Unity.Greeter.Broadcast" OBJPATH="/com/canonical/Unity/Greeter/Broadcast"
+start on dbus BUS=system SIGNAL="StartUrl" INTERFACE="org.ayatana.Desktop.Greeter.Broadcast" OBJPATH="/org/ayatana/Desktop/Greeter/Broadcast"
 
 pre-start script
 	if [ -z $ARG0 ] ; then
@@ -16,7 +16,7 @@ pre-start script
 		exit 1
 	fi
 
-	OWNER=`gdbus call --system --dest org.freedesktop.DBus --object-path / --method org.freedesktop.DBus.GetNameOwner com.canonical.Unity.Greeter.Broadcast | cut -d "'" -f 2`
+	OWNER=`gdbus call --system --dest org.freedesktop.DBus --object-path / --method org.freedesktop.DBus.GetNameOwner org.ayatana.Desktop.Greeter.Broadcast | cut -d "'" -f 2`
 
 	if [ -z $OWNER ] ; then
 		stop
diff --git a/data/com.canonical.Unity.Greeter.Broadcast.service.in b/data/com.canonical.Unity.Greeter.Broadcast.service.in
deleted file mode 100644
index 9cfe989..0000000
--- a/data/com.canonical.Unity.Greeter.Broadcast.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.Unity.Greeter.Broadcast
-Exec=@pkglibexecdir@/unity-greeter-session-broadcast-service
-User=root
diff --git a/data/com.canonical.Unity.Greeter.Broadcast.conf b/data/org.ayatana.Desktop.Greeter.Broadcast.conf
index 8a8cfe6..3e42f6b 100644
--- a/data/com.canonical.Unity.Greeter.Broadcast.conf
+++ b/data/org.ayatana.Desktop.Greeter.Broadcast.conf
@@ -5,16 +5,16 @@
 <busconfig>
 
   <policy user="root">
-    <allow own="com.canonical.Unity.Greeter.Broadcast"/>
-    <allow send_destination="com.canonical.Unity.Greeter.Broadcast"/>
+    <allow own="org.ayatana.Desktop.Greeter.Broadcast"/>
+    <allow send_destination="org.ayatana.Desktop.Greeter.Broadcast"/>
   </policy>
 
   <policy user="lightdm">
-    <allow send_destination="com.canonical.Unity.Greeter.Broadcast"/>
+    <allow send_destination="org.ayatana.Desktop.Greeter.Broadcast"/>
   </policy>
 
   <policy context="default">
-    <allow send_destination="com.canonical.Unity.Greeter.Broadcast"
+    <allow send_destination="org.ayatana.Desktop.Greeter.Broadcast"
            send_interface="org.freedesktop.DBus.Introspectable"/>
   </policy>
 
diff --git a/data/com.canonical.Unity.Greeter.Broadcast.gschema.xml b/data/org.ayatana.Desktop.Greeter.Broadcast.gschema.xml
index f9fbf22..2ea105d 100644
--- a/data/com.canonical.Unity.Greeter.Broadcast.gschema.xml
+++ b/data/org.ayatana.Desktop.Greeter.Broadcast.gschema.xml
@@ -1,5 +1,5 @@
 <schemalist>
-	<schema id="com.canonical.Unity.Greeter.Broadcast" path="/com/canonical/Unity/Greeter/Broadcast/" gettext-domain="unity-greeter-session-broadcast">
+	<schema id="org.ayatana.Desktop.Greeter.Broadcast" path="/org/ayatana/Desktop/Greeter/Broadcast/" gettext-domain="ayatana-greeter-session-broadcast">
 		<key name="allow-start-url" type="b">
 			<summary>Allow the Greeter to start URLs in this session</summary>
 			<description>
diff --git a/data/org.ayatana.Desktop.Greeter.Broadcast.service.in b/data/org.ayatana.Desktop.Greeter.Broadcast.service.in
new file mode 100644
index 0000000..9ba7a60
--- /dev/null
+++ b/data/org.ayatana.Desktop.Greeter.Broadcast.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.ayatana.Desktop.Greeter.Broadcast
+Exec=@pkglibexecdir@/ayatana-greeter-session-broadcast-service
+User=root
diff --git a/data/com.canonical.Unity.Greeter.Broadcast.xml b/data/org.ayatana.Desktop.Greeter.Broadcast.xml
index 5a4276a..af9393a 100644
--- a/data/com.canonical.Unity.Greeter.Broadcast.xml
+++ b/data/org.ayatana.Desktop.Greeter.Broadcast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node>
-	<interface name="com.canonical.Unity.Greeter.Broadcast">
+	<interface name="org.ayatana.Desktop.Greeter.Broadcast">
 		<!-- From the Greeter -->
 		<method name="RequestUrlStart">
 			<arg type="s" name="username" direction="in" />