diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3390a4c58..ccb8f7ee7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
-	android:versionCode="52" android:versionName="@string/build_revision" package="org.yaxim.androidclient">
+	android:versionCode="52" android:versionName="@string/build_revision" package="org.yaxim.bruno">
 
 	<uses-sdk android:targetSdkVersion="17" android:minSdkVersion="7"
 		tools:overrideLibrary="me.leolin.shortcutbadger" />
@@ -109,8 +109,8 @@
 				<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
 			</intent-filter>
 			<intent-filter>
-				<action android:name="org.yaxim.androidclient.ACTION_MESSAGE_HEARD" />
-				<action android:name="org.yaxim.androidclient.ACTION_MESSAGE_REPLY" />
+				<action android:name="org.yaxim.bruno.ACTION_MESSAGE_HEARD" />
+				<action android:name="org.yaxim.bruno.ACTION_MESSAGE_REPLY" />
 			</intent-filter>
 		</receiver>
 		<receiver android:name=".service.InstallReferrerReceiver"
@@ -123,10 +123,10 @@
 
 		<provider android:name=".data.ChatProvider"
 			android:exported="false"
-			android:authorities="org.yaxim.androidclient.provider.Chats" />
+			android:authorities="org.yaxim.bruno.provider.Chats" />
 		<provider android:name=".data.RosterProvider"
 			android:exported="false"
-			android:authorities="org.yaxim.androidclient.provider.Roster" />
+			android:authorities="org.yaxim.bruno.provider.Roster" />
 
 		<activity android:name="de.duenndns.ssl.MemorizingActivity" />
 
diff --git a/res/layout/addrosteritemdialog.xml b/res/layout/addrosteritemdialog.xml
index af04f3381..2badaae16 100644
--- a/res/layout/addrosteritemdialog.xml
+++ b/res/layout/addrosteritemdialog.xml
@@ -22,7 +22,7 @@
 			android:paddingBottom="20dp"
 			style="?attr/dialogTextColor"
 		/>
-	<org.yaxim.androidclient.widget.AutoCompleteJidEdit
+	<org.yaxim.bruno.widget.AutoCompleteJidEdit
 			android:id="@+id/AddContact_EditTextField"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
@@ -49,7 +49,7 @@
 			android:hint="@string/addFriend_aliasHint"
 			style="@style/dialogEditText"
 			/>
-		<org.yaxim.androidclient.dialogs.GroupNameView
+		<org.yaxim.bruno.dialogs.GroupNameView
 			android:id="@+id/AddRosterItem_GroupName"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
diff --git a/res/layout/firststartdialog.xml b/res/layout/firststartdialog.xml
index 070fc872e..129a56716 100644
--- a/res/layout/firststartdialog.xml
+++ b/res/layout/firststartdialog.xml
@@ -35,7 +35,7 @@
 			android:padding="2sp"
 			style="?attr/dialogTextColor"
 		/>
-	<org.yaxim.androidclient.widget.AutoCompleteJidEdit
+	<org.yaxim.bruno.widget.AutoCompleteJidEdit
 			android:id="@+id/StartupDialog_JID_EditTextField"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
diff --git a/res/layout/moverosterentrytogroupview.xml b/res/layout/moverosterentrytogroupview.xml
index 0e55bc367..bea9983dd 100644
--- a/res/layout/moverosterentrytogroupview.xml
+++ b/res/layout/moverosterentrytogroupview.xml
@@ -18,7 +18,7 @@
 			android:focusable="true"
 			style="?attr/dialogTextColor"
 			/>
-		<org.yaxim.androidclient.dialogs.GroupNameView
+		<org.yaxim.bruno.dialogs.GroupNameView
 			android:id="@+id/moverosterentrytogroupview_gv"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
diff --git a/res/layout/muc_new_dialog.xml b/res/layout/muc_new_dialog.xml
index 857e82113..e241f9e08 100644
--- a/res/layout/muc_new_dialog.xml
+++ b/res/layout/muc_new_dialog.xml
@@ -16,7 +16,7 @@
 	android:layout_marginBottom="15dp"
 	android:visibility="gone"
 	/>
-    <org.yaxim.androidclient.widget.AutoCompleteJidEdit
+    <org.yaxim.bruno.widget.AutoCompleteJidEdit
 	android:id="@+id/muc_new_jid"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 313addf6f..edefb02a6 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Připojuji se k serveru...</string>
 	<string name="conn_disconnecting">Odpojuje se...</string>
 	<string name="conn_online">Připojen</string>
@@ -28,8 +28,8 @@
 	<string name="Global_JID_malformed">Ověřte adresu!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Vítejte v klientu yaxim!</string>
-	<string name="StartupDialog_Summary">Před použitím je potřeba yaxim nakonfigurovat. Prosím zadejte své Jabber ID a heslo.</string>
+	<string name="StartupDialog_Title">Vítejte v klientu Bruno!</string>
+	<string name="StartupDialog_Summary">Před použitím je potřeba Bruno nakonfigurovat. Prosím zadejte své Jabber ID a heslo.</string>
 	<string name="StartupDialog_pwHint">Zadejte heslo</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">Jabber ID:</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Zpráva od %s</string>
 	<string name="notification_anonymous_message">Přijata nová zpráva</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">Zobrazení odpojených kontaktů</string>
 	<string name="enableGroups_summ">Uspořádat kontakty podle jejich skupin</string>
 	<string name="enableGroups_title">Zobrazovat skupiny kontaktů</string>
-	<string name="foregroundService_summ">Uchovávat yaxim v paměti pro zajištění stálého připojení (foreground service)</string>
+	<string name="foregroundService_summ">Uchovávat Bruno v paměti pro zajištění stálého připojení (foreground service)</string>
 	<string name="foregroundService_title">Ikona ve stavové liště</string>
 
 	<string name="preftitle_debug">Ladění</string>
@@ -134,7 +134,7 @@
 	<string name="Menu_Status">Stav</string>
 	<string name="Menu_connect">Připojit</string>
 	<string name="Menu_disconnect">Odpojit</string>
-	<string name="Menu_about">O aplikaci yaxim</string>
+	<string name="Menu_about">O aplikaci Bruno</string>
 	<string name="Menu_muc">Add group chat</string>
 	<string name="Menu_mark_all_as_read">Mark all as read</string>
 	<string name="Menu_send_invitation">Create invitation</string>
@@ -184,9 +184,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Zdroj</string>
-	<string name="account_resource_summ">Výchozí: yaxim</string>
+	<string name="account_resource_summ">Výchozí: Bruno</string>
 	<string name="account_resource_dialog_title">Zadejte zdroj:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Priorita:</string>
 	<string name="account_prio_summ">Výchozí: 0 (povolené hodnoty: -128 až 127)</string>
 	<string name="account_prio_error">Povolené hodnoty: -128 .. 127</string>
@@ -241,7 +241,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">O aplikaci yaxim</string>
+	<string name="AboutDialog_title">O aplikaci Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Vývojáři</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Licence</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 28d6a1727..5c0f071e5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Verbinde mit Server…</string>
 	<string name="conn_disconnecting">Verbindung wird getrennt…</string>
 	<string name="conn_online">Online</string>
@@ -24,8 +24,8 @@
 	<string name="Global_JID_malformed">Adressformat überprüfen!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Willkommen bei yaxim!</string>
-	<string name="StartupDialog_Summary">Sie müssen yaxim zuerst konfigurieren. Bitte Ihre Jabber-ID und Ihr Passwort eingeben.</string>
+	<string name="StartupDialog_Title">Willkommen bei Bruno!</string>
+	<string name="StartupDialog_Summary">Sie müssen Bruno zuerst konfigurieren. Bitte Ihre Jabber-ID und Ihr Passwort eingeben.</string>
 	<string name="StartupDialog_pwHint">Passwort eingeben</string>
 	<string name="StartupDialog_pwshowHint">Passwort anzeigen</string>
 	<string name="StartupDialog_Username_title">Jabber-ID:</string>
@@ -42,9 +42,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Mitteilung von %s</string>
 	<string name="notification_anonymous_message">Mitteilung empfangen</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Antworten</string>
@@ -130,7 +130,7 @@
 	<string name="Menu_Status">Status</string>
 	<string name="Menu_connect">Verbinden</string>
 	<string name="Menu_disconnect">Trennen</string>
-	<string name="Menu_about">Über yaxim</string>
+	<string name="Menu_about">Über Bruno</string>
 	<string name="Menu_muc">Gruppenchat hinzufügen</string>
 	<string name="Menu_mark_all_as_read">Alle als gelesen markieren</string>
 	<string name="Menu_send_invitation">Einladung erzeugen</string>
@@ -180,9 +180,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Client-Ressource</string>
-	<string name="account_resource_summ">Vorgabe: yaxim</string>
+	<string name="account_resource_summ">Vorgabe: Bruno</string>
 	<string name="account_resource_dialog_title">Quelle eingeben:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Client-Priorität</string>
 	<string name="account_prio_summ">Vorgabe: 0 (erlaubt: -128 .. 127)</string>
 	<string name="account_prio_error">Erlaubte Werte: -128 .. 127</string>
@@ -237,7 +237,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">Über yaxim</string>
+	<string name="AboutDialog_title">Über Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Entwickler</string>
 	<string name="AboutDialog_DevelopersText">Kontakt</string>
 	<string name="AboutDialog_LicenceTitle">Lizenzierung</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7ce28143f..4fddcd8b0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Σύνδεση στο server…</string>
 	<string name="conn_disconnecting">Disconnecting…</string>
 	<string name="conn_online">Συνδεδεμένος</string>
@@ -28,8 +28,8 @@
 	<string name="Global_JID_malformed">Check address format!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Καλωσορίσατε στο yaxim!</string>
-	<string name="StartupDialog_Summary">Πρέπει να ρυθμίσετε πρώτα το yaxim για να μπορέσετε να το χρησιμοποιήσετε. Παρακαλώ το εισάγετε το Jabber ID και τον κωδικό σας.</string>
+	<string name="StartupDialog_Title">Καλωσορίσατε στο Bruno!</string>
+	<string name="StartupDialog_Summary">Πρέπει να ρυθμίσετε πρώτα το Bruno για να μπορέσετε να το χρησιμοποιήσετε. Παρακαλώ το εισάγετε το Jabber ID και τον κωδικό σας.</string>
 	<string name="StartupDialog_pwHint">Εισάγετε κωδικό</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">Jabber ID:</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Message from %s</string>
 	<string name="notification_anonymous_message">Message received</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">Εμφάνιση επαφών εκτός σύνδεσης</string>
 	<string name="enableGroups_summ">Arrange your contacts by their groups</string>
 	<string name="enableGroups_title">Show contact groups</string>
-	<string name="foregroundService_summ">Keep yaxim in memory to ensure always-on connection (foreground service)</string>
+	<string name="foregroundService_summ">Keep Bruno in memory to ensure always-on connection (foreground service)</string>
 	<string name="foregroundService_title">Statusbar icon</string>
 
 	<string name="preftitle_debug">Debugging</string>
@@ -134,7 +134,7 @@
 	<string name="Menu_Status">Κατάσταση</string>
 	<string name="Menu_connect">Σύνδεση</string>
 	<string name="Menu_disconnect">Αποσύνδεση</string>
-	<string name="Menu_about">περί yaxim</string>
+	<string name="Menu_about">περί Bruno</string>
 	<string name="Menu_muc">Add group chat</string>
 	<string name="Menu_mark_all_as_read">Mark all as read</string>
 	<string name="Menu_send_invitation">Create invitation</string>
@@ -184,9 +184,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Client Resource</string>
-	<string name="account_resource_summ">Default: yaxim</string>
+	<string name="account_resource_summ">Default: Bruno</string>
 	<string name="account_resource_dialog_title">Εισάγετε το resource:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Προτεραιότητά του Client</string>
 	<string name="account_prio_summ">Default: 0 (allowed: -128 .. 127)</string>
 	<string name="account_prio_error">Allowed values: -128 .. 127</string>
@@ -241,7 +241,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">περί yaxim</string>
+	<string name="AboutDialog_title">περί Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Προγραμματιστές</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Αδειοδότηση</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 25a9725b2..e44298339 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Conectándose al servidor…</string>
 	<string name="conn_disconnecting">Desconectando...</string>
 	<string name="conn_online">En línea</string>
@@ -24,8 +24,8 @@
 	<string name="Global_JID_malformed">Verifique el formato de la dirección!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">¡Bienvenido/a a yaxim!</string>
-	<string name="StartupDialog_Summary">Necesita configurar yaxim antes de usarlo. Por favor escriba su identidad de Jabber y su contaseña.</string>
+	<string name="StartupDialog_Title">¡Bienvenido/a a Bruno!</string>
+	<string name="StartupDialog_Summary">Necesita configurar Bruno antes de usarlo. Por favor escriba su identidad de Jabber y su contaseña.</string>
 	<string name="StartupDialog_pwHint">Escribe la contraseña</string>
 	<string name="StartupDialog_pwshowHint">Contraseña</string>
 	<string name="StartupDialog_Username_title">Identidad Jabber:</string>
@@ -42,9 +42,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Mensaje de %s</string>
 	<string name="notification_anonymous_message">Mensaje recibido</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s en %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Responder</string>
@@ -84,7 +84,7 @@
 	<string name="showOffline_title">Mostrar contactos desconectados</string>
 	<string name="enableGroups_summ">Organizar sus contactos por grupo</string>
 	<string name="enableGroups_title">Mostrar grupos de contactos</string>
-	<string name="foregroundService_summ">Mantener yaxim en memoria para asegurar conexiones persistentes (servicio en primer plano)</string>
+	<string name="foregroundService_summ">Mantener Bruno en memoria para asegurar conexiones persistentes (servicio en primer plano)</string>
 	<string name="foregroundService_title">Icono de barra de estado</string>
 
 	<string name="preftitle_debug">Depuración</string>
@@ -130,7 +130,7 @@
 	<string name="Menu_Status">Estado</string>
 	<string name="Menu_connect">Conectar</string>
 	<string name="Menu_disconnect">Desconectar</string>
-	<string name="Menu_about">Acerca de yaxim</string>
+	<string name="Menu_about">Acerca de Bruno</string>
 	<string name="Menu_muc">Añadir chat en grupo</string>
 	<string name="Menu_mark_all_as_read">Marcar todos como leídos</string>
 	<string name="Menu_send_invitation">Crear invitación</string>
@@ -180,9 +180,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Recurso del cliente</string>
-	<string name="account_resource_summ">Standard : yaxim</string>
+	<string name="account_resource_summ">Standard : Bruno</string>
 	<string name="account_resource_dialog_title">Escriba su recurso:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Prioridad del cliente</string>
 	<string name="account_prio_summ">Predefinido: 0 (permitido: -128 a 127)</string>
 	<string name="account_prio_error">Valores permitidos: -128 a 127</string>
@@ -237,7 +237,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">Acerca de yaxim</string>
+	<string name="AboutDialog_title">Acerca de Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Desarrolladores</string>
 	<string name="AboutDialog_DevelopersText">Contacto</string>
 	<string name="AboutDialog_LicenceTitle">Licencia</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 5dc719166..6a0ecfc36 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Zerbitzarira konektatzen...</string>
 	<string name="conn_disconnecting">Disconnecting…</string>
 	<string name="conn_online">Linean</string>
@@ -28,8 +28,8 @@
 	<string name="Global_JID_malformed">Check address format!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Ongietorri yaxim-era!</string>
-	<string name="StartupDialog_Summary">Erabili aurretik yaxim konfiguratu behar duzu. Mesedez, sartu zure Jabber IDa eta pasahitza.</string>
+	<string name="StartupDialog_Title">Ongietorri Bruno-era!</string>
+	<string name="StartupDialog_Summary">Erabili aurretik Bruno konfiguratu behar duzu. Mesedez, sartu zure Jabber IDa eta pasahitza.</string>
 	<string name="StartupDialog_pwHint">Sartu pasahitza</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">Jabber IDa:</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">%s-(r)en mezua</string>
 	<string name="notification_anonymous_message">Mezua jasota</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">Erakutsi lineaz kanpo dauden kontaktuak</string>
 	<string name="enableGroups_summ">Arrange your contacts by their groups</string>
 	<string name="enableGroups_title">Show contact groups</string>
-	<string name="foregroundService_summ">Mantendu yaxim memorian beti konektatuta dagoela ziurtatzeko (aurreko planoko zerbitzua)</string>
+	<string name="foregroundService_summ">Mantendu Bruno memorian beti konektatuta dagoela ziurtatzeko (aurreko planoko zerbitzua)</string>
 	<string name="foregroundService_title">Egoera-barra ikonoa</string>
 
 	<string name="preftitle_debug">Arazketa</string>
@@ -134,7 +134,7 @@
 	<string name="Menu_Status">Egoera</string>
 	<string name="Menu_connect">Konektatu</string>
 	<string name="Menu_disconnect">Deskonektatu</string>
-	<string name="Menu_about">yaxim-i buruz</string>
+	<string name="Menu_about">Bruno-i buruz</string>
 	<string name="Menu_muc">Add group chat</string>
 	<string name="Menu_mark_all_as_read">Mark all as read</string>
 	<string name="Menu_send_invitation">Create invitation</string>
@@ -184,9 +184,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Bezeroaren baliabidea</string>
-	<string name="account_resource_summ">Lehenetsia: yaxim</string>
+	<string name="account_resource_summ">Lehenetsia: Bruno</string>
 	<string name="account_resource_dialog_title">Sartu zure baliabidea:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Bezeroaren lehentasuna</string>
 	<string name="account_prio_summ">Lehenetsia: 0 (baimenduak: -128 .. 127)</string>
 	<string name="account_prio_error">Allowed values: -128 .. 127</string>
@@ -241,7 +241,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">yaxim-i buruz</string>
+	<string name="AboutDialog_title">Bruno-i buruz</string>
 	<string name="AboutDialog_DevelopersTitle">Garatzaileak</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Lizentzia</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4c6bf7850..0d435c785 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Yhdistetään palvelimeen...</string>
 	<string name="conn_disconnecting">Katkaistaan yhteyttä...</string>
 	<string name="conn_online">Verkossa</string>
@@ -32,7 +32,7 @@
 	<string name="Global_JID_malformed">Tarkista osoitteen muotoilu ja oikeinkirjoitus</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Tervetuloa yaxim-viestimeen!</string>
+	<string name="StartupDialog_Title">Tervetuloa Bruno-viestimeen!</string>
 	<string name="StartupDialog_Summary">Yaximin asetukset on määriteltävä ennen käyttöä. Ole hyvä ja anna Jabber-käyttäjätunnuksesi sekä salasanasi.</string>
 	<string name="StartupDialog_pwHint">Syötä salasana</string>
 	<string name="StartupDialog_pwshowHint">Näytä salasana</string>
@@ -50,9 +50,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Viesti käyttäjältä %s</string>
 	<string name="notification_anonymous_message">Viesti vastaanotettu</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s huoneessa %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Vastaa</string>
@@ -92,7 +92,7 @@
 	<string name="showOffline_title">Näytä poissaolevat kontaktit</string>
 	<string name="enableGroups_summ">Järjestä kontaktit ryhmien mukaan</string>
 	<string name="enableGroups_title">Näytä ryhmät</string>
-	<string name="foregroundService_summ">Pidä yaxim muistissa, jotta yhteys ei katkeaisi (palvelu toimii etualalla)</string>
+	<string name="foregroundService_summ">Pidä Bruno muistissa, jotta yhteys ei katkeaisi (palvelu toimii etualalla)</string>
 	<string name="foregroundService_title">Tilapalkin kuvake</string>
 
 	<string name="preftitle_debug">Virheenjäljitys</string>
@@ -138,7 +138,7 @@
 	<string name="Menu_Status">Tila</string>
 	<string name="Menu_connect">Yhdistä</string>
 	<string name="Menu_disconnect">Katkaise yhteys</string>
