diff --git a/data/deforaos-phone-contacts.desktop b/data/org.defora.phone-contacts.desktop
similarity index 100%
rename from data/deforaos-phone-contacts.desktop
rename to data/org.defora.phone-contacts.desktop
diff --git a/data/deforaos-phone-dialer.desktop b/data/org.defora.phone-dialer.desktop
similarity index 100%
rename from data/deforaos-phone-dialer.desktop
rename to data/org.defora.phone-dialer.desktop
diff --git a/data/deforaos-phone-gprs.desktop b/data/org.defora.phone-gprs.desktop
similarity index 100%
rename from data/deforaos-phone-gprs.desktop
rename to data/org.defora.phone-gprs.desktop
diff --git a/data/deforaos-phone-log.desktop b/data/org.defora.phone-log.desktop
similarity index 100%
rename from data/deforaos-phone-log.desktop
rename to data/org.defora.phone-log.desktop
diff --git a/data/deforaos-phone-messages.desktop b/data/org.defora.phone-messages.desktop
similarity index 100%
rename from data/deforaos-phone-messages.desktop
rename to data/org.defora.phone-messages.desktop
diff --git a/data/deforaos-phone-settings.desktop b/data/org.defora.phone-settings.desktop
similarity index 100%
rename from data/deforaos-phone-settings.desktop
rename to data/org.defora.phone-settings.desktop
diff --git a/data/deforaos-phone-sofia.desktop b/data/org.defora.phone-sofia.desktop
similarity index 100%
rename from data/deforaos-phone-sofia.desktop
rename to data/org.defora.phone-sofia.desktop
diff --git a/data/project.conf b/data/project.conf
index 5114e2b..a1489ec 100644
--- a/data/project.conf
+++ b/data/project.conf
@@ -1,13 +1,15 @@
 subdirs=16x16,22x22,24x24,32x32,48x48
 targets=Phone.pc
-dist=Makefile,Phone.pc.in,0.wav,1.wav,2.wav,3.wav,4.wav,5.wav,6.wav,7.wav,8.wav,9.wav,a.wav,b.wav,busy.wav,c.wav,d.wav,deforaos-phone-contacts.desktop,deforaos-phone-dialer.desktop,deforaos-phone-gprs.desktop,deforaos-phone-log.desktop,deforaos-phone-messages.desktop,deforaos-phone-settings.desktop,deforaos-phone-sofia.desktop,hash.wav,keytone.wav,pkgconfig.sh,ringback.wav,ringtone.wav,star.wav
+dist=Makefile,Phone.pc.in,0.wav,1.wav,2.wav,3.wav,4.wav,5.wav,6.wav,7.wav,8.wav,9.wav,a.wav,b.wav,busy.wav,c.wav,d.wav,hash.wav,keytone.wav,org.defora.phone-contacts.desktop,org.defora.phone-dialer.desktop,org.defora.phone-gprs.desktop,org.defora.phone-log.desktop,org.defora.phone-messages.desktop,org.defora.phone-settings.desktop,org.defora.phone-sofia.desktop,pkgconfig.sh,ringback.wav,ringtone.wav,star.wav
 
+#targets
 [Phone.pc]
 type=script
 script=./pkgconfig.sh
 depends=Phone.pc.in,../config.sh
 install=$(PREFIX)
 
+#dist
 [0.wav]
 install=$(PREFIX)/share/sounds/Phone
 
@@ -53,30 +55,30 @@ install=$(PREFIX)/share/sounds/Phone
 [d.wav]
 install=$(PREFIX)/share/sounds/Phone
 
-[deforaos-phone-contacts.desktop]
-install=$(PREFIX)/share/applications
-
-[deforaos-phone-dialer.desktop]
-install=$(PREFIX)/share/applications
-
-[deforaos-phone-log.desktop]
-install=$(PREFIX)/share/applications
-
-[deforaos-phone-messages.desktop]
-install=$(PREFIX)/share/applications
-
-[deforaos-phone-settings.desktop]
-install=$(PREFIX)/share/applications
-
-[deforaos-phone-sofia.desktop]
-install=$(PREFIX)/share/applications
-
 [hash.wav]
 install=$(PREFIX)/share/sounds/Phone
 
 [keytone.wav]
 install=$(PREFIX)/share/sounds/Phone
 
+[org.defora.phone-contacts.desktop]
+install=$(PREFIX)/share/applications
+
+[org.defora.phone-dialer.desktop]
+install=$(PREFIX)/share/applications
+
+[org.defora.phone-log.desktop]
+install=$(PREFIX)/share/applications
+
+[org.defora.phone-messages.desktop]
+install=$(PREFIX)/share/applications
+
+[org.defora.phone-settings.desktop]
+install=$(PREFIX)/share/applications
+
+[org.defora.phone-sofia.desktop]
+install=$(PREFIX)/share/applications
+
 [ringback.wav]
 install=$(PREFIX)/share/sounds/Phone