diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index d64f76a7c..80f7e11fe 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -192,7 +192,7 @@ limitations under the License.
     </activity>
     <activity
       android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale"
-      android:name="com.google.android.apps.mytracks.MyTracks" >
+      android:name="com.google.android.apps.mytracks.TrackDetailActivity" >
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
 
@@ -245,8 +245,8 @@ limitations under the License.
         android:value="com.google.android.apps.mytracks.SearchActivity" />
     </activity>
     <activity
-      android:label="@string/track_detail_title"
-      android:name="com.google.android.apps.mytracks.TrackDetail" >
+      android:label="@string/track_edit_title"
+      android:name="com.google.android.apps.mytracks.TrackEditActivity" >
       <intent-filter>
         <action android:name="android.intent.action.EDIT" />
 
diff --git a/MyTracks/res/layout/track_detail.xml b/MyTracks/res/layout/track_edit.xml
similarity index 84%
rename from MyTracks/res/layout/track_detail.xml
rename to MyTracks/res/layout/track_edit.xml
index fe4f4ed10..6598a5d92 100644
--- a/MyTracks/res/layout/track_detail.xml
+++ b/MyTracks/res/layout/track_edit.xml
@@ -35,7 +35,7 @@ limitations under the License.
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
-        android:text="@string/track_detail_track_name"
+        android:text="@string/track_edit_track_name"
         />
       <LinearLayout
         android:layout_height="wrap_content"
@@ -53,8 +53,8 @@ limitations under the License.
           />
         <EditText
           android:inputType="textAutoCorrect|textCapWords"
-          android:hint="@string/track_detail_track_name"
-          android:id="@+id/track_detail_track_name"
+          android:hint="@string/track_edit_track_name"
+          android:id="@+id/track_edit_track_name"
           android:imeOptions="actionNext"
           android:layout_height="wrap_content"
           android:layout_width="fill_parent"
@@ -65,24 +65,24 @@ limitations under the License.
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
-        android:text="@string/track_detail_activity_type"
+        android:text="@string/track_edit_activity_type"
         />
       <AutoCompleteTextView
-        android:id="@+id/track_detail_activity_type"
+        android:id="@+id/track_edit_activity_type"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:singleLine="true"
-        android:hint="@string/track_detail_activity_type_hint"
+        android:hint="@string/track_edit_activity_type_hint"
         android:imeOptions="actionNext"/>
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
-        android:text="@string/track_detail_track_description"
+        android:text="@string/track_edit_track_description"
         />
       <EditText
         android:inputType="textAutoCorrect|textCapSentences"
-        android:hint="@string/track_detail_track_description"
-        android:id="@+id/track_detail_track_description"
+        android:hint="@string/track_edit_track_description"
+        android:id="@+id/track_edit_track_description"
         android:imeOptions="actionDone"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
@@ -95,13 +95,13 @@ limitations under the License.
   <LinearLayout style="@style/ButtonLayout">
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button
-      android:id="@+id/track_detail_save"
+      android:id="@+id/track_edit_save"
       android:layout_gravity="left"
       android:text="@string/generic_save"
       style="@style/Button"
       />
     <Button
-      android:id="@+id/track_detail_cancel"
+      android:id="@+id/track_edit_cancel"
       android:layout_gravity="right"
       android:text="@string/generic_cancel"
       style="@style/Button"
diff --git a/MyTracks/res/menu/main.xml b/MyTracks/res/menu/track_detail.xml
similarity index 100%
rename from MyTracks/res/menu/main.xml
rename to MyTracks/res/menu/track_detail.xml
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 62d896b14..9c6d3af32 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -2237,40 +2237,33 @@ limitations under the License.
     Total time
   </string>
 
-  <!-- Track -->
-  <string name="track_detail_activity_type"
-    translation_description="In the detail page for a track, the text field for the activity type,
-      including for examples.
-
-      Screenshot: track_detail.png">
+  <!-- Track Edit -->
+  <string name="track_edit_activity_type"
+    translation_description="In the page to edit a track, the title for the text field to edit the
+      activity type, including some examples of activity types.">
     Activity type (e.g. hiking, cycling, running...)
   </string>
-  <string name="track_detail_activity_type_hint"
-    translation_description="In the detail page for a track, the hint in the 'Activity type' text
-      field when it is empty.
-
-      Screenshot: track_detail.png">
+  <string name="track_edit_activity_type_hint"
+    translation_description="In the page to edit a track, the hint in the 'Activity type' text field
+      when it is empty.">
     Activity type
   </string>