-	<string name="Menu_about">Tietoja yaximista</string>
+	<string name="Menu_about">Tietoja Brunoista</string>
 	<string name="Menu_muc">Lisää ryhmäkeskustelu</string>
 	<string name="Menu_mark_all_as_read">Merkitse kaikki luetuiksi</string>
 	<string name="Menu_send_invitation">Luo kutsu</string>
@@ -188,9 +188,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Ohjelman resurssi</string>
-	<string name="account_resource_summ">Oletus: yaxim</string>
+	<string name="account_resource_summ">Oletus: Bruno</string>
 	<string name="account_resource_dialog_title">Anna haluamasi resurssi:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Ohjelman prioriteetti</string>
 	<string name="account_prio_summ">Oletus: 0 (sallittu: -128 .. 127)</string>
 	<string name="account_prio_error">Sallitut arvot: -128 .. 127</string>
@@ -245,7 +245,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">Tietoja yaximista</string>
+	<string name="AboutDialog_title">Tietoja Brunoista</string>
 	<string name="AboutDialog_DevelopersTitle">Kehittäjät</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Lisenssit</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2b4515c3a..f99fa83ac 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim : %s</string>
+	<string name="conn_title">Bruno : %s</string>
 	<string name="conn_connecting">Connexion au serveur…</string>
 	<string name="conn_disconnecting">Déconnexion…</string>
 	<string name="conn_online">En ligne</string>
@@ -24,8 +24,8 @@
 	<string name="Global_JID_malformed">Vérifiez le format de l\'adresse !</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Bienvenue dans yaxim !</string>
-	<string name="StartupDialog_Summary">Vous devez configurer yaxim avant de pouvoir l\'utiliser. Merci d\'entrer votre identifiant Jabber et son mot de passe.</string>
+	<string name="StartupDialog_Title">Bienvenue dans Bruno !</string>
+	<string name="StartupDialog_Summary">Vous devez configurer Bruno avant de pouvoir l\'utiliser. Merci d\'entrer votre identifiant Jabber et son mot de passe.</string>
 	<string name="StartupDialog_pwHint">Saisir un mot de passe</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">Identifiant Jabber :</string>
@@ -42,9 +42,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Message de %s</string>
 	<string name="notification_anonymous_message">Message reçu</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s dans %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Répondre</string>
@@ -84,7 +84,7 @@
 	<string name="showOffline_title">Afficher les contacts hors ligne</string>
 	<string name="enableGroups_summ">Organiser vos contacts selon leurs groupes</string>
 	<string name="enableGroups_title">Afficher les groupes du contact</string>
-	<string name="foregroundService_summ">Conserver yaxim en mémoire afin d\'assurer la connexion permanente (service au premier plan)</string>
+	<string name="foregroundService_summ">Conserver Bruno en mémoire afin d\'assurer la connexion permanente (service au premier plan)</string>
 	<string name="foregroundService_title">Icône de la barre d\'état</string>
 
 	<string name="preftitle_debug">Débogage</string>
@@ -130,7 +130,7 @@
 	<string name="Menu_Status">État</string>
 	<string name="Menu_connect">Se connecter</string>
 	<string name="Menu_disconnect">Se déconnecter</string>
-	<string name="Menu_about">À propos de yaxim</string>
+	<string name="Menu_about">À propos de Bruno</string>
 	<string name="Menu_muc">Ajouter un salon</string>
 	<string name="Menu_mark_all_as_read">Tout marquer comme lu</string>
 	<string name="Menu_send_invitation">Créer une invitation</string>
@@ -180,9 +180,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Ressource client</string>
-	<string name="account_resource_summ">Par défaut : yaxim</string>
+	<string name="account_resource_summ">Par défaut : Bruno</string>
 	<string name="account_resource_dialog_title">Entrez votre ressource :</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Priorité du client</string>
 	<string name="account_prio_summ">Par défaut : 0 (autorisé: -128 .. 127)</string>
 	<string name="account_prio_error">Valeurs autorisées : -128 .. 127</string>
@@ -237,7 +237,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">À propos de yaxim</string>
+	<string name="AboutDialog_title">À propos de Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Développeurs</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Licence</string>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index b7a10c609..c236c14b9 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">כעת מתחבר לשרת…</string>
 	<string name="conn_disconnecting">כעת מתנתק…</string>
 	<string name="conn_online">מקוון</string>
@@ -28,8 +28,8 @@
 	<string name="Global_JID_malformed">בדוק צורת כתובת!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">ברוך בואך אל yaxim!</string>
-	<string name="StartupDialog_Summary">עליך להגדיר את yaxim טרם תעמוד לך האפשרות להפיק ממנה תועלת. אנא הזן מזהה Jabber וסיסמה.</string>
+	<string name="StartupDialog_Title">ברוך בואך אל Bruno!</string>
+	<string name="StartupDialog_Summary">עליך להגדיר את Bruno טרם תעמוד לך האפשרות להפיק ממנה תועלת. אנא הזן מזהה Jabber וסיסמה.</string>
 	<string name="StartupDialog_pwHint">הזן סיסמה</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">מזהה Jabber:</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">הודעה מאת %s</string>
 	<string name="notification_anonymous_message">הודעה התקבלה</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">הצג אנשי קשר לא מקוונים</string>
 	<string name="enableGroups_summ">ארגן אנשי קשר לפי הקבוצות שלהם</string>
 	<string name="enableGroups_title">הצג קבוצות איש קשר</string>
-	<string name="foregroundService_summ">השאר את yaxim בזיכרון כדי להבטיח חיבור תמידי (שירות מרקע)</string>
+	<string name="foregroundService_summ">השאר את Bruno בזיכרון כדי להבטיח חיבור תמידי (שירות מרקע)</string>
 	<string name="foregroundService_title">צלמית שורת מצב</string>
 
 	<string name="preftitle_debug">דיבאג</string>
@@ -134,7 +134,7 @@
 	<string name="Menu_Status">מצב</string>
 	<string name="Menu_connect">התחבר</string>
 	<string name="Menu_disconnect">התנתק</string>
-	<string name="Menu_about">אודות yaxim</string>
+	<string name="Menu_about">אודות Bruno</string>
 	<string name="Menu_muc">Add group chat</string>
 	<string name="Menu_mark_all_as_read">Mark all as read</string>
 	<string name="Menu_send_invitation">Create invitation</string>
@@ -184,9 +184,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">משאב לקוח</string>
-	<string name="account_resource_summ">ברירת מחדל: yaxim</string>
+	<string name="account_resource_summ">ברירת מחדל: Bruno</string>
 	<string name="account_resource_dialog_title">הזן משאב:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">עדיפות לקוח</string>
 	<string name="account_prio_summ">ברירת מחדל: 0 (מותרים: -128 .. 127)</string>
 	<string name="account_prio_error">ערכים מורשים: -128 .. 127</string>
@@ -241,7 +241,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">אודות yaxim</string>
+	<string name="AboutDialog_title">אודות Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">מפתחים</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">רישוי</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 558a886fc..e7a336145 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">सर्वर से कनेक्ट हो रहा है…</string>
 	<string name="conn_disconnecting">डिस्कनेक्ट हो रहा है…</string>
 	<string name="conn_online">ऑनलाइन</string>
@@ -28,8 +28,8 @@
 	<string name="Global_JID_malformed">पता के प्रारूप की जाँच करें!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Welcome to yaxim!</string>
-	<string name="StartupDialog_Summary">You need to configure yaxim before you can use it. Please enter your Jabber ID and password.</string>
+	<string name="StartupDialog_Title">Welcome to Bruno!</string>
+	<string name="StartupDialog_Summary">You need to configure Bruno before you can use it. Please enter your Jabber ID and password.</string>
 	<string name="StartupDialog_pwHint">पासवर्ड डालें</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">जैबर आईडीः</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">%s से संदेश</string>
 	<string name="notification_anonymous_message">संदेश प्राप्त हुआ</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">Show offline contacts</string>
 	<string name="enableGroups_summ">Arrange your contacts by their groups</string>
 	<string name="enableGroups_title">Show contact groups</string>
-	<string name="foregroundService_summ">Keep yaxim in memory to ensure always-on connection (foreground service)</string>
+	<string name="foregroundService_summ">Keep Bruno in memory to ensure always-on connection (foreground service)</string>
 	<string name="foregroundService_title">Statusbar icon</string>
 
 	<string name="preftitle_debug">Debugging</string>
@@ -134,7 +134,7 @@
 	<string name="Menu_Status">Status</string>
 	<string name="Menu_connect">Connect</string>
 	<string name="Menu_disconnect">Disconnect</string>
-	<string name="Menu_about">About yaxim</string>
+	<string name="Menu_about">About Bruno</string>
 	<string name="Menu_muc">Add group chat</string>
 	<string name="Menu_mark_all_as_read">Mark all as read</string>
 	<string name="Menu_send_invitation">Create invitation</string>
@@ -185,9 +185,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Client Resource</string>
-	<string name="account_resource_summ">Default: yaxim</string>
+	<string name="account_resource_summ">Default: Bruno</string>
 	<string name="account_resource_dialog_title">Enter your resource:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Client Priority</string>
 	<string name="account_prio_summ">Default: 0 (allowed: -128 .. 127)</string>
 	<string name="account_prio_error">Allowed values: -128 .. 127</string>
@@ -242,7 +242,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">About yaxim</string>
+	<string name="AboutDialog_title">About Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Developers</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Licensing</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e15625b6f..8c6ad84c5 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Connecting to server…</string>
 	<string name="conn_disconnecting">Disconnecting…</string>
 	<string name="conn_online">Online</string>
@@ -28,8 +28,8 @@
 	<string name="Global_JID_malformed">Check address format!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Welcome to yaxim!</string>
-	<string name="StartupDialog_Summary">You need to configure yaxim before you can use it. Please enter your Jabber ID and password.</string>
+	<string name="StartupDialog_Title">Welcome to Bruno!</string>
+	<string name="StartupDialog_Summary">You need to configure Bruno before you can use it. Please enter your Jabber ID and password.</string>
 	<string name="StartupDialog_pwHint">Enter password</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">Jabber ID:</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Message from %s</string>
 	<string name="notification_anonymous_message">Message received</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">Show offline contacts</string>
 	<string name="enableGroups_summ">Arrange your contacts by their groups</string>
 	<string name="enableGroups_title">Show contact groups</string>
-	<string name="foregroundService_summ">Keep yaxim in memory to ensure always-on connection (foreground service)</string>
+	<string name="foregroundService_summ">Keep Bruno in memory to ensure always-on connection (foreground service)</string>
 	<string name="foregroundService_title">Statusbar icon</string>
 
 	<string name="preftitle_debug">Debugging</string>
@@ -134,7 +134,7 @@
 	<string name="Menu_Status">Status</string>
 	<string name="Menu_connect">Connect</string>
 	<string name="Menu_disconnect">Disconnect</string>
-	<string name="Menu_about">About yaxim</string>
+	<string name="Menu_about">About Bruno</string>
 	<string name="Menu_muc">Add group chat</string>
 	<string name="Menu_mark_all_as_read">Mark all as read</string>
 	<string name="Menu_send_invitation">Create invitation</string>
@@ -185,9 +185,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Client Resource</string>
-	<string name="account_resource_summ">Default: yaxim</string>
+	<string name="account_resource_summ">Default: Bruno</string>
 	<string name="account_resource_dialog_title">Enter your resource:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Client Priority</string>
 	<string name="account_prio_summ">Default: 0 (allowed: -128 .. 127)</string>
 	<string name="account_prio_error">Allowed values: -128 .. 127</string>
@@ -242,7 +242,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">About yaxim</string>
+	<string name="AboutDialog_title">About Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Developers</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Licensing</string>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index 8f9eb4732..eab389921 100644
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Menghubungi erver</string>
 	<string name="conn_disconnecting">Disconnecting…</string>
 	<string name="conn_online">Tersambung</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Pesan dari %s</string>
 	<string name="notification_anonymous_message">Pesan diterima</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">Show offline contacts</string>
 	<string name="enableGroups_summ">Arrange your contacts by their groups</string>
 	<string name="enableGroups_title">Show contact groups</string>
-	<string name="foregroundService_summ">Keep yaxim in memory to ensure always-on connection (foreground service)</string>
+	<string name="foregroundService_summ">Keep Bruno in memory to ensure always-on connection (foreground service)</string>
 	<string name="foregroundService_title">Statusbar icon</string>
 
 	<string name="preftitle_debug">Debugging</string>
@@ -185,9 +185,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Client Resource</string>
-	<string name="account_resource_summ">Default: yaxim</string>
+	<string name="account_resource_summ">Default: Bruno</string>
 	<string name="account_resource_dialog_title">Enter your resource:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Client Priority</string>
 	<string name="account_prio_summ">Default: 0 (allowed: -128 .. 127)</string>
 	<string name="account_prio_error">Allowed values: -128 .. 127</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c6ca12a2b..425675e58 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Connessione al server…</string>
 	<string name="conn_disconnecting">Disconnessione…</string>
 	<string name="conn_online">Connesso</string>
@@ -24,8 +24,8 @@
 	<string name="Global_JID_malformed">Controlla il formato dell\'indirizzo!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Benvenuto in yaxim!</string>
-	<string name="StartupDialog_Summary">È necessario configurare yaxim prima di poterlo usare. Inserisci il tuo ID Jabber e la tua password.</string>
+	<string name="StartupDialog_Title">Benvenuto in Bruno!</string>
+	<string name="StartupDialog_Summary">È necessario configurare Bruno prima di poterlo usare. Inserisci il tuo ID Jabber e la tua password.</string>
 	<string name="StartupDialog_pwHint">Inserisci la password</string>
 	<string name="StartupDialog_pwshowHint">Mostra la password</string>
 	<string name="StartupDialog_Username_title">Jabber ID:</string>
@@ -42,9 +42,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Messaggio da %s</string>
 	<string name="notification_anonymous_message">Messaggio ricevuto</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Rispondi</string>
@@ -84,7 +84,7 @@
 	<string name="showOffline_title">Mostra contatti offline</string>
 	<string name="enableGroups_summ">Ordina i tuoi contatti secondo i loro gruppi</string>
 	<string name="enableGroups_title">Mostra i gruppi dei contatti</string>
-	<string name="foregroundService_summ">Mantieni yaxim in memoria per garantire una connessione sempre attiva (servizio in background)</string>
+	<string name="foregroundService_summ">Mantieni Bruno in memoria per garantire una connessione sempre attiva (servizio in background)</string>
 	<string name="foregroundService_title">Icona barra di stato</string>
 
 	<string name="preftitle_debug">Debug</string>
@@ -130,7 +130,7 @@
 	<string name="Menu_Status">Stato</string>
 	<string name="Menu_connect">Connetti</string>
 	<string name="Menu_disconnect">Disconnetti</string>
-	<string name="Menu_about">Informazioni su yaxim</string>
+	<string name="Menu_about">Informazioni su Bruno</string>
 	<string name="Menu_muc">Aggiungi conversazione di gruppo</string>
 	<string name="Menu_mark_all_as_read">Segna tutti come letti</string>
 	<string name="Menu_send_invitation">Crea invito</string>
@@ -180,9 +180,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Risorsa del client</string>
-	<string name="account_resource_summ">Predefinito: yaxim</string>
+	<string name="account_resource_summ">Predefinito: Bruno</string>
 	<string name="account_resource_dialog_title">Inserisci la risorsa:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Priorità del client</string>
 	<string name="account_prio_summ">Default: 0 (ammessi: -128 .. 127)</string>
 	<string name="account_prio_error">Valori permessi: -128 .. 127</string>
@@ -237,7 +237,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">Informazioni su yaxim</string>
+	<string name="AboutDialog_title">Informazioni su Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Sviluppatori</string>
 	<string name="AboutDialog_DevelopersText">Contatto</string>
 	<string name="AboutDialog_LicenceTitle">Licenza</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d1869df4e..750ae70f8 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">サーバーに接続しています…</string>
 	<string name="conn_disconnecting">切断しています…</string>
 	<string name="conn_online">オンライン</string>
@@ -24,8 +24,8 @@
 	<string name="Global_JID_malformed">アドレスの形式を確認してください!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">yaximへようこそ！</string>
-	<string name="StartupDialog_Summary">yaxim を使用する前に、yaxim を設定する必要があります。 あなたの Jabber ID とパスワードを入力してください。</string>
+	<string name="StartupDialog_Title">Brunoへようこそ！</string>
+	<string name="StartupDialog_Summary">Bruno を使用する前に、Bruno を設定する必要があります。 あなたの Jabber ID とパスワードを入力してください。</string>
 	<string name="StartupDialog_pwHint">パスワードを入力</string>
 	<string name="StartupDialog_pwshowHint">パスワードを表示</string>
 	<string name="StartupDialog_Username_title">Jabber ID:</string>
@@ -42,9 +42,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">%s さんからのメッセージ</string>
 	<string name="notification_anonymous_message">メッセージを受信しました</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%2$s の %1$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">返信</string>
@@ -84,7 +84,7 @@
 	<string name="showOffline_title">オフラインの連絡先を表示する</string>
 	<string name="enableGroups_summ">連絡先をグループ別に整理する</string>
 	<string name="enableGroups_title">連絡先グループを表示する</string>
-	<string name="foregroundService_summ">yaxim を常時接続 (フォアグラウンドサービス) するために、メモリに保存する</string>
+	<string name="foregroundService_summ">Bruno を常時接続 (フォアグラウンドサービス) するために、メモリに保存する</string>
 	<string name="foregroundService_title">ステータスバーアイコン</string>
 
 	<string name="preftitle_debug">デバッグ</string>
@@ -130,7 +130,7 @@
 	<string name="Menu_Status">ステータス</string>
 	<string name="Menu_connect">接続</string>
 	<string name="Menu_disconnect">切断</string>
-	<string name="Menu_about">yaxim について</string>
+	<string name="Menu_about">Bruno について</string>
 	<string name="Menu_muc">グループチャットを追加</string>
 	<string name="Menu_mark_all_as_read">すべて既読にする</string>
 	<string name="Menu_send_invitation">招待状を作成</string>
@@ -180,9 +180,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">クライアント リソース</string>
-	<string name="account_resource_summ">デフォルト: yaxim</string>
+	<string name="account_resource_summ">デフォルト: Bruno</string>
 	<string name="account_resource_dialog_title">リソースを入力してください:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">クライアントの優先度</string>
 	<string name="account_prio_summ">デフォルト: 0 (可能な範囲: -128 .. 127)</string>
 	<string name="account_prio_error">可能な範囲は: -128 .. 127</string>
@@ -237,7 +237,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">yaxim について</string>
+	<string name="AboutDialog_title">Bruno について</string>
 	<string name="AboutDialog_DevelopersTitle">開発者</string>
 	<string name="AboutDialog_DevelopersText">連絡先</string>
 	<string name="AboutDialog_LicenceTitle">ライセンス</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index d131b5e2e..2febbb832 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -28,8 +28,8 @@
 	<string name="Global_JID_malformed">Check address format!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Sveiki atvykę į yaxim!</string>
-	<string name="StartupDialog_Summary">Prieš naudojantis Jums reikia sukonfigūruoti yaxim. Įveskite savo Jabber ID ir slaptažodį.</string>
+	<string name="StartupDialog_Title">Sveiki atvykę į Bruno!</string>
+	<string name="StartupDialog_Summary">Prieš naudojantis Jums reikia sukonfigūruoti Bruno. Įveskite savo Jabber ID ir slaptažodį.</string>
 	<string name="StartupDialog_pwHint">Įveskite slaptažodį</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">Jabber ID:</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Message from %s</string>
 	<string name="notification_anonymous_message">Message received</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">Rodyti atsijungusius adresatus</string>
 	<string name="enableGroups_summ">Arrange your contacts by their groups</string>
 	<string name="enableGroups_title">Show contact groups</string>
