diff --git a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java
index a10a88c6b..260cd5c56 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java
@@ -136,8 +136,8 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
                 recordingTrackPaused = PreferencesUtils.getBoolean(TrackDetailActivity.this, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
             }
 
-            if (key == null || key.equals(PreferencesUtils.getKey(TrackDetailActivity.this, R.string.trackdetail_show_on_lockscreen_while_recording))) {
-                showOnLockScreen = PreferencesUtils.getBoolean(TrackDetailActivity.this, R.string.trackdetail_show_on_lockscreen_while_recording, PreferencesUtils.SHOW_TRACKDETAIL_WHILE_RECORDING_ON_LOCKSCREEN);
+            if (key == null || key.equals(PreferencesUtils.getKey(TrackDetailActivity.this, R.string.trackdetail_show_on_lockscreen_while_recording_key))) {
+                showOnLockScreen = PreferencesUtils.getBoolean(TrackDetailActivity.this, R.string.trackdetail_show_on_lockscreen_while_recording_key, PreferencesUtils.SHOW_TRACKDETAIL_WHILE_RECORDING_ON_LOCKSCREEN);
                 setLockscreenPolicy();
             }
 
diff --git a/src/main/res/values/keys.xml b/src/main/res/values/preference_keys.xml
similarity index 98%
rename from src/main/res/values/keys.xml
rename to src/main/res/values/preference_keys.xml
index 6a9c496a6..691ca81a8 100644
--- a/src/main/res/values/keys.xml
+++ b/src/main/res/values/preference_keys.xml
@@ -33,7 +33,7 @@ limitations under the License.
     <string name="stats_show_coordinate_key" translatable="false">statsShowCoordinate</string>
     <string name="stats_show_grade_elevation_key" translatable="false">statsShowGradeElevation</string>
     <string name="stats_units_key" translatable="false">statsUnits</string>
-    <string name="trackdetail_show_on_lockscreen_while_recording" translatable="false">trackdetail_show_on_lockscreen_while_recording</string>
+    <string name="trackdetail_show_on_lockscreen_while_recording_key" translatable="false">trackdetail_show_on_lockscreen_while_recording</string>
     <string name="track_name_key" translatable="false">trackName</string>
     <string name="track_widget_item1" translatable="false">trackWidgetItem1</string>
     <string name="track_widget_item2" translatable="false">trackWidgetItem2</string>
diff --git a/src/main/res/xml/settings_recording.xml b/src/main/res/xml/settings_recording.xml
index 11ae067db..8bacf5e94 100644
--- a/src/main/res/xml/settings_recording.xml
+++ b/src/main/res/xml/settings_recording.xml
@@ -67,7 +67,7 @@ limitations under the License.
         android:title="@string/settings_recording_auto_resume_track_timeout_title" />
     <CheckBoxPreference
         android:defaultValue="false"
-        android:key="@string/trackdetail_show_on_lockscreen_while_recording"
+        android:key="@string/trackdetail_show_on_lockscreen_while_recording_key"
         android:summary="@string/settings_recording_show_on_lockscreen_while_recording_summary"
         android:title="@string/settings_recording_show_on_lockscreen_while_recording_title" />
     <de.dennisguse.opentracks.settings.ActivityTypePreference