diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/105-pwhm-wpa3-cm.t b/.gitlab/tests/cram/mxl25641-hdk-6/105-pwhm-wpa3-cm.t
index c6fcba11e9..fbc99b4d6a 100644
--- a/.gitlab/tests/cram/mxl25641-hdk-6/105-pwhm-wpa3-cm.t
+++ b/.gitlab/tests/cram/mxl25641-hdk-6/105-pwhm-wpa3-cm.t
@@ -192,26 +192,26 @@ Check RSNO2 parameter was added to 6GHz hostapd conf file
 
 Next, restore security modes in two steps: WPA3 Transition to 2.4GHz/5GHz, and WPA3 Personal to 6GHz
 
-  $ R "usp-cli -j -l Device.WiFi.AccessPoint.1.Security.ModeEnabled='WPA2-WPA3-Personal' | jsonfilter -e @[0]'[@].ModeEnabled'"
-  WPA2-WPA3-Personal
+  $ R "usp-cli -j -l Device.WiFi.AccessPoint.1.Security.ModeEnabled='WPA3-Personal-Transition' | jsonfilter -e @[0]'[@].ModeEnabled'"
+  WPA3-Personal-Transition
 
-  $ R "usp-cli -j -l Device.WiFi.AccessPoint.2.Security.ModeEnabled='WPA2-WPA3-Personal' | jsonfilter -e @[0]'[@].ModeEnabled'"
-  WPA2-WPA3-Personal
+  $ R "usp-cli -j -l Device.WiFi.AccessPoint.2.Security.ModeEnabled='WPA3-Personal-Transition' | jsonfilter -e @[0]'[@].ModeEnabled'"
+  WPA3-Personal-Transition
 
   $ R "usp-cli -j -l Device.WiFi.AccessPoint.3.Security.ModeEnabled='WPA3-Personal' | jsonfilter -e @[0]'[@].ModeEnabled'"
   WPA3-Personal
 
   $ sleep 10
 
-Here the expected configuration is: One VAP Enabled on 2.4 / 5 GHz / 6GHz bands // Security.ModeEnabled=WPA2-WPA3-Personal or WPA3-Personal
+Here the expected configuration is: One VAP Enabled on 2.4 / 5 GHz / 6GHz bands // Security.ModeEnabled=WPA3-Personal-Transition or WPA3-Personal
 
-Check 5GHz is broadcasting WPA2-WPA3 Transition // at least WPA-PSK SAE // ignore 11BE/ AKM24
+Check 5GHz is broadcasting WPA3 Transition // at least WPA-PSK SAE // ignore 11BE/ AKM24
 
   $ itf=$(R "usp-cli -l Device.WiFi.AccessPoint.1.SSIDReference+.Name?" | sed '/^$/d')
   $ get_hapd_config $itf wpa_key_mgmt
   (?=.*WPA-PSK)(?=.*SAE).* (re)
 
-Check 2.4GHz is broadcasting WPA2-WPA3 Transition // at least WPA-PSK SAE // ignore 11BE/ AKM24
+Check 2.4GHz is broadcasting WPA3 Transition // at least WPA-PSK SAE // ignore 11BE/ AKM24
 
   $ itf=$(R "usp-cli -l Device.WiFi.AccessPoint.2.SSIDReference+.Name?" | sed '/^$/d')
   $ get_hapd_config $itf wpa_key_mgmt
diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t b/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t
index 3f99a827ca..9647acd29b 100644
--- a/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t
+++ b/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t
@@ -253,15 +253,15 @@ Check that wireless is disabled:
 
 Restore Security Mode to default values
 
-  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.1'].Security.ModeEnabled='WPA2-WPA3-Personal'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
-  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
-  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
-  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.1'].Security.ModeEnabled='WPA3-Personal-Transition'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal-Transition" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal-Transition" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal-Transition" (re)
 