-	<string name="foregroundService_summ">Keep yaxim in memory to ensure always-on connection (foreground service)</string>
+	<string name="foregroundService_summ">Keep Bruno in memory to ensure always-on connection (foreground service)</string>
 	<string name="foregroundService_title">Statusbar icon</string>
 
 	<string name="preftitle_debug">Programų derinimas</string>
@@ -134,7 +134,7 @@
 	<string name="Menu_Status">Būsena</string>
 	<string name="Menu_connect">Prisijungti</string>
 	<string name="Menu_disconnect">Atsijungti</string>
-	<string name="Menu_about">Apie yaxim</string>
+	<string name="Menu_about">Apie Bruno</string>
 	<string name="Menu_muc">Add group chat</string>
 	<string name="Menu_mark_all_as_read">Mark all as read</string>
 	<string name="Menu_send_invitation">Create invitation</string>
@@ -184,7 +184,7 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Kliento resursas</string>
-	<string name="account_resource_summ">Pagal nutylėjimą: yaxim</string>
+	<string name="account_resource_summ">Pagal nutylėjimą: Bruno</string>
 	<string name="account_resource_dialog_title">Įveskite resursą:</string>
 	<string name="account_resource_hint">Yaxim</string>
 	<string name="account_prio_title">Prioritetas</string>
@@ -241,7 +241,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">Apie yaxim</string>
+	<string name="AboutDialog_title">Apie Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Plėtotojai</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Licencija</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6ee991ff2..0b4b7bc5d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Kobler til tjener…</string>
 	<string name="conn_disconnecting">Kobler fra…</string>
 	<string name="conn_online">Tilkoblet</string>
@@ -24,8 +24,8 @@
 	<string name="Global_JID_malformed">Se over adresseformatet.</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Velkommen til yaxim!</string>
-	<string name="StartupDialog_Summary">Du må sette opp yaxim før du bruker det. Skriv inn din Jabber-ID og passordet ditt.</string>
+	<string name="StartupDialog_Title">Velkommen til Bruno!</string>
+	<string name="StartupDialog_Summary">Du må sette opp Bruno før du bruker det. Skriv inn din Jabber-ID og passordet ditt.</string>
 	<string name="StartupDialog_pwHint">Skriv inn passord</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">Jabber-ID:</string>
@@ -42,9 +42,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Melding fra %s</string>
 	<string name="notification_anonymous_message">Melding mottatt</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s i %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Svar</string>
@@ -84,7 +84,7 @@
 	<string name="showOffline_title">Vis frakoblede kontakter</string>
 	<string name="enableGroups_summ">Arranger kontakter etter gruppetilhørighet</string>
 	<string name="enableGroups_title">Vis kontaktgrupper</string>
-	<string name="foregroundService_summ">Behold yaxim i minnet for å besørge alltid-på tilkobling (forgrunnstjeneste)</string>
+	<string name="foregroundService_summ">Behold Bruno i minnet for å besørge alltid-på tilkobling (forgrunnstjeneste)</string>
 	<string name="foregroundService_title">Statusfeltikon</string>
 
 	<string name="preftitle_debug">Feilsøking</string>
@@ -130,7 +130,7 @@
 	<string name="Menu_Status">Status</string>
 	<string name="Menu_connect">Koble til</string>
 	<string name="Menu_disconnect">Koble fra</string>
-	<string name="Menu_about">Om yaxim</string>
+	<string name="Menu_about">Om Bruno</string>
 	<string name="Menu_muc">Legg til gruppesludring</string>
 	<string name="Menu_mark_all_as_read">Merk alt som lest</string>
 	<string name="Menu_send_invitation">Opprett invitasjon</string>
@@ -180,9 +180,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Klientressurs</string>
-	<string name="account_resource_summ">Forvalg: yaxim</string>
+	<string name="account_resource_summ">Forvalg: Bruno</string>
 	<string name="account_resource_dialog_title">Skriv inn din ressurs:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Klientprioritet</string>
 	<string name="account_prio_summ">Forvalg: 0 (tillatt: -128 .. 127)</string>
 	<string name="account_prio_error">Tillatte verdier: -128 .. 127</string>
@@ -237,7 +237,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">Om yaxim</string>
+	<string name="AboutDialog_title">Om Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Utviklere</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Lisens</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e9c2c49bb..ebc29eea6 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Bezig met verbinden...</string>
 	<string name="conn_disconnecting">Verbinding verbreken…</string>
 	<string name="conn_online">Online</string>
@@ -24,8 +24,8 @@
 	<string name="Global_JID_malformed">Controleer adres!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Welkom bij yaxim!</string>
-	<string name="StartupDialog_Summary">Je moet eerst wat dingen instellen voordat je yaxim kunt gebruiken. Voer a.u.b. een gebruikersnaam en wachtwoord in.</string>
+	<string name="StartupDialog_Title">Welkom bij Bruno!</string>
+	<string name="StartupDialog_Summary">Je moet eerst wat dingen instellen voordat je Bruno kunt gebruiken. Voer a.u.b. een gebruikersnaam en wachtwoord in.</string>
 	<string name="StartupDialog_pwHint">Wachtwoord invoeren</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">Jabber ID:</string>
@@ -42,9 +42,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Bericht van %s</string>
 	<string name="notification_anonymous_message">Bericht ontvangen</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reageren</string>
@@ -84,7 +84,7 @@
 	<string name="showOffline_title">Offline contacten tonen</string>
 	<string name="enableGroups_summ">Contacten naar groep sorteren</string>
 	<string name="enableGroups_title">Contactengroepen tonen</string>
-	<string name="foregroundService_summ">Houdt yaxim in het geheugen om zeker te weten dat de verbinding actief blijft (Voorgrond service)</string>
+	<string name="foregroundService_summ">Houdt Bruno in het geheugen om zeker te weten dat de verbinding actief blijft (Voorgrond service)</string>
 	<string name="foregroundService_title">Statusbalk icoon</string>
 
 	<string name="preftitle_debug">Fouten opsporen</string>
@@ -130,7 +130,7 @@
 	<string name="Menu_Status">Status</string>
 	<string name="Menu_connect">Verbinding maken</string>
 	<string name="Menu_disconnect">Verbinding verbreken</string>
-	<string name="Menu_about">Over yaxim</string>
+	<string name="Menu_about">Over Bruno</string>
 	<string name="Menu_muc">Groepsgesprek toevoegen</string>
 	<string name="Menu_mark_all_as_read">Markeer alles als gelezen</string>
 	<string name="Menu_send_invitation">Uitnodiging maken</string>
@@ -180,9 +180,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Naam apparaat</string>
-	<string name="account_resource_summ">Standaard: yaxim</string>
+	<string name="account_resource_summ">Standaard: Bruno</string>
 	<string name="account_resource_dialog_title">Vul nieuwe naam apparaat in</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Apparaat prioriteit</string>
 	<string name="account_prio_summ">Standaard: 0</string>
 	<string name="account_prio_error">Toegestane waarden: -128 .. 127</string>
@@ -237,7 +237,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">Over yaxim</string>
+	<string name="AboutDialog_title">Over Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Ontwikkelaars</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Licentie</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4e89edb08..905a5f60c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Łączenie z serwerem…</string>
 	<string name="conn_disconnecting">Rozłączanie...</string>
 	<string name="conn_online">Połączony</string>
@@ -24,8 +24,8 @@
 	<string name="Global_JID_malformed">Sprawdź format adresu!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Witaj w yaxim!</string>
-	<string name="StartupDialog_Summary">Używanie yaxima wymaga konfiguracji. Podaj swój Jabber ID i hasło.</string>
+	<string name="StartupDialog_Title">Witaj w Bruno!</string>
+	<string name="StartupDialog_Summary">Używanie Brunoa wymaga konfiguracji. Podaj swój Jabber ID i hasło.</string>
 	<string name="StartupDialog_pwHint">Wprowadź hasło</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">Jabber ID:</string>
@@ -42,9 +42,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Wiadomość od %s</string>
 	<string name="notification_anonymous_message">Otrzymano wiadomość</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s w %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Odpowiedź</string>
@@ -84,7 +84,7 @@
 	<string name="showOffline_title">Pokaż kontakty w trybie offline</string>
 	<string name="enableGroups_summ">Uporządkuj kontakty według grup</string>
 	<string name="enableGroups_title">Wyświetlanie grup kontaktów</string>
-	<string name="foregroundService_summ">Utrzymuj yaxima w pamięci aby zapewnić stałe połączenie (usługa w tle)</string>
+	<string name="foregroundService_summ">Utrzymuj Brunoa w pamięci aby zapewnić stałe połączenie (usługa w tle)</string>
 	<string name="foregroundService_title">Ikona na pasku powiadomień</string>
 
 	<string name="preftitle_debug">Debugowanie</string>
@@ -180,9 +180,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Zasób</string>
-	<string name="account_resource_summ">Domyślnie: yaxim</string>
+	<string name="account_resource_summ">Domyślnie: Bruno</string>
 	<string name="account_resource_dialog_title">Podaj zasób:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Priorytet klienta</string>
 	<string name="account_prio_summ">Domyślnie: 0 (dozwolone wartości: -128 .. 127)</string>
 	<string name="account_prio_error">Dozwolone wartości: -128 .. 127</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 868141931..9ce6dcaed 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Conectando ao servidor...</string>
 	<string name="conn_disconnecting">Desconectando...</string>
 	<string name="conn_online">Online</string>
@@ -28,8 +28,8 @@
 	<string name="Global_JID_malformed">Verifique o formato de endereço!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Bem vindo ao yaxim!</string>
-	<string name="StartupDialog_Summary">Você precisa configurar o yaxim antes de poder usá-lo. Por favor coloque seu usuário XMPP e senha.</string>
+	<string name="StartupDialog_Title">Bem vindo ao Bruno!</string>
+	<string name="StartupDialog_Summary">Você precisa configurar o Bruno antes de poder usá-lo. Por favor coloque seu usuário XMPP e senha.</string>
 	<string name="StartupDialog_pwHint">Digite a senha</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">ID do Jabber:</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Mensagem de %s</string>
 	<string name="notification_anonymous_message">Mensagem recebida</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">Mostra contatos que estão offline</string>
 	<string name="enableGroups_summ">Organizar contatos por grupo</string>
 	<string name="enableGroups_title">Mostrar grupos de contato</string>
-	<string name="foregroundService_summ">Manter yaxim na memória para garantir conexão sempre ativa (programa não oculto)</string>
+	<string name="foregroundService_summ">Manter Bruno na memória para garantir conexão sempre ativa (programa não oculto)</string>
 	<string name="foregroundService_title">Ícone na barra de status</string>
 
 	<string name="preftitle_debug">Debugging</string>
@@ -134,7 +134,7 @@
 	<string name="Menu_Status">Status</string>
 	<string name="Menu_connect">Conectar</string>
 	<string name="Menu_disconnect">Desconectar</string>
-	<string name="Menu_about">Sobre o yaxim</string>
+	<string name="Menu_about">Sobre o Bruno</string>
 	<string name="Menu_muc">Add group chat</string>
 	<string name="Menu_mark_all_as_read">Mark all as read</string>
 	<string name="Menu_send_invitation">Create invitation</string>
@@ -184,9 +184,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Cliente: Recurso</string>
-	<string name="account_resource_summ">Padrão: yaxim</string>
+	<string name="account_resource_summ">Padrão: Bruno</string>
 	<string name="account_resource_dialog_title">Escolha seu recurso:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Client Priority</string>
 	<string name="account_prio_summ">Default: 0 (allowed: -128 .. 127)</string>
 	<string name="account_prio_error">Allowed values: -128 .. 127</string>
@@ -241,7 +241,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">Sobre o yaxim</string>
+	<string name="AboutDialog_title">Sobre o Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Developers</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Licensing</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 26d498519..b548dcd40 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Conectando ao servidor...</string>
 	<string name="conn_disconnecting">Desconectando</string>
 	<string name="conn_online">Ligado</string>
@@ -28,8 +28,8 @@
 	<string name="Global_JID_malformed">Verifique o formato do endereço!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Bem vindo ao yaxim!</string>
-	<string name="StartupDialog_Summary">Você precisa configurar o yaxim antes de usá-lo. Por favor, entre seu ID de Jabber e senha.</string>
+	<string name="StartupDialog_Title">Bem vindo ao Bruno!</string>
+	<string name="StartupDialog_Summary">Você precisa configurar o Bruno antes de usá-lo. Por favor, entre seu ID de Jabber e senha.</string>
 	<string name="StartupDialog_pwHint">Introduza a senha</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">ID de Jabber:</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Mensagem de %s</string>
 	<string name="notification_anonymous_message">Mensagem recebida</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">Exibir os contactos desligados</string>
 	<string name="enableGroups_summ">Arrange your contacts by their groups</string>
 	<string name="enableGroups_title">Show contact groups</string>
-	<string name="foregroundService_summ">Manter yaxim na memória para garantir conexão sempre-represente (serviço de foreground)</string>
+	<string name="foregroundService_summ">Manter Bruno na memória para garantir conexão sempre-represente (serviço de foreground)</string>
 	<string name="foregroundService_title">Ícone da barra de status</string>
 
 	<string name="preftitle_debug">Depuração</string>
@@ -134,7 +134,7 @@
 	<string name="Menu_Status">Situação</string>
 	<string name="Menu_connect">Conectar</string>
 	<string name="Menu_disconnect">Desconectar</string>
-	<string name="Menu_about">Sobre yaxim</string>
+	<string name="Menu_about">Sobre Bruno</string>
 	<string name="Menu_muc">Add group chat</string>
 	<string name="Menu_mark_all_as_read">Mark all as read</string>
 	<string name="Menu_send_invitation">Create invitation</string>
@@ -184,9 +184,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Recursos do cliente</string>
-	<string name="account_resource_summ">Padrão: yaxim</string>
+	<string name="account_resource_summ">Padrão: Bruno</string>
 	<string name="account_resource_dialog_title">Entre a sua ferramenta:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Prioridade do cliente</string>
 	<string name="account_prio_summ">Padrão: 0 (permitidos: -128 .. 127)</string>
 	<string name="account_prio_error">Valores permitidos: -128 a 127</string>
@@ -241,7 +241,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">Sobre yaxim</string>
+	<string name="AboutDialog_title">Sobre Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Desenvolvedores</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Licença</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 207cb6915..b10300c1b 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Conectare la server…</string>
 	<string name="conn_disconnecting">Deconectare…</string>
 	<string name="conn_online">Conectat</string>
@@ -24,8 +24,8 @@
 	<string name="Global_JID_malformed">Verificați formatul adresei!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Bine ați venit la yaxim!</string>
-	<string name="StartupDialog_Summary">Trebuie să configurați yaxim înainte de a-l folosi. Vă rugăm să introduceți ID-ul Jabber și parola.</string>
+	<string name="StartupDialog_Title">Bine ați venit la Bruno!</string>
+	<string name="StartupDialog_Summary">Trebuie să configurați Bruno înainte de a-l folosi. Vă rugăm să introduceți ID-ul Jabber și parola.</string>
 	<string name="StartupDialog_pwHint">Introducere parolă</string>
 	<string name="StartupDialog_pwshowHint">Arată parola</string>
 	<string name="StartupDialog_Username_title">ID Jabber:</string>
@@ -42,9 +42,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Mesaj de la %s</string>
 	<string name="notification_anonymous_message">Mesaj primit</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s în %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Răspunde</string>
@@ -84,7 +84,7 @@
 	<string name="showOffline_title">Arată contactele deconectate</string>
 	<string name="enableGroups_summ">Aranjare contacte în grupuri</string>
 	<string name="enableGroups_title">Arată grupurile contactelor</string>
-	<string name="foregroundService_summ">Se păstrează yaxim în memorie pentru a asigura o conexiune în permanență (serviciul în prim-plan)</string>
+	<string name="foregroundService_summ">Se păstrează Bruno în memorie pentru a asigura o conexiune în permanență (serviciul în prim-plan)</string>
 	<string name="foregroundService_title">Iconița în bara de stare</string>
 
 	<string name="preftitle_debug">Rapoarte erori</string>
@@ -132,7 +132,7 @@
 	<string name="Menu_disconnect">Stare</string>
 	<string name="Menu_about">Conectare</string>
 	<string name="Menu_muc">Deconectare</string>
-	<string name="Menu_mark_all_as_read">Despre yaxim</string>
+	<string name="Menu_mark_all_as_read">Despre Bruno</string>
 	<string name="Menu_send_invitation">Adaugă discuție de grup</string>
     <string name="Menu_userlist">Marchează totul ca citit</string>
 
@@ -182,11 +182,11 @@
 	<string name="account_resource_title">Vă rugăm să așteptați, se schimbă parola…</string>
 	<string name="account_resource_summ">Parola a fost schimbată cu succes.</string>
 	<string name="account_resource_dialog_title">Eroare la schimbarea parolei: %s</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Nume resursa client</string>
-	<string name="account_prio_summ">Implicit: yaxim</string>
+	<string name="account_prio_summ">Implicit: Bruno</string>
 	<string name="account_prio_error">Introducere nume resursa:</string>
-	<string name="account_prio_dialog_title">yaxim</string>
+	<string name="account_prio_dialog_title">Bruno</string>
 	<string name="account_port_title">Prioritate client</string>
 	<string name="account_port_sum">Implicit: 0 (permis: -128 .. 127)</string>
 	<string name="account_port_dialog_title">Valori permise: -128 .. 127</string>
@@ -307,7 +307,7 @@
 	<string name="status_away">Introduceți mesajul</string>
 	<string name="status_chat">Citează</string>
 	<string name="status_dnd">Retrimite</string>
-	<string name="status_xa">Despre yaxim</string>
+	<string name="status_xa">Despre Bruno</string>
 	<string name="status_offline">Deconectat</string>
 
 	<string name="translator_credits">Dezvoltatori
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 6aafdb64d..a83f211e0 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Подключение к серверу…</string>
 	<string name="conn_disconnecting">Отключение…</string>
 	<string name="conn_online">В сети</string>
@@ -24,8 +24,8 @@
 	<string name="Global_JID_malformed">Проверьте формат адреса!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Добро пожаловать в yaxim!</string>
-	<string name="StartupDialog_Summary">Необходимо настроить yaxim перед использованием. Пожалуйста, введите Jabber ID и пароль.</string>
+	<string name="StartupDialog_Title">Добро пожаловать в Bruno!</string>
+	<string name="StartupDialog_Summary">Необходимо настроить Bruno перед использованием. Пожалуйста, введите Jabber ID и пароль.</string>
 	<string name="StartupDialog_pwHint">Введите пароль</string>
 	<string name="StartupDialog_pwshowHint">Показать пароль</string>
 	<string name="StartupDialog_Username_title">Jabber ID:</string>
@@ -42,9 +42,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Сообщение от %s</string>
 	<string name="notification_anonymous_message">Получено сообщение</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s в %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Ответить</string>
@@ -84,7 +84,7 @@
 	<string name="showOffline_title">Показывать отключённые контакты</string>
 	<string name="enableGroups_summ">Упорядочить контакты по группам</string>
 	<string name="enableGroups_title">Показывать группы</string>
-	<string name="foregroundService_summ">Удерживать yaxim в памяти для обеспечения постоянного соединения (фоновый сервис)</string>
+	<string name="foregroundService_summ">Удерживать Bruno в памяти для обеспечения постоянного соединения (фоновый сервис)</string>
 	<string name="foregroundService_title">Значок в статусной строке</string>
 
 	<string name="preftitle_debug">Отладка</string>
@@ -130,7 +130,7 @@
 	<string name="Menu_Status">Статус</string>
 	<string name="Menu_connect">Подключиться</string>
 	<string name="Menu_disconnect">Отключиться</string>
-	<string name="Menu_about">О yaxim</string>
+	<string name="Menu_about">О Bruno</string>
 	<string name="Menu_muc">Добавить конференцию</string>
 	<string name="Menu_mark_all_as_read">Отметить все как прочитанные</string>
 	<string name="Menu_send_invitation">Создать приглашение</string>