-  <string name="track_detail_title"
-    translation_description="In the detail page for a track, the title of the page.
-
-      Screenshot: track_detail.png">
-    Track details
+  <string name="track_edit_title"
+    translation_description="The title of the page to edit a track.">
+    Edit track
   </string>
-  <string name="track_detail_track_description"
-    translation_description="In the detail page for a track, the text field for the track
-      description.
-
-      Screenshot: track_detail.png">
+  <string name="track_edit_track_description"
+    translation_description="In the page to edit a track, the title for the text field to edit the
+      track description.">
     Track description
   </string>
-  <string name="track_detail_track_name"
-    translation_description="In the detail page for a track, the text field for the track name.
-
-      Screenshot: track_detail.png">
+  <string name="track_edit_track_name"
+    translation_description="In the page to edit a track, the title for the text field to edit the
+      track name.">
     Track name
   </string>
+
+  <!-- Track -->
   <string name="track_icon_description"
     translation_description="The accessibility description for the track icon.">
     Track
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
index 7214687d0..3f423df6e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
@@ -523,7 +523,8 @@ public class MapActivity extends com.google.android.maps.MapActivity
     long trackId = dataHub.getSelectedTrackId();
     switch (item.getItemId()) {
       case Constants.MENU_EDIT: 
-        intent = new Intent(this, TrackDetail.class).putExtra(TrackDetail.TRACK_ID, trackId);
+        intent = new Intent(this, TrackEditActivity.class)
+            .putExtra(TrackEditActivity.TRACK_ID, trackId);
         startActivity(intent);
         return true;
       case Constants.MENU_PLAY:
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java
index 6f23a39ad..e6b87d0da 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java
@@ -32,11 +32,11 @@ import android.view.MenuItem;
  */
 class MenuManager {
 
-  private final MyTracks activity;
+  private final TrackDetailActivity activity;
   private MenuItem recordTrack;
   private MenuItem stopRecording;
   
-  public MenuManager(MyTracks activity) {
+  public MenuManager(TrackDetailActivity activity) {
     this.activity = activity;
   }
 
@@ -47,7 +47,7 @@ class MenuManager {
    * @return true on success, false otherwise
    */
   public boolean onCreateOptionsMenu(Menu menu) {
-    activity.getMenuInflater().inflate(R.menu.main, menu);
+    activity.getMenuInflater().inflate(R.menu.track_detail, menu);
 
     // TODO: Replace search button with search widget if API level >= 11
     return true;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
similarity index 97%
rename from MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
rename to MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
index 37ab619bd..c4c586ad2 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -68,7 +68,7 @@ import android.widget.Toast;
  * @author Rodrigo Damazio
  */
 @SuppressWarnings("deprecation")
-public class MyTracks extends TabActivity implements OnTouchListener {
+public class TrackDetailActivity extends TabActivity implements OnTouchListener {
   private static final int DIALOG_EULA_ID = 0;
   private static final int DIALOG_CHECK_UNITS_ID = 1;
   private static final String CHECK_UNITS_PREFERENCE_FILE = "checkunits";
@@ -283,9 +283,9 @@ public class MyTracks extends TabActivity implements OnTouchListener {
             .setPositiveButton(R.string.eula_accept, new DialogInterface.OnClickListener() {
               @Override
               public void onClick(DialogInterface dialog, int which) {
-                EulaUtils.setEulaValue(MyTracks.this);
+                EulaUtils.setEulaValue(TrackDetailActivity.this);
                 startActivityForResult(
-                    new Intent(MyTracks.this, WelcomeActivity.class), Constants.WELCOME);
+                    new Intent(TrackDetailActivity.this, WelcomeActivity.class), Constants.WELCOME);
               }
             })
             .setTitle(R.string.eula_title)
@@ -523,9 +523,9 @@ public class MyTracks extends TabActivity implements OnTouchListener {
     serviceConnection.stop();
 
     if (currentTrackId > 0) {
-      Intent intent = new Intent(MyTracks.this, TrackDetail.class);
-      intent.putExtra(TrackDetail.TRACK_ID, currentTrackId);
-      intent.putExtra(TrackDetail.SHOW_CANCEL, false);
+      Intent intent = new Intent(this, TrackEditActivity.class)
+          .putExtra(TrackEditActivity.SHOW_CANCEL, false)
+          .putExtra(TrackEditActivity.TRACK_ID, currentTrackId);
       startActivity(intent);
     }
   }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetail.java b/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java
similarity index 84%
rename from MyTracks/src/com/google/android/apps/mytracks/TrackDetail.java
rename to MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java
index e44094ae7..bc21d80d0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetail.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java
@@ -35,12 +35,12 @@ import android.widget.EditText;
  *
  * @author Leif Hendrik Wilden
  */
-public class TrackDetail extends Activity implements OnClickListener {
+public class TrackEditActivity extends Activity implements OnClickListener {
 
   public static final String TRACK_ID = "trackId";
   public static final String SHOW_CANCEL = "showCancel";
 
-  private static final String TAG = TrackDetail.class.getSimpleName();
+  private static final String TAG = TrackEditActivity.class.getSimpleName();
 
   private Long trackId;
   private MyTracksProviderUtils myTracksProviderUtils;
@@ -53,7 +53,7 @@ public class TrackDetail extends Activity implements OnClickListener {
   @Override
   protected void onCreate(Bundle bundle) {
     super.onCreate(bundle);
-    setContentView(R.layout.track_detail);
+    setContentView(R.layout.track_edit);
 
     trackId = getIntent().getLongExtra(TRACK_ID, -1);
     if (trackId < 0) {
@@ -71,22 +71,22 @@ public class TrackDetail extends Activity implements OnClickListener {
       return;
     }
 
-    trackName = (EditText) findViewById(R.id.track_detail_track_name);
+    trackName = (EditText) findViewById(R.id.track_edit_track_name);
     trackName.setText(track.getName());
 
-    activityType = (AutoCompleteTextView) findViewById(R.id.track_detail_activity_type);
+    activityType = (AutoCompleteTextView) findViewById(R.id.track_edit_activity_type);
     activityType.setText(track.getCategory());
 
     ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(
         this, R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
     activityType.setAdapter(adapter);
-    trackDescription = (EditText) findViewById(R.id.track_detail_track_description);
+    trackDescription = (EditText) findViewById(R.id.track_edit_track_description);
     trackDescription.setText(track.getDescription());
 
-    Button save = (Button) findViewById(R.id.track_detail_save);
+    Button save = (Button) findViewById(R.id.track_edit_save);
     save.setOnClickListener(this);
 
-    Button cancel = (Button) findViewById(R.id.track_detail_cancel);
+    Button cancel = (Button) findViewById(R.id.track_edit_cancel);
     if (getIntent().getBooleanExtra(SHOW_CANCEL, true)) {
       cancel.setOnClickListener(this);
       cancel.setVisibility(View.VISIBLE);
@@ -98,11 +98,11 @@ public class TrackDetail extends Activity implements OnClickListener {
   @Override
   public void onClick(View view) {
     switch (view.getId()) {
-      case R.id.track_detail_save:
+      case R.id.track_edit_save:
         save();
         finish();
         break;
-      case R.id.track_detail_cancel:
+      case R.id.track_edit_cancel:
         finish();
         break;
       default:   
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
index 7c8c366e7..7a1af743d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
@@ -348,9 +348,9 @@ public class TrackListActivity extends FragmentActivity {
       try {
         service.endCurrentTrack();
         if (recordingTrackId != -1L) {
-          Intent intent = new Intent(this, TrackDetail.class)
-              .putExtra(TrackDetail.SHOW_CANCEL, false)
-              .putExtra(TrackDetail.TRACK_ID, recordingTrackId);
+          Intent intent = new Intent(this, TrackEditActivity.class)
+              .putExtra(TrackEditActivity.SHOW_CANCEL, false)
+              .putExtra(TrackEditActivity.TRACK_ID, recordingTrackId);
           startActivity(intent);
         }
         recordingTrackId = -1L;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreActivity.java
index b00aa3fe3..a95edb6a1 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreActivity.java
@@ -16,7 +16,7 @@
 
 package com.google.android.apps.mytracks.io.backup;
 
-import com.google.android.apps.mytracks.MyTracks;
+import com.google.android.apps.mytracks.TrackDetailActivity;
 import com.google.android.apps.mytracks.util.DialogUtils;
 import com.google.android.maps.mytracks.R;
 
@@ -92,7 +92,8 @@ public class RestoreActivity extends Activity {
   public void onAsyncTaskCompleted(boolean success, int messageId) {
     removeDialog(DIALOG_PROGRESS_ID);
     Toast.makeText(this, messageId, success ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG).show();
-    startActivity(new Intent(this, MyTracks.class).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP));
+    startActivity(
+        new Intent(this, TrackDetailActivity.class).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP));
     finish();
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
index 45f7eb4a7..7af00130c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
@@ -19,7 +19,7 @@ import static com.google.android.apps.mytracks.Constants.RESUME_TRACK_EXTRA_NAME
 import static com.google.android.apps.mytracks.Constants.TAG;
 
 import com.google.android.apps.mytracks.Constants;
-import com.google.android.apps.mytracks.MyTracks;
+import com.google.android.apps.mytracks.TrackDetailActivity;
 import com.google.android.apps.mytracks.content.DescriptionGenerator;
 import com.google.android.apps.mytracks.content.DescriptionGeneratorImpl;
 import com.google.android.apps.mytracks.content.MyTracksLocation;
@@ -485,7 +485,7 @@ public class TrackRecordingService extends Service {
           R.drawable.arrow_320, null /* tickerText */,
           System.currentTimeMillis());
       PendingIntent contentIntent = PendingIntent.getActivity(
-          this, 0 /* requestCode */, new Intent(this, MyTracks.class),
+          this, 0 /* requestCode */, new Intent(this, TrackDetailActivity.class),
           0 /* flags */);
       notification.setLatestEventInfo(this, getString(R.string.my_tracks_app_name),
           getString(R.string.track_record_notification), contentIntent);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
index 9d123295d..9908c3ec5 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
@@ -19,7 +19,7 @@ package com.google.android.apps.mytracks.widgets;
 import static com.google.android.apps.mytracks.Constants.SETTINGS_NAME;
 import static com.google.android.apps.mytracks.Constants.TAG;
 
-import com.google.android.apps.mytracks.MyTracks;
+import com.google.android.apps.mytracks.TrackDetailActivity;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.TracksColumns;
@@ -145,7 +145,7 @@ public class TrackWidgetProvider
     RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.track_widget);
 
     // Make all of the stats open the mytracks activity.
-    Intent intent = new Intent(context, MyTracks.class);
+    Intent intent = new Intent(context, TrackDetailActivity.class);
     PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
     views.setOnClickPendingIntent(R.id.appwidget_track_statistics, pendingIntent);
 
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/MyTracksTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/TrackDetailActivityTest.java
similarity index 96%
rename from MyTracksTest/src/com/google/android/apps/mytracks/MyTracksTest.java
rename to MyTracksTest/src/com/google/android/apps/mytracks/TrackDetailActivityTest.java
index eecd804e3..d01e671ae 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/MyTracksTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/TrackDetailActivityTest.java
@@ -34,16 +34,16 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * A unit test for {@link MyTracks} activity.
+ * A unit test for {@link TrackDetailActivity}.
  *
  * @author Bartlomiej Niechwiej
  */
-public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
+public class TrackDetailActivityTest extends ActivityInstrumentationTestCase2<TrackDetailActivity>{
   private SharedPreferences sharedPreferences;
   private TrackRecordingServiceConnection serviceConnection;
 
-  public MyTracksTest() {
-    super(MyTracks.class);
+  public TrackDetailActivityTest() {
+    super(TrackDetailActivity.class);
   }
 
   @Override
@@ -154,7 +154,7 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
 
     // Watch for MyTracksDetails activity.
     ActivityMonitor monitor = getInstrumentation().addMonitor(
-        TrackDetail.class.getName(), null, false);
+        TrackEditActivity.class.getName(), null, false);
 
     // Now, stop the track and make sure that it is still selected, but
     // no longer recording.
@@ -162,13 +162,13 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
 
     // Check if we got back MyTracksDetails activity.
     Activity activity = getInstrumentation().waitForMonitor(monitor);
-    assertTrue(activity instanceof TrackDetail);
+    assertTrue(activity instanceof TrackEditActivity);
 
     // TODO: Update track name and other properties and test if they were
     // properly saved.
 
     // Simulate a click on Save button.
-    final Button save = (Button) activity.findViewById(R.id.track_detail_save);
+    final Button save = (Button) activity.findViewById(R.id.track_edit_save);
     getActivity().runOnUiThread(new Runnable() {
       @Override
       public void run() {