diff --git a/Makefile b/Makefile
index 192de74..ff07546 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,9 @@ dist:
 	$(LN) -s . $(PACKAGE)-$(VERSION)
 	@$(TAR) $(PACKAGE)-$(VERSION).tar.gz \
 		$(PACKAGE)-$(VERSION)/data/Makefile \
-		$(PACKAGE)-$(VERSION)/data/phone.desktop \
+		$(PACKAGE)-$(VERSION)/data/phone-contacts.desktop \
+		$(PACKAGE)-$(VERSION)/data/phone-dialer.desktop \
+		$(PACKAGE)-$(VERSION)/data/phone-messages.desktop \
 		$(PACKAGE)-$(VERSION)/data/phone-signal-00.png \
 		$(PACKAGE)-$(VERSION)/data/phone-signal-25.png \
 		$(PACKAGE)-$(VERSION)/data/phone-signal-50.png \
@@ -34,13 +36,13 @@ dist:
 		$(PACKAGE)-$(VERSION)/po/POTFILES \
 		$(PACKAGE)-$(VERSION)/po/fr.po \
 		$(PACKAGE)-$(VERSION)/po/project.conf \
-		$(PACKAGE)-$(VERSION)/src/contacts.c \
-		$(PACKAGE)-$(VERSION)/src/dialer.c \
-		$(PACKAGE)-$(VERSION)/src/messages.c \
 		$(PACKAGE)-$(VERSION)/src/callbacks.c \
 		$(PACKAGE)-$(VERSION)/src/gsm.c \
 		$(PACKAGE)-$(VERSION)/src/main.c \
 		$(PACKAGE)-$(VERSION)/src/phone.c \
+		$(PACKAGE)-$(VERSION)/src/contacts.c \
+		$(PACKAGE)-$(VERSION)/src/dialer.c \
+		$(PACKAGE)-$(VERSION)/src/messages.c \
 		$(PACKAGE)-$(VERSION)/src/Makefile \
 		$(PACKAGE)-$(VERSION)/src/callbacks.h \
 		$(PACKAGE)-$(VERSION)/src/gsm.h \
diff --git a/data/Makefile b/data/Makefile
index 7fdb346..7d14f01 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -13,7 +13,11 @@ distclean: clean
 
 install: all
 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
-	$(INSTALL) -m 0644 phone.desktop $(DESTDIR)$(PREFIX)/share/applications/phone.desktop
+	$(INSTALL) -m 0644 phone-contacts.desktop $(DESTDIR)$(PREFIX)/share/applications/phone-contacts.desktop
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
+	$(INSTALL) -m 0644 phone-dialer.desktop $(DESTDIR)$(PREFIX)/share/applications/phone-dialer.desktop
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
+	$(INSTALL) -m 0644 phone-messages.desktop $(DESTDIR)$(PREFIX)/share/applications/phone-messages.desktop
 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps
 	$(INSTALL) -m 0644 phone-signal-00.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/phone-signal-00.png
 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps
@@ -26,7 +30,9 @@ install: all
 	$(INSTALL) -m 0644 phone-signal-100.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/phone-signal-100.png
 
 uninstall:
-	$(RM) $(DESTDIR)$(PREFIX)/share/applications/phone.desktop
+	$(RM) $(DESTDIR)$(PREFIX)/share/applications/phone-contacts.desktop
+	$(RM) $(DESTDIR)$(PREFIX)/share/applications/phone-dialer.desktop
+	$(RM) $(DESTDIR)$(PREFIX)/share/applications/phone-messages.desktop
 	$(RM) $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/phone-signal-00.png
 	$(RM) $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/phone-signal-25.png
 	$(RM) $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/phone-signal-50.png
diff --git a/data/phone-contacts.desktop b/data/phone-contacts.desktop
new file mode 100644
index 0000000..0234d4f
--- /dev/null
+++ b/data/phone-contacts.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Contacts
+Comment=Phone address book
+Exec=phone-contacts
+Icon=stock_addressbook
+Type=Application
+Categories=Network;Telephony;GTK;
+StartupNotify=true
diff --git a/data/phone.desktop b/data/phone-dialer.desktop
similarity index 52%
rename from data/phone.desktop
rename to data/phone-dialer.desktop
index 4a90b3c..bc0d580 100644
--- a/data/phone.desktop
+++ b/data/phone-dialer.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Phone
-Comment=A telephony application
-Exec=phone
-Icon=stock_cell-phone
+Name=Dialer
+Comment=Phone dialer
+Exec=phone-dialer
+Icon=stock_landline-phone
 Type=Application
 Categories=Network;Telephony;GTK;
 StartupNotify=true