@@ -180,9 +180,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Ресурс клиента</string>
-	<string name="account_resource_summ">По умолчанию: yaxim</string>
+	<string name="account_resource_summ">По умолчанию: Bruno</string>
 	<string name="account_resource_dialog_title">Введите ресурс:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Приоритет клиента</string>
 	<string name="account_prio_summ">По умолчанию: 0 (разрешено от -128 до 127)</string>
 	<string name="account_prio_error">Допустимые значения: -128 .. 127</string>
@@ -237,7 +237,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">О yaxim</string>
+	<string name="AboutDialog_title">О Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Разработчики</string>
 	<string name="AboutDialog_DevelopersText">Контакт</string>
 	<string name="AboutDialog_LicenceTitle">Лицензирование</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 60675e768..6d1dccffd 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Pripájanie k serveru...</string>
 	<string name="conn_disconnecting">Odpájanie...</string>
 	<string name="conn_online">Pripojené</string>
@@ -28,8 +28,8 @@
 	<string name="Global_JID_malformed">Overte formát adresy!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Vitajte v yaxim!</string>
-	<string name="StartupDialog_Summary">Pred používaním musíte yaxim nastaviť. Prosím, zadajte vaše Jabber ID a heslo.</string>
+	<string name="StartupDialog_Title">Vitajte v Bruno!</string>
+	<string name="StartupDialog_Summary">Pred používaním musíte Bruno nastaviť. Prosím, zadajte vaše Jabber ID a heslo.</string>
 	<string name="StartupDialog_pwHint">Zadajte heslo</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">Jabber ID:</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Správa od %s</string>
 	<string name="notification_anonymous_message">Prijatá správa</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">Zobraziť odpojené kontakty</string>
 	<string name="enableGroups_summ">Usporiadanie kontaktov do skupín</string>
 	<string name="enableGroups_title">Zobraziť skupiny kontaktov</string>
-	<string name="foregroundService_summ">Ponechať yaxim v pamäti - na zabezpečenie stáleho pripojenia</string>
+	<string name="foregroundService_summ">Ponechať Bruno v pamäti - na zabezpečenie stáleho pripojenia</string>
 	<string name="foregroundService_title">Ikona v stavovom riadku</string>
 
 	<string name="preftitle_debug">Ladenie</string>
@@ -134,7 +134,7 @@
 	<string name="Menu_Status">Status</string>
 	<string name="Menu_connect">Pripojiť</string>
 	<string name="Menu_disconnect">Odpojiť</string>
-	<string name="Menu_about">O aplikácii yaxim</string>
+	<string name="Menu_about">O aplikácii Bruno</string>
 	<string name="Menu_muc">Add group chat</string>
 	<string name="Menu_mark_all_as_read">Mark all as read</string>
 	<string name="Menu_send_invitation">Create invitation</string>
@@ -184,9 +184,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Client Resource</string>
-	<string name="account_resource_summ">Štandardné: yaxim</string>
+	<string name="account_resource_summ">Štandardné: Bruno</string>
 	<string name="account_resource_dialog_title">Enter your resource:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Client Priority</string>
 	<string name="account_prio_summ">Základné: 0 (allowed: -128 .. 127)</string>
 	<string name="account_prio_error">Povolené hodnoty: -128 .. 127</string>
@@ -241,7 +241,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">O aplikácii yaxim</string>
+	<string name="AboutDialog_title">O aplikácii Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Vývojári</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Licencia</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 04401f74c..ae3609046 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Connecting to server…</string>
 	<string name="conn_disconnecting">Disconnecting…</string>
 	<string name="conn_online">На мрежи</string>
@@ -28,8 +28,8 @@
 	<string name="Global_JID_malformed">Check address format!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Welcome to yaxim!</string>
-	<string name="StartupDialog_Summary">You need to configure yaxim before you can use it. Please enter your Jabber ID and password.</string>
+	<string name="StartupDialog_Title">Welcome to Bruno!</string>
+	<string name="StartupDialog_Summary">You need to configure Bruno before you can use it. Please enter your Jabber ID and password.</string>
 	<string name="StartupDialog_pwHint">Упишите лозинку</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">Џабер ИД:</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Message from %s</string>
 	<string name="notification_anonymous_message">Message received</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">Show offline contacts</string>
 	<string name="enableGroups_summ">Arrange your contacts by their groups</string>
 	<string name="enableGroups_title">Show contact groups</string>
-	<string name="foregroundService_summ">Keep yaxim in memory to ensure always-on connection (foreground service)</string>
+	<string name="foregroundService_summ">Keep Bruno in memory to ensure always-on connection (foreground service)</string>
 	<string name="foregroundService_title">Statusbar icon</string>
 
 	<string name="preftitle_debug">Debugging</string>
@@ -134,7 +134,7 @@
 	<string name="Menu_Status">Status</string>
 	<string name="Menu_connect">Connect</string>
 	<string name="Menu_disconnect">Disconnect</string>
-	<string name="Menu_about">About yaxim</string>
+	<string name="Menu_about">About Bruno</string>
 	<string name="Menu_muc">Add group chat</string>
 	<string name="Menu_mark_all_as_read">Mark all as read</string>
 	<string name="Menu_send_invitation">Create invitation</string>
@@ -185,9 +185,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Client Resource</string>
-	<string name="account_resource_summ">Default: yaxim</string>
+	<string name="account_resource_summ">Default: Bruno</string>
 	<string name="account_resource_dialog_title">Enter your resource:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Client Priority</string>
 	<string name="account_prio_summ">Default: 0 (allowed: -128 .. 127)</string>
 	<string name="account_prio_error">Allowed values: -128 .. 127</string>
@@ -242,7 +242,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">About yaxim</string>
+	<string name="AboutDialog_title">About Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Developers</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Licensing</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 7366ace1d..690932d03 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Ansluter till server…</string>
 	<string name="conn_disconnecting">Disconnecting…</string>
 	<string name="conn_online">Ansluten</string>
@@ -28,7 +28,7 @@
 	<string name="Global_JID_malformed">Kontrollera adressformat!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Välkommen till yaxim!</string>
+	<string name="StartupDialog_Title">Välkommen till Bruno!</string>
 	<string name="StartupDialog_Summary">Vissa inställningar måste göras innan du kan börja använda programmet. Ange ditt Jabber-ID och lösenord.</string>
 	<string name="StartupDialog_pwHint">Ange lösenord</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Meddelande från %s</string>
 	<string name="notification_anonymous_message">Meddelande mottaget</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">Visa frånkopplade kontakter</string>
 	<string name="enableGroups_summ">Arrange your contacts by their groups</string>
 	<string name="enableGroups_title">Show contact groups</string>
-	<string name="foregroundService_summ">Behåll yaxim i minnet för att säkerställa bibehållen anslutning (tjänsten körs i förgrunden)</string>
+	<string name="foregroundService_summ">Behåll Bruno i minnet för att säkerställa bibehållen anslutning (tjänsten körs i förgrunden)</string>
 	<string name="foregroundService_title">Statusfältikon</string>
 
 	<string name="preftitle_debug">Felsökning</string>
@@ -134,7 +134,7 @@
 	<string name="Menu_Status">Status</string>
 	<string name="Menu_connect">Anslut</string>
 	<string name="Menu_disconnect">Koppla från</string>
-	<string name="Menu_about">Om yaxim</string>
+	<string name="Menu_about">Om Bruno</string>
 	<string name="Menu_muc">Add group chat</string>
 	<string name="Menu_mark_all_as_read">Mark all as read</string>
 	<string name="Menu_send_invitation">Create invitation</string>
@@ -184,9 +184,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Instans</string>
-	<string name="account_resource_summ">Förvalt: yaxim</string>
+	<string name="account_resource_summ">Förvalt: Bruno</string>
 	<string name="account_resource_dialog_title">Ange instans:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Prioritet</string>
 	<string name="account_prio_summ">Förvalt: 0 (tillåtet: -128 .. 127)</string>
 	<string name="account_prio_error">Tillåtna värden: -128 .. 127</string>
@@ -241,7 +241,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">Om yaxim</string>
+	<string name="AboutDialog_title">Om Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Utvecklare</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Licensing</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index cf06371bc..93d006535 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Sunucuya bağlanılıyor…</string>
 	<string name="conn_disconnecting">Bağlantı kesiliyor…</string>
 	<string name="conn_online">Çevirimiçi</string>
@@ -29,7 +29,7 @@
 
 	<!-- FirstStartUpDialog -->
 	<string name="StartupDialog_Title">Yaxim\'e hoş geldiniz!</string>
-	<string name="StartupDialog_Summary">Kullanabilmek için yaxim\'i yapılandırmanız lazımdır. Jabber kimliğinizi ve parolanızı giriniz.</string>
+	<string name="StartupDialog_Summary">Kullanabilmek için Bruno\'i yapılandırmanız lazımdır. Jabber kimliğinizi ve parolanızı giriniz.</string>
 	<string name="StartupDialog_pwHint">Parola girin</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">Jabber kimliği:</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">%s mesajı</string>
 	<string name="notification_anonymous_message">Mesaj alındı</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">Çevrimdışı kişileri göster</string>
 	<string name="enableGroups_summ">Kişileri gruplara göre sıralandır</string>
 	<string name="enableGroups_title">Kişi gruplarını göster</string>
-	<string name="foregroundService_summ">Bağlantıyı daima açık tutmak için yaxim\'i hafızada tut (ön planda servis)</string>
+	<string name="foregroundService_summ">Bağlantıyı daima açık tutmak için Bruno\'i hafızada tut (ön planda servis)</string>
 	<string name="foregroundService_title">Durum çubuğu ikonu</string>
 
 	<string name="preftitle_debug">Hata ayıklama</string>
@@ -184,9 +184,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">İstemci Kaynağı</string>
-	<string name="account_resource_summ">Varsayılan: yaxim</string>
+	<string name="account_resource_summ">Varsayılan: Bruno</string>
 	<string name="account_resource_dialog_title">Kaynağınızı giriniz:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">İstemci Önceliği</string>
 	<string name="account_prio_summ">Varsayılan: 0 (izin verilen: -128 ilâ 127)</string>
 	<string name="account_prio_error">İzin verilen değerler: -128 ilâ 127</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ecb8fbe3b..d528f2797 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Підключення до сервера...</string>
 	<string name="conn_disconnecting">Відключення...</string>
 	<string name="conn_online">На зв’язку</string>
@@ -24,7 +24,7 @@
 	<string name="Global_JID_malformed">Перевірте формат!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Вітаємо в yaxim</string>
+	<string name="StartupDialog_Title">Вітаємо в Bruno</string>
 	<string name="StartupDialog_Summary">Для початку користування вам необхідно налаштувати програму. Будь ласка, введіть ваш Jabber ID та пароль.</string>
 	<string name="StartupDialog_pwHint">Введіть пароль</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
@@ -42,9 +42,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Повідомлення від %s</string>
 	<string name="notification_anonymous_message">Отримано повідомлення</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s в %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Відповісти</string>
@@ -84,7 +84,7 @@
 	<string name="showOffline_title">Показувати співрозмовників, що відключені</string>
 	<string name="enableGroups_summ">Впорядкувати контакти по групам</string>
 	<string name="enableGroups_title">Показувати групи контактів</string>
-	<string name="foregroundService_summ">Запустити yaxim в режимі сервісу</string>
+	<string name="foregroundService_summ">Запустити Bruno в режимі сервісу</string>
 	<string name="foregroundService_title">Іконка в статусному рідку</string>
 
 	<string name="preftitle_debug">Діагностика</string>
@@ -130,7 +130,7 @@
 	<string name="Menu_Status">Статус</string>
 	<string name="Menu_connect">З’єднатися</string>
 	<string name="Menu_disconnect">Від’єднатися</string>
-	<string name="Menu_about">Про yaxim</string>
+	<string name="Menu_about">Про Bruno</string>
 	<string name="Menu_muc">Додати конференцію</string>
 	<string name="Menu_mark_all_as_read">Позначити всі як прочитані</string>
 	<string name="Menu_send_invitation">Створити запрошення</string>
@@ -180,9 +180,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Ресурс</string>
-	<string name="account_resource_summ">За замовчування: yaxim</string>
+	<string name="account_resource_summ">За замовчування: Bruno</string>
 	<string name="account_resource_dialog_title">Введіть ваш ресурс:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Приоритет</string>
 	<string name="account_prio_summ">За замовчуванням: 0 (дозволено: -128 .. 127)</string>
 	<string name="account_prio_error">Допустимі значення: -128 .. 127</string>
@@ -237,7 +237,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">Про yaxim</string>
+	<string name="AboutDialog_title">Про Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Розробники</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Ліцензія</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 295d2cb17..0097bb317 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Connecting to server…</string>
 	<string name="conn_disconnecting">Disconnecting…</string>
 	<string name="conn_online">Online</string>
@@ -28,8 +28,8 @@
 	<string name="Global_JID_malformed">Check address format!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Welcome to yaxim!</string>
-	<string name="StartupDialog_Summary">You need to configure yaxim before you can use it. Please enter your Jabber ID and password.</string>
+	<string name="StartupDialog_Title">Welcome to Bruno!</string>
+	<string name="StartupDialog_Summary">You need to configure Bruno before you can use it. Please enter your Jabber ID and password.</string>
 	<string name="StartupDialog_pwHint">Enter password</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">Jabber ID:</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Message from %s</string>
 	<string name="notification_anonymous_message">Message received</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">Show offline contacts</string>
 	<string name="enableGroups_summ">Arrange your contacts by their groups</string>
 	<string name="enableGroups_title">Show contact groups</string>
-	<string name="foregroundService_summ">Keep yaxim in memory to ensure always-on connection (foreground service)</string>
+	<string name="foregroundService_summ">Keep Bruno in memory to ensure always-on connection (foreground service)</string>
 	<string name="foregroundService_title">Statusbar icon</string>
 
 	<string name="preftitle_debug">Debugging</string>
@@ -134,7 +134,7 @@
 	<string name="Menu_Status">Status</string>
 	<string name="Menu_connect">Connect</string>
 	<string name="Menu_disconnect">Disconnect</string>
-	<string name="Menu_about">About yaxim</string>
+	<string name="Menu_about">About Bruno</string>
 	<string name="Menu_muc">Add group chat</string>
 	<string name="Menu_mark_all_as_read">Mark all as read</string>
 	<string name="Menu_send_invitation">Create invitation</string>
@@ -185,9 +185,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Client Resource</string>
-	<string name="account_resource_summ">Default: yaxim</string>
+	<string name="account_resource_summ">Default: Bruno</string>
 	<string name="account_resource_dialog_title">Enter your resource:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Client Priority</string>
 	<string name="account_prio_summ">Default: 0 (allowed: -128 .. 127)</string>
 	<string name="account_prio_error">Allowed values: -128 .. 127</string>
@@ -242,7 +242,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">About yaxim</string>
+	<string name="AboutDialog_title">About Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Developers</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Licensing</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index feca92397..857e8f425 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">正在连接服务器…</string>
 	<string name="conn_disconnecting">断开连接...</string>
 	<string name="conn_online">在线</string>
@@ -28,8 +28,8 @@
 	<string name="Global_JID_malformed">检查地址格式</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">欢迎使用yaxim！</string>
-	<string name="StartupDialog_Summary">你需要先配置yaxim才能使用。请输入你的Jabber标识和密码。</string>
+	<string name="StartupDialog_Title">欢迎使用Bruno！</string>
+	<string name="StartupDialog_Summary">你需要先配置Bruno才能使用。请输入你的Jabber标识和密码。</string>
 	<string name="StartupDialog_pwHint">输入密码</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">Jabber ID</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">来自 %s 的消息</string>
 	<string name="notification_anonymous_message">收到消息</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">显示离线联系人</string>
 	<string name="enableGroups_summ">移动该联系人到分组中</string>
 	<string name="enableGroups_title">显示联系人分组</string>
-	<string name="foregroundService_summ">保持yaxim一直在线（后台挂机）</string>
+	<string name="foregroundService_summ">保持Bruno一直在线（后台挂机）</string>
 	<string name="foregroundService_title">状态栏图标</string>
 
 	<string name="preftitle_debug">正在调试</string>
@@ -134,7 +134,7 @@
 	<string name="Menu_Status">状态</string>
 	<string name="Menu_connect">连接</string>
 	<string name="Menu_disconnect">断开连接</string>
-	<string name="Menu_about">关于 yaxim</string>
+	<string name="Menu_about">关于 Bruno</string>
 	<string name="Menu_muc">Add group chat</string>
 	<string name="Menu_mark_all_as_read">Mark all as read</string>
 	<string name="Menu_send_invitation">Create invitation</string>
@@ -184,9 +184,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">客户来源</string>
-	<string name="account_resource_summ">默认: yaxim</string>
+	<string name="account_resource_summ">默认: Bruno</string>
 	<string name="account_resource_dialog_title">输入你的来源</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">客户端优先级</string>
 	<string name="account_prio_summ">默认：０（允许范围：-128..127）</string>
 	<string name="account_prio_error">输入范围: -128 .. 127</string>
@@ -241,7 +241,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">关于 yaxim</string>
+	<string name="AboutDialog_title">关于 Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">开发者</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">许可</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 465bb17f1..d8230691c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">yaxim</string>
+	<string name="app_name">Bruno</string>
 
 	<!-- Connection state -->
-	<string name="conn_title">yaxim: %s</string>
+	<string name="conn_title">Bruno: %s</string>
 	<string name="conn_connecting">Connecting to server…</string>
 	<string name="conn_disconnecting">Disconnecting…</string>
 	<string name="conn_online">Online</string>
@@ -28,8 +28,8 @@
 	<string name="Global_JID_malformed">Check address format!</string>
 
 	<!-- FirstStartUpDialog -->
-	<string name="StartupDialog_Title">Welcome to yaxim!</string>
-	<string name="StartupDialog_Summary">You need to configure yaxim before you can use it. Please enter your Jabber ID and password.</string>
+	<string name="StartupDialog_Title">Welcome to Bruno!</string>
+	<string name="StartupDialog_Summary">You need to configure Bruno before you can use it. Please enter your Jabber ID and password.</string>
 	<string name="StartupDialog_pwHint">Enter password</string>
 	<string name="StartupDialog_pwshowHint">Show password</string>
 	<string name="StartupDialog_Username_title">Jabber ID:</string>
@@ -46,9 +46,9 @@
 	<!-- Notifications -->
 	<string name="notification_message">Message from %s</string>
 	<string name="notification_anonymous_message">Message received</string>
-	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Chat notification, %1$s is the user name, %2$s is the room, e.g. "{Ge0rG} in {Bruno Chat}" -->
 	<string name="notification_muc_message">%1$s in %2$s</string>
-	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {yaxim Chat}" -->
+	<!--  Group Group Chat private message notification, %1$s is the user name, %2$s is the room, e.g. "Message from {Ge0rG} in {Bruno Chat}" -->
 	<!--string name="notification_muc_pm">Message from %1$s in %2$s</string-->
 	<!-- notification button: direct reply (make SHORT string) -->
 	<string name="notification_reply">Reply</string>
@@ -88,7 +88,7 @@
 	<string name="showOffline_title">Show offline contacts</string>
 	<string name="enableGroups_summ">Arrange your contacts by their groups</string>
 	<string name="enableGroups_title">Show contact groups</string>
-	<string name="foregroundService_summ">Keep yaxim in memory to ensure always-on connection (foreground service)</string>
+	<string name="foregroundService_summ">Keep Bruno in memory to ensure always-on connection (foreground service)</string>
 	<string name="foregroundService_title">Statusbar icon</string>
 
 	<string name="preftitle_debug">Debugging</string>
@@ -134,7 +134,7 @@
 	<string name="Menu_Status">Status</string>
 	<string name="Menu_connect">Connect</string>
 	<string name="Menu_disconnect">Disconnect</string>