-  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.2'].Security.ModeEnabled='WPA2-WPA3-Personal'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
-  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
-  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
-  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.2'].Security.ModeEnabled='WPA3-Personal-Transition'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal-Transition" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal-Transition" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal-Transition" (re)
 
   $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.3'].Security.ModeEnabled='WPA3-Personal'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
   WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal" (re)
diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/113-prplmesh-wpa3-cm.t b/.gitlab/tests/cram/mxl25641-hdk-6/113-prplmesh-wpa3-cm.t
index d6d60768a8..224398122a 100644
--- a/.gitlab/tests/cram/mxl25641-hdk-6/113-prplmesh-wpa3-cm.t
+++ b/.gitlab/tests/cram/mxl25641-hdk-6/113-prplmesh-wpa3-cm.t
@@ -24,10 +24,10 @@ Check default SecMode:
   $ R logger -t cram "Check default SecMode"
 
   $ wifi_dm "AccessPoint.1.Security.ModeEnabled?"
-  Device.WiFi.AccessPoint.1.Security.ModeEnabled="WPA2-WPA3-Personal"
+  Device.WiFi.AccessPoint.1.Security.ModeEnabled="WPA3-Personal-Transition"
 
   $ wifi_dm "AccessPoint.2.Security.ModeEnabled?"
-  Device.WiFi.AccessPoint.2.Security.ModeEnabled="WPA2-WPA3-Personal"
+  Device.WiFi.AccessPoint.2.Security.ModeEnabled="WPA3-Personal-Transition"
 
   $ wifi_dm "AccessPoint.3.Security.ModeEnabled?"
   Device.WiFi.AccessPoint.3.Security.ModeEnabled="WPA3-Personal"
diff --git a/.gitlab/tests/cram/wnc-freedom/105-pwhm-wpa3-cm.t b/.gitlab/tests/cram/wnc-freedom/105-pwhm-wpa3-cm.t
index 52c4f15e01..bd9509d4ec 100644
--- a/.gitlab/tests/cram/wnc-freedom/105-pwhm-wpa3-cm.t
+++ b/.gitlab/tests/cram/wnc-freedom/105-pwhm-wpa3-cm.t
@@ -159,26 +159,26 @@ Check RSNO2 parameter was added to 6GHz hostapd conf file
 
 Next, restore security modes in two steps: WPA3 Transition to 2.4GHz/5GHz, and WPA3 Personal to 6GHz
 
-  $ R "usp-cli -j -l Device.WiFi.AccessPoint.1.Security.ModeEnabled='WPA2-WPA3-Personal' | jsonfilter -e @[0]'[@].ModeEnabled'"
-  WPA2-WPA3-Personal
+  $ R "usp-cli -j -l Device.WiFi.AccessPoint.1.Security.ModeEnabled='WPA3-Personal-Transition' | jsonfilter -e @[0]'[@].ModeEnabled'"
+  WPA3-Personal-Transition
 
-  $ R "usp-cli -j -l Device.WiFi.AccessPoint.3.Security.ModeEnabled='WPA2-WPA3-Personal' | jsonfilter -e @[0]'[@].ModeEnabled'"
-  WPA2-WPA3-Personal
+  $ R "usp-cli -j -l Device.WiFi.AccessPoint.3.Security.ModeEnabled='WPA3-Personal-Transition' | jsonfilter -e @[0]'[@].ModeEnabled'"
+  WPA3-Personal-Transition
 
   $ R "usp-cli -j -l Device.WiFi.AccessPoint.5.Security.ModeEnabled='WPA3-Personal' | jsonfilter -e @[0]'[@].ModeEnabled'"
   WPA3-Personal
 
   $ sleep 10
 
-Here the expected configuration is: One VAP Enabled on 2.4 / 5 GHz / 6GHz bands // Security.ModeEnabled=WPA2-WPA3-Personal or WPA3-Personal
+Here the expected configuration is: One VAP Enabled on 2.4 / 5 GHz / 6GHz bands // Security.ModeEnabled=WPA3-Personal-Transition or WPA3-Personal
 