diff --git a/data/phone-messages.desktop b/data/phone-messages.desktop
new file mode 100644
index 0000000..b6859f1
--- /dev/null
+++ b/data/phone-messages.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Messages
+Comment=Phone messaging
+Exec=phone-messages
+Icon=stock_mail-compose
+Type=Application
+Categories=Network;Telephony;GTK;
+StartupNotify=true
diff --git a/data/project.conf b/data/project.conf
index 7b81f5b..a838536 100644
--- a/data/project.conf
+++ b/data/project.conf
@@ -1,6 +1,12 @@
-dist=Makefile,phone.desktop,phone-signal-00.png,phone-signal-25.png,phone-signal-50.png,phone-signal-75.png,phone-signal-100.png
+dist=Makefile,phone-contacts.desktop,phone-dialer.desktop,phone-messages.desktop,phone-signal-00.png,phone-signal-25.png,phone-signal-50.png,phone-signal-75.png,phone-signal-100.png
 
-[phone.desktop]
+[phone-contacts.desktop]
+install=$(PREFIX)/share/applications
+
+[phone-dialer.desktop]
+install=$(PREFIX)/share/applications
+
+[phone-messages.desktop]
 install=$(PREFIX)/share/applications
 
 [phone-signal-00.png]
diff --git a/po/fr.po b/po/fr.po
index 66dcb66..281077e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the Phone package.
 # Pierre Pronchery <khorben@defora.org>, 2010.
 #
+#: ../src/phone.c:451
 msgid ""
 msgstr ""
 "Project-Id-Version: Phone 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-07 03:11+0200\n"
+"POT-Creation-Date: 2010-05-07 19:41+0200\n"
 "PO-Revision-Date: 2010-04-24 02:07+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: French\n"
@@ -16,123 +17,123 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../src/gsm.c:118
+#: ../src/gsm.c:116
 msgid "Phone failure"
 msgstr "Défaillance du téléphone"
 
-#: ../src/gsm.c:119
+#: ../src/gsm.c:117
 msgid "No connection to phone"
 msgstr "Pas de connexion au téléphone"
 
-#: ../src/gsm.c:120 ../src/gsm.c:154
+#: ../src/gsm.c:118 ../src/gsm.c:152
 msgid "Operation not allowed"
 msgstr "Opération non autorisée"
 
-#: ../src/gsm.c:121 ../src/gsm.c:155
+#: ../src/gsm.c:119 ../src/gsm.c:153
 msgid "Operation not supported"
 msgstr "Opération non supportée"
 
-#: ../src/gsm.c:122 ../src/gsm.c:157
+#: ../src/gsm.c:120 ../src/gsm.c:155
 msgid "SIM not inserted"
 msgstr "SIM non insérée"
 
-#: ../src/gsm.c:123 ../src/gsm.c:158
+#: ../src/gsm.c:121 ../src/gsm.c:156
 msgid "SIM PIN required"
 msgstr "Code SIM PIN requis"
 
-#: ../src/gsm.c:124
+#: ../src/gsm.c:122
 msgid "SIM PUK required"
 msgstr "Code PUK requis"
 
-#: ../src/gsm.c:125
+#: ../src/gsm.c:123
 msgid "SIM failure"
 msgstr "Défaillance SIM"
 
-#: ../src/gsm.c:126
+#: ../src/gsm.c:124
 msgid "SIM busy"
 msgstr "SIM occupée"
 
-#: ../src/gsm.c:127
+#: ../src/gsm.c:125
 msgid "SIM wrong"
 msgstr "SIM erronée"
 
-#: ../src/gsm.c:128
+#: ../src/gsm.c:126
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
-#: ../src/gsm.c:129
+#: ../src/gsm.c:127
 msgid "SIM PIN2 required"
 msgstr "Code SIM PIN2 requis"
 
-#: ../src/gsm.c:130
+#: ../src/gsm.c:128
 msgid "SIM PUK2 required"
 msgstr "Code SIM PUK2 requis"
 
-#: ../src/gsm.c:131
+#: ../src/gsm.c:129
 msgid "Memory full"
 msgstr "Mémoire pleine"
 
-#: ../src/gsm.c:132
+#: ../src/gsm.c:130
 msgid "Invalid index"
 msgstr "Index invalide"
 
