diff --git a/src/androidTest/java/com/google/android/apps/mytracks/content/CustomContentProviderTest.java b/src/androidTest/java/com/google/android/apps/mytracks/content/CustomContentProviderTest.java
index 783548998..226c1d3cd 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/content/CustomContentProviderTest.java
+++ b/src/androidTest/java/com/google/android/apps/mytracks/content/CustomContentProviderTest.java
@@ -36,16 +36,16 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 public class CustomContentProviderTest {
 
-  private static final String DATABASE_NAME = "mytrackstest.db";
+  private static final String DATABASE_NAME = "test.db";
 
   private SQLiteDatabase db;
-  private CustomContentProvider myTracksProvider;
+  private CustomContentProvider customContentProvider;
 
   @Before
   protected void setUp()  {
     InstrumentationRegistry.getInstrumentation().getContext().deleteDatabase(DATABASE_NAME);
     db = (new DatabaseHelper(InstrumentationRegistry.getInstrumentation().getContext(), DATABASE_NAME)).getWritableDatabase();
-    myTracksProvider = new CustomContentProvider();
+    customContentProvider = new CustomContentProvider();
   }
 
   /**
@@ -61,18 +61,18 @@ public class CustomContentProviderTest {
    * Tests {@link CustomContentProvider#onCreate(android.content.Context)}.
    */
   public void testOnCreate() {
-    Assert.assertTrue(myTracksProvider.onCreate(InstrumentationRegistry.getInstrumentation().getContext()));
+    Assert.assertTrue(customContentProvider.onCreate(InstrumentationRegistry.getInstrumentation().getContext()));
   }
 
   /**
    * Tests {@link CustomContentProvider#getType(Uri)}.
    */
   public void testGetType() {
-    Assert.assertEquals(TracksColumns.CONTENT_TYPE, myTracksProvider.getType(TracksColumns.CONTENT_URI));
+    Assert.assertEquals(TracksColumns.CONTENT_TYPE, customContentProvider.getType(TracksColumns.CONTENT_URI));
     Assert.assertEquals(
-        TrackPointsColumns.CONTENT_TYPE, myTracksProvider.getType(TrackPointsColumns.CONTENT_URI));
+        TrackPointsColumns.CONTENT_TYPE, customContentProvider.getType(TrackPointsColumns.CONTENT_URI));
     Assert.assertEquals(
-        WaypointsColumns.CONTENT_TYPE, myTracksProvider.getType(WaypointsColumns.CONTENT_URI));
+        WaypointsColumns.CONTENT_TYPE, customContentProvider.getType(WaypointsColumns.CONTENT_URI));
   }
 
   /**
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/content/CustomContentProviderUtilsImplTest.java b/src/androidTest/java/com/google/android/apps/mytracks/content/CustomContentProviderUtilsImplTest.java
index cfe36c17c..f3463ef3a 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/content/CustomContentProviderUtilsImplTest.java
+++ b/src/androidTest/java/com/google/android/apps/mytracks/content/CustomContentProviderUtilsImplTest.java
@@ -381,12 +381,12 @@ public class CustomContentProviderUtilsImplTest {
     waypoint.setLocation(loc);
     providerUtils.insertWaypoint(waypoint);
   
-    ContentProviderUtilsImpl myTracksProviderUtilsImpl = new ContentProviderUtilsImpl(
+    ContentProviderUtilsImpl contentProviderUtils = new ContentProviderUtilsImpl(
         new MockContentResolver());
     
     long waypointId = System.currentTimeMillis();
     waypoint.setId(waypointId);
-    ContentValues contentValues = myTracksProviderUtilsImpl.createContentValues(waypoint);
+    ContentValues contentValues = contentProviderUtils.createContentValues(waypoint);
     Assert.assertEquals(waypointId, contentValues.get(WaypointsColumns._ID));
     Assert.assertEquals(22 * 1000000, contentValues.get(WaypointsColumns.LONGITUDE));
     Assert.assertEquals(TEST_DESC, contentValues.get(WaypointsColumns.DESCRIPTION));
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 e9fabd4ce..455b66556 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
@@ -52,7 +52,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Tests for the MyTracks track recording service.
+ * Tests for the track recording service.
  * <p>
  * TODO: The original class, ServiceTestCase, has a few limitations, e.g. it's
  * not possible to properly shutdown the service, unless tearDown() is called,
@@ -135,9 +135,9 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
     context = new MockContext(mockContentResolver, renamingDelegatingContext);
 
     // Set up the mock content resolver
-    CustomContentProvider myTracksProvider = new CustomContentProvider();
-    myTracksProvider.attachInfo(context, null);
-    mockContentResolver.addProvider(ContentProviderUtils.AUTHORITY, myTracksProvider);
+    CustomContentProvider customContentProvider = new CustomContentProvider();
+    customContentProvider.attachInfo(context, null);
+    mockContentResolver.addProvider(ContentProviderUtils.AUTHORITY, customContentProvider);
 
     MockContentProvider settingsProvider = new MockContentProvider(context) {
         @Override
@@ -341,7 +341,7 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
 
     @Override
     public void onReceive(Context ctx, Intent intent) {
-      Log.d("MyTracksTest", "Got broadcast: " + intent);
+      Log.d("Test", "Got broadcast: " + intent);
       synchronized (receivedIntents) {
         receivedIntents.add(intent);
         receivedIntents.notifyAll();
diff --git a/src/main/java/com/google/android/apps/mytracks/BootReceiver.java b/src/main/java/com/google/android/apps/mytracks/BootReceiver.java
index 84d489ba2..861beed2c 100644
--- a/src/main/java/com/google/android/apps/mytracks/BootReceiver.java
+++ b/src/main/java/com/google/android/apps/mytracks/BootReceiver.java
@@ -25,7 +25,7 @@ import android.content.Intent;
 import android.util.Log;
 
 /**
- * This class handles MyTracks related broadcast messages.
+ * This class react to the BOOT_COMPLETED broadcast.
  *
  * One example of a broadcast message that this class is interested in,
  * is notification about the phone boot.  We may want to resume a previously
diff --git a/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java b/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java
index e6314a2d9..3ffd091c2 100644
--- a/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -400,7 +400,7 @@ public class TrackDetailActivity extends AbstractTrackActivity implements Choose
     File file = new File(dir, FileUtils.buildUniqueFileName(dir, fileName, JPEG_EXTENSION));
 
     if (file != null) {
-      photoUri = FileProvider.getUriForFile(this, "com.google.android.apps.mytracks.fileprovider", file);
+      photoUri = FileProvider.getUriForFile(this, FileUtils.FILEPROVIDER, file);
       Log.d(TAG, "Taking photo to URI: " + photoUri);
       Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE)
               .putExtra(MediaStore.EXTRA_OUTPUT, photoUri);
diff --git a/src/main/java/com/google/android/apps/mytracks/content/CustomContentProvider.java b/src/main/java/com/google/android/apps/mytracks/content/CustomContentProvider.java
index 09a3414cb..d18f4964d 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/CustomContentProvider.java
+++ b/src/main/java/com/google/android/apps/mytracks/content/CustomContentProvider.java
@@ -55,7 +55,7 @@ public class CustomContentProvider extends ContentProvider {
   static final int DATABASE_VERSION = 23;
 
   @VisibleForTesting
-  static final String DATABASE_NAME = "mytracks.db";
+  static final String DATABASE_NAME = "database.db";
 
   /**
    * Database helper for creating and upgrading the database.
diff --git a/src/main/java/com/google/android/apps/mytracks/services/ControlRecordingService.java b/src/main/java/com/google/android/apps/mytracks/services/ControlRecordingService.java
index e2bdfefa7..0dd476b55 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/ControlRecordingService.java
+++ b/src/main/java/com/google/android/apps/mytracks/services/ControlRecordingService.java
@@ -30,7 +30,7 @@ import com.google.android.maps.mytracks.R;
 /**
  * A service to control starting and stopping of a recording. This service,
  * through the AndroidManifest.xml, is configured to only allow components of
- * the same application to invoke it. Thus this service can be used my MyTracks
+ * the same application to invoke it. Thus this service can be used my the
  * app widget, {@link TrackWidgetProvider}, but not by other applications. This
  * application delegates starting and stopping a recording to
  * {@link TrackRecordingService} using RPC calls.
diff --git a/src/main/java/com/google/android/apps/mytracks/services/ITrackRecordingService.java b/src/main/java/com/google/android/apps/mytracks/services/ITrackRecordingService.java
index 84482c37d..179e88088 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/ITrackRecordingService.java
+++ b/src/main/java/com/google/android/apps/mytracks/services/ITrackRecordingService.java
@@ -22,7 +22,7 @@ import com.google.android.apps.mytracks.content.sensor.SensorDataSet;
 import com.google.android.apps.mytracks.content.sensor.SensorState;
 
 /**
- * MyTracks service.
+ * App's service.
  * This service is the process that actually records and manages tracks.
  */
 public interface ITrackRecordingService {
diff --git a/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingService.java b/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingService.java
index 2035a27b5..2a328edea 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingService.java
@@ -238,13 +238,6 @@ public class TrackRecordingService extends Service {
         }
     };
 
