diff --git a/data/ayatana-indicator-datetime.conf.in b/data/ayatana-indicator-datetime.conf.in
index 9b43b96a..8b3e1b8d 100644
--- a/data/ayatana-indicator-datetime.conf.in
+++ b/data/ayatana-indicator-datetime.conf.in
@@ -1,9 +1,9 @@
-description "Indicator Date & Time Backend"
+description "Ayatana Indicator Date & Time Backend"
 
-start on indicator-services-start
-stop on desktop-end or indicator-services-end
+start on ayatana-indicator-services-start
+stop on desktop-end or ayatana-indicator-services-end
 
 respawn
 respawn limit 2 10
 
-exec @pkglibexecdir@/indicator-datetime-service
+exec @pkglibexecdir@/ayatana-indicator-datetime-service
diff --git a/data/ayatana-indicator-datetime.desktop.in b/data/ayatana-indicator-datetime.desktop.in
index ac957c03..70df0d73 100644
--- a/data/ayatana-indicator-datetime.desktop.in
+++ b/data/ayatana-indicator-datetime.desktop.in
@@ -1,9 +1,8 @@
 [Desktop Entry]
 Type=Application
-Name=Indicator Date & Time
-Exec=@pkglibexecdir@/indicator-datetime-service
+Name=Ayatana Indicator Date & Time
+Exec=@pkglibexecdir@/ayatana-indicator-datetime-service
 OnlyShowIn=MATE;Unity;XFCE;Pantheon;
 NoDisplay=true
 StartupNotify=false
 Terminal=false
-AutostartCondition=GNOME3 unless-session gnome
diff --git a/data/ayatana-indicator-datetime.upstart.desktop.in b/data/ayatana-indicator-datetime.upstart.desktop.in
index 076d373a..7d053e07 100644
--- a/data/ayatana-indicator-datetime.upstart.desktop.in
+++ b/data/ayatana-indicator-datetime.upstart.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=Indicator Date & Time
-Exec=@pkglibexecdir@/indicator-datetime-service
+Name=Ayatana Indicator Date & Time
+Exec=@pkglibexecdir@/ayatana-indicator-datetime-service
 OnlyShowIn=Unity;
 NoDisplay=true
 StartupNotify=false