diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index b0b8c056b..31dd2a013 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -30,7 +30,7 @@ limitations under the License.
         <!-- Activities -->
         <activity android:name=".AboutActivity" />
 
-        <activity android:name=".DeleteActivity" />
+        <activity android:name=".TrackDeleteActivity" />
 
         <activity
             android:name=".HelpActivity"
diff --git a/src/main/java/de/dennisguse/opentracks/AbstractListActivity.java b/src/main/java/de/dennisguse/opentracks/AbstractListActivity.java
index a2349a442..27d064836 100644
--- a/src/main/java/de/dennisguse/opentracks/AbstractListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/AbstractListActivity.java
@@ -76,8 +76,8 @@ public abstract class AbstractListActivity extends AbstractActivity implements C
         if (stopRecording) {
             getTrackRecordingServiceConnection().stopRecording(this, false);
         }
-        Intent intent = IntentUtils.newIntent(this, DeleteActivity.class);
-        intent.putExtra(DeleteActivity.EXTRA_TRACK_IDS, trackIds);
+        Intent intent = IntentUtils.newIntent(this, TrackDeleteActivity.class);
+        intent.putExtra(TrackDeleteActivity.EXTRA_TRACK_IDS, trackIds);
         startActivityForResult(intent, DELETE_REQUEST_CODE);
     }
 
@@ -88,7 +88,7 @@ public abstract class AbstractListActivity extends AbstractActivity implements C
     abstract protected TrackRecordingServiceConnection getTrackRecordingServiceConnection();
 
     /**
-     * Called after {@link DeleteActivity} returns its result.
+     * Called after {@link TrackDeleteActivity} returns its result.
      */
     abstract protected void onDeleted();
 }
diff --git a/src/main/java/de/dennisguse/opentracks/DeleteAsyncTask.java b/src/main/java/de/dennisguse/opentracks/DeleteAsyncTask.java
index 4bcaed63f..537560e2c 100644
--- a/src/main/java/de/dennisguse/opentracks/DeleteAsyncTask.java
+++ b/src/main/java/de/dennisguse/opentracks/DeleteAsyncTask.java
@@ -30,7 +30,7 @@ public class DeleteAsyncTask extends AsyncTask<Void, Integer, Boolean> {
 
     private final long[] trackIds;
     private final Context context;
-    private DeleteActivity deleteActivity;
+    private TrackDeleteActivity deleteActivity;
     // true if the AsyncTask has completed
     private boolean completed;
 
@@ -41,7 +41,7 @@ public class DeleteAsyncTask extends AsyncTask<Void, Integer, Boolean> {
      * @param trackIds       the track ids to delete. To delete all, set to size 1 with
      *                       trackIds[0] == -1L
      */
-    public DeleteAsyncTask(DeleteActivity deleteActivity, long[] trackIds) {
+    public DeleteAsyncTask(TrackDeleteActivity deleteActivity, long[] trackIds) {
         this.deleteActivity = deleteActivity;
         this.trackIds = trackIds;
         context = deleteActivity.getApplicationContext();
@@ -53,7 +53,7 @@ public class DeleteAsyncTask extends AsyncTask<Void, Integer, Boolean> {
      *
      * @param deleteActivity the current activity, can be null
      */
-    public void setActivity(DeleteActivity deleteActivity) {
+    public void setActivity(TrackDeleteActivity deleteActivity) {
         this.deleteActivity = deleteActivity;
         if (completed && deleteActivity != null) {
             deleteActivity.onAsyncTaskCompleted();
diff --git a/src/main/java/de/dennisguse/opentracks/DeleteActivity.java b/src/main/java/de/dennisguse/opentracks/TrackDeleteActivity.java
similarity index 97%
rename from src/main/java/de/dennisguse/opentracks/DeleteActivity.java
rename to src/main/java/de/dennisguse/opentracks/TrackDeleteActivity.java
index d2fc4114a..944716a4b 100644
--- a/src/main/java/de/dennisguse/opentracks/DeleteActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackDeleteActivity.java
@@ -23,14 +23,13 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import de.dennisguse.opentracks.util.DialogUtils;
-import de.dennisguse.opentracks.R;
 
 /**
  * An activity for delete tracks.
  *
  * @author Jimmy Shih
  */
-public class DeleteActivity extends Activity {
+public class TrackDeleteActivity extends Activity {
 
     public static final String EXTRA_TRACK_IDS = "track_ids";