diff --git a/src/androidTest/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java b/src/androidTest/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java
index d7e601daf..51e77e74c 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java
+++ b/src/androidTest/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java
@@ -63,7 +63,7 @@ public class DescriptionGeneratorImplTest {
     track.setTripStatistics(stats);
     track.setCategory("hiking");
     String expected = "Created by" 
-      + " <a href='http://www.google.com/mobile/mytracks'>Google My Tracks</a> on Android<p>" 
+      + " <a href='TODO'>TODO</a> on Android<p>"
       + "Name: -<br>"
       + "Activity type: hiking<br>"
       + "Description: -<br>"
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java b/src/androidTest/java/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
index 28d74f79b..e9fabd4ce 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
+++ b/src/androidTest/java/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
@@ -372,8 +372,7 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
   @MediumTest
   public void testStartNewTrack_noRecording() throws Exception {
     // NOTICE: due to the way Android permissions work, if this fails,
-    // uninstall the test apk then retry - the test must be installed *after*
-    // My Tracks (go figure).
+    // uninstall the test apk then retry - the test must be installed *after* the app (go figure).
     // Reference: http://code.google.com/p/android/issues/detail?id=5521
     BlockingBroadcastReceiver startReceiver = new BlockingBroadcastReceiver();
     String startAction = context.getString(R.string.track_started_broadcast_action);
diff --git a/src/main/java/com/google/android/apps/mytracks/AbstractActivity.java b/src/main/java/com/google/android/apps/mytracks/AbstractActivity.java
index 2e8be5bf2..42e81eaaf 100644
--- a/src/main/java/com/google/android/apps/mytracks/AbstractActivity.java
+++ b/src/main/java/com/google/android/apps/mytracks/AbstractActivity.java
@@ -27,8 +27,7 @@ import androidx.fragment.app.FragmentActivity;
 import com.google.android.apps.mytracks.util.TrackIconUtils;
 
 /**
- * An abstract class for all My Tracks activities.
- * 
+ *
  * @author Jimmy Shih
  */
 public abstract class AbstractActivity extends FragmentActivity {
diff --git a/src/main/java/com/google/android/apps/mytracks/content/ContentProviderUtils.java b/src/main/java/com/google/android/apps/mytracks/content/ContentProviderUtils.java
index 7514dbe03..a7371a36f 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/ContentProviderUtils.java
+++ b/src/main/java/com/google/android/apps/mytracks/content/ContentProviderUtils.java
@@ -28,14 +28,14 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * Utilities to access data from the My Tracks content provider.
+ * Utilities to access data from the app's content provider.
  * 
  * @author Rodrigo Damazio
  */
 public interface ContentProviderUtils {
 
   /**
-   * The authority (the first part of the URI) for the My Tracks content
+   * The authority (the first part of the URI) for the app's content
    * provider.
    */
   String AUTHORITY = "com.google.android.maps.mytracks";
diff --git a/src/main/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java b/src/main/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java
index 680951119..ecb26c298 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java
+++ b/src/main/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java
@@ -27,8 +27,6 @@ import com.google.android.maps.mytracks.R;
 import java.util.Vector;
 
 /**
- * An implementation of {@link DescriptionGenerator} for My Tracks.
- *
  * @author Jimmy Shih
  */
 public class DescriptionGeneratorImpl implements DescriptionGenerator {
diff --git a/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java b/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java
index 02cb4fa1e..166d4435a 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java
+++ b/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java
@@ -94,7 +94,7 @@ public class TrackDataHub implements DataSourceListener {
    * 
    * @param context the context
    * @param trackDataManager the track data manager
-   * @param contentProviderUtils the my tracks provider utils
+   * @param contentProviderUtils the content tracks provider utils
    * @param targetNumPoints the target number of points
    */
   @VisibleForTesting
diff --git a/src/main/java/com/google/android/apps/mytracks/fragments/AbstractDialogFragment.java b/src/main/java/com/google/android/apps/mytracks/fragments/AbstractDialogFragment.java
index 0b0b686d3..f01f7de71 100644
--- a/src/main/java/com/google/android/apps/mytracks/fragments/AbstractDialogFragment.java
+++ b/src/main/java/com/google/android/apps/mytracks/fragments/AbstractDialogFragment.java
@@ -25,8 +25,7 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 
 /**
- * Abstract My Tracks DialogFragment.
- * 
+
  * @author Jimmy Shih
  */
 public abstract class AbstractDialogFragment extends DialogFragment {
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporter.java b/src/main/java/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporter.java
index 6f7f6a465..c9868a406 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporter.java
+++ b/src/main/java/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporter.java
@@ -48,7 +48,7 @@ public class FileTrackExporter implements TrackExporter {
   /**
    * Constructor.
    * 
-   * @param contentProviderUtils the my tracks provider utils
+   * @param contentProviderUtils the content provider utils
    * @param tracks the tracks
    * @param trackWriter the track writer
    * @param trackExporterListener the track export listener
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmzTrackExporter.java b/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmzTrackExporter.java
index da00d116d..6cd06cf24 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmzTrackExporter.java
+++ b/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmzTrackExporter.java
@@ -58,7 +58,7 @@ public class KmzTrackExporter implements TrackExporter {
   /**
    * Constructor.
    * 
-   * @param contentProviderUtils the my tracks provider utils
+   * @param contentProviderUtils the content provider utils
    * @param fileTrackExporter the file track exporter
    * @param tracks the tracks to export
    * @param context the context
diff --git a/src/main/java/com/google/android/apps/mytracks/util/FileUtils.java b/src/main/java/com/google/android/apps/mytracks/util/FileUtils.java
index 0f218c4b5..41debeaea 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/FileUtils.java
+++ b/src/main/java/com/google/android/apps/mytracks/util/FileUtils.java
@@ -32,7 +32,7 @@ public class FileUtils {
   private FileUtils() {}
 
   /**
-   * The My Tracks external storage directory.
+   * Our external storage directory.
    */
   static final String SDCARD_TOP_DIR = "MyTracks";
 
@@ -43,12 +43,12 @@ public class FileUtils {
   static final int MAX_FAT32_PATH_LENGTH = 260;
 
   /**
-   * The play tracks directory under the My Tracks cache directory.
+   * The play tracks directory in the app's cache directory.
    */
   public static final String PLAY_TRACKS_DIR = "temp";
 
   /**
-   * The pictures directory under the My Tracks external storage directory.
+   * The pictures directory under the app's external storage directory.
    */
   private static final String PICTURES_DIR = "pictures";
 
diff --git a/src/main/java/com/google/android/apps/mytracks/util/SystemUtils.java b/src/main/java/com/google/android/apps/mytracks/util/SystemUtils.java
index 371d7289d..761c6a232 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/SystemUtils.java
+++ b/src/main/java/com/google/android/apps/mytracks/util/SystemUtils.java
@@ -37,7 +37,7 @@ public class SystemUtils {
   private SystemUtils() {}
 
   /**
-   * Get the My Tracks version from the manifest.
+   * Get the app version from the manifest.
    * 
    * @return the version, or an empty string in case of failure.
    */
diff --git a/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
index af4ca8f53..9c6cfd5de 100644
--- a/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+++ b/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
@@ -42,7 +42,7 @@ import android.view.View;
 import android.widget.RemoteViews;
 
 /**
- * A track widget to start/stop/pause/resume recording, launch My Tracks, and
+ * A track widget to start/stop/pause/resume recording, launch the main activity, and
  * display track statistics (total distance, total time, average speed, and
  * moving time) for the recording track, the selected track or the last track.
  *