-#: ../src/gsm.c:133
+#: ../src/gsm.c:131
 msgid "Not found"
 msgstr "Non trouvé"
 
-#: ../src/gsm.c:134
+#: ../src/gsm.c:132
 msgid "Memory failure"
 msgstr "Défaillance mémoire"
 
-#: ../src/gsm.c:135
+#: ../src/gsm.c:133
 msgid "Text string too long"
 msgstr "Texte trop long"
 
-#: ../src/gsm.c:136
+#: ../src/gsm.c:134
 msgid "Invalid characters in text string"
 msgstr "Caractère invalide dans le texte"
 
-#: ../src/gsm.c:137
+#: ../src/gsm.c:135
 msgid "Dial string too long"
 msgstr "Le numéro composé est trop long"
 
-#: ../src/gsm.c:138
+#: ../src/gsm.c:136
 msgid "Invalid characters in dial string"
 msgstr "Caractères invalides dans le numéro"
 
-#: ../src/gsm.c:139
+#: ../src/gsm.c:137
 msgid "No network service"
 msgstr "Pas de couverture réseau"
 
-#: ../src/gsm.c:140
+#: ../src/gsm.c:138
 msgid "Network timeout"
 msgstr "Délai d'attente du réseau dépassé"
 
-#: ../src/gsm.c:141
+#: ../src/gsm.c:139
 msgid "Network not allowed - emergency calls only"
 msgstr "Réseau non autorisé - appels d'urgence uniquement"
 
-#: ../src/gsm.c:152
+#: ../src/gsm.c:150
 msgid "ME failure"
 msgstr "Défaillance ME"
 
-#: ../src/gsm.c:153
+#: ../src/gsm.c:151
 msgid "SMS service of ME reserved"
 msgstr "Service SMS du ME réservé"
 
-#: ../src/gsm.c:156
+#: ../src/gsm.c:154
 msgid "Invalid PDU mode parameter"
 msgstr "Paramètre de mode PDU invalide"
 
-#: ../src/gsm.c:376
+#: ../src/gsm.c:373
 msgid ": Unknown baudrate"
 msgstr ": Débit inconnu"
 
-#: ../src/gsm.c:787
+#: ../src/gsm.c:784
 msgid "Event not handled"
 msgstr "Événement non géré"
 
-#: ../src/main.c:50
+#: ../src/main.c:45
 msgid ""
 "Usage: phone -b baudrate -d device -r retry -F\n"
 "  -b\tSpeed to set before communicating with the device\n"
@@ -141,126 +142,135 @@ msgid ""
 "  -F\tEnable hardware flow control (RTS/CTS)\n"
 msgstr ""
 
-#: ../src/phone.c:217
+#: ../src/phone.c:215
 msgid "Initializing..."
 msgstr "Initialisation..."
 
-#: ../src/phone.c:326
+#: ../src/phone.c:324
 msgid "Checking SIM PIN code..."
 msgstr "Vérification du code SIM PIN..."
 
-#: ../src/phone.c:453
+#: ../src/phone.c:450
+#, c-format
+msgid "%d message%s, %d/%d characters"
+msgstr ""
+
+#: ../src/phone.c:451
+msgid "s"
+msgstr ""
+
+#: ../src/phone.c:477
 msgid "Sending message..."
 msgstr "Envoi du message..."
 
-#: ../src/phone.c:517
+#: ../src/phone.c:541
 msgid "Enter"
 msgstr "Entrer"
 
-#: ../src/phone.c:519
+#: ../src/phone.c:543
 msgid "Skip"
 msgstr "Ignorer"
 
-#: ../src/phone.c:530
+#: ../src/phone.c:554
 msgid "Enter SIM PIN code"
 msgstr "Entrer le code SIM PIN"
 
-#: ../src/phone.c:559
+#: ../src/phone.c:583
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../src/phone.c:566 ../src/phone.c:651 ../src/phone.c:690
+#: ../src/phone.c:590 ../src/phone.c:678 ../src/phone.c:717
 msgid "Call"
 msgstr "Appeler"
 
-#: ../src/phone.c:576
+#: ../src/phone.c:600
 msgid "Write"
 msgstr "Écrire"
 
-#: ../src/phone.c:596
+#: ../src/phone.c:620
 msgid "Contact"
 msgstr "Contact"
 
-#: ../src/phone.c:626
+#: ../src/phone.c:650
 msgid "Dialer"
 msgstr "Composer"
 