-	<string name="Menu_about">About yaxim</string>
+	<string name="Menu_about">About Bruno</string>
 	<string name="Menu_muc">Add group chat</string>
 	<string name="Menu_mark_all_as_read">Mark all as read</string>
 	<string name="Menu_send_invitation">Create invitation</string>
@@ -185,9 +185,9 @@
 	
 	<!-- accountprefs -->
 	<string name="account_resource_title">Client Resource</string>
-	<string name="account_resource_summ">Default: yaxim</string>
+	<string name="account_resource_summ">Default: Bruno</string>
 	<string name="account_resource_dialog_title">Enter your resource:</string>
-	<string name="account_resource_hint">yaxim</string>
+	<string name="account_resource_hint">Bruno</string>
 	<string name="account_prio_title">Client Priority</string>
 	<string name="account_prio_summ">Default: 0 (allowed: -128 .. 127)</string>
 	<string name="account_prio_error">Allowed values: -128 .. 127</string>
@@ -242,7 +242,7 @@
 	-->
 
 	<!-- About Dialog -->
-	<string name="AboutDialog_title">About yaxim</string>
+	<string name="AboutDialog_title">About Bruno</string>
 	<string name="AboutDialog_DevelopersTitle">Developers</string>
 	<string name="AboutDialog_DevelopersText">Contact</string>
 	<string name="AboutDialog_LicenceTitle">Licensing</string>
diff --git a/res/xml/accountprefs.xml b/res/xml/accountprefs.xml
index ad4ae4c1b..4b7944f56 100644
--- a/res/xml/accountprefs.xml
+++ b/res/xml/accountprefs.xml
@@ -2,7 +2,7 @@
 <PreferenceScreen
 	xmlns:android="http://schemas.android.com/apk/res/android">
 	<PreferenceCategory android:title="@string/account_settings_login">
-		<org.yaxim.androidclient.preferences.EditTextPreferenceWithValue
+		<org.yaxim.bruno.preferences.EditTextPreferenceWithValue
 			android:id="@+id/account_jabberID"
 			android:key="account_jabberID"
 			android:title="@string/account_jabberID_title"
@@ -29,7 +29,7 @@
 		/>
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/account_options_advanced">
-		<org.yaxim.androidclient.preferences.EditTextPreferenceWithValue
+		<org.yaxim.bruno.preferences.EditTextPreferenceWithValue
 			android:id="@+id/account_resource"
 			android:key="account_resource"
 			android:title="@string/account_resource_title"
@@ -38,7 +38,7 @@
 			android:singleLine="true"
 			android:hint="@string/account_resource_hint"
 		 />
-		<org.yaxim.androidclient.preferences.EditTextPreferenceWithValue
+		<org.yaxim.bruno.preferences.EditTextPreferenceWithValue
 			android:id="@+id/account_prio"
 			android:key="account_prio"
 			android:title="@string/account_prio_title"
@@ -47,7 +47,7 @@
 			android:singleLine="true"
 			android:numeric="integer|signed"
 		/>	
-		<org.yaxim.androidclient.preferences.EditTextPreferenceWithValue
+		<org.yaxim.bruno.preferences.EditTextPreferenceWithValue
 			android:id="@+id/account_customserver"
 			android:key="account_customserver"
 			android:title="@string/account_customserver_title"
@@ -57,7 +57,7 @@
 			android:singleLine="true"
 			android:inputType="textUri"
 		/>	
-		<org.yaxim.androidclient.preferences.EditTextPreferenceWithValue
+		<org.yaxim.bruno.preferences.EditTextPreferenceWithValue
 			android:id="@+id/account_port"
 			android:key="account_port"
 			android:title="@string/account_port_title"
diff --git a/res/xml/mainprefs.xml b/res/xml/mainprefs.xml
index 969ac63c2..e77ace8ed 100644
--- a/res/xml/mainprefs.xml
+++ b/res/xml/mainprefs.xml
@@ -8,8 +8,8 @@
 		android:summary="">
 
 		<intent android:action="android.intent.action.MAIN"
-			android:targetPackage="org.yaxim.androidclient"
-			android:targetClass="org.yaxim.androidclient.preferences.AccountPrefs" />
+			android:targetPackage="org.yaxim.bruno"
+			android:targetClass="org.yaxim.bruno.preferences.AccountPrefs" />
 	</PreferenceScreen>
 	</PreferenceCategory>
 
@@ -19,8 +19,8 @@
 			android:summary="">
 
 			<intent android:action="android.intent.action.MAIN"
-					android:targetPackage="org.yaxim.androidclient"
-					android:targetClass="org.yaxim.androidclient.preferences.NotificationPrefs" />
+					android:targetPackage="org.yaxim.bruno"
+					android:targetClass="org.yaxim.bruno.preferences.NotificationPrefs" />
 		</PreferenceScreen>
 		<PreferenceScreen
 			android:title="@string/preftitle_notify_muc"
@@ -28,8 +28,8 @@
 
 			<intent android:action="android.intent.action.MAIN"
 					android:data="muc"
-					android:targetPackage="org.yaxim.androidclient"
-					android:targetClass="org.yaxim.androidclient.preferences.NotificationPrefs" />
+					android:targetPackage="org.yaxim.bruno"
+					android:targetClass="org.yaxim.bruno.preferences.NotificationPrefs" />
 		</PreferenceScreen>
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/preftitle_general">
diff --git a/src/eu/siacs/conversations/utils/StylingHelper.java b/src/eu/siacs/conversations/utils/StylingHelper.java
index 62bbc4758..341832cb2 100644
--- a/src/eu/siacs/conversations/utils/StylingHelper.java
+++ b/src/eu/siacs/conversations/utils/StylingHelper.java
@@ -46,7 +46,7 @@
 import android.util.DisplayMetrics;
 import android.widget.EditText;
 
-import org.yaxim.androidclient.util.MessageStylingHelper;
+import org.yaxim.bruno.util.MessageStylingHelper;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/org/yaxim/androidclient/service/ParcelablePresence.aidl b/src/org/yaxim/androidclient/service/ParcelablePresence.aidl
deleted file mode 100644
index 29c35ae20..000000000
--- a/src/org/yaxim/androidclient/service/ParcelablePresence.aidl
+++ /dev/null
@@ -1,3 +0,0 @@
-package org.yaxim.androidclient.service;
-
-parcelable ParcelablePresence;
\ No newline at end of file
diff --git a/src/org/yaxim/androidclient/FileHttpUploadTask.java b/src/org/yaxim/bruno/FileHttpUploadTask.java
similarity index 95%
rename from src/org/yaxim/androidclient/FileHttpUploadTask.java
rename to src/org/yaxim/bruno/FileHttpUploadTask.java
index c732b3b84..89f9cb317 100644
--- a/src/org/yaxim/androidclient/FileHttpUploadTask.java
+++ b/src/org/yaxim/bruno/FileHttpUploadTask.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient;
+package org.yaxim.bruno;
 
 import android.content.Context;
 import android.net.Uri;
@@ -10,11 +10,11 @@
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.filter.*;
 import org.jivesoftware.smack.packet.IQ;
-import org.yaxim.androidclient.data.YaximConfiguration;
-import org.yaxim.androidclient.packet.httpupload.Request;
-import org.yaxim.androidclient.packet.httpupload.Slot;
-import org.yaxim.androidclient.service.Smackable;
-import org.yaxim.androidclient.util.FileHelper;
+import org.yaxim.bruno.data.YaximConfiguration;
+import org.yaxim.bruno.packet.httpupload.Request;
+import org.yaxim.bruno.packet.httpupload.Slot;
+import org.yaxim.bruno.service.Smackable;
+import org.yaxim.bruno.util.FileHelper;
 
 import java.io.*;
 import java.net.HttpURLConnection;
