diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 85d4400..0404835 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -107,7 +107,7 @@
             android:label="@string/title_activity_login" >
         </activity>
         <activity
-            android:name=".activities.restore_sms.AccountListActivity"
+            android:name="fr.unix_experience.owncloud_sms.activities.remote_account.AccountListActivity"
             android:label="@string/title_activity_select_account" >
         </activity>
         <activity
@@ -130,7 +130,7 @@
         </activity>
         -->
         <activity
-            android:name=".activities.restore_sms.ContactListActivity"
+            android:name="fr.unix_experience.owncloud_sms.activities.remote_account.ContactListActivity"
             android:label="@string/title_activity_select_contact" >
         </activity>
     </application>
diff --git a/res/layout/fragment_mainactivity_gotosettings.xml b/res/layout/fragment_mainactivity_gotosettings.xml
index 0132f24..7e754e9 100644
--- a/res/layout/fragment_mainactivity_gotosettings.xml
+++ b/res/layout/fragment_mainactivity_gotosettings.xml
@@ -104,27 +104,27 @@
         android:text="@string/ma_button_sync_accounts_now" />
     
     <TextView
-        android:id="@+id/tv_restoremsgs"
+        android:id="@+id/tv_remoteaccount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignLeft="@+id/main_tv_accounts"
         android:layout_alignStart="@+id/main_tv_accounts"
         android:layout_below="@+id/main_button_sync"
         android:layout_marginTop="18dp"
-        android:text="@string/ma_title_restore_messages"
+        android:text="@string/ma_title_remote_account"
         android:textAppearance="?android:attr/textAppearanceLarge" />
 
     <Button
-        android:id="@+id/main_button_restore_choose_account"
+        android:id="@+id/main_button_choose_account"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/tv_restoremsgs"
+        android:layout_below="@+id/tv_remoteaccount"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="19dp"
-        android:onClick="selectAccountForRestauration"
+        android:onClick="selectRemoteAccount"
         android:background="@drawable/standard_button"
         style="@style/StandardButton"
-        android:text="@string/ma_button_restore_messages" />
+        android:text="@string/choose_account" />
 
     <ImageView
         android:id="@+id/imageView1"
@@ -132,7 +132,7 @@
         android:layout_height="wrap_content"
         android:layout_alignLeft="@+id/textView1"
         android:layout_alignStart="@+id/textView1"
-        android:layout_below="@+id/main_button_restore_choose_account"
+        android:layout_below="@+id/main_button_choose_account"
         android:layout_marginTop="33dp"
         android:src="@drawable/next_arrow" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0511d7e..e19c586 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -137,8 +137,8 @@
 Contributors and issue\'s reporters</string>
     <string name="ma_title_sync_all">Synchronize all messages</string>
     <string name="ma_button_sync_accounts_now">Launch synchronization now</string>
-    <string name="ma_title_restore_messages">Restore messages</string>
-    <string name="ma_button_restore_messages">Choose account</string>
+    <string name="ma_title_remote_account">Remote account</string>
+    <string name="choose_account">Choose account</string>
 
     <!-- Restauration -->
     <string name="title_activity_select_account">Select account</string>
diff --git a/src/fr/unix_experience/owncloud_sms/activities/MainActivity.java b/src/fr/unix_experience/owncloud_sms/activities/MainActivity.java
index 6e84ad8..f038ada 100644
--- a/src/fr/unix_experience/owncloud_sms/activities/MainActivity.java
+++ b/src/fr/unix_experience/owncloud_sms/activities/MainActivity.java
@@ -46,7 +46,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 import fr.unix_experience.owncloud_sms.R;
-import fr.unix_experience.owncloud_sms.activities.restore_sms.AccountListActivity;
+import fr.unix_experience.owncloud_sms.activities.remote_account.AccountListActivity;
 import fr.unix_experience.owncloud_sms.engine.ASyncTask.SyncTask;
 import fr.unix_experience.owncloud_sms.engine.ConnectivityMonitor;
 import fr.unix_experience.owncloud_sms.engine.SmsFetcher;
@@ -182,7 +182,7 @@ public class MainActivity extends Activity {
 		}
 	}
 
-	public void selectAccountForRestauration(final View view) {
+	public void selectRemoteAccount(final View view) {
 		startActivity(new Intent(this, AccountListActivity.class));
 	}
 
diff --git a/src/fr/unix_experience/owncloud_sms/activities/restore_sms/AccountListActivity.java b/src/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java
similarity index 94%
rename from src/fr/unix_experience/owncloud_sms/activities/restore_sms/AccountListActivity.java
rename to src/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java
index 24d9791..aec1001 100644
--- a/src/fr/unix_experience/owncloud_sms/activities/restore_sms/AccountListActivity.java
+++ b/src/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java
@@ -1,4 +1,4 @@
-package fr.unix_experience.owncloud_sms.activities.restore_sms;
+package fr.unix_experience.owncloud_sms.activities.remote_account;
 
 import java.util.ArrayList;
 
diff --git a/src/fr/unix_experience/owncloud_sms/activities/restore_sms/ContactListActivity.java b/src/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java
similarity index 96%
rename from src/fr/unix_experience/owncloud_sms/activities/restore_sms/ContactListActivity.java
rename to src/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java
index ee7dbcd..7b06781 100644
--- a/src/fr/unix_experience/owncloud_sms/activities/restore_sms/ContactListActivity.java
+++ b/src/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java
@@ -1,4 +1,4 @@
-package fr.unix_experience.owncloud_sms.activities.restore_sms;
+package fr.unix_experience.owncloud_sms.activities.remote_account;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;