-    /*
-     * Note that this service, through the AndroidManifest.xml, is configured to
-     * allow both MyTracks and third party apps to invoke it. For the onCreate
-     * callback, we cannot tell whether the caller is MyTracks or a third party
-     * app, thus it cannot start/stop a recording or write/update MyTracks
-     * database.
-     */
     @Override
     public void onCreate() {
         super.onCreate();
@@ -282,13 +275,6 @@ public class TrackRecordingService extends Service {
         }
     }
 
-    /*
-     * Note that this service, through the AndroidManifest.xml, is configured to
-     * allow both MyTracks and third party apps to invoke it. For the
-     * onStartCommand callback, we cannot tell whether the caller is MyTracks or a
-     * third party app, thus it cannot start/stop a recording or write/update
-     * MyTracks database.
-     */
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         handleStartCommand(intent, startId);
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 41debeaea..1dc2c2479 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
@@ -36,6 +36,13 @@ public class FileUtils {
    */
   static final String SDCARD_TOP_DIR = "MyTracks";
 
+  static final String TRACK_PREFIX = "MyTracks";
+
+  /**
+   * Used to transfer picture from the camera.
+   */
+  public static final String FILEPROVIDER = "com.google.android.apps.mytracks.fileprovider";
+
   /**
    * The maximum FAT32 path length. See the FAT32 spec at
    * http://msdn.microsoft.com/en-us/windows/hardware/gg463080
@@ -96,7 +103,7 @@ public class FileUtils {
   }
 
   public static File getPhotoDir(long trackId) {
-    return new File(getPath(PICTURES_DIR, "MyTracks" + trackId));
+    return new File(getPath(PICTURES_DIR, TRACK_PREFIX + trackId));
   }
 
   /**
diff --git a/src/main/res/drawable-hdpi/action_mode_background_mytracks.9.png b/src/main/res/drawable-hdpi/custom_action_mode_background.png
similarity index 100%
rename from src/main/res/drawable-hdpi/action_mode_background_mytracks.9.png
rename to src/main/res/drawable-hdpi/custom_action_mode_background.png
diff --git a/src/main/res/drawable-hdpi/tab_selected_mytracks.9.png b/src/main/res/drawable-hdpi/tab_selected.9.png
similarity index 100%
rename from src/main/res/drawable-hdpi/tab_selected_mytracks.9.png
rename to src/main/res/drawable-hdpi/tab_selected.9.png
diff --git a/src/main/res/drawable-hdpi/tab_selected_focused_mytracks.9.png b/src/main/res/drawable-hdpi/tab_selected_focused.9.png
similarity index 100%
rename from src/main/res/drawable-hdpi/tab_selected_focused_mytracks.9.png
rename to src/main/res/drawable-hdpi/tab_selected_focused.9.png
diff --git a/src/main/res/drawable-hdpi/tab_selected_pressed_mytracks.9.png b/src/main/res/drawable-hdpi/tab_selected_pressed.9.png
similarity index 100%
rename from src/main/res/drawable-hdpi/tab_selected_pressed_mytracks.9.png
rename to src/main/res/drawable-hdpi/tab_selected_pressed.9.png
diff --git a/src/main/res/drawable-hdpi/tab_unselected_mytracks.9.png b/src/main/res/drawable-hdpi/tab_unselected.9.png
similarity index 100%
rename from src/main/res/drawable-hdpi/tab_unselected_mytracks.9.png
rename to src/main/res/drawable-hdpi/tab_unselected.9.png
diff --git a/src/main/res/drawable-hdpi/tab_unselected_focused_mytracks.9.png b/src/main/res/drawable-hdpi/tab_unselected_focused.9.png
similarity index 100%
rename from src/main/res/drawable-hdpi/tab_unselected_focused_mytracks.9.png
rename to src/main/res/drawable-hdpi/tab_unselected_focused.9.png
diff --git a/src/main/res/drawable-hdpi/tab_unselected_pressed_mytracks.9.png b/src/main/res/drawable-hdpi/tab_unselected_pressed.9.png
similarity index 100%
rename from src/main/res/drawable-hdpi/tab_unselected_pressed_mytracks.9.png
rename to src/main/res/drawable-hdpi/tab_unselected_pressed.9.png
diff --git a/src/main/res/drawable-mdpi/action_mode_background_mytracks.9.png b/src/main/res/drawable-mdpi/custom_action_mode_background.png
similarity index 100%
rename from src/main/res/drawable-mdpi/action_mode_background_mytracks.9.png
rename to src/main/res/drawable-mdpi/custom_action_mode_background.png
diff --git a/src/main/res/drawable-mdpi/tab_selected_mytracks.9.png b/src/main/res/drawable-mdpi/tab_selected.9.png
similarity index 100%
rename from src/main/res/drawable-mdpi/tab_selected_mytracks.9.png
rename to src/main/res/drawable-mdpi/tab_selected.9.png
diff --git a/src/main/res/drawable-mdpi/tab_selected_focused_mytracks.9.png b/src/main/res/drawable-mdpi/tab_selected_focused.9.png
similarity index 100%
rename from src/main/res/drawable-mdpi/tab_selected_focused_mytracks.9.png
rename to src/main/res/drawable-mdpi/tab_selected_focused.9.png
diff --git a/src/main/res/drawable-mdpi/tab_selected_pressed_mytracks.9.png b/src/main/res/drawable-mdpi/tab_selected_pressed.9.png
similarity index 100%
rename from src/main/res/drawable-mdpi/tab_selected_pressed_mytracks.9.png
rename to src/main/res/drawable-mdpi/tab_selected_pressed.9.png
diff --git a/src/main/res/drawable-mdpi/tab_unselected_mytracks.9.png b/src/main/res/drawable-mdpi/tab_unselected.9.png
similarity index 100%
rename from src/main/res/drawable-mdpi/tab_unselected_mytracks.9.png
rename to src/main/res/drawable-mdpi/tab_unselected.9.png
diff --git a/src/main/res/drawable-mdpi/tab_unselected_focused_mytracks.9.png b/src/main/res/drawable-mdpi/tab_unselected_focused.9.png
similarity index 100%
rename from src/main/res/drawable-mdpi/tab_unselected_focused_mytracks.9.png
rename to src/main/res/drawable-mdpi/tab_unselected_focused.9.png
diff --git a/src/main/res/drawable-mdpi/tab_unselected_pressed_mytracks.9.png b/src/main/res/drawable-mdpi/tab_unselected_pressed.9.png
similarity index 100%
rename from src/main/res/drawable-mdpi/tab_unselected_pressed_mytracks.9.png
rename to src/main/res/drawable-mdpi/tab_unselected_pressed.9.png
diff --git a/src/main/res/drawable-xhdpi/action_mode_background_mytracks.9.png b/src/main/res/drawable-xhdpi/custom_action_mode_background.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/action_mode_background_mytracks.9.png
rename to src/main/res/drawable-xhdpi/custom_action_mode_background.png
diff --git a/src/main/res/drawable-xhdpi/tab_selected_mytracks.9.png b/src/main/res/drawable-xhdpi/tab_selected.9.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/tab_selected_mytracks.9.png
rename to src/main/res/drawable-xhdpi/tab_selected.9.png
diff --git a/src/main/res/drawable-xhdpi/tab_selected_focused_mytracks.9.png b/src/main/res/drawable-xhdpi/tab_selected_focused.9.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/tab_selected_focused_mytracks.9.png
rename to src/main/res/drawable-xhdpi/tab_selected_focused.9.png
diff --git a/src/main/res/drawable-xhdpi/tab_selected_pressed_mytracks.9.png b/src/main/res/drawable-xhdpi/tab_selected_pressed.9.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/tab_selected_pressed_mytracks.9.png
rename to src/main/res/drawable-xhdpi/tab_selected_pressed.9.png
diff --git a/src/main/res/drawable-xhdpi/tab_unselected_mytracks.9.png b/src/main/res/drawable-xhdpi/tab_unselected.9.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/tab_unselected_mytracks.9.png
rename to src/main/res/drawable-xhdpi/tab_unselected.9.png
diff --git a/src/main/res/drawable-xhdpi/tab_unselected_focused_mytracks.9.png b/src/main/res/drawable-xhdpi/tab_unselected_focused.9.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/tab_unselected_focused_mytracks.9.png
rename to src/main/res/drawable-xhdpi/tab_unselected_focused.9.png
diff --git a/src/main/res/drawable-xhdpi/tab_unselected_pressed_mytracks.9.png b/src/main/res/drawable-xhdpi/tab_unselected_pressed.9.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/tab_unselected_pressed_mytracks.9.png
rename to src/main/res/drawable-xhdpi/tab_unselected_pressed.9.png
diff --git a/src/main/res/drawable/tab_indicator_mytracks.xml b/src/main/res/drawable/tab_indicator_mytracks.xml
index 7b76fa8cf..f0a40880b 100644
--- a/src/main/res/drawable/tab_indicator_mytracks.xml
+++ b/src/main/res/drawable/tab_indicator_mytracks.xml
@@ -16,16 +16,16 @@ limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <!-- Non focused states -->
-  <item android:drawable="@drawable/tab_unselected_mytracks" android:state_focused="false" android:state_pressed="false" android:state_selected="false"/>
-  <item android:drawable="@drawable/tab_selected_mytracks" android:state_focused="false" android:state_pressed="false" android:state_selected="true"/>
+  <item android:drawable="@drawable/tab_unselected" android:state_focused="false" android:state_pressed="false" android:state_selected="false"/>
+  <item android:drawable="@drawable/tab_selected" android:state_focused="false" android:state_pressed="false" android:state_selected="true"/>
   <!-- Focused states -->
-  <item android:drawable="@drawable/tab_unselected_focused_mytracks" android:state_focused="true" android:state_pressed="false" android:state_selected="false"/>
-  <item android:drawable="@drawable/tab_selected_focused_mytracks" android:state_focused="true" android:state_pressed="false" android:state_selected="true"/>
+  <item android:drawable="@drawable/tab_unselected_focused" android:state_focused="true" android:state_pressed="false" android:state_selected="false"/>
+  <item android:drawable="@drawable/tab_selected_focused" android:state_focused="true" android:state_pressed="false" android:state_selected="true"/>
   <!-- Pressed -->
   <!-- Non focused states -->
-  <item android:drawable="@drawable/tab_unselected_pressed_mytracks" android:state_focused="false" android:state_pressed="true" android:state_selected="false"/>
-  <item android:drawable="@drawable/tab_selected_pressed_mytracks" android:state_focused="false" android:state_pressed="true" android:state_selected="true"/>
+  <item android:drawable="@drawable/tab_unselected_pressed" android:state_focused="false" android:state_pressed="true" android:state_selected="false"/>
+  <item android:drawable="@drawable/tab_selected_pressed" android:state_focused="false" android:state_pressed="true" android:state_selected="true"/>
   <!-- Focused states -->
-  <item android:drawable="@drawable/tab_unselected_pressed_mytracks" android:state_focused="true" android:state_pressed="true" android:state_selected="false"/>
-  <item android:drawable="@drawable/tab_selected_pressed_mytracks" android:state_focused="true" android:state_pressed="true" android:state_selected="true"/>
+  <item android:drawable="@drawable/tab_unselected_pressed" android:state_focused="true" android:state_pressed="true" android:state_selected="false"/>
+  <item android:drawable="@drawable/tab_selected_pressed" android:state_focused="true" android:state_pressed="true" android:state_selected="true"/>
 </selector>
\ No newline at end of file
diff --git a/src/main/res/values/themes_custom.xml b/src/main/res/values/themes_custom.xml
index 07bd29158..692f91a20 100644
--- a/src/main/res/values/themes_custom.xml
+++ b/src/main/res/values/themes_custom.xml
@@ -27,7 +27,7 @@ limitations under the License.
     <item name="android:progressBarStyleHorizontal">@style/ProgressBarCustom</item>
     <!-- Manually added -->
     <item name="android:actionBarStyle">@style/ActionBarStyleCustom</item>
-    <item name="android:actionModeBackground">@drawable/action_mode_background_mytracks</item>
+    <item name="android:actionModeBackground">@drawable/custom_action_mode_background</item>
     <item name="android:alertDialogTheme">@style/CustomAlertDialogTheme</item>
   </style>
   <style name="CustomAlertDialogTheme" parent="@android:style/Theme.Holo.Dialog">