diff --git a/manager-ui/src/types/soundcore-lib.d.ts b/manager-ui/src/types/soundcore-lib.d.ts
index 97049cf..db7f65a 100644
--- a/manager-ui/src/types/soundcore-lib.d.ts
+++ b/manager-ui/src/types/soundcore-lib.d.ts
@@ -107,11 +107,11 @@ export enum SoundcoreFeatureFlags {
   TOUCH_TONE = 'TOUCH_TONE',
   GAME_MODE = 'GAME_MODE',
   AUTO_POWER_OFF_ON = 'AUTO_POWER_OFF_ON',
-  InEarBeep = 'IN_EAR_BEEP',
-  PromptLang = 'PROMPT_LANG',
-  HearingProtect = 'HEARING_PROTECT',
-  AmbientSoundNotice = 'AMBIENT_SOUND_NOTICE',
-  PowerOnBatteryNotice = 'POWER_ON_BATTERY_NOTICE',
-  SupportTwoCnn = 'SUPPORT_TWO_CNN',
-  MultipleDeviceList = 'MULTIPLE_DEVICE_LIST'
+  IN_EAR_BEEP = 'IN_EAR_BEEP',
+  LANG_PROMPT = 'LANG_PROMPT',
+  HEARING_PROTECTION = 'HEARING_PROTECTION',
+  AMBIENT_SOUND_NOTICE = 'AMBIENT_SOUND_NOTICE',
+  POWER_ON_BATTERY_NOTICE = 'POWER_ON_BATTERY_NOTICE',
+  SUPPORT_TWO_CONNECTIONS = 'SUPPORT_TWO_CONNECTIONS',
+  MULTIPLE_DEVICE_LIST = 'MULTIPLE_DEVICE_LIST'
 }
diff --git a/soundcore-lib/src/models/feature_flags.rs b/soundcore-lib/src/models/feature_flags.rs
index 176c388..0b95bdf 100644
--- a/soundcore-lib/src/models/feature_flags.rs
+++ b/soundcore-lib/src/models/feature_flags.rs
@@ -25,12 +25,11 @@ pub enum SoundcoreFeatureFlags {
     TOUCH_TONE,
     GAME_MODE,
     AUTO_POWER_OFF_ON,
-    // TODO: Rename
-    InEarBeep,
-    PromptLang,
-    HearingProtect,
-    AmbientSoundNotice,
-    PowerOnBatteryNotice,
-    SupportTwoCnn,
-    MultipleDeviceList
+    IN_EAR_BEEP,
+    LANG_PROMPT,
+    HEARING_PROTECTION,
+    AMBIENT_SOUND_NOTICE,
+    POWER_ON_BATTERY_NOTICE,
+    SUPPORT_TWO_CONNECTIONS,
+    MULTIPLE_DEVICE_LIST
 }
diff --git a/soundcore-lib/src/packets/response/state/a3040.rs b/soundcore-lib/src/packets/response/state/a3040.rs
index c58e8b4..6e98952 100644
--- a/soundcore-lib/src/packets/response/state/a3040.rs
+++ b/soundcore-lib/src/packets/response/state/a3040.rs
@@ -60,12 +60,12 @@ const A3040_FEATURE_FLAGS: BitFlags<SoundcoreFeatureFlags> = make_bitflags!(Soun
     | TOUCH_TONE
     | GAME_MODE
     | AUTO_POWER_OFF_ON
-    | PowerOnBatteryNotice
-    | AmbientSoundNotice
-    | HearingProtect
-    | PromptLang
-    | InEarBeep
-    | SupportTwoCnn
+    | POWER_ON_BATTERY_NOTICE
+    | AMBIENT_SOUND_NOTICE
+    | HEARING_PROTECTION
+    | LANG_PROMPT
+    | IN_EAR_BEEP
+    | SUPPORT_TWO_CONNECTIONS
 });
 
 // TODO: Figure out what the bytes remaining are so this can be all_consuming