diff --git a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py
index 177f416fe..84ad2dd7f 100644
--- a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py
+++ b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py
@@ -54,7 +54,7 @@ class TestRateLimitingBridge(object):
                                                      get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and bridge and wpa2_personal and twog and up and batch_size_125"
+            pytest -m "rate_limiting_tests and bridge and wpa2_personal and twog and upload and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -85,7 +85,7 @@ class TestRateLimitingBridge(object):
                                                      get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and bridge and wpa2_personal and twog and dw and batch_size_125"
+            pytest -m "rate_limiting_tests and bridge and wpa2_personal and twog and download and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -117,7 +117,7 @@ class TestRateLimitingBridge(object):
                                                         get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and bridge and wpa2_personal and twog and up_dw and batch_size_125"
+            pytest -m "rate_limiting_tests and bridge and wpa2_personal and twog and upload_download and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -268,14 +268,14 @@ class TestRateLimitingBridge(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.up
+    @pytest.mark.upload
     @pytest.mark.batch_size_125
     @allure.title("Test for Upload per client batch size 1,2,5 5 GHz")
     def test_wpa2_personal_ssid_up_batch_size_125_5g(self, get_test_library, get_dut_logs_per_test_case,
                                                      get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and bridge and wpa2_personal and fiveg and up and batch_size_125"
+            pytest -m "rate_limiting_tests and bridge and wpa2_personal and fiveg and upload and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
@@ -299,14 +299,14 @@ class TestRateLimitingBridge(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.dw
+    @pytest.mark.download
     @pytest.mark.batch_size_125
     @allure.title("Test for Download per client batch size 1,2,5 5 GHz")
     def test_wpa2_personal_ssid_dw_batch_size_125_5g(self, get_test_library, get_dut_logs_per_test_case,
                                                      get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and bridge and wpa2_personal and fiveg and dw and batch_size_125"
+            pytest -m "rate_limiting_tests and bridge and wpa2_personal and fiveg and download and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
@@ -331,7 +331,7 @@ class TestRateLimitingBridge(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.up_dw
+    @pytest.mark.upload_download
     @pytest.mark.batch_size_125
     @allure.story('Rate Limiting Open SSID 2.4 GHZ Band')
     @allure.title("Test for Upload and Download per client batch size 1,2,5 5 GHz")
@@ -339,7 +339,7 @@ class TestRateLimitingBridge(object):
                                                         get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and bridge and wpa2_personal and fiveg and up_dw and batch_size_125"
+            pytest -m "rate_limiting_tests and bridge and wpa2_personal and fiveg and upload_download and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
@@ -363,14 +363,14 @@ class TestRateLimitingBridge(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    @pytest.mark.up
+    @pytest.mark.upload
     @pytest.mark.batch_size_1
     @allure.title("Test for Upload batch size 1 2.4 GHz")
     def test_wpa2_personal_ssid_up_batch_size_1_2g(self, get_test_library, get_dut_logs_per_test_case,
                                                    get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and bridge and wpa2_personal and twog and up and batch_size_1"
+            pytest -m "rate_limiting_tests and bridge and wpa2_personal and twog and upload and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -394,14 +394,14 @@ class TestRateLimitingBridge(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    @pytest.mark.dw
+    @pytest.mark.download
     @pytest.mark.batch_size_1
     @allure.title("Test for Download batch size 1 2.4 GHz")
     def test_wpa2_personal_ssid_dw_batch_size_1_2g(self, get_test_library, get_dut_logs_per_test_case,
                                                    get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and bridge and wpa2_personal and twog and dw and batch_size_1"
+            pytest -m "rate_limiting_tests and bridge and wpa2_personal and twog and download and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -425,14 +425,14 @@ class TestRateLimitingBridge(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    @pytest.mark.up_dw
+    @pytest.mark.upload_download
     @pytest.mark.batch_size_1
     @allure.title("Test for Upload and Download batch size 1 2.4 GHz")
     def test_wpa2_personal_ssid_up_dw_batch_size_1_2g(self, get_test_library, get_dut_logs_per_test_case,
                                                       get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and bridge and wpa2_personal and twog and up_dw and batch_size_1"
+            pytest -m "rate_limiting_tests and bridge and wpa2_personal and twog and upload_download and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -456,14 +456,14 @@ class TestRateLimitingBridge(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.up
+    @pytest.mark.upload
     @pytest.mark.batch_size_1
     @allure.title("Test for Upload batch size 1 5 GHz")
     def test_wpa2_personal_ssid_up_batch_size_1_5g(self, get_test_library, get_dut_logs_per_test_case,
                                                    get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and bridge and wpa2_personal and fiveg and up and batch_size_1"
+            pytest -m "rate_limiting_tests and bridge and wpa2_personal and fiveg and upload and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
@@ -487,14 +487,14 @@ class TestRateLimitingBridge(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.dw
+    @pytest.mark.download
     @pytest.mark.batch_size_1
     @allure.title("Test for Download batch size 1 5 GHz")
     def test_wpa2_personal_ssid_dw_batch_size_1_5g(self, get_test_library, get_dut_logs_per_test_case,
                                                    get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and bridge and wpa2_personal and fiveg and dw and batch_size_1"
+            pytest -m "rate_limiting_tests and bridge and wpa2_personal and fiveg and download and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
@@ -518,14 +518,14 @@ class TestRateLimitingBridge(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.up_dw
+    @pytest.mark.upload_download
     @pytest.mark.batch_size_1
     @allure.title("Test for Upload and Download batch size 1 5 GHz")
     def test_wpa2_personal_ssid_up_dw_batch_size_1_5g(self, get_test_library, get_dut_logs_per_test_case,
                                                       get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and bridge and wpa2_personal and fiveg and up_dw and batch_size_1"
+            pytest -m "rate_limiting_tests and bridge and wpa2_personal and fiveg and upload_download and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
diff --git a/tests/e2e/basic/validation_of_operating_modes/nat_mode/rate_limiting/test_rate_limiting.py b/tests/e2e/basic/validation_of_operating_modes/nat_mode/rate_limiting/test_rate_limiting.py
index 1b9c67b30..aa1f986b7 100644
--- a/tests/e2e/basic/validation_of_operating_modes/nat_mode/rate_limiting/test_rate_limiting.py
+++ b/tests/e2e/basic/validation_of_operating_modes/nat_mode/rate_limiting/test_rate_limiting.py
@@ -54,7 +54,7 @@ class TestRateLimitingNAT(object):
                                                      get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and nat and wpa2_personal and twog and up and batch_size_125"
+            pytest -m "rate_limiting_tests and nat and wpa2_personal and twog and upload and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -85,7 +85,7 @@ class TestRateLimitingNAT(object):
                                                      get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and nat and wpa2_personal and twog and dw and batch_size_125"
+            pytest -m "rate_limiting_tests and nat and wpa2_personal and twog and download and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -117,7 +117,7 @@ class TestRateLimitingNAT(object):
                                                         get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and nat and wpa2_personal and twog and up_dw and batch_size_125"
+            pytest -m "rate_limiting_tests and nat and wpa2_personal and twog and upload_download and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -268,14 +268,14 @@ class TestRateLimitingNAT(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.up
+    @pytest.mark.upload
     @pytest.mark.batch_size_125
     @allure.title("Test for Upload per client batch size 1,2,5 5 GHz")
     def test_wpa2_personal_ssid_up_batch_size_125_5g(self, get_test_library, get_dut_logs_per_test_case,
                                                      get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and nat and wpa2_personal and fiveg and up and batch_size_125"
+            pytest -m "rate_limiting_tests and nat and wpa2_personal and fiveg and upload and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
@@ -299,14 +299,14 @@ class TestRateLimitingNAT(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.dw
+    @pytest.mark.download
     @pytest.mark.batch_size_125
     @allure.title("Test for Download per client batch size 1,2,5 5 GHz")
     def test_wpa2_personal_ssid_dw_batch_size_125_5g(self, get_test_library, get_dut_logs_per_test_case,
                                                      get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and nat and wpa2_personal and fiveg and dw and batch_size_125"
+            pytest -m "rate_limiting_tests and nat and wpa2_personal and fiveg and download and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
@@ -330,14 +330,14 @@ class TestRateLimitingNAT(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.up_dw
+    @pytest.mark.upload_download
     @pytest.mark.batch_size_125
     @allure.title("Test for Upload and Download per client batch size 1,2,5 5 GHz")
     def test_wpa2_personal_ssid_up_dw_batch_size_125_5g(self, get_test_library, get_dut_logs_per_test_case,
                                                         get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and nat and wpa2_personal and fiveg and up_dw and batch_size_125"
+            pytest -m "rate_limiting_tests and nat and wpa2_personal and fiveg and upload_download and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
@@ -361,14 +361,14 @@ class TestRateLimitingNAT(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    @pytest.mark.up
+    @pytest.mark.upload
     @pytest.mark.batch_size_1
     @allure.title("Test for Upload batch size 1 2.4 GHz")
     def test_wpa2_personal_ssid_up_batch_size_1_2g(self, get_test_library, get_dut_logs_per_test_case,
                                                    get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and nat and wpa2_personal and twog and up and batch_size_1"
+            pytest -m "rate_limiting_tests and nat and wpa2_personal and twog and upload and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -392,14 +392,14 @@ class TestRateLimitingNAT(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    @pytest.mark.dw
+    @pytest.mark.download
     @pytest.mark.batch_size_1
     @allure.title("Test for Download batch size 1 2.4 GHz")
     def test_wpa2_personal_ssid_dw_batch_size_1_2g(self, get_test_library, get_dut_logs_per_test_case,
                                                    get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and nat and wpa2_personal and twog and dw and batch_size_1"
+            pytest -m "rate_limiting_tests and nat and wpa2_personal and twog and download and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -423,14 +423,14 @@ class TestRateLimitingNAT(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    @pytest.mark.up_dw
+    @pytest.mark.upload_download
     @pytest.mark.batch_size_1
     @allure.title("Test for Upload and Download batch size 1 2.4 GHz")
     def test_wpa2_personal_ssid_up_dw_batch_size_1_2g(self, get_test_library, get_dut_logs_per_test_case,
                                                       get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and nat and wpa2_personal and twog and up_dw and batch_size_1"
+            pytest -m "rate_limiting_tests and nat and wpa2_personal and twog and upload_download and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -454,14 +454,14 @@ class TestRateLimitingNAT(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.up
+    @pytest.mark.upload
     @pytest.mark.batch_size_1
     @allure.title("Test for Upload batch size 1 5 GHz")
     def test_wpa2_personal_ssid_up_batch_size_1_5g(self, get_test_library, get_dut_logs_per_test_case,
                                                    get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and nat and wpa2_personal and fiveg and up and batch_size_1"
+            pytest -m "rate_limiting_tests and nat and wpa2_personal and fiveg and upload and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
@@ -485,14 +485,14 @@ class TestRateLimitingNAT(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.dw
+    @pytest.mark.download
     @pytest.mark.batch_size_1
     @allure.title("Test for Download batch size 1 5 GHz")
     def test_wpa2_personal_ssid_dw_batch_size_1_5g(self, get_test_library, get_dut_logs_per_test_case,
                                                    get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and nat and wpa2_personal and fiveg and dw and batch_size_1"
+            pytest -m "rate_limiting_tests and nat and wpa2_personal and fiveg and download and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
@@ -516,14 +516,14 @@ class TestRateLimitingNAT(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.up_dw
+    @pytest.mark.upload_download
     @pytest.mark.batch_size_1
     @allure.title("Test for Upload and Download batch size 1 5 GHz")
     def test_wpa2_personal_ssid_up_dw_batch_size_1_5g(self, get_test_library, get_dut_logs_per_test_case,
                                                       get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and nat and wpa2_personal and fiveg and up_dw and batch_size_1"
+            pytest -m "rate_limiting_tests and nat and wpa2_personal and fiveg and upload_download and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/rate_limiting/test_rate_limiting.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/rate_limiting/test_rate_limiting.py
index 3d3e5201d..090704c0c 100644
--- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/rate_limiting/test_rate_limiting.py
+++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/rate_limiting/test_rate_limiting.py
@@ -56,7 +56,7 @@ class TestRateLimitingVLAN(object):
                                                      get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and vlan and wpa2_personal and twog and up and batch_size_125"
+            pytest -m "rate_limiting_tests and vlan and wpa2_personal and twog and upload and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -89,7 +89,7 @@ class TestRateLimitingVLAN(object):
                                                      get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and vlan and wpa2_personal and twog and dw and batch_size_125"
+            pytest -m "rate_limiting_tests and vlan and wpa2_personal and twog and download and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -122,7 +122,7 @@ class TestRateLimitingVLAN(object):
                                                         get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and vlan and wpa2_personal and twog and up_dw and batch_size_125"
+            pytest -m "rate_limiting_tests and vlan and wpa2_personal and twog and upload_download and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -278,14 +278,14 @@ class TestRateLimitingVLAN(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.up
+    @pytest.mark.upload
     @pytest.mark.batch_size_125
     @allure.title("Test for Upload per client batch size 1,2,5 5 GHz")
     def test_wpa2_personal_ssid_up_batch_size_125_5g(self, get_test_library, get_dut_logs_per_test_case,
                                                      get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and vlan and wpa2_personal and fiveg and up and batch_size_125"
+            pytest -m "rate_limiting_tests and vlan and wpa2_personal and fiveg and upload and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
@@ -310,14 +310,14 @@ class TestRateLimitingVLAN(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.dw
+    @pytest.mark.download
     @pytest.mark.batch_size_125
     @allure.title("Test for Download per client batch size 1,2,5 5 GHz")
     def test_wpa2_personal_ssid_dw_batch_size_125_5g(self, get_test_library, get_dut_logs_per_test_case,
                                                      get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and vlan and wpa2_personal and fiveg and dw and batch_size_125"
+            pytest -m "rate_limiting_tests and vlan and wpa2_personal and fiveg and download and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
@@ -342,7 +342,7 @@ class TestRateLimitingVLAN(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.up_dw
+    @pytest.mark.upload_download
     @pytest.mark.batch_size_125
     @allure.story('Rate Limiting Open SSID 2.4 GHZ Band')
     @allure.title("Test for Upload and Download per client batch size 1,2,5 5 GHz")
@@ -350,7 +350,7 @@ class TestRateLimitingVLAN(object):
                                                         get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and vlan and wpa2_personal and fiveg and up_dw and batch_size_125"
+            pytest -m "rate_limiting_tests and vlan and wpa2_personal and fiveg and upload_download and batch_size_125"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
@@ -375,14 +375,14 @@ class TestRateLimitingVLAN(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    @pytest.mark.up
+    @pytest.mark.upload
     @pytest.mark.batch_size_1
     @allure.title("Test for Upload batch size 1 2.4 GHz")
     def test_wpa2_personal_ssid_up_batch_size_1_2g(self, get_test_library, get_dut_logs_per_test_case,
                                                    get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and vlan and wpa2_personal and twog and up and batch_size_1"
+            pytest -m "rate_limiting_tests and vlan and wpa2_personal and twog and upload and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -407,14 +407,14 @@ class TestRateLimitingVLAN(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    @pytest.mark.dw
+    @pytest.mark.download
     @pytest.mark.batch_size_1
     @allure.title("Test for Download batch size 1 2.4 GHz")
     def test_wpa2_personal_ssid_dw_batch_size_1_2g(self, get_test_library, get_dut_logs_per_test_case,
                                                    get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and vlan and wpa2_personal and twog and dw and batch_size_1"
+            pytest -m "rate_limiting_tests and vlan and wpa2_personal and twog and download and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -439,14 +439,14 @@ class TestRateLimitingVLAN(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    @pytest.mark.up_dw
+    @pytest.mark.upload_download
     @pytest.mark.batch_size_1
     @allure.title("Test for Upload and Download batch size 1 2.4 GHz")
     def test_wpa2_personal_ssid_up_dw_batch_size_1_2g(self, get_test_library, get_dut_logs_per_test_case,
                                                       get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and vlan and wpa2_personal and twog and up_dw and batch_size_1"
+            pytest -m "rate_limiting_tests and vlan and wpa2_personal and twog and upload_download and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_2g_br",
@@ -471,14 +471,14 @@ class TestRateLimitingVLAN(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.up
+    @pytest.mark.upload
     @pytest.mark.batch_size_1
     @allure.title("Test for Upload batch size 1 5 GHz")
     def test_wpa2_personal_ssid_up_batch_size_1_5g(self, get_test_library, get_dut_logs_per_test_case,
                                                    get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and vlan and wpa2_personal and fiveg and up and batch_size_1"
+            pytest -m "rate_limiting_tests and vlan and wpa2_personal and fiveg and upload and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
@@ -503,14 +503,14 @@ class TestRateLimitingVLAN(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.dw
+    @pytest.mark.download
     @pytest.mark.batch_size_1
     @allure.title("Test for Download batch size 1 5 GHz")
     def test_wpa2_personal_ssid_dw_batch_size_1_5g(self, get_test_library, get_dut_logs_per_test_case,
                                                    get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and vlan and wpa2_personal and fiveg and dw and batch_size_1"
+            pytest -m "rate_limiting_tests and vlan and wpa2_personal and fiveg and download and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",
@@ -535,14 +535,14 @@ class TestRateLimitingVLAN(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    @pytest.mark.up_dw
+    @pytest.mark.upload_download
     @pytest.mark.batch_size_1
     @allure.title("Test for Upload and Download batch size 1 5 GHz")
     def test_wpa2_personal_ssid_up_dw_batch_size_1_5g(self, get_test_library, get_dut_logs_per_test_case,
                                                       get_test_device_logs, num_stations, setup_configuration):
         """
             Test Rate Limiting Scenario
-            pytest -m "rate_limiting_tests and vlan and wpa2_personal and fiveg and up_dw and batch_size_1"
+            pytest -m "rate_limiting_tests and vlan and wpa2_personal and fiveg and upload_download and batch_size_1"
         """
         # run wifi capacity test here
         profile_data = {"ssid_name": "ssid_wpa2_5g_br",