diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 558a77cbe..bac3f32dd 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -246,7 +246,7 @@ limitations under the License.
               android:label="@string/welcome_title"
               android:exported="false" />
 
-    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.ServicePickerActivity"/>
+    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity"/>
 
     <service android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
              android:label="@string/my_tracks_recording_service"
diff --git a/MyTracks/res/layout/mytracks_send_to_google.xml b/MyTracks/res/layout/upload_service_chooser.xml
similarity index 100%
rename from MyTracks/res/layout/mytracks_send_to_google.xml
rename to MyTracks/res/layout/upload_service_chooser.xml
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
index d80010cd7..21524287a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
@@ -26,7 +26,7 @@ import com.google.android.apps.mytracks.content.TracksColumns;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.io.file.SaveActivity;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendType;
-import com.google.android.apps.mytracks.io.sendtogoogle.ServicePickerActivity;
+import com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity;
 import com.google.android.apps.mytracks.services.tasks.StatusAnnouncerFactory;
 import com.google.android.apps.mytracks.stats.TripStatistics;
 import com.google.android.apps.mytracks.util.ApiFeatures;
@@ -404,20 +404,21 @@ public class MapActivity extends com.google.android.maps.MapActivity
     long trackId = dataHub.getSelectedTrackId();
     switch (item.getItemId()) {
       case Constants.MENU_SEND_TO_GOOGLE:
-        intent = new Intent(this, ServicePickerActivity.class);
-        intent.putExtra(ServicePickerActivity.TRACK_ID, trackId);
+        intent = new Intent(this, UploadServiceChooserActivity.class);
+        intent.putExtra(UploadServiceChooserActivity.TRACK_ID, trackId);
         startActivity(intent);
         return true;
       case Constants.MENU_SHARE_MAP:
-        intent = new Intent(this, ServicePickerActivity.class);
-        intent.putExtra(ServicePickerActivity.TRACK_ID, trackId);
-        intent.putExtra(ServicePickerActivity.SEND_TYPE, (Parcelable) SendType.MAPS);
+        intent = new Intent(this, UploadServiceChooserActivity.class);
+        intent.putExtra(UploadServiceChooserActivity.TRACK_ID, trackId);
+        intent.putExtra(UploadServiceChooserActivity.SEND_TYPE, (Parcelable) SendType.MAPS);
         startActivity(intent);
         return true;
       case Constants.MENU_SHARE_FUSION_TABLE:
-        intent = new Intent(this, ServicePickerActivity.class);
-        intent.putExtra(ServicePickerActivity.TRACK_ID, trackId);
-        intent.putExtra(ServicePickerActivity.SEND_TYPE, (Parcelable) SendType.FUSION_TABLES);
+        intent = new Intent(this, UploadServiceChooserActivity.class);
+        intent.putExtra(UploadServiceChooserActivity.TRACK_ID, trackId);
+        intent.putExtra(
+            UploadServiceChooserActivity.SEND_TYPE, (Parcelable) SendType.FUSION_TABLES);
         startActivity(intent);
         return true;
       case Constants.MENU_SAVE_GPX_FILE:
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
index 7ef5d6d4f..94166448a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
@@ -20,7 +20,7 @@ import static com.google.android.apps.mytracks.Constants.TAG;
 import com.google.android.apps.mytracks.content.TracksColumns;
 import com.google.android.apps.mytracks.io.file.SaveActivity;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendType;
-import com.google.android.apps.mytracks.io.sendtogoogle.ServicePickerActivity;
+import com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity;
 import com.google.android.apps.mytracks.services.ServiceUtils;
 import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
 import com.google.android.apps.mytracks.util.StringUtils;
@@ -175,20 +175,21 @@ public class TrackList extends ListActivity
       case Constants.MENU_WRITE_TO_SD_CARD:
         return false;
       case Constants.MENU_SEND_TO_GOOGLE:
-        intent = new Intent(this, ServicePickerActivity.class);
-        intent.putExtra(ServicePickerActivity.TRACK_ID, trackId);
+        intent = new Intent(this, UploadServiceChooserActivity.class);
+        intent.putExtra(UploadServiceChooserActivity.TRACK_ID, trackId);
         startActivity(intent);
         return true;
       case Constants.MENU_SHARE_MAP:
-        intent = new Intent(this, ServicePickerActivity.class);
-        intent.putExtra(ServicePickerActivity.TRACK_ID, trackId);
-        intent.putExtra(ServicePickerActivity.SEND_TYPE, (Parcelable) SendType.MAPS);
+        intent = new Intent(this, UploadServiceChooserActivity.class);
+        intent.putExtra(UploadServiceChooserActivity.TRACK_ID, trackId);
+        intent.putExtra(UploadServiceChooserActivity.SEND_TYPE, (Parcelable) SendType.MAPS);
         startActivity(intent);
         return true;
       case Constants.MENU_SHARE_FUSION_TABLE:
-        intent = new Intent(this, ServicePickerActivity.class);
-        intent.putExtra(ServicePickerActivity.TRACK_ID, trackId);
-        intent.putExtra(ServicePickerActivity.SEND_TYPE, (Parcelable) SendType.FUSION_TABLES);
+        intent = new Intent(this, UploadServiceChooserActivity.class);
+        intent.putExtra(UploadServiceChooserActivity.TRACK_ID, trackId);
+        intent.putExtra(
+            UploadServiceChooserActivity.SEND_TYPE, (Parcelable) SendType.FUSION_TABLES);
         startActivity(intent);
         return true;
       case Constants.MENU_SAVE_GPX_FILE:
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
index 058c9fc9e..404ff0d05 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
@@ -185,7 +185,6 @@ public class SendActivity extends Activity implements ProgressIndicator {
     Log.w(TAG, "Starting at state " + currentState);
     executeStateMachine(currentState);
   }
-  
 
   private boolean handleIntent() {
     Intent intent = getIntent();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ServicePickerActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
similarity index 96%
rename from MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ServicePickerActivity.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
index 04de2117c..636edf7aa 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ServicePickerActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
@@ -37,11 +37,11 @@ import android.widget.RadioButton;
 import android.widget.TableRow;
 
 /**
- * A picker to select the Google services to send a track to.
+ * A chooser to select the Google services to upload a track to.
  *
  * @author jshih@google.com (Jimmy Shih)
  */
-public class ServicePickerActivity extends Activity {
+public class UploadServiceChooserActivity extends Activity {
 
   /**
    * The track id.
@@ -89,7 +89,7 @@ public class ServicePickerActivity extends Activity {
       case SERVICE_PICKER_DIALOG:
         final Dialog dialog = new Dialog(this);
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(R.layout.mytracks_send_to_google);
+        dialog.setContentView(R.layout.upload_service_chooser);
         dialog.setCancelable(true);
         dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
           @Override
@@ -131,7 +131,7 @@ public class ServicePickerActivity extends Activity {
         send.setOnClickListener(new View.OnClickListener() {
           public void onClick(View v) {
             saveState();
-            Intent intent = new Intent(ServicePickerActivity.this, SendActivity.class);
+            Intent intent = new Intent(UploadServiceChooserActivity.this, SendActivity.class);
             intent.putExtra(SendActivity.TRACK_ID, trackId);
             intent.putExtra(SendActivity.SHARE_URL, sendType != null);
             intent.putExtra(SendActivity.SEND_MAPS, sendMaps());