diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 96c14258c..7ca290e20 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -612,7 +612,7 @@
             android:parentActivityName=".devices.qhybrid.HRConfigActivity" />
         <activity
             android:name=".devices.qhybrid.CalibrationActivity"
-            android:label="@string/qhybrid_pref_title_calibration"
+            android:label="@string/qhybrid_title_calibration"
             android:parentActivityName=".devices.qhybrid.HRConfigActivity" />
         <activity
             android:name=".devices.qhybrid.CommuteActionsActivity"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ef29def82..771b64eac 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1001,7 +1001,7 @@
     <string name="prefs_button_long_press_action_selection_title">Long press button action</string>
     <string name="error_no_location_access">Location access must be granted and enabled for scanning to work properly</string>
     <string name="pref_qhybrid_title_widget_draw_circles">Draw widget circles</string>
-    <string name="qhybrid_pref_save_raw_activity_files">Save raw activity files</string>
+    <string name="pref_qhybrid_save_raw_activity_files">Save raw activity files</string>
     <string name="hr_widget_last_notification">Last notification</string>
     <string name="homepage_url" translatable="false">Homepage: <a href="https://gadgetbridge.org/">https://gadgetbridge.org/</a></string>
     <string name="codeberg_url" translatable="false">Code: <a href="https://codeberg.org/Freeyourgadget/Gadgetbridge">https://codeberg.org/Freeyourgadget/Gadgetbridge</a></string>
@@ -1170,12 +1170,12 @@
     <string name="qhybrid_title_background_image">Background image</string>
     <string name="qhybrid_title_file_management">File management</string>
     <string name="qhybrid_title_apps_management">Apps management</string>
-    <string name="qhybrid_pref_title_calibration">Calibration</string>
+    <string name="qhybrid_title_calibration">Calibration</string>
     <string name="fossil_hr_warning_firmware_too_new">Some functions are disabled because the firmware of the watch is too new</string>
     <string name="pref_title_physical_buttons">Physical buttons</string>
     <string name="pref_summary_physical_buttons">Configure the functionality of the physical buttons on the watch</string>
     <string name="qhybrid_summary_file_management">Upload and download files</string>
-    <string name="qhybrid_pref_summary_calibration">Calibrate the watch hands</string>
+    <string name="qhybrid_summary_calibration">Calibrate the watch hands</string>
     <string name="pref_summary_canned_messages_set">Send the messages configured below to your device</string>
     <string name="pref_summary_canned_messages_dismisscall">Dismiss calls from the watch with an SMS message</string>
     <string name="fossil_hr_commute_actions_explanation">The actions configured here will appear in the Commute app on your watch. Read the wiki for information on how to handle the intents produced by these actions.</string>
diff --git a/app/src/main/res/xml/devicesettings_fossilhybridhr.xml b/app/src/main/res/xml/devicesettings_fossilhybridhr.xml
index c973983e6..d6d89136d 100644
--- a/app/src/main/res/xml/devicesettings_fossilhybridhr.xml
+++ b/app/src/main/res/xml/devicesettings_fossilhybridhr.xml
@@ -88,8 +88,8 @@
         app:showSeekBarValue="true" />
 
     <Preference
-        android:title="@string/qhybrid_pref_title_calibration"
-        android:summary="@string/qhybrid_pref_summary_calibration">
+        android:title="@string/qhybrid_title_calibration"
+        android:summary="@string/qhybrid_summary_calibration">
         <intent
             android:targetPackage="nodomain.freeyourgadget.gadgetbridge"
             android:targetClass="nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.CalibrationActivity" />
@@ -103,7 +103,7 @@
         <SwitchPreference
             android:defaultValue="false"
             android:key="save_raw_activity_files"
-            android:title="@string/qhybrid_pref_save_raw_activity_files" />
+            android:title="@string/pref_qhybrid_save_raw_activity_files" />
 
         <SwitchPreference
             android:defaultValue="false"