-Check 5GHz is broadcasting WPA2-WPA3 Transition // at least WPA-PSK SAE // ignore 11BE/ AKM24
+Check 5GHz is broadcasting WPA3 Transition // at least WPA-PSK SAE // ignore 11BE/ AKM24
 
   $ itf=$(R "usp-cli -l Device.WiFi.AccessPoint.3.SSIDReference+.Name?" | sed '/^$/d')
   $ get_hapd_config $itf wpa_key_mgmt
   (?=.*WPA-PSK)(?=.*SAE).* (re)
 
-Check 2.4GHz is broadcasting WPA2-WPA3 Transition // at least WPA-PSK SAE // ignore 11BE/ AKM24
+Check 2.4GHz is broadcasting WPA3 Transition // at least WPA-PSK SAE // ignore 11BE/ AKM24
 
   $ itf=$(R "usp-cli -l Device.WiFi.AccessPoint.1.SSIDReference+.Name?" | sed '/^$/d')
   $ get_hapd_config $itf wpa_key_mgmt
diff --git a/.gitlab/tests/cram/wnc-freedom/107-wifi-bstamld_step_1.t b/.gitlab/tests/cram/wnc-freedom/107-wifi-bstamld_step_1.t
index 4d2f6e5d65..4605ed3a43 100644
--- a/.gitlab/tests/cram/wnc-freedom/107-wifi-bstamld_step_1.t
+++ b/.gitlab/tests/cram/wnc-freedom/107-wifi-bstamld_step_1.t
@@ -95,8 +95,8 @@ Create profile for EP 1. As UseNeighborProfile is enbaled by default, no need to
   $ wifi_dm "EndPoint.1.Profile.${ep1_alias}.SSID=\"TEST_MLO\"" "Device.WiFi." "ba-cli"
   Device.WiFi.EndPoint.1.Profile.\d+.SSID="TEST_MLO" (re)
 
-  $ wifi_dm "EndPoint.1.Profile.${ep1_alias}.Security.ModeEnabled=\"WPA2-WPA3-Personal\"" "Device.WiFi." "ba-cli"
-  Device.WiFi.EndPoint.1.Profile.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  $ wifi_dm "EndPoint.1.Profile.${ep1_alias}.Security.ModeEnabled=\"WPA3-Personal-Transition\"" "Device.WiFi." "ba-cli"
+  Device.WiFi.EndPoint.1.Profile.\d+.Security.ModeEnabled="WPA3-Personal-Transition" (re)
 
   $ wifi_dm "EndPoint.1.Profile.${ep1_alias}.Security.KeyPassphrase=\"password\"" "Device.WiFi." "ba-cli"
   Device.WiFi.EndPoint.1.Profile.\d+.Security.KeyPassphrase="password" (re)
diff --git a/.gitlab/tests/cram/wnc-freedom/107-wifi-bstamld_step_2.t b/.gitlab/tests/cram/wnc-freedom/107-wifi-bstamld_step_2.t
index 317b821018..802b2c97e1 100644
--- a/.gitlab/tests/cram/wnc-freedom/107-wifi-bstamld_step_2.t
+++ b/.gitlab/tests/cram/wnc-freedom/107-wifi-bstamld_step_2.t
@@ -55,8 +55,8 @@ Create profile for EP 2:
   $ wifi_dm "EndPoint.2.Profile.${ep2_alias}.SSID=\"TEST_MLO\"" "Device.WiFi." "ba-cli"
   Device.WiFi.EndPoint.2.Profile.\d+.SSID="TEST_MLO" (re)
 
