diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 722f8e232..6212f9cf2 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -211,8 +211,8 @@ limitations under the License.
   <string name="settings_auto_resume_track_timeout_summary">Maximum time in minutes after which a previously recording track will not be resumed on phone reboot</string>
 
   <string name="settings_timestamp_track_name">Timestamp as track name</string>
-  <string name="settings_timestamp_track_name_on">The default track name will be the date and time at the start of the track</string>
-  <string name="settings_timestamp_track_name_off">Track names will have numbers which increment for each new track.</string>
+  <string name="settings_timestamp_track_name_summary_on">The default track name will be the date and time at the start of the track</string>
+  <string name="settings_timestamp_track_name_summary_off">Track names will have numbers which increment for each new track.</string>
 
   <string name="pace_label">Pace</string>
 
diff --git a/MyTracks/res/xml/preferences.xml b/MyTracks/res/xml/preferences.xml
index 8de128543..848bab5a2 100644
--- a/MyTracks/res/xml/preferences.xml
+++ b/MyTracks/res/xml/preferences.xml
@@ -103,8 +103,8 @@ limitations under the License.
     <CheckBoxPreference
         android:key="@string/timestamp_track_name_key"
         android:title="@string/settings_timestamp_track_name"
-        android:summaryOn="@string/settings_timestamp_track_name_on"
-        android:summaryOff="@string/settings_timestamp_track_name_off"
+        android:summaryOn="@string/settings_timestamp_track_name_summary_on"
+        android:summaryOff="@string/settings_timestamp_track_name_summary_off"
         android:defaultValue="true" />
 
   </PreferenceScreen>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java b/MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java
index e0049aca4..802199460 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java
@@ -60,13 +60,7 @@ class DefaultTrackNameFactory {
   protected boolean useTimestampTrackName() {
     SharedPreferences prefs =
         context.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
-
-    boolean useTimestamp = false;
-    if (prefs != null) {
-      useTimestamp = prefs.getBoolean(
-          context.getString(R.string.timestamp_track_name_key), true);
-    }
-
-    return useTimestamp;
+    return prefs.getBoolean(
+        context.getString(R.string.timestamp_track_name_key), true);
   }
 }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactoryTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactoryTest.java
index 62e529a14..855619cb7 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactoryTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactoryTest.java
@@ -21,7 +21,16 @@ import android.test.AndroidTestCase;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+/**
+ * Tests {@link DefaultTrackNameFactory}
+ * 
+ * @author Matthew Simmons
+ */
 public class DefaultTrackNameFactoryTest extends AndroidTestCase {
+  /**
+   * A version of the factory which allows us to supply our own answer as to
+   * whether a timestamp-based track name should be used.
+   */
   private static class MockDefaultTrackNameFactory
       extends DefaultTrackNameFactory {
     private final boolean useTimestamp;