diff --git a/src/org/yaxim/androidclient/IXMPPRosterCallback.aidl b/src/org/yaxim/bruno/IXMPPRosterCallback.aidl
similarity index 81%
rename from src/org/yaxim/androidclient/IXMPPRosterCallback.aidl
rename to src/org/yaxim/bruno/IXMPPRosterCallback.aidl
index 4eb031ed3..842072a40 100644
--- a/src/org/yaxim/androidclient/IXMPPRosterCallback.aidl
+++ b/src/org/yaxim/bruno/IXMPPRosterCallback.aidl
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient;
+package org.yaxim.bruno;
 
 /*
 	IPC interface for XMPPService to send broadcasts to UI
diff --git a/src/org/yaxim/androidclient/MainWindow.java b/src/org/yaxim/bruno/MainWindow.java
similarity index 96%
rename from src/org/yaxim/androidclient/MainWindow.java
rename to src/org/yaxim/bruno/MainWindow.java
index 46afb0f11..79f77bdae 100644
--- a/src/org/yaxim/androidclient/MainWindow.java
+++ b/src/org/yaxim/bruno/MainWindow.java
@@ -1,27 +1,27 @@
-package org.yaxim.androidclient;
+package org.yaxim.bruno;
 
 import java.util.HashMap;
 import java.util.List;
 
-import org.yaxim.androidclient.data.ChatHelper;
-import org.yaxim.androidclient.data.ChatProvider;
-import org.yaxim.androidclient.data.ChatProvider.ChatConstants;
-import org.yaxim.androidclient.data.ChatRoomHelper;
-import org.yaxim.androidclient.data.RosterProvider;
-import org.yaxim.androidclient.data.RosterProvider.RosterConstants;
-import org.yaxim.androidclient.data.YaximConfiguration;
-import org.yaxim.androidclient.dialogs.AddRosterItemDialog;
-import org.yaxim.androidclient.dialogs.ChangeStatusDialog;
-import org.yaxim.androidclient.dialogs.EditMUCDialog;
-import org.yaxim.androidclient.dialogs.FirstStartDialog;
-import org.yaxim.androidclient.preferences.AccountPrefs;
-import org.yaxim.androidclient.preferences.MainPrefs;
-import org.yaxim.androidclient.preferences.NotificationPrefs;
-import org.yaxim.androidclient.service.XMPPService;
-import org.yaxim.androidclient.util.ConnectionState;
-import org.yaxim.androidclient.util.PreferenceConstants;
-import org.yaxim.androidclient.util.StatusMode;
-import org.yaxim.androidclient.util.XMPPHelper;
+import org.yaxim.bruno.data.ChatHelper;
+import org.yaxim.bruno.data.ChatProvider;
+import org.yaxim.bruno.data.ChatProvider.ChatConstants;
+import org.yaxim.bruno.data.ChatRoomHelper;
+import org.yaxim.bruno.data.RosterProvider;
+import org.yaxim.bruno.data.RosterProvider.RosterConstants;
+import org.yaxim.bruno.data.YaximConfiguration;
+import org.yaxim.bruno.dialogs.AddRosterItemDialog;
+import org.yaxim.bruno.dialogs.ChangeStatusDialog;
+import org.yaxim.bruno.dialogs.EditMUCDialog;
+import org.yaxim.bruno.dialogs.FirstStartDialog;
+import org.yaxim.bruno.preferences.AccountPrefs;
+import org.yaxim.bruno.preferences.MainPrefs;
+import org.yaxim.bruno.preferences.NotificationPrefs;
+import org.yaxim.bruno.service.XMPPService;
+import org.yaxim.bruno.util.ConnectionState;
+import org.yaxim.bruno.util.PreferenceConstants;
+import org.yaxim.bruno.util.StatusMode;
+import org.yaxim.bruno.util.XMPPHelper;
 
 import android.annotation.TargetApi;
 import android.app.AlertDialog;
@@ -56,12 +56,12 @@
 import android.widget.ExpandableListView;
 import android.widget.ImageView;
 
-import org.yaxim.androidclient.util.SimpleCursorTreeAdapter;
+import org.yaxim.bruno.util.SimpleCursorTreeAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
-import org.yaxim.androidclient.IXMPPRosterCallback.Stub;
-import org.yaxim.androidclient.service.IXMPPRosterService;
+import org.yaxim.bruno.IXMPPRosterCallback.Stub;
+import org.yaxim.bruno.service.IXMPPRosterService;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockExpandableListActivity;
@@ -894,7 +894,7 @@ private String getConnectDisconnectText() {
 	private void registerXMPPService() {
 		Log.i(TAG, "called startXMPPService()");
 		xmppServiceIntent = new Intent(this, XMPPService.class);
-		xmppServiceIntent.setAction("org.yaxim.androidclient.XMPPSERVICE");
+		xmppServiceIntent.setAction("org.yaxim.bruno.XMPPSERVICE");
 
 		xmppServiceConnection = new ServiceConnection() {
 
diff --git a/src/org/yaxim/androidclient/XMPPRosterServiceAdapter.java b/src/org/yaxim/bruno/XMPPRosterServiceAdapter.java
similarity index 94%
rename from src/org/yaxim/androidclient/XMPPRosterServiceAdapter.java
rename to src/org/yaxim/bruno/XMPPRosterServiceAdapter.java
index 2c5b949d6..e65a67c4a 100644
--- a/src/org/yaxim/androidclient/XMPPRosterServiceAdapter.java
+++ b/src/org/yaxim/bruno/XMPPRosterServiceAdapter.java
@@ -1,11 +1,11 @@
-package org.yaxim.androidclient;
+package org.yaxim.bruno;
 
-import org.yaxim.androidclient.util.ConnectionState;
+import org.yaxim.bruno.util.ConnectionState;
 
 import android.os.RemoteException;
 import android.util.Log;
-import org.yaxim.androidclient.IXMPPRosterCallback;
-import org.yaxim.androidclient.service.IXMPPRosterService;
+import org.yaxim.bruno.IXMPPRosterCallback;
+import org.yaxim.bruno.service.IXMPPRosterService;
 
 public class XMPPRosterServiceAdapter {
 	
diff --git a/src/org/yaxim/androidclient/YaximApplication.java b/src/org/yaxim/bruno/YaximApplication.java
similarity index 89%
rename from src/org/yaxim/androidclient/YaximApplication.java
rename to src/org/yaxim/bruno/YaximApplication.java
index c3ee642ba..3eab8afac 100644
--- a/src/org/yaxim/androidclient/YaximApplication.java
+++ b/src/org/yaxim/bruno/YaximApplication.java
@@ -1,8 +1,8 @@
-package org.yaxim.androidclient;
+package org.yaxim.bruno;
 
-import org.yaxim.androidclient.data.YaximConfiguration;
-import org.yaxim.androidclient.service.Smackable;
-import org.yaxim.androidclient.service.YaximBroadcastReceiver;
+import org.yaxim.bruno.data.YaximConfiguration;
+import org.yaxim.bruno.service.Smackable;
+import org.yaxim.bruno.service.YaximBroadcastReceiver;
 
 import android.app.Activity;
 import android.app.Application;
diff --git a/src/org/yaxim/androidclient/chat/ChatWindow.java b/src/org/yaxim/bruno/chat/ChatWindow.java
similarity index 97%
rename from src/org/yaxim/androidclient/chat/ChatWindow.java
rename to src/org/yaxim/bruno/chat/ChatWindow.java
index 99eddb871..7ef9c2115 100644
--- a/src/org/yaxim/androidclient/chat/ChatWindow.java
+++ b/src/org/yaxim/bruno/chat/ChatWindow.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.chat;
+package org.yaxim.bruno.chat;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
@@ -16,21 +16,21 @@
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.MenuInflater;
 
-import org.yaxim.androidclient.FileHttpUploadTask;
-import org.yaxim.androidclient.MainWindow;
-import org.yaxim.androidclient.R;
-import org.yaxim.androidclient.YaximApplication;
-import org.yaxim.androidclient.data.ChatHelper;
-import org.yaxim.androidclient.data.ChatProvider;
-import org.yaxim.androidclient.data.ChatProvider.ChatConstants;
-import org.yaxim.androidclient.data.RosterProvider;
-import org.yaxim.androidclient.data.YaximConfiguration;
-import org.yaxim.androidclient.service.IXMPPChatService;
-import org.yaxim.androidclient.service.XMPPService;
-import org.yaxim.androidclient.util.FileHelper;
-import org.yaxim.androidclient.util.MessageStylingHelper;
-import org.yaxim.androidclient.util.StatusMode;
-import org.yaxim.androidclient.util.XMPPHelper;
+import org.yaxim.bruno.FileHttpUploadTask;
+import org.yaxim.bruno.MainWindow;
+import org.yaxim.bruno.R;
+import org.yaxim.bruno.YaximApplication;
+import org.yaxim.bruno.data.ChatHelper;
+import org.yaxim.bruno.data.ChatProvider;
+import org.yaxim.bruno.data.ChatProvider.ChatConstants;
+import org.yaxim.bruno.data.RosterProvider;
+import org.yaxim.bruno.data.YaximConfiguration;
+import org.yaxim.bruno.service.IXMPPChatService;
+import org.yaxim.bruno.service.XMPPService;
+import org.yaxim.bruno.util.FileHelper;
+import org.yaxim.bruno.util.MessageStylingHelper;
+import org.yaxim.bruno.util.StatusMode;
+import org.yaxim.bruno.util.XMPPHelper;
 
 import eu.siacs.conversations.utils.StylingHelper;
 
@@ -348,7 +348,7 @@ protected void registerXMPPService() {
 		mChatServiceIntent = new Intent(this, XMPPService.class);
 		Uri chatURI = Uri.parse(mWithJabberID);
 		mChatServiceIntent.setData(chatURI);
-		mChatServiceIntent.setAction("org.yaxim.androidclient.XMPPSERVICE");
+		mChatServiceIntent.setAction("org.yaxim.bruno.XMPPSERVICE");
 		
 		mChatServiceConnection = new ServiceConnection() {
 			public void onServiceConnected(ComponentName name, IBinder service) {
diff --git a/src/org/yaxim/androidclient/chat/MUCChatWindow.java b/src/org/yaxim/bruno/chat/MUCChatWindow.java
similarity index 91%
rename from src/org/yaxim/androidclient/chat/MUCChatWindow.java
rename to src/org/yaxim/bruno/chat/MUCChatWindow.java
index 9e13d7db3..4bc8f9ebb 100644
--- a/src/org/yaxim/androidclient/chat/MUCChatWindow.java
+++ b/src/org/yaxim/bruno/chat/MUCChatWindow.java
@@ -1,18 +1,18 @@
-package org.yaxim.androidclient.chat;
+package org.yaxim.bruno.chat;
 
 import java.util.List;
 
-import org.yaxim.androidclient.R;
-import org.yaxim.androidclient.data.ChatProvider.ChatConstants;
-import org.yaxim.androidclient.data.ChatHelper;
-import org.yaxim.androidclient.data.ChatRoomHelper;
-import org.yaxim.androidclient.dialogs.ConfirmDialog;
-import org.yaxim.androidclient.dialogs.EditMUCDialog;
-import org.yaxim.androidclient.service.IXMPPMucService;
-import org.yaxim.androidclient.service.ParcelablePresence;
-import org.yaxim.androidclient.service.XMPPService;
-import org.yaxim.androidclient.util.XEP0392Helper;
-import org.yaxim.androidclient.util.XMPPHelper;
+import org.yaxim.bruno.R;
+import org.yaxim.bruno.data.ChatProvider.ChatConstants;
+import org.yaxim.bruno.data.ChatHelper;
+import org.yaxim.bruno.data.ChatRoomHelper;
+import org.yaxim.bruno.dialogs.ConfirmDialog;
+import org.yaxim.bruno.dialogs.EditMUCDialog;
+import org.yaxim.bruno.service.IXMPPMucService;
+import org.yaxim.bruno.service.ParcelablePresence;
+import org.yaxim.bruno.service.XMPPService;
+import org.yaxim.bruno.util.XEP0392Helper;
+import org.yaxim.bruno.util.XMPPHelper;
 
 import android.app.AlertDialog;
 import android.content.ComponentName;
@@ -70,7 +70,7 @@ protected void registerXMPPService() {
 		mMucServiceIntent = new Intent(this, XMPPService.class);
 		Uri dtaUri = Uri.parse(mWithJabberID+"?chat");
 		mMucServiceIntent.setData(dtaUri);
-		mMucServiceIntent.setAction("org.yaxim.androidclient.XMPPSERVICE");
+		mMucServiceIntent.setAction("org.yaxim.bruno.XMPPSERVICE");
 
 		mMucServiceConnection = new ServiceConnection() {
 			public void onServiceConnected(ComponentName name, IBinder service) {
diff --git a/src/org/yaxim/androidclient/chat/XMPPChatServiceAdapter.java b/src/org/yaxim/bruno/chat/XMPPChatServiceAdapter.java
similarity index 93%
rename from src/org/yaxim/androidclient/chat/XMPPChatServiceAdapter.java
rename to src/org/yaxim/bruno/chat/XMPPChatServiceAdapter.java
index 5a72b63f9..a96d85a6f 100644
--- a/src/org/yaxim/androidclient/chat/XMPPChatServiceAdapter.java
+++ b/src/org/yaxim/bruno/chat/XMPPChatServiceAdapter.java
@@ -1,9 +1,9 @@
-package org.yaxim.androidclient.chat;
+package org.yaxim.bruno.chat;
 
 import android.net.Uri;
 import android.os.RemoteException;
 import android.util.Log;
-import org.yaxim.androidclient.service.IXMPPChatService;
+import org.yaxim.bruno.service.IXMPPChatService;
 
 public class XMPPChatServiceAdapter {
 
diff --git a/src/org/yaxim/androidclient/chat/XMPPMucServiceAdapter.java b/src/org/yaxim/bruno/chat/XMPPMucServiceAdapter.java
similarity index 87%
rename from src/org/yaxim/androidclient/chat/XMPPMucServiceAdapter.java
rename to src/org/yaxim/bruno/chat/XMPPMucServiceAdapter.java
index 9716db632..1aa1b905c 100644
--- a/src/org/yaxim/androidclient/chat/XMPPMucServiceAdapter.java
+++ b/src/org/yaxim/bruno/chat/XMPPMucServiceAdapter.java
@@ -1,12 +1,12 @@
-package org.yaxim.androidclient.chat;
+package org.yaxim.bruno.chat;
 
 import java.util.List;
 
 import android.net.Uri;
 import android.os.RemoteException;
 import android.util.Log;
-import org.yaxim.androidclient.service.IXMPPMucService;
-import org.yaxim.androidclient.service.ParcelablePresence;
+import org.yaxim.bruno.service.IXMPPMucService;
+import org.yaxim.bruno.service.ParcelablePresence;
 
 public class XMPPMucServiceAdapter {
 
diff --git a/src/org/yaxim/androidclient/data/ChatHelper.java b/src/org/yaxim/bruno/data/ChatHelper.java
similarity index 93%
rename from src/org/yaxim/androidclient/data/ChatHelper.java
rename to src/org/yaxim/bruno/data/ChatHelper.java
index 1ffd67f72..bd3074a58 100644
--- a/src/org/yaxim/androidclient/data/ChatHelper.java
+++ b/src/org/yaxim/bruno/data/ChatHelper.java
@@ -1,19 +1,19 @@
-package org.yaxim.androidclient.data;
-
-import org.yaxim.androidclient.YaximApplication;
-import org.yaxim.androidclient.chat.ChatWindow;
-import org.yaxim.androidclient.chat.MUCChatWindow;
-import org.yaxim.androidclient.data.ChatProvider.ChatConstants;
-import org.yaxim.androidclient.data.RosterProvider.RosterConstants;
-import org.yaxim.androidclient.dialogs.AddRosterItemDialog;
-import org.yaxim.androidclient.dialogs.ConfirmDialog;
-import org.yaxim.androidclient.dialogs.EditMUCDialog;
-import org.yaxim.androidclient.dialogs.GroupNameView;
-import org.yaxim.androidclient.preferences.NotificationPrefs;
-import org.yaxim.androidclient.service.IXMPPChatService;
-import org.yaxim.androidclient.util.StatusMode;
-import org.yaxim.androidclient.util.XMPPHelper;
-import org.yaxim.androidclient.R;
+package org.yaxim.bruno.data;
+
+import org.yaxim.bruno.YaximApplication;
+import org.yaxim.bruno.chat.ChatWindow;
+import org.yaxim.bruno.chat.MUCChatWindow;
+import org.yaxim.bruno.data.ChatProvider.ChatConstants;
+import org.yaxim.bruno.data.RosterProvider.RosterConstants;
+import org.yaxim.bruno.dialogs.AddRosterItemDialog;
+import org.yaxim.bruno.dialogs.ConfirmDialog;
+import org.yaxim.bruno.dialogs.EditMUCDialog;
+import org.yaxim.bruno.dialogs.GroupNameView;
+import org.yaxim.bruno.preferences.NotificationPrefs;
+import org.yaxim.bruno.service.IXMPPChatService;
+import org.yaxim.bruno.util.StatusMode;
+import org.yaxim.bruno.util.XMPPHelper;
+import org.yaxim.bruno.R;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -78,8 +78,8 @@ public static void clearAndRespond(Context ctx, BroadcastReceiver br, String jid
 		markAsRead(ctx, jid);
 
 		// obtain service reference if possible
-		Intent serviceIntent = new Intent(ctx, org.yaxim.androidclient.service.XMPPService.class);
-		serviceIntent.setAction("org.yaxim.androidclient.XMPPSERVICE");
+		Intent serviceIntent = new Intent(ctx, org.yaxim.bruno.service.XMPPService.class);
+		serviceIntent.setAction("org.yaxim.bruno.XMPPSERVICE");
 		IXMPPChatService.Stub cs = (IXMPPChatService.Stub)br.peekService(ctx, serviceIntent);
 		if (cs == null) {
 			android.util.Log.d("ChatHelper", "Could not peek Service for " + jid);
@@ -95,8 +95,8 @@ public static void clearAndRespond(Context ctx, BroadcastReceiver br, String jid
 	}
 
 	public static void sendMessage(final Context ctx, final String jid, final String message) {
-		Intent serviceIntent = new Intent(ctx, org.yaxim.androidclient.service.XMPPService.class);
-		serviceIntent.setAction("org.yaxim.androidclient.XMPPSERVICE");
+		Intent serviceIntent = new Intent(ctx, org.yaxim.bruno.service.XMPPService.class);
+		serviceIntent.setAction("org.yaxim.bruno.XMPPSERVICE");
 		ServiceConnection c = new ServiceConnection() {
 			public void onServiceConnected(ComponentName name, IBinder service) {
 				IXMPPChatService chatService = IXMPPChatService.Stub.asInterface(service);
diff --git a/src/org/yaxim/androidclient/data/ChatProvider.java b/src/org/yaxim/bruno/data/ChatProvider.java
similarity index 98%
rename from src/org/yaxim/androidclient/data/ChatProvider.java
rename to src/org/yaxim/bruno/data/ChatProvider.java
index f4a70a0ba..7f20b7118 100644
--- a/src/org/yaxim/androidclient/data/ChatProvider.java
+++ b/src/org/yaxim/bruno/data/ChatProvider.java
@@ -1,8 +1,8 @@
-package org.yaxim.androidclient.data;
+package org.yaxim.bruno.data;
 
 import java.util.ArrayList;
 
-import org.yaxim.androidclient.util.LogConstants;
+import org.yaxim.bruno.util.LogConstants;
 
 import android.content.ContentProvider;
 import android.content.ContentUris;
@@ -21,7 +21,7 @@
 
 public class ChatProvider extends ContentProvider {
 
-	public static final String AUTHORITY = "org.yaxim.androidclient.provider.Chats";
+	public static final String AUTHORITY = "org.yaxim.bruno.provider.Chats";
 	public static final String TABLE_NAME = "chats";
 	public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY
 			+ "/" + TABLE_NAME);
diff --git a/src/org/yaxim/androidclient/data/ChatRoomHelper.java b/src/org/yaxim/bruno/data/ChatRoomHelper.java
similarity index 93%
rename from src/org/yaxim/androidclient/data/ChatRoomHelper.java
rename to src/org/yaxim/bruno/data/ChatRoomHelper.java
index 79f0fda6d..d2aa26de4 100644
--- a/src/org/yaxim/androidclient/data/ChatRoomHelper.java
+++ b/src/org/yaxim/bruno/data/ChatRoomHelper.java
@@ -1,8 +1,8 @@
-package org.yaxim.androidclient.data;
+package org.yaxim.bruno.data;
 
-import org.yaxim.androidclient.data.RosterProvider.RosterConstants;
-import org.yaxim.androidclient.service.IXMPPMucService;
-import org.yaxim.androidclient.util.XMPPHelper;
+import org.yaxim.bruno.data.RosterProvider.RosterConstants;
+import org.yaxim.bruno.service.IXMPPMucService;
+import org.yaxim.bruno.util.XMPPHelper;
 
 import android.content.ComponentName;
 import android.content.ContentValues;
@@ -58,8 +58,8 @@ public static boolean isRoom(Context ctx, String jid) {
 	}
 
 	public static void syncDbRooms(final Context ctx) {
-		Intent serviceIntent = new Intent(ctx, org.yaxim.androidclient.service.XMPPService.class);
-		serviceIntent.setAction("org.yaxim.androidclient.XMPPSERVICE");
+		Intent serviceIntent = new Intent(ctx, org.yaxim.bruno.service.XMPPService.class);
+		serviceIntent.setAction("org.yaxim.bruno.XMPPSERVICE");
 		serviceIntent.setData(Uri.parse("?chat"));
 		ServiceConnection c = new ServiceConnection() {
 			public void onServiceConnected(ComponentName name, IBinder service) {
diff --git a/src/org/yaxim/androidclient/data/RosterProvider.java b/src/org/yaxim/bruno/data/RosterProvider.java
similarity index 98%
rename from src/org/yaxim/androidclient/data/RosterProvider.java
rename to src/org/yaxim/bruno/data/RosterProvider.java
index 0a10fd7ca..eebb92f97 100644
--- a/src/org/yaxim/androidclient/data/RosterProvider.java
+++ b/src/org/yaxim/bruno/data/RosterProvider.java
@@ -1,8 +1,8 @@
-package org.yaxim.androidclient.data;
+package org.yaxim.bruno.data;
 
 import java.util.ArrayList;
 
-import org.yaxim.androidclient.util.LogConstants;
+import org.yaxim.bruno.util.LogConstants;
 
 import android.content.ContentProvider;
 import android.content.ContentUris;
@@ -22,7 +22,7 @@
 
 public class RosterProvider extends ContentProvider {
 
-	public static final String AUTHORITY = "org.yaxim.androidclient.provider.Roster";
+	public static final String AUTHORITY = "org.yaxim.bruno.provider.Roster";
 	public static final String TABLE_ROSTER = "roster";
 	public static final String TABLE_GROUPS = "groups";
 	public static final String TABLE_MUCS = "mucs";
diff --git a/src/org/yaxim/androidclient/data/YaximConfiguration.java b/src/org/yaxim/bruno/data/YaximConfiguration.java
similarity index 96%
rename from src/org/yaxim/androidclient/data/YaximConfiguration.java
rename to src/org/yaxim/bruno/data/YaximConfiguration.java
index d0f530186..fca3b9ff7 100644
--- a/src/org/yaxim/androidclient/data/YaximConfiguration.java
+++ b/src/org/yaxim/bruno/data/YaximConfiguration.java
@@ -1,10 +1,10 @@
-package org.yaxim.androidclient.data;
+package org.yaxim.bruno.data;
 
-import org.yaxim.androidclient.R;
-import org.yaxim.androidclient.exceptions.YaximXMPPAdressMalformedException;
-import org.yaxim.androidclient.util.PreferenceConstants;
-import org.yaxim.androidclient.util.StatusMode;
-import org.yaxim.androidclient.util.XMPPHelper;
+import org.yaxim.bruno.R;
+import org.yaxim.bruno.exceptions.YaximXMPPAdressMalformedException;
+import org.yaxim.bruno.util.PreferenceConstants;
+import org.yaxim.bruno.util.StatusMode;
+import org.yaxim.bruno.util.XMPPHelper;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -139,7 +139,7 @@ private void loadPrefs(SharedPreferences prefs) {
 
 		this.password = prefs.getString(PreferenceConstants.PASSWORD, "");
 		this.ressource = prefs
-				.getString(PreferenceConstants.RESSOURCE, "yaxim");
+				.getString(PreferenceConstants.RESSOURCE, "Bruno");
 		this.port = XMPPHelper.tryToParseInt(prefs.getString(
 				PreferenceConstants.PORT, ""),
 				-1);
diff --git a/src/org/yaxim/androidclient/dialogs/AddRosterItemDialog.java b/src/org/yaxim/bruno/dialogs/AddRosterItemDialog.java
similarity index 87%
rename from src/org/yaxim/androidclient/dialogs/AddRosterItemDialog.java
rename to src/org/yaxim/bruno/dialogs/AddRosterItemDialog.java
index ed1819b41..8d2109bf0 100644
--- a/src/org/yaxim/androidclient/dialogs/AddRosterItemDialog.java
+++ b/src/org/yaxim/bruno/dialogs/AddRosterItemDialog.java
@@ -1,11 +1,11 @@
-package org.yaxim.androidclient.dialogs;
+package org.yaxim.bruno.dialogs;
 
-import org.yaxim.androidclient.XMPPRosterServiceAdapter;
-import org.yaxim.androidclient.data.ChatHelper;
-import org.yaxim.androidclient.exceptions.YaximXMPPAdressMalformedException;
-import org.yaxim.androidclient.util.XMPPHelper;
-import org.yaxim.androidclient.widget.AutoCompleteJidEdit;
-import org.yaxim.androidclient.YaximApplication;
+import org.yaxim.bruno.XMPPRosterServiceAdapter;
+import org.yaxim.bruno.data.ChatHelper;
+import org.yaxim.bruno.exceptions.YaximXMPPAdressMalformedException;
+import org.yaxim.bruno.util.XMPPHelper;
+import org.yaxim.bruno.widget.AutoCompleteJidEdit;
+import org.yaxim.bruno.YaximApplication;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -18,7 +18,7 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
-import org.yaxim.androidclient.R;
+import org.yaxim.bruno.R;
 
 public class AddRosterItemDialog extends AlertDialog implements
 		DialogInterface.OnClickListener, TextWatcher {
diff --git a/src/org/yaxim/androidclient/dialogs/ChangePasswordDialog.java b/src/org/yaxim/bruno/dialogs/ChangePasswordDialog.java
similarity index 90%
rename from src/org/yaxim/androidclient/dialogs/ChangePasswordDialog.java
rename to src/org/yaxim/bruno/dialogs/ChangePasswordDialog.java
index 06883c5c8..5e8d8c975 100644
--- a/src/org/yaxim/androidclient/dialogs/ChangePasswordDialog.java
+++ b/src/org/yaxim/bruno/dialogs/ChangePasswordDialog.java
@@ -1,10 +1,10 @@
-package org.yaxim.androidclient.dialogs;
+package org.yaxim.bruno.dialogs;
 
-import org.yaxim.androidclient.XMPPRosterServiceAdapter;
-import org.yaxim.androidclient.service.IXMPPRosterService;
-import org.yaxim.androidclient.service.XMPPService;
-import org.yaxim.androidclient.util.ConnectionState;
-import org.yaxim.androidclient.util.PreferenceConstants;
+import org.yaxim.bruno.XMPPRosterServiceAdapter;
+import org.yaxim.bruno.service.IXMPPRosterService;
+import org.yaxim.bruno.service.XMPPService;
+import org.yaxim.bruno.util.ConnectionState;
+import org.yaxim.bruno.util.PreferenceConstants;
 
 import android.annotation.TargetApi;
 import android.app.AlertDialog;
@@ -30,7 +30,7 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
-import org.yaxim.androidclient.R;
+import org.yaxim.bruno.R;
 
 public class ChangePasswordDialog extends AlertDialog implements
 		DialogInterface.OnClickListener, TextWatcher {
@@ -96,7 +96,7 @@ public void onCreate(Bundle icicle) {
 		mOkButton.setEnabled(false);
 		
 		Intent serviceIntent = new Intent(mContext, XMPPService.class);
-		serviceIntent.setAction("org.yaxim.androidclient.XMPPSERVICE");
+		serviceIntent.setAction("org.yaxim.bruno.XMPPSERVICE");
 
 		mXmppServiceConnection = new ServiceConnection() {
 
diff --git a/src/org/yaxim/androidclient/dialogs/ChangeStatusDialog.java b/src/org/yaxim/bruno/dialogs/ChangeStatusDialog.java
similarity index 94%
rename from src/org/yaxim/androidclient/dialogs/ChangeStatusDialog.java
rename to src/org/yaxim/bruno/dialogs/ChangeStatusDialog.java
index e96e5bc36..614098b95 100644
--- a/src/org/yaxim/androidclient/dialogs/ChangeStatusDialog.java
+++ b/src/org/yaxim/bruno/dialogs/ChangeStatusDialog.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.dialogs;
+package org.yaxim.bruno.dialogs;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -6,12 +6,12 @@
 import java.util.Comparator;
 import java.util.List;
 
-import org.yaxim.androidclient.MainWindow;
-import org.yaxim.androidclient.YaximApplication;
-import org.yaxim.androidclient.R;
-import org.yaxim.androidclient.data.YaximConfiguration;
-import org.yaxim.androidclient.util.PreferenceConstants;
-import org.yaxim.androidclient.util.StatusMode;
+import org.yaxim.bruno.MainWindow;
+import org.yaxim.bruno.YaximApplication;
+import org.yaxim.bruno.R;
+import org.yaxim.bruno.data.YaximConfiguration;
+import org.yaxim.bruno.util.PreferenceConstants;
+import org.yaxim.bruno.util.StatusMode;
 
 import android.app.AlertDialog;
 import android.content.Context;
diff --git a/src/org/yaxim/androidclient/dialogs/ConfirmDialog.java b/src/org/yaxim/bruno/dialogs/ConfirmDialog.java
similarity index 85%
rename from src/org/yaxim/androidclient/dialogs/ConfirmDialog.java
rename to src/org/yaxim/bruno/dialogs/ConfirmDialog.java
index 08eea04b5..f61a1322f 100644
--- a/src/org/yaxim/androidclient/dialogs/ConfirmDialog.java
+++ b/src/org/yaxim/bruno/dialogs/ConfirmDialog.java
@@ -1,11 +1,11 @@
-package org.yaxim.androidclient.dialogs;
+package org.yaxim.bruno.dialogs;
 
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 
-import org.yaxim.androidclient.data.ChatRoomHelper;
-import org.yaxim.androidclient.R;
+import org.yaxim.bruno.data.ChatRoomHelper;
+import org.yaxim.bruno.R;
 
 public class ConfirmDialog {
 
diff --git a/src/org/yaxim/androidclient/dialogs/EditMUCDialog.java b/src/org/yaxim/bruno/dialogs/EditMUCDialog.java
similarity index 89%
rename from src/org/yaxim/androidclient/dialogs/EditMUCDialog.java
rename to src/org/yaxim/bruno/dialogs/EditMUCDialog.java
index b628265c0..7d652abc5 100644
--- a/src/org/yaxim/androidclient/dialogs/EditMUCDialog.java
+++ b/src/org/yaxim/bruno/dialogs/EditMUCDialog.java
@@ -1,11 +1,11 @@
-package org.yaxim.androidclient.dialogs;
+package org.yaxim.bruno.dialogs;
 
-import org.yaxim.androidclient.data.ChatHelper;
-import org.yaxim.androidclient.data.ChatRoomHelper;
-import org.yaxim.androidclient.exceptions.YaximXMPPAdressMalformedException;
-import org.yaxim.androidclient.util.XMPPHelper;
-import org.yaxim.androidclient.widget.AutoCompleteJidEdit;
-import org.yaxim.androidclient.YaximApplication;
+import org.yaxim.bruno.data.ChatHelper;
+import org.yaxim.bruno.data.ChatRoomHelper;
+import org.yaxim.bruno.exceptions.YaximXMPPAdressMalformedException;
+import org.yaxim.bruno.util.XMPPHelper;
+import org.yaxim.bruno.widget.AutoCompleteJidEdit;
+import org.yaxim.bruno.YaximApplication;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -21,7 +21,7 @@
 import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.TextView;
-import org.yaxim.androidclient.R;
+import org.yaxim.bruno.R;
 
 public class EditMUCDialog extends AlertDialog implements
 		DialogInterface.OnClickListener, TextWatcher {
diff --git a/src/org/yaxim/androidclient/dialogs/FirstStartDialog.java b/src/org/yaxim/bruno/dialogs/FirstStartDialog.java
similarity index 93%
rename from src/org/yaxim/androidclient/dialogs/FirstStartDialog.java
rename to src/org/yaxim/bruno/dialogs/FirstStartDialog.java
index ecaa27d2a..82cd205fb 100644
--- a/src/org/yaxim/androidclient/dialogs/FirstStartDialog.java
+++ b/src/org/yaxim/bruno/dialogs/FirstStartDialog.java
@@ -1,11 +1,11 @@
-package org.yaxim.androidclient.dialogs;
+package org.yaxim.bruno.dialogs;
 
-import org.yaxim.androidclient.XMPPRosterServiceAdapter;
-import org.yaxim.androidclient.exceptions.YaximXMPPAdressMalformedException;
-import org.yaxim.androidclient.preferences.AccountPrefs;
-import org.yaxim.androidclient.util.PreferenceConstants;
-import org.yaxim.androidclient.util.XMPPHelper;
-import org.yaxim.androidclient.widget.AutoCompleteJidEdit;
+import org.yaxim.bruno.XMPPRosterServiceAdapter;
+import org.yaxim.bruno.exceptions.YaximXMPPAdressMalformedException;
+import org.yaxim.bruno.preferences.AccountPrefs;
+import org.yaxim.bruno.util.PreferenceConstants;
+import org.yaxim.bruno.util.XMPPHelper;
+import org.yaxim.bruno.widget.AutoCompleteJidEdit;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -27,8 +27,8 @@
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
-import org.yaxim.androidclient.MainWindow;
-import org.yaxim.androidclient.R;
+import org.yaxim.bruno.MainWindow;
+import org.yaxim.bruno.R;
 
 public class FirstStartDialog extends AlertDialog implements DialogInterface.OnClickListener,
 		CompoundButton.OnCheckedChangeListener, TextWatcher {
diff --git a/src/org/yaxim/androidclient/dialogs/GroupNameView.java b/src/org/yaxim/bruno/dialogs/GroupNameView.java
similarity index 97%
rename from src/org/yaxim/androidclient/dialogs/GroupNameView.java
rename to src/org/yaxim/bruno/dialogs/GroupNameView.java
index 82a51cdfb..ca7327e93 100644
--- a/src/org/yaxim/androidclient/dialogs/GroupNameView.java
+++ b/src/org/yaxim/bruno/dialogs/GroupNameView.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.dialogs;
+package org.yaxim.bruno.dialogs;
 
 import java.util.List;
 
@@ -14,7 +14,7 @@
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 
-import org.yaxim.androidclient.R;
+import org.yaxim.bruno.R;
 
 public class GroupNameView extends LinearLayout implements OnItemSelectedListener {
 	private Context mContext;
diff --git a/src/org/yaxim/androidclient/exceptions/YaximXMPPAdressMalformedException.java b/src/org/yaxim/bruno/exceptions/YaximXMPPAdressMalformedException.java
similarity index 86%
rename from src/org/yaxim/androidclient/exceptions/YaximXMPPAdressMalformedException.java
rename to src/org/yaxim/bruno/exceptions/YaximXMPPAdressMalformedException.java
index 43a8dd071..9b28278a7 100644
--- a/src/org/yaxim/androidclient/exceptions/YaximXMPPAdressMalformedException.java
+++ b/src/org/yaxim/bruno/exceptions/YaximXMPPAdressMalformedException.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.exceptions;
+package org.yaxim.bruno.exceptions;
 
 public class YaximXMPPAdressMalformedException extends Exception {
 	
diff --git a/src/org/yaxim/androidclient/exceptions/YaximXMPPException.java b/src/org/yaxim/bruno/exceptions/YaximXMPPException.java
similarity index 85%
rename from src/org/yaxim/androidclient/exceptions/YaximXMPPException.java
rename to src/org/yaxim/bruno/exceptions/YaximXMPPException.java
index 6bcc731be..7c0d35f8e 100644
--- a/src/org/yaxim/androidclient/exceptions/YaximXMPPException.java
+++ b/src/org/yaxim/bruno/exceptions/YaximXMPPException.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.exceptions;
+package org.yaxim.bruno.exceptions;
 
 public class YaximXMPPException extends Exception {
 	
diff --git a/src/org/yaxim/androidclient/packet/Oob.java b/src/org/yaxim/bruno/packet/Oob.java
similarity index 97%
rename from src/org/yaxim/androidclient/packet/Oob.java
rename to src/org/yaxim/bruno/packet/Oob.java
index f998218ad..ae50ab1c2 100644
--- a/src/org/yaxim/androidclient/packet/Oob.java
+++ b/src/org/yaxim/bruno/packet/Oob.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.packet;
+package org.yaxim.bruno.packet;
 
 import org.jivesoftware.smack.packet.PacketExtension;
 import org.jivesoftware.smack.provider.PacketExtensionProvider;
diff --git a/src/org/yaxim/androidclient/packet/PreAuth.java b/src/org/yaxim/bruno/packet/PreAuth.java
similarity index 92%
rename from src/org/yaxim/androidclient/packet/PreAuth.java
rename to src/org/yaxim/bruno/packet/PreAuth.java
index 3f5876523..78df4d391 100755
--- a/src/org/yaxim/androidclient/packet/PreAuth.java
+++ b/src/org/yaxim/bruno/packet/PreAuth.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.packet;
+package org.yaxim.bruno.packet;
 
 import org.jivesoftware.smack.packet.PacketExtension;
 import org.jivesoftware.smack.provider.PacketExtensionProvider;
diff --git a/src/org/yaxim/androidclient/packet/Replace.java b/src/org/yaxim/bruno/packet/Replace.java
similarity index 91%
rename from src/org/yaxim/androidclient/packet/Replace.java
rename to src/org/yaxim/bruno/packet/Replace.java
index e3fec2d73..c10baeb34 100755
--- a/src/org/yaxim/androidclient/packet/Replace.java
+++ b/src/org/yaxim/bruno/packet/Replace.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.packet;
+package org.yaxim.bruno.packet;
 
 import org.jivesoftware.smack.packet.PacketExtension;
 import org.jivesoftware.smack.provider.PacketExtensionProvider;
diff --git a/src/org/yaxim/androidclient/packet/httpupload/Request.java b/src/org/yaxim/bruno/packet/httpupload/Request.java
similarity index 98%
rename from src/org/yaxim/androidclient/packet/httpupload/Request.java
rename to src/org/yaxim/bruno/packet/httpupload/Request.java
index 6bfd7d357..75a7ed24d 100644
--- a/src/org/yaxim/androidclient/packet/httpupload/Request.java
+++ b/src/org/yaxim/bruno/packet/httpupload/Request.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.packet.httpupload;
+package org.yaxim.bruno.packet.httpupload;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.provider.IQProvider;
diff --git a/src/org/yaxim/androidclient/packet/httpupload/Slot.java b/src/org/yaxim/bruno/packet/httpupload/Slot.java
similarity index 97%
rename from src/org/yaxim/androidclient/packet/httpupload/Slot.java
rename to src/org/yaxim/bruno/packet/httpupload/Slot.java
index 871c9c780..cf2662f21 100644
--- a/src/org/yaxim/androidclient/packet/httpupload/Slot.java
+++ b/src/org/yaxim/bruno/packet/httpupload/Slot.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.packet.httpupload;
+package org.yaxim.bruno.packet.httpupload;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.provider.IQProvider;
diff --git a/src/org/yaxim/androidclient/preferences/AccountPrefs.java b/src/org/yaxim/bruno/preferences/AccountPrefs.java
similarity index 91%
rename from src/org/yaxim/androidclient/preferences/AccountPrefs.java
rename to src/org/yaxim/bruno/preferences/AccountPrefs.java
index 124a62ccc..883d8cb3d 100644
--- a/src/org/yaxim/androidclient/preferences/AccountPrefs.java
+++ b/src/org/yaxim/bruno/preferences/AccountPrefs.java
@@ -1,10 +1,10 @@
-package org.yaxim.androidclient.preferences;
+package org.yaxim.bruno.preferences;
 
-import org.yaxim.androidclient.YaximApplication;
-import org.yaxim.androidclient.dialogs.ChangePasswordDialog;
-import org.yaxim.androidclient.exceptions.YaximXMPPAdressMalformedException;
-import org.yaxim.androidclient.util.PreferenceConstants;
-import org.yaxim.androidclient.util.XMPPHelper;
+import org.yaxim.bruno.YaximApplication;
+import org.yaxim.bruno.dialogs.ChangePasswordDialog;
+import org.yaxim.bruno.exceptions.YaximXMPPAdressMalformedException;
+import org.yaxim.bruno.util.PreferenceConstants;
+import org.yaxim.bruno.util.XMPPHelper;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -19,7 +19,7 @@
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockPreferenceActivity;
 
-import org.yaxim.androidclient.R;
+import org.yaxim.bruno.R;
 
 public class AccountPrefs extends SherlockPreferenceActivity {
 
diff --git a/src/org/yaxim/androidclient/preferences/EditTextPreferenceWithValue.java b/src/org/yaxim/bruno/preferences/EditTextPreferenceWithValue.java
similarity index 94%
rename from src/org/yaxim/androidclient/preferences/EditTextPreferenceWithValue.java
rename to src/org/yaxim/bruno/preferences/EditTextPreferenceWithValue.java
index b202574b4..c322e7bf2 100644
--- a/src/org/yaxim/androidclient/preferences/EditTextPreferenceWithValue.java
+++ b/src/org/yaxim/bruno/preferences/EditTextPreferenceWithValue.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.preferences;
+package org.yaxim.bruno.preferences;
 
 import android.content.Context;
 import android.preference.EditTextPreference;
diff --git a/src/org/yaxim/androidclient/preferences/MainPrefs.java b/src/org/yaxim/bruno/preferences/MainPrefs.java
similarity index 84%
rename from src/org/yaxim/androidclient/preferences/MainPrefs.java
rename to src/org/yaxim/bruno/preferences/MainPrefs.java
index 8fc6fe059..91e2c4559 100644
--- a/src/org/yaxim/androidclient/preferences/MainPrefs.java
+++ b/src/org/yaxim/bruno/preferences/MainPrefs.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.preferences;
+package org.yaxim.bruno.preferences;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -6,9 +6,9 @@
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockPreferenceActivity;
 
-import org.yaxim.androidclient.MainWindow;
-import org.yaxim.androidclient.R;
-import org.yaxim.androidclient.YaximApplication;
+import org.yaxim.bruno.MainWindow;
+import org.yaxim.bruno.R;
+import org.yaxim.bruno.YaximApplication;
 
 public class MainPrefs extends SherlockPreferenceActivity {
 	public void onCreate(Bundle savedInstanceState) {
diff --git a/src/org/yaxim/androidclient/preferences/NotificationPrefs.java b/src/org/yaxim/bruno/preferences/NotificationPrefs.java
similarity index 93%
rename from src/org/yaxim/androidclient/preferences/NotificationPrefs.java
rename to src/org/yaxim/bruno/preferences/NotificationPrefs.java
index 13effbd2b..6f4ea1beb 100644
--- a/src/org/yaxim/androidclient/preferences/NotificationPrefs.java
+++ b/src/org/yaxim/bruno/preferences/NotificationPrefs.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.preferences;
+package org.yaxim.bruno.preferences;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -9,8 +9,8 @@
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockPreferenceActivity;
 
-import org.yaxim.androidclient.R;
-import org.yaxim.androidclient.YaximApplication;
+import org.yaxim.bruno.R;
+import org.yaxim.bruno.YaximApplication;
 
 import java.net.URLEncoder;
 
diff --git a/src/org/yaxim/androidclient/service/GenericService.java b/src/org/yaxim/bruno/service/GenericService.java
similarity index 95%
rename from src/org/yaxim/androidclient/service/GenericService.java
rename to src/org/yaxim/bruno/service/GenericService.java
index e26cd040b..2cd88eb6d 100644
--- a/src/org/yaxim/androidclient/service/GenericService.java
+++ b/src/org/yaxim/bruno/service/GenericService.java
@@ -1,13 +1,13 @@
-package org.yaxim.androidclient.service;
+package org.yaxim.bruno.service;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.jivesoftware.smack.packet.Message;
-import org.yaxim.androidclient.chat.ChatWindow;
-import org.yaxim.androidclient.chat.MUCChatWindow;
-import org.yaxim.androidclient.data.YaximConfiguration;
-import org.yaxim.androidclient.util.LogConstants;
+import org.yaxim.bruno.chat.ChatWindow;
+import org.yaxim.bruno.chat.MUCChatWindow;
+import org.yaxim.bruno.data.YaximConfiguration;
+import org.yaxim.bruno.util.LogConstants;
 
 import android.app.Notification;
 import android.app.PendingIntent;
@@ -33,9 +33,9 @@
 import android.text.style.StyleSpan;
 import android.util.Log;
 import android.widget.Toast;
-import org.yaxim.androidclient.R;
-import org.yaxim.androidclient.util.MessageStylingHelper;
-import org.yaxim.androidclient.util.PreferenceConstants;
+import org.yaxim.bruno.R;
+import org.yaxim.bruno.util.MessageStylingHelper;
+import org.yaxim.bruno.util.PreferenceConstants;
 
 import me.leolin.shortcutbadger.ShortcutBadger;
 
@@ -67,7 +67,7 @@ public abstract class GenericService extends Service {
 	public void onCreate() {
 		Log.i(TAG, "called onCreate()");
 		super.onCreate();
-		mConfig = org.yaxim.androidclient.YaximApplication.getConfig(this);
+		mConfig = org.yaxim.bruno.YaximApplication.getConfig(this);
 		mVibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
 		mWakeLock = ((PowerManager)getSystemService(Context.POWER_SERVICE))
 				.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, APP_NAME);
@@ -221,12 +221,12 @@ private void setNotification(String fromJid, String fromResource, String fromUse
 
 		Intent msgHeardIntent = new Intent()
 			.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
-			.setAction("org.yaxim.androidclient.ACTION_MESSAGE_HEARD")
+			.setAction("org.yaxim.bruno.ACTION_MESSAGE_HEARD")
 			.putExtra("jid", fromJid);
 
 		Intent msgResponseIntent = new Intent()
 			.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
-			.setAction("org.yaxim.androidclient.ACTION_MESSAGE_REPLY")
+			.setAction("org.yaxim.bruno.ACTION_MESSAGE_REPLY")
 			.putExtra("jid", fromJid);
 
 		PendingIntent msgHeardPendingIntent = PendingIntent.getBroadcast(
diff --git a/src/org/yaxim/androidclient/service/IXMPPChatService.aidl b/src/org/yaxim/bruno/service/IXMPPChatService.aidl
similarity index 84%
rename from src/org/yaxim/androidclient/service/IXMPPChatService.aidl
rename to src/org/yaxim/bruno/service/IXMPPChatService.aidl
index 37c0730ad..fec83625d 100644
--- a/src/org/yaxim/androidclient/service/IXMPPChatService.aidl
+++ b/src/org/yaxim/bruno/service/IXMPPChatService.aidl
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.service;
+package org.yaxim.bruno.service;
 
 interface IXMPPChatService {
 	void sendMessage(String user, String message, String lmc, long _id);
diff --git a/src/org/yaxim/androidclient/service/IXMPPMucService.aidl b/src/org/yaxim/bruno/service/IXMPPMucService.aidl
similarity index 79%
rename from src/org/yaxim/androidclient/service/IXMPPMucService.aidl
rename to src/org/yaxim/bruno/service/IXMPPMucService.aidl
index 0fe7bc5e4..15f934944 100644
--- a/src/org/yaxim/androidclient/service/IXMPPMucService.aidl
+++ b/src/org/yaxim/bruno/service/IXMPPMucService.aidl
@@ -1,6 +1,6 @@
-package org.yaxim.androidclient.service;
+package org.yaxim.bruno.service;
 
-import org.yaxim.androidclient.service.ParcelablePresence;
+import org.yaxim.bruno.service.ParcelablePresence;
 
 interface IXMPPMucService {
 	void syncDbRooms();
diff --git a/src/org/yaxim/androidclient/service/IXMPPRosterService.aidl b/src/org/yaxim/bruno/service/IXMPPRosterService.aidl
similarity index 90%
rename from src/org/yaxim/androidclient/service/IXMPPRosterService.aidl
rename to src/org/yaxim/bruno/service/IXMPPRosterService.aidl
index 2aeedd92f..555bf1f46 100644
--- a/src/org/yaxim/androidclient/service/IXMPPRosterService.aidl
+++ b/src/org/yaxim/bruno/service/IXMPPRosterService.aidl
@@ -1,10 +1,10 @@
-package org.yaxim.androidclient.service;
+package org.yaxim.bruno.service;
 
 /*
 	IPC interface for methods on XMPPService called by an activity
 */
 