-  $ wifi_dm "EndPoint.2.Profile.${ep2_alias}.Security.ModeEnabled=\"WPA2-WPA3-Personal\"" "Device.WiFi." "ba-cli"
-  Device.WiFi.EndPoint.2.Profile.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  $ wifi_dm "EndPoint.2.Profile.${ep2_alias}.Security.ModeEnabled=\"WPA3-Personal-Transition\"" "Device.WiFi." "ba-cli"
+  Device.WiFi.EndPoint.2.Profile.\d+.Security.ModeEnabled="WPA3-Personal-Transition" (re)
 
   $ wifi_dm "EndPoint.2.Profile.${ep2_alias}.Security.KeyPassphrase=\"password\"" "Device.WiFi." "ba-cli"
   Device.WiFi.EndPoint.2.Profile.\d+.Security.KeyPassphrase="password" (re)
@@ -76,8 +76,8 @@ Create profile for EP 3:
   $ wifi_dm "EndPoint.3.Profile.${ep3_alias}.SSID=\"TEST_MLO\"" "Device.WiFi." "ba-cli"
   Device.WiFi.EndPoint.3.Profile.\d+.SSID="TEST_MLO" (re)
 
-  $ wifi_dm "EndPoint.3.Profile.${ep3_alias}.Security.ModeEnabled=\"WPA2-WPA3-Personal\"" "Device.WiFi." "ba-cli"
-  Device.WiFi.EndPoint.3.Profile.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  $ wifi_dm "EndPoint.3.Profile.${ep3_alias}.Security.ModeEnabled=\"WPA3-Personal-Transition\"" "Device.WiFi." "ba-cli"
+  Device.WiFi.EndPoint.3.Profile.\d+.Security.ModeEnabled="WPA3-Personal-Transition" (re)
 
   $ wifi_dm "EndPoint.3.Profile.${ep3_alias}.Security.KeyPassphrase=\"password\"" "Device.WiFi." "ba-cli"
   Device.WiFi.EndPoint.3.Profile.\d+.Security.KeyPassphrase="password" (re)
diff --git a/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t b/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t
index aae1472bfe..6dab625ace 100644
--- a/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t
+++ b/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t
@@ -250,15 +250,15 @@ To disable wireless, disable instances of Network.AccessPoint{i} and call Access
 
 Restore Security.ModeEnabled for AccessPoints used in the test
 
-  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.1'].Security.ModeEnabled='WPA2-WPA3-Personal'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
-  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
-  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
-  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.1'].Security.ModeEnabled='WPA3-Personal-Transition'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal-Transition" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal-Transition" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal-Transition" (re)
 
-  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.2'].Security.ModeEnabled='WPA2-WPA3-Personal'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
-  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
-  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
-  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.2'].Security.ModeEnabled='WPA3-Personal-Transition'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal-Transition" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal-Transition" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal-Transition" (re)
 
   $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.3'].Security.ModeEnabled='WPA3-Personal'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
   WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal" (re)
diff --git a/.gitlab/tests/cram/wnc-freedom/113-prplmesh-wpa3-cm.t b/.gitlab/tests/cram/wnc-freedom/113-prplmesh-wpa3-cm.t
index 913663a4ac..d32b2a381b 100644
--- a/.gitlab/tests/cram/wnc-freedom/113-prplmesh-wpa3-cm.t
+++ b/.gitlab/tests/cram/wnc-freedom/113-prplmesh-wpa3-cm.t
@@ -24,10 +24,10 @@ Check default SecMode:
   $ R logger -t cram "Check default SecMode"
 
   $ wifi_dm "AccessPoint.1.Security.ModeEnabled?"
-  Device.WiFi.AccessPoint.1.Security.ModeEnabled="WPA2-WPA3-Personal"
+  Device.WiFi.AccessPoint.1.Security.ModeEnabled="WPA3-Personal-Transition"
 
   $ wifi_dm "AccessPoint.3.Security.ModeEnabled?"
-  Device.WiFi.AccessPoint.3.Security.ModeEnabled="WPA2-WPA3-Personal"
+  Device.WiFi.AccessPoint.3.Security.ModeEnabled="WPA3-Personal-Transition"
 
   $ wifi_dm "AccessPoint.5.Security.ModeEnabled?"
   Device.WiFi.AccessPoint.5.Security.ModeEnabled="WPA3-Personal"