-#: ../src/phone.c:653
+#: ../src/phone.c:680
 msgid "Hang up"
 msgstr "Raccrocher"
 
-#: ../src/phone.c:683
+#: ../src/phone.c:710
 msgid "Messages"
 msgstr "Messages"
 
-#: ../src/phone.c:696
+#: ../src/phone.c:723
 msgid "New message"
 msgstr "Nouveau message"
 
-#: ../src/phone.c:702
+#: ../src/phone.c:729
 msgid "Reply"
 msgstr "Répondre"
 
-#: ../src/phone.c:720
+#: ../src/phone.c:747
 msgid "Inbox"
 msgstr "Reçus"
 
-#: ../src/phone.c:727
+#: ../src/phone.c:754
 msgid "Sent"
 msgstr "Envoyés"
 
-#: ../src/phone.c:744
+#: ../src/phone.c:771
 msgid "Message"
 msgstr "Message"
 
-#: ../src/phone.c:773
+#: ../src/phone.c:801
 msgid "Write message"
 msgstr "Écrire un message"
 
-#: ../src/phone.c:894
+#: ../src/phone.c:935
 msgid "Operation in progress..."
 msgstr "Opération en cours..."
 
-#: ../src/phone.c:922 ../src/phone.c:927
+#: ../src/phone.c:963 ../src/phone.c:968
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/phone.c:975 ../src/phone.c:980
+#: ../src/phone.c:1019 ../src/phone.c:1024
 msgid "Information"
 msgstr "Information"
 
-#: ../src/phone.c:1067
+#: ../src/phone.c:1111
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../src/phone.c:1070
+#: ../src/phone.c:1114
 msgid "Registering..."
 msgstr "Enregistrement..."
 
-#: ../src/phone.c:1073
+#: ../src/phone.c:1117
 msgid "Denied"
 msgstr "Refusé"
 
-#: ../src/phone.c:1076
+#: ../src/phone.c:1120
 msgid "SIM check..."
 msgstr "Vérification SIM..."
 
-#: ../src/phone.c:1082
+#: ../src/phone.c:1126
 msgid "SIM ready..."
 msgstr "SIM prête..."
 
-#: ../src/phone.c:1168
+#: ../src/phone.c:1214
 msgid "Message sent"
 msgstr "Message envoyé"
 
-#: ../src/phone.c:1184
+#: ../src/phone.c:1231
 msgid "SIM PIN is valid"
 msgstr "Code SIM PIN valide"
 
-#: ../src/phone.c:1205
+#: ../src/phone.c:1253
 msgid "Wrong SIM PIN code"
 msgstr "Code SIM PIN erroné"
 
-#: ../src/phone.c:1223
+#: ../src/phone.c:1271
 msgid "Could not send message"
 msgstr "Le message n'a pas pu être envoyé"
diff --git a/src/Makefile b/src/Makefile
index 58fdaf4..1a1fce1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-TARGETS	= contacts dialer messages phone
+TARGETS	= phone phone-contacts phone-dialer phone-messages
 PREFIX	= /usr/local
 DESTDIR	= 
 BINDIR	= $(PREFIX)/bin
@@ -16,27 +16,6 @@ INSTALL	= install
 
 all: $(TARGETS)
 
-contacts_OBJS = contacts.o
-contacts_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-contacts_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
-
-contacts: $(contacts_OBJS)
-	$(CC) -o contacts $(contacts_OBJS) $(contacts_LDFLAGS)
-
-dialer_OBJS = dialer.o
-dialer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-dialer_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
-
-dialer: $(dialer_OBJS)
-	$(CC) -o dialer $(dialer_OBJS) $(dialer_LDFLAGS)
-
-messages_OBJS = messages.o
-messages_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-messages_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
-
-messages: $(messages_OBJS)
-	$(CC) -o messages $(messages_OBJS) $(messages_LDFLAGS)
-
 phone_OBJS = callbacks.o gsm.o main.o phone.o
 phone_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
 phone_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
@@ -44,14 +23,26 @@ phone_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
 phone: $(phone_OBJS)
 	$(CC) -o phone $(phone_OBJS) $(phone_LDFLAGS)
 
-contacts.o: contacts.c common.c
-	$(CC) $(contacts_CFLAGS) -c contacts.c
+phone-contacts_OBJS = contacts.o
+phone-contacts_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
+phone-contacts_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
 
