9 files changed, 34 insertions, 34 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 0750128..0d903b9 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -3,7 +3,7 @@
 ##
 
 include (UseGSettings)
-set (SCHEMA_NAME "com.canonical.indicator.power.gschema.xml")
+set (SCHEMA_NAME "org.ayatana.indicator.power.gschema.xml")
 set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
 set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
 
@@ -80,11 +80,11 @@ install (FILES "${UPSTART_XDG_AUTOSTART_FILE}"
 ##
 
 # where to install
-set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/unity/indicators")
-message (STATUS "${UNITY_INDICATOR_DIR} is the Unity Indicator install dir")
+set (AYATANA_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/ayatana/indicators")
+message (STATUS "${AYATANA_INDICATOR_DIR} is the Unity Indicator install dir")
 
-set (UNITY_INDICATOR_NAME "com.canonical.indicator.power")
-set (UNITY_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}")
+set (AYATANA_INDICATOR_NAME "org.ayatana.indicator.power")
+set (AYATANA_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${AYATANA_INDICATOR_NAME}")
 
-install (FILES "${UNITY_INDICATOR_FILE}"
-         DESTINATION "${UNITY_INDICATOR_DIR}")
+install (FILES "${AYATANA_INDICATOR_FILE}"
+         DESTINATION "${AYATANA_INDICATOR_DIR}")
diff --git a/data/indicator-power.conf.in b/data/ayatana-indicator-power.conf.in
index 665fb35..665fb35 100644
--- a/data/indicator-power.conf.in
+++ b/data/ayatana-indicator-power.conf.in
diff --git a/data/indicator-power.desktop.in b/data/ayatana-indicator-power.desktop.in
index c2fd54c..c2fd54c 100644
--- a/data/indicator-power.desktop.in
+++ b/data/ayatana-indicator-power.desktop.in
diff --git a/data/indicator-power.upstart.desktop.in b/data/ayatana-indicator-power.upstart.desktop.in
index 5f95f8e..5f95f8e 100644
--- a/data/indicator-power.upstart.desktop.in
+++ b/data/ayatana-indicator-power.upstart.desktop.in
diff --git a/data/com.canonical.indicator.power b/data/com.canonical.indicator.power
deleted file mode 100644
index f94ed0f..0000000
--- a/data/com.canonical.indicator.power
+++ /dev/null
@@ -1,24 +0,0 @@
-[Indicator Service]
-Name=indicator-power
-ObjectPath=/com/canonical/indicator/power
-Position=40
-
-[phone]
-ObjectPath=/com/canonical/indicator/power/phone
-Position=25
-
-[desktop]
-ObjectPath=/com/canonical/indicator/power/desktop
-
-[desktop_greeter]
-ObjectPath=/com/canonical/indicator/power/desktop_greeter
-
-[desktop_lockscreen]
-ObjectPath=/com/canonical/indicator/power/desktop_greeter
-
-[phone_greeter]
-ObjectPath=/com/canonical/indicator/power/phone
-Position=25
-
-[ubiquity]
-ObjectPath=/com/canonical/indicator/power/desktop_greeter
diff --git a/data/org.ayatana.indicator.power b/data/org.ayatana.indicator.power
new file mode 100644
index 0000000..1625507
--- /dev/null
+++ b/data/org.ayatana.indicator.power
@@ -0,0 +1,24 @@
+[Indicator Service]
+Name=indicator-power
+ObjectPath=/org.ayatana.indicator/power
+Position=40
+
+[phone]
+ObjectPath=/org.ayatana.indicator/power/phone
+Position=25
+
+[desktop]
+ObjectPath=/org.ayatana.indicator/power/desktop
+
+[desktop_greeter]
+ObjectPath=/org.ayatana.indicator/power/desktop_greeter
+
+[desktop_lockscreen]
+ObjectPath=/org.ayatana.indicator/power/desktop_greeter
+
+[phone_greeter]
+ObjectPath=/org.ayatana.indicator/power/phone
+Position=25
+
+[ubiquity]
+ObjectPath=/org.ayatana.indicator/power/desktop_greeter
diff --git a/data/com.canonical.indicator.power.Battery.xml b/data/org.ayatana.indicator.power.Battery.xml
index eca4524..cfb4b01 100644
--- a/data/com.canonical.indicator.power.Battery.xml
+++ b/data/org.ayatana.indicator.power.Battery.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
-  <interface name="com.canonical.indicator.power.Battery">
+  <interface name="org.ayatana.indicator.power.Battery">
 
     <property name="PowerLevel" type="s" access="read">
       <doc:doc>
diff --git a/data/com.canonical.indicator.power.Testing.xml b/data/org.ayatana.indicator.power.Testing.xml
index 72cf6cf..a0d7f50 100644
--- a/data/com.canonical.indicator.power.Testing.xml
+++ b/data/org.ayatana.indicator.power.Testing.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
-  <interface name="com.canonical.indicator.power.Testing">
+  <interface name="org.ayatana.indicator.power.Testing">
 
     <property name="MockBatteryEnabled" type="b" access="readwrite">
       <doc:doc>
diff --git a/data/com.canonical.indicator.power.gschema.xml.in b/data/org.ayatana.indicator.power.gschema.xml.in
index 4fd2620..901135b 100644
--- a/data/com.canonical.indicator.power.gschema.xml.in
+++ b/data/org.ayatana.indicator.power.gschema.xml.in
@@ -4,7 +4,7 @@
     <value nick="charge" value="1" />
     <value nick="never" value="2" />
   </enum>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.indicator.power" path="/com/canonical/indicator/power/">
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.ayatana.indicator.power" path="/org.ayatana.indicator/power/">
     <key name="show-time" type="b">
       <default>false</default>
       <_summary>Show time in Menu Bar</_summary>