diff --git a/app/src/main/java/io/heckel/ntfy/db/Repository.kt b/app/src/main/java/io/heckel/ntfy/db/Repository.kt
index 5d9695c..71b0309 100644
--- a/app/src/main/java/io/heckel/ntfy/db/Repository.kt
+++ b/app/src/main/java/io/heckel/ntfy/db/Repository.kt
@@ -292,13 +292,13 @@ class Repository(private val sharedPrefs: SharedPreferences, private val databas
             .apply()
     }
 
-    fun getEnableUP(): Boolean {
-        return sharedPrefs.getBoolean(SHARED_PREFS_ENABLE_UP, true) // Enabled by default
+    fun getUnifiedPushEnabled(): Boolean {
+        return sharedPrefs.getBoolean(SHARED_PREFS_UNIFIEDPUSH_ENABLED, true) // Enabled by default
     }
 
-    fun setEnableUP(enabled: Boolean) {
+    fun setUnifiedPushEnabled(enabled: Boolean) {
         sharedPrefs.edit()
-            .putBoolean(SHARED_PREFS_ENABLE_UP, enabled)
+            .putBoolean(SHARED_PREFS_UNIFIEDPUSH_ENABLED, enabled)
             .apply()
     }
 
@@ -487,7 +487,7 @@ class Repository(private val sharedPrefs: SharedPreferences, private val databas
         const val SHARED_PREFS_CONNECTION_PROTOCOL = "ConnectionProtocol"
         const val SHARED_PREFS_DARK_MODE = "DarkMode"
         const val SHARED_PREFS_BROADCAST_ENABLED = "BroadcastEnabled"
-        const val SHARED_PREFS_ENABLE_UP = "EnableUP"
+        const val SHARED_PREFS_UNIFIEDPUSH_ENABLED = "UnifiedPushEnabled"
         const val SHARED_PREFS_INSISTENT_MAX_PRIORITY_ENABLED = "InsistentMaxPriority"
         const val SHARED_PREFS_RECORD_LOGS_ENABLED = "RecordLogs"
         const val SHARED_PREFS_BATTERY_OPTIMIZATIONS_REMIND_TIME = "BatteryOptimizationsRemindTime"
diff --git a/app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt b/app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt
index 7323829..f4ef5d8 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt
@@ -365,22 +365,22 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere
             }
 
             // Enable UnifiedPush
-            val enableUPPrefId = context?.getString(R.string.settings_advanced_enable_up_key) ?: return
-            val enableUP: SwitchPreference? = findPreference(enableUPPrefId)
-            enableUP?.isChecked = repository.getEnableUP()
-            enableUP?.preferenceDataStore = object : PreferenceDataStore() {
+            val unifiedPushEnabledPrefId = context?.getString(R.string.settings_advanced_unifiedpush_key) ?: return
+            val unifiedPushEnabled: SwitchPreference? = findPreference(unifiedPushEnabledPrefId)
+            unifiedPushEnabled?.isChecked = repository.getUnifiedPushEnabled()
+            unifiedPushEnabled?.preferenceDataStore = object : PreferenceDataStore() {
                 override fun putBoolean(key: String?, value: Boolean) {
-                    repository.setEnableUP(value)
+                    repository.setUnifiedPushEnabled(value)
                 }
                 override fun getBoolean(key: String?, defValue: Boolean): Boolean {
-                    return repository.getEnableUP()
+                    return repository.getUnifiedPushEnabled()
                 }
             }
-            enableUP?.summaryProvider = Preference.SummaryProvider<SwitchPreference> { pref ->
+            unifiedPushEnabled?.summaryProvider = Preference.SummaryProvider<SwitchPreference> { pref ->
                 if (pref.isChecked) {
-                    getString(R.string.settings_advanced_enable_up_summary_enabled)
+                    getString(R.string.settings_advanced_unifiedpush_summary_enabled)
                 } else {
-                    getString(R.string.settings_advanced_enable_up_summary_disabled)
+                    getString(R.string.settings_advanced_unifiedpush_summary_disabled)
                 }
             }
 
diff --git a/app/src/main/java/io/heckel/ntfy/up/BroadcastReceiver.kt b/app/src/main/java/io/heckel/ntfy/up/BroadcastReceiver.kt
index a1ab52f..46a0bcb 100644
--- a/app/src/main/java/io/heckel/ntfy/up/BroadcastReceiver.kt
+++ b/app/src/main/java/io/heckel/ntfy/up/BroadcastReceiver.kt
@@ -38,9 +38,9 @@ class BroadcastReceiver : android.content.BroadcastReceiver() {
         val repository = app.repository
         val distributor = Distributor(app)
         Log.d(TAG, "REGISTER received for app $appId (connectorToken=$connectorToken)")
-        if (!repository.getEnableUP()) {
+        if (!repository.getUnifiedPushEnabled()) {
             Log.w(TAG, "Refusing registration because 'EnableUP' is disabled")
-            distributor.sendRegistrationFailed(appId, connectorToken, "EnableUP setting is disabled")
+            distributor.sendRegistrationFailed(appId, connectorToken, "UnifiedPush is disabled in ntfy")
             return
         }
         if (appId.isBlank()) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0a2971f..c775990 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -320,9 +320,9 @@
     <string name="settings_advanced_broadcast_title">Broadcast messages</string>
     <string name="settings_advanced_broadcast_summary_enabled">Apps can receive incoming notifications as broadcasts</string>
     <string name="settings_advanced_broadcast_summary_disabled">Apps cannot receive notifications as broadcasts</string>
-    <string name="settings_advanced_enable_up_title">Enable UnifiedPush</string>
-    <string name="settings_advanced_enable_up_summary_enabled">ntfy will act as a UnifiedPush distributor</string>
-    <string name="settings_advanced_enable_up_summary_disabled">ntfy will NOT act as a UnifiedPush distributor</string>
+    <string name="settings_advanced_unifiedpush_title">Enable UnifiedPush</string>
+    <string name="settings_advanced_unifiedpush_summary_enabled">ntfy will act as a UnifiedPush distributor</string>
+    <string name="settings_advanced_unifiedpush_summary_disabled">ntfy will not act as a UnifiedPush distributor</string>
     <string name="settings_advanced_record_logs_title">Record logs</string>
     <string name="settings_advanced_record_logs_summary_enabled">Logging (up to 1,000 entries) to device …</string>
     <string name="settings_advanced_record_logs_summary_disabled">Turn on logging, so you can share logs later to diagnose issues.</string>
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index b851724..f94a598 100644
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -25,7 +25,7 @@
     <string name="settings_backup_restore_backup_key" translatable="false">Backup</string>
     <string name="settings_backup_restore_restore_key" translatable="false">Restore</string>
     <string name="settings_advanced_broadcast_key" translatable="false">BroadcastEnabled</string>
-    <string name="settings_advanced_enable_up_key" translatable="false">EnableUP</string>
+    <string name="settings_advanced_unifiedpush_key" translatable="false">UnifiedPushEnabled</string>
     <string name="settings_advanced_record_logs_key" translatable="false">RecordLogs</string>
     <string name="settings_advanced_export_logs_key" translatable="false">ExportLogs</string>
     <string name="settings_advanced_clear_logs_key" translatable="false">ClearLogs</string>
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index 630c284..0be2442 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -77,8 +77,8 @@
                 app:title="@string/settings_advanced_broadcast_title"
                 app:enabled="true"/>
         <SwitchPreference
-                app:key="@string/settings_advanced_enable_up_key"
-                app:title="@string/settings_advanced_enable_up_title"
+                app:key="@string/settings_advanced_unifiedpush_key"
+                app:title="@string/settings_advanced_unifiedpush_title"
                 app:enabled="true"/>
         <SwitchPreference
                 app:key="@string/settings_advanced_record_logs_key"