-dialer.o: dialer.c common.c
-	$(CC) $(dialer_CFLAGS) -c dialer.c
+phone-contacts: $(phone-contacts_OBJS)
+	$(CC) -o phone-contacts $(phone-contacts_OBJS) $(phone-contacts_LDFLAGS)
 
-messages.o: messages.c common.c
-	$(CC) $(messages_CFLAGS) -c messages.c
+phone-dialer_OBJS = dialer.o
+phone-dialer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
+phone-dialer_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
+
+phone-dialer: $(phone-dialer_OBJS)
+	$(CC) -o phone-dialer $(phone-dialer_OBJS) $(phone-dialer_LDFLAGS)
+
+phone-messages_OBJS = messages.o
+phone-messages_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
+phone-messages_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
+
+phone-messages: $(phone-messages_OBJS)
+	$(CC) -o phone-messages $(phone-messages_OBJS) $(phone-messages_LDFLAGS)
 
 callbacks.o: callbacks.c phone.h callbacks.h
 	$(CC) $(phone_CFLAGS) -c callbacks.c
@@ -65,26 +56,35 @@ main.o: main.c phone.h ../config.h
 phone.o: phone.c gsm.h callbacks.h phone.h
 	$(CC) $(phone_CFLAGS) -c phone.c
 
+contacts.o: contacts.c common.c
+	$(CC) $(phone-contacts_CFLAGS) -c contacts.c
+
+dialer.o: dialer.c common.c
+	$(CC) $(phone-dialer_CFLAGS) -c dialer.c
+
+messages.o: messages.c common.c
+	$(CC) $(phone-messages_CFLAGS) -c messages.c
+
 clean:
-	$(RM) $(contacts_OBJS) $(dialer_OBJS) $(messages_OBJS) $(phone_OBJS)
+	$(RM) $(phone_OBJS) $(phone-contacts_OBJS) $(phone-dialer_OBJS) $(phone-messages_OBJS)
 
 distclean: clean
 	$(RM) $(TARGETS)
 
 install: all
-	$(MKDIR) $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 0755 contacts $(DESTDIR)$(BINDIR)/contacts
-	$(MKDIR) $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 0755 dialer $(DESTDIR)$(BINDIR)/dialer
-	$(MKDIR) $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 0755 messages $(DESTDIR)$(BINDIR)/messages
 	$(MKDIR) $(DESTDIR)$(BINDIR)
 	$(INSTALL) -m 0755 phone $(DESTDIR)$(BINDIR)/phone
+	$(MKDIR) $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 0755 phone-contacts $(DESTDIR)$(BINDIR)/phone-contacts
+	$(MKDIR) $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 0755 phone-dialer $(DESTDIR)$(BINDIR)/phone-dialer
+	$(MKDIR) $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 0755 phone-messages $(DESTDIR)$(BINDIR)/phone-messages
 
 uninstall:
-	$(RM) $(DESTDIR)$(BINDIR)/contacts
-	$(RM) $(DESTDIR)$(BINDIR)/dialer
-	$(RM) $(DESTDIR)$(BINDIR)/messages
 	$(RM) $(DESTDIR)$(BINDIR)/phone
+	$(RM) $(DESTDIR)$(BINDIR)/phone-contacts
+	$(RM) $(DESTDIR)$(BINDIR)/phone-dialer
+	$(RM) $(DESTDIR)$(BINDIR)/phone-messages
 
 .PHONY: all clean distclean install uninstall
diff --git a/src/project.conf b/src/project.conf
index a48b1f4..ce0c4c1 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,10 +1,10 @@
-targets=contacts,dialer,messages,phone
+targets=phone,phone-contacts,phone-dialer,phone-messages
 cflags_force=-W
 cflags=-Wall -g -O2 -pedantic `pkg-config --cflags gtk+-2.0`
 ldflags_force=`pkg-config --libs gtk+-2.0`
 dist=Makefile,callbacks.h,gsm.h,phone.h,common.c
 
-[contacts]
+[phone-contacts]
 type=binary
 sources=contacts.c
 install=$(BINDIR)
@@ -12,7 +12,7 @@ install=$(BINDIR)
 [contacts.c]
 depends=common.c
 
-[dialer]
+[phone-dialer]
 type=binary
 sources=dialer.c
 install=$(BINDIR)
@@ -20,7 +20,7 @@ install=$(BINDIR)
 [dialer.c]
 depends=common.c
 
-[messages]
+[phone-messages]
 type=binary
 sources=messages.c
 install=$(BINDIR)