-import org.yaxim.androidclient.IXMPPRosterCallback;
+import org.yaxim.bruno.IXMPPRosterCallback;
 
 interface IXMPPRosterService {
 	/* hack: use int because enums are not trivially parcellable */
diff --git a/src/org/yaxim/androidclient/service/InstallReferrerReceiver.java b/src/org/yaxim/bruno/service/InstallReferrerReceiver.java
similarity index 87%
rename from src/org/yaxim/androidclient/service/InstallReferrerReceiver.java
rename to src/org/yaxim/bruno/service/InstallReferrerReceiver.java
index 2b2260fb9..32f0e4ced 100644
--- a/src/org/yaxim/androidclient/service/InstallReferrerReceiver.java
+++ b/src/org/yaxim/bruno/service/InstallReferrerReceiver.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.service;
+package org.yaxim.bruno.service;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -6,8 +6,8 @@
 import android.net.Uri;
 import android.util.Log;
 
-import org.yaxim.androidclient.MainWindow;
-import org.yaxim.androidclient.data.YaximConfiguration;
+import org.yaxim.bruno.MainWindow;
+import org.yaxim.bruno.data.YaximConfiguration;
 
 import java.net.URLDecoder;
 
diff --git a/src/org/yaxim/androidclient/service/MUCController.java b/src/org/yaxim/bruno/service/MUCController.java
similarity index 92%
rename from src/org/yaxim/androidclient/service/MUCController.java
rename to src/org/yaxim/bruno/service/MUCController.java
index ed50729bf..a07bbb625 100644
--- a/src/org/yaxim/androidclient/service/MUCController.java
+++ b/src/org/yaxim/bruno/service/MUCController.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.service;
+package org.yaxim.bruno.service;
 
 import android.content.ContentResolver;
 import android.content.ContentUris;
@@ -11,8 +11,8 @@
 import org.jivesoftware.smackx.muc.MultiUserChat;
 
 import org.jivesoftware.smackx.muc.RoomInfo;
-import org.yaxim.androidclient.data.ChatProvider;
-import org.yaxim.androidclient.data.ChatProvider.ChatConstants;
+import org.yaxim.bruno.data.ChatProvider;
+import org.yaxim.bruno.data.ChatProvider.ChatConstants;
 
 /* The MUCController implements common MUC related management tasks.
  *
diff --git a/src/org/yaxim/bruno/service/ParcelablePresence.aidl b/src/org/yaxim/bruno/service/ParcelablePresence.aidl
new file mode 100644
index 000000000..7c596ac17
--- /dev/null
+++ b/src/org/yaxim/bruno/service/ParcelablePresence.aidl
@@ -0,0 +1,3 @@
+package org.yaxim.bruno.service;
+
+parcelable ParcelablePresence;
\ No newline at end of file
diff --git a/src/org/yaxim/androidclient/service/ParcelablePresence.java b/src/org/yaxim/bruno/service/ParcelablePresence.java
similarity index 94%
rename from src/org/yaxim/androidclient/service/ParcelablePresence.java
rename to src/org/yaxim/bruno/service/ParcelablePresence.java
index e54333fcf..a43093128 100644
--- a/src/org/yaxim/androidclient/service/ParcelablePresence.java
+++ b/src/org/yaxim/bruno/service/ParcelablePresence.java
@@ -1,7 +1,7 @@
-package org.yaxim.androidclient.service;
+package org.yaxim.bruno.service;
 
 import org.jivesoftware.smack.packet.Presence;
-import org.yaxim.androidclient.util.StatusMode;
+import org.yaxim.bruno.util.StatusMode;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/src/org/yaxim/androidclient/service/Smackable.java b/src/org/yaxim/bruno/service/Smackable.java
similarity index 90%
rename from src/org/yaxim/androidclient/service/Smackable.java
rename to src/org/yaxim/bruno/service/Smackable.java
index f37ec5ca6..26214e573 100644
--- a/src/org/yaxim/androidclient/service/Smackable.java
+++ b/src/org/yaxim/bruno/service/Smackable.java
@@ -1,10 +1,10 @@
-package org.yaxim.androidclient.service;
+package org.yaxim.bruno.service;
 
 import java.util.List;
 
 import org.jivesoftware.smack.XMPPConnection;
-import org.yaxim.androidclient.exceptions.YaximXMPPException;
-import org.yaxim.androidclient.util.ConnectionState;
+import org.yaxim.bruno.exceptions.YaximXMPPException;
+import org.yaxim.bruno.util.ConnectionState;
 
 
 public interface Smackable {
diff --git a/src/org/yaxim/androidclient/service/SmackableImp.java b/src/org/yaxim/bruno/service/SmackableImp.java
similarity index 98%
rename from src/org/yaxim/androidclient/service/SmackableImp.java
rename to src/org/yaxim/bruno/service/SmackableImp.java
index 421bd1825..292d728f0 100644
--- a/src/org/yaxim/androidclient/service/SmackableImp.java
+++ b/src/org/yaxim/bruno/service/SmackableImp.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.service;
+package org.yaxim.bruno.service;
 
 import java.io.File;
 import java.util.Collection;
@@ -73,23 +73,23 @@
 import org.jivesoftware.smackx.receipts.DeliveryReceiptManager;
 import org.jivesoftware.smackx.receipts.DeliveryReceiptRequest;
 import org.jivesoftware.smackx.receipts.ReceiptReceivedListener;
-import org.yaxim.androidclient.YaximApplication;
-import org.yaxim.androidclient.data.ChatHelper;
-import org.yaxim.androidclient.data.ChatProvider;
-import org.yaxim.androidclient.data.ChatRoomHelper;
-import org.yaxim.androidclient.data.RosterProvider;
-import org.yaxim.androidclient.data.YaximConfiguration;
-import org.yaxim.androidclient.data.ChatProvider.ChatConstants;
-import org.yaxim.androidclient.data.RosterProvider.RosterConstants;
-import org.yaxim.androidclient.exceptions.YaximXMPPException;
-import org.yaxim.androidclient.packet.Oob;
-import org.yaxim.androidclient.packet.PreAuth;
-import org.yaxim.androidclient.packet.Replace;
-import org.yaxim.androidclient.packet.httpupload.Slot;
-import org.yaxim.androidclient.util.ConnectionState;
-import org.yaxim.androidclient.util.LogConstants;
-import org.yaxim.androidclient.util.StatusMode;
-import org.yaxim.androidclient.R;
+import org.yaxim.bruno.YaximApplication;
+import org.yaxim.bruno.data.ChatHelper;
+import org.yaxim.bruno.data.ChatProvider;
+import org.yaxim.bruno.data.ChatRoomHelper;
+import org.yaxim.bruno.data.RosterProvider;
+import org.yaxim.bruno.data.YaximConfiguration;
+import org.yaxim.bruno.data.ChatProvider.ChatConstants;
+import org.yaxim.bruno.data.RosterProvider.RosterConstants;
+import org.yaxim.bruno.exceptions.YaximXMPPException;
+import org.yaxim.bruno.packet.Oob;
+import org.yaxim.bruno.packet.PreAuth;
+import org.yaxim.bruno.packet.Replace;
+import org.yaxim.bruno.packet.httpupload.Slot;
+import org.yaxim.bruno.util.ConnectionState;
+import org.yaxim.bruno.util.LogConstants;
+import org.yaxim.bruno.util.StatusMode;
+import org.yaxim.bruno.R;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -221,8 +221,8 @@ static void registerSmackProviders() {
 
 	private PendingIntent mPingAlarmPendIntent;
 	private PendingIntent mPongTimeoutAlarmPendIntent;
-	private static final String PING_ALARM = "org.yaxim.androidclient.PING_ALARM";
-	private static final String PONG_TIMEOUT_ALARM = "org.yaxim.androidclient.PONG_TIMEOUT_ALARM";
+	private static final String PING_ALARM = "org.yaxim.bruno.PING_ALARM";
+	private static final String PONG_TIMEOUT_ALARM = "org.yaxim.bruno.PONG_TIMEOUT_ALARM";
 	private Intent mPingAlarmIntent = new Intent(PING_ALARM);
 	private Intent mPongTimeoutAlarmIntent = new Intent(PONG_TIMEOUT_ALARM);
 	private Service mService;
diff --git a/src/org/yaxim/androidclient/service/XMPPService.java b/src/org/yaxim/bruno/service/XMPPService.java
similarity index 96%
rename from src/org/yaxim/androidclient/service/XMPPService.java
rename to src/org/yaxim/bruno/service/XMPPService.java
index a1bf4052e..6a7e8fe03 100644
--- a/src/org/yaxim/androidclient/service/XMPPService.java
+++ b/src/org/yaxim/bruno/service/XMPPService.java
@@ -1,18 +1,18 @@
-package org.yaxim.androidclient.service;
+package org.yaxim.bruno.service;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.yaxim.androidclient.FileHttpUploadTask;
-import org.yaxim.androidclient.IXMPPRosterCallback;
-import org.yaxim.androidclient.MainWindow;
-import org.yaxim.androidclient.R;
-import org.yaxim.androidclient.YaximApplication;
-import org.yaxim.androidclient.data.RosterProvider;
-import org.yaxim.androidclient.exceptions.YaximXMPPException;
-import org.yaxim.androidclient.util.ConnectionState;
-import org.yaxim.androidclient.util.StatusMode;
+import org.yaxim.bruno.FileHttpUploadTask;
+import org.yaxim.bruno.IXMPPRosterCallback;
+import org.yaxim.bruno.MainWindow;
+import org.yaxim.bruno.R;
+import org.yaxim.bruno.YaximApplication;
+import org.yaxim.bruno.data.RosterProvider;
+import org.yaxim.bruno.exceptions.YaximXMPPException;
+import org.yaxim.bruno.util.ConnectionState;
+import org.yaxim.bruno.util.StatusMode;
 
 import org.jivesoftware.smack.packet.Message.Type;
 
@@ -43,7 +43,7 @@ public class XMPPService extends GenericService {
 	private AtomicBoolean mConnectionDemanded = new AtomicBoolean(false); // should we try to reconnect?
 	private static final int RECONNECT_AFTER = 5;
 	private static final int RECONNECT_MAXIMUM = 10*60;
-	private static final String RECONNECT_ALARM = "org.yaxim.androidclient.RECONNECT_ALARM";
+	private static final String RECONNECT_ALARM = "org.yaxim.bruno.RECONNECT_ALARM";
 	private int mReconnectTimeout = RECONNECT_AFTER;
 	private String mReconnectInfo = "";
 	private Intent mAlarmIntent = new Intent(RECONNECT_ALARM);
@@ -172,7 +172,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 					Log.d(TAG, "got reply: " + replystring);
 					mSmackable.sendMessage(jid, replystring, null, null, -1);
 				}
-				org.yaxim.androidclient.data.ChatHelper.markAsRead(this, jid);
+				org.yaxim.bruno.data.ChatHelper.markAsRead(this, jid);
 				clearNotification(jid);
 				return START_STICKY;
 			}
diff --git a/src/org/yaxim/androidclient/service/XMPPServiceCallback.java b/src/org/yaxim/bruno/service/XMPPServiceCallback.java
similarity index 81%
rename from src/org/yaxim/androidclient/service/XMPPServiceCallback.java
rename to src/org/yaxim/bruno/service/XMPPServiceCallback.java
index b805dbf9f..aea84ab88 100644
--- a/src/org/yaxim/androidclient/service/XMPPServiceCallback.java
+++ b/src/org/yaxim/bruno/service/XMPPServiceCallback.java
@@ -1,7 +1,7 @@
-package org.yaxim.androidclient.service;
+package org.yaxim.bruno.service;
 
 import org.jivesoftware.smack.packet.Message;
-import org.yaxim.androidclient.util.ConnectionState;
+import org.yaxim.bruno.util.ConnectionState;
 
 public interface XMPPServiceCallback {
 	void notifyMessage(String[] from, String messageBody, boolean silent_notification, Message.Type msgType);
diff --git a/src/org/yaxim/androidclient/service/XmppStreamHandler.java b/src/org/yaxim/bruno/service/XmppStreamHandler.java
similarity index 99%
rename from src/org/yaxim/androidclient/service/XmppStreamHandler.java
rename to src/org/yaxim/bruno/service/XmppStreamHandler.java
index 9a0a8c75c..f334b41c8 100644
--- a/src/org/yaxim/androidclient/service/XmppStreamHandler.java
+++ b/src/org/yaxim/bruno/service/XmppStreamHandler.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.service;
+package org.yaxim.bruno.service;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/src/org/yaxim/androidclient/service/YaximBroadcastReceiver.java b/src/org/yaxim/bruno/service/YaximBroadcastReceiver.java
similarity index 93%
rename from src/org/yaxim/androidclient/service/YaximBroadcastReceiver.java
rename to src/org/yaxim/bruno/service/YaximBroadcastReceiver.java
index 170ee3922..45636bd74 100644
--- a/src/org/yaxim/androidclient/service/YaximBroadcastReceiver.java
+++ b/src/org/yaxim/bruno/service/YaximBroadcastReceiver.java
@@ -1,6 +1,6 @@
-package org.yaxim.androidclient.service;
+package org.yaxim.bruno.service;
 
-import org.yaxim.androidclient.util.PreferenceConstants;
+import org.yaxim.bruno.util.PreferenceConstants;
 
 import android.content.Context;
 import android.content.Intent;
@@ -71,7 +71,7 @@ public void onReceive(Context context, Intent intent) {
 				return;
 			context.startService(xmppServiceIntent);
 		} else
-		if (intent.getAction().equals("org.yaxim.androidclient.ACTION_MESSAGE_HEARD")) {
+		if (intent.getAction().equals("org.yaxim.bruno.ACTION_MESSAGE_HEARD")) {
 			Log.d(TAG, "heard " + intent);
 			xmppServiceIntent.setAction("respond");
 			String jid = intent.getStringExtra("jid");
@@ -79,7 +79,7 @@ public void onReceive(Context context, Intent intent) {
 			xmppServiceIntent.setData(Uri.parse(jid));
 			context.startService(xmppServiceIntent);
 		} else
-		if (intent.getAction().equals("org.yaxim.androidclient.ACTION_MESSAGE_REPLY")) {
+		if (intent.getAction().equals("org.yaxim.bruno.ACTION_MESSAGE_REPLY")) {
 			Log.d(TAG, "reply " + intent);
 			Bundle reply = android.support.v4.app.RemoteInput.getResultsFromIntent(intent);
 			String replystring = null;
diff --git a/src/org/yaxim/androidclient/util/AdapterConstants.java b/src/org/yaxim/bruno/util/AdapterConstants.java
similarity index 83%
rename from src/org/yaxim/androidclient/util/AdapterConstants.java
rename to src/org/yaxim/bruno/util/AdapterConstants.java
index 6781168db..a13f3134c 100644
--- a/src/org/yaxim/androidclient/util/AdapterConstants.java
+++ b/src/org/yaxim/bruno/util/AdapterConstants.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.util;
+package org.yaxim.bruno.util;
 
 public class AdapterConstants {
 	public static final String[] GROUP_NAME = {"groupName"};
diff --git a/src/org/yaxim/androidclient/util/ConnectionState.java b/src/org/yaxim/bruno/util/ConnectionState.java
similarity index 92%
rename from src/org/yaxim/androidclient/util/ConnectionState.java
rename to src/org/yaxim/bruno/util/ConnectionState.java
index 26c6f23a1..f2865a149 100644
--- a/src/org/yaxim/androidclient/util/ConnectionState.java
+++ b/src/org/yaxim/bruno/util/ConnectionState.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.util;
+package org.yaxim.bruno.util;
 
 public enum ConnectionState {
 	OFFLINE,		/// no connection is desired by the user
diff --git a/src/org/yaxim/androidclient/util/FileHelper.java b/src/org/yaxim/bruno/util/FileHelper.java
similarity index 99%
rename from src/org/yaxim/androidclient/util/FileHelper.java
rename to src/org/yaxim/bruno/util/FileHelper.java
index 875056b48..4a0f0abb7 100644
--- a/src/org/yaxim/androidclient/util/FileHelper.java
+++ b/src/org/yaxim/bruno/util/FileHelper.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.util;
+package org.yaxim.bruno.util;
 
 import android.annotation.SuppressLint;
 import android.content.ContentResolver;
diff --git a/src/org/yaxim/androidclient/util/LogConstants.java b/src/org/yaxim/bruno/util/LogConstants.java
similarity index 81%
rename from src/org/yaxim/androidclient/util/LogConstants.java
rename to src/org/yaxim/bruno/util/LogConstants.java
index 114bad016..4a049a59d 100644
--- a/src/org/yaxim/androidclient/util/LogConstants.java
+++ b/src/org/yaxim/bruno/util/LogConstants.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.util;
+package org.yaxim.bruno.util;
 
 public class LogConstants {
 
diff --git a/src/org/yaxim/androidclient/util/MessageStylingHelper.java b/src/org/yaxim/bruno/util/MessageStylingHelper.java
similarity index 98%
rename from src/org/yaxim/androidclient/util/MessageStylingHelper.java
rename to src/org/yaxim/bruno/util/MessageStylingHelper.java
index fc47aa710..470ae855e 100644
--- a/src/org/yaxim/androidclient/util/MessageStylingHelper.java
+++ b/src/org/yaxim/bruno/util/MessageStylingHelper.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.util;
+package org.yaxim.bruno.util;
 
 import android.graphics.Typeface;
 import android.text.Editable;
diff --git a/src/org/yaxim/androidclient/util/PreferenceConstants.java b/src/org/yaxim/bruno/util/PreferenceConstants.java
similarity index 97%
rename from src/org/yaxim/androidclient/util/PreferenceConstants.java
rename to src/org/yaxim/bruno/util/PreferenceConstants.java
index bca510ef5..42e0a0b1a 100644
--- a/src/org/yaxim/androidclient/util/PreferenceConstants.java
+++ b/src/org/yaxim/bruno/util/PreferenceConstants.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.util;
+package org.yaxim.bruno.util;
 
 public class PreferenceConstants {
 	public final static String JID = "account_jabberID";
diff --git a/src/org/yaxim/androidclient/util/SimpleCursorTreeAdapter.java b/src/org/yaxim/bruno/util/SimpleCursorTreeAdapter.java
similarity index 99%
rename from src/org/yaxim/androidclient/util/SimpleCursorTreeAdapter.java
rename to src/org/yaxim/bruno/util/SimpleCursorTreeAdapter.java
index cac55eb53..cd69118e9 100644
--- a/src/org/yaxim/androidclient/util/SimpleCursorTreeAdapter.java
+++ b/src/org/yaxim/bruno/util/SimpleCursorTreeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.yaxim.androidclient.util;
+package org.yaxim.bruno.util;
 
 import android.content.Context;
 import android.database.Cursor;
diff --git a/src/org/yaxim/androidclient/util/StatusMode.java b/src/org/yaxim/bruno/util/StatusMode.java
similarity index 92%
rename from src/org/yaxim/androidclient/util/StatusMode.java
rename to src/org/yaxim/bruno/util/StatusMode.java
index a071823af..fe11fa489 100644
--- a/src/org/yaxim/androidclient/util/StatusMode.java
+++ b/src/org/yaxim/bruno/util/StatusMode.java
@@ -1,6 +1,6 @@
-package org.yaxim.androidclient.util;
+package org.yaxim.bruno.util;
 
-import org.yaxim.androidclient.R;
+import org.yaxim.bruno.R;
 
 public enum StatusMode {
 	unknown(0 /* not a status you can set */, R.drawable.ic_status_unknown),
