diff --git a/app/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/model/FlagKey.kt b/app/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/model/FlagKey.kt
index 9a75259dfa..a58fe6a30f 100644
--- a/app/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/model/FlagKey.kt
+++ b/app/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/model/FlagKey.kt
@@ -45,7 +45,7 @@ sealed class FlagKey<out T : Any> {
      * Indicates whether syncing with the main Bitwarden password manager app should be enabled..
      */
     data object PasswordManagerSync : FlagKey<Boolean>() {
-        override val keyName: String = "enable-password-manager-sync-android"
+        override val keyName: String = "enable-pm-bwa-sync"
         override val defaultValue: Boolean = false
         override val isRemotelyConfigured: Boolean = true
     }
diff --git a/app/src/test/java/com/bitwarden/authenticator/data/platform/manager/FlagKeyTest.kt b/app/src/test/java/com/bitwarden/authenticator/data/platform/manager/FlagKeyTest.kt
new file mode 100644
index 0000000000..843939f01a
--- /dev/null
+++ b/app/src/test/java/com/bitwarden/authenticator/data/platform/manager/FlagKeyTest.kt
@@ -0,0 +1,39 @@
+package com.bitwarden.authenticator.data.platform.manager
+
+import com.bitwarden.authenticator.data.platform.manager.model.FlagKey
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+
+class FlagKeyTest {
+    @Test
+    fun `Feature flags have the correct key name set`() {
+        assertEquals(
+            FlagKey.BitwardenAuthenticationEnabled.keyName,
+            "bitwarden-authentication-enabled",
+        )
+        assertEquals(
+            FlagKey.PasswordManagerSync.keyName,
+            "enable-pm-bwa-sync",
+        )
+    }
+
+    @Test
+    fun `All feature flags have the correct default value set`() {
+        assertTrue(
+            listOf(
+                FlagKey.BitwardenAuthenticationEnabled,
+                FlagKey.PasswordManagerSync,
+            ).all {
+                !it.defaultValue
+            },
+        )
+    }
+
+    @Test
+    fun `All feature flags are correctly set to be remotely configured`() {
+        assertTrue(FlagKey.PasswordManagerSync.isRemotelyConfigured)
+        assertFalse(FlagKey.BitwardenAuthenticationEnabled.isRemotelyConfigured)
+    }
+}