diff --git a/src/org/yaxim/androidclient/util/XEP0392Helper.java b/src/org/yaxim/bruno/util/XEP0392Helper.java
similarity index 97%
rename from src/org/yaxim/androidclient/util/XEP0392Helper.java
rename to src/org/yaxim/bruno/util/XEP0392Helper.java
index be7add19b..53e2d9c0f 100644
--- a/src/org/yaxim/androidclient/util/XEP0392Helper.java
+++ b/src/org/yaxim/bruno/util/XEP0392Helper.java
@@ -1,4 +1,4 @@
-package org.yaxim.androidclient.util;
+package org.yaxim.bruno.util;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
@@ -9,7 +9,7 @@
 import android.util.TypedValue;
 
 import org.hsluv.HUSLColorConverter;
-import org.yaxim.androidclient.R;
+import org.yaxim.bruno.R;
 
 public class XEP0392Helper {
 	static final double KR=0.2627;
diff --git a/src/org/yaxim/androidclient/util/XMPPHelper.java b/src/org/yaxim/bruno/util/XMPPHelper.java
similarity index 97%
rename from src/org/yaxim/androidclient/util/XMPPHelper.java
rename to src/org/yaxim/bruno/util/XMPPHelper.java
index e89fa9b10..5bf112e22 100644
--- a/src/org/yaxim/androidclient/util/XMPPHelper.java
+++ b/src/org/yaxim/bruno/util/XMPPHelper.java
@@ -1,12 +1,12 @@
-package org.yaxim.androidclient.util;
+package org.yaxim.bruno.util;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.security.SecureRandom;
 
-import org.yaxim.androidclient.R;
-import org.yaxim.androidclient.data.YaximConfiguration;
-import org.yaxim.androidclient.exceptions.YaximXMPPAdressMalformedException;
+import org.yaxim.bruno.R;
+import org.yaxim.bruno.data.YaximConfiguration;
+import org.yaxim.bruno.exceptions.YaximXMPPAdressMalformedException;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
diff --git a/src/org/yaxim/androidclient/widget/AutoCompleteJidEdit.java b/src/org/yaxim/bruno/widget/AutoCompleteJidEdit.java
similarity index 98%
rename from src/org/yaxim/androidclient/widget/AutoCompleteJidEdit.java
rename to src/org/yaxim/bruno/widget/AutoCompleteJidEdit.java
index ebf97a138..2ef42d586 100644
--- a/src/org/yaxim/androidclient/widget/AutoCompleteJidEdit.java
+++ b/src/org/yaxim/bruno/widget/AutoCompleteJidEdit.java
@@ -1,6 +1,6 @@
-package org.yaxim.androidclient.widget;
+package org.yaxim.bruno.widget;
 
-import org.yaxim.androidclient.R;
+import org.yaxim.bruno.R;
 
 import java.util.Arrays;
 import java.util.ArrayList;