diff --git a/conf/nic_single_core_perf.cfg b/conf/nic_single_core_perf.cfg
index 9cc72174..05b5abea 100644
--- a/conf/nic_single_core_perf.cfg
+++ b/conf/nic_single_core_perf.cfg
@@ -49,7 +49,7 @@ expected_throughput = {
     'I40E_40G-QSFP_A': {
         '1C/1T': {64: {512: 0.00, 2048: 0.00}},
         '1C/2T': {64: {512: 0.00, 2048: 0.00}}},
-    'I40E_10G-SFP_XL710': {
+    'I40E_10G-SFP_X710': {
         '1C/1T':{64: {512: 0.00, 2048: 0.00}},
         '1C/2T':{64: {512: 0.00, 2048: 0.00}}},
     'IXGBE_10G-82599_SFP': {
diff --git a/conf/test_case_checklist.json b/conf/test_case_checklist.json
index 9dfda15a..64d3567c 100644
--- a/conf/test_case_checklist.json
+++ b/conf/test_case_checklist.json
@@ -7,7 +7,7 @@
             "NIC": [
                 "IGB_1G-82580_COPPER",
                 "IGB_1G-I350_COPPER",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -116,7 +116,7 @@
             ],
             "NIC": [
                 "I40E_25G-25G_SFP28",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "IGB_1G-I210_COPPER",
@@ -150,7 +150,7 @@
                 "IGB_1G-82580_COPPER",
                 "IGB_1G-I350_COPPER",
                 "I40E_25G-25G_SFP28",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "IGB_1G-I210_COPPER",
@@ -231,7 +231,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -288,7 +288,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "IGC-I225_LM",
@@ -444,7 +444,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -485,7 +485,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -526,7 +526,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -1316,7 +1316,7 @@
             ],
             "NIC": [
                 "IXGBE_10G-82599_SFP_SF_QP",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28"
@@ -1332,7 +1332,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28"
@@ -2117,7 +2117,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -2217,7 +2217,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -2267,7 +2267,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -2286,7 +2286,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "cavium_a034",
@@ -2415,7 +2415,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -2919,7 +2919,7 @@
                 "ICE_100G-E810C_QSFP",
 		"IGC-I225_LM",
                 "IGC-I226_LM",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
 	        "I40E_40G-QSFP_B",
 	        "I40E_10G-X722_A0",
@@ -2982,7 +2982,7 @@
                 "freebsd"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710"
+                "I40E_10G-SFP_X710"
             ],
             "Target": [
                 "ALL"
@@ -3010,7 +3010,7 @@
                 "freebsd"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710"
+                "I40E_10G-SFP_X710"
             ],
             "Target": [
                 "ALL"
@@ -3250,7 +3250,7 @@
                 "freebsd"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710"
+                "I40E_10G-SFP_X710"
             ],
             "Target": [
                 "ALL"
@@ -3278,7 +3278,7 @@
                 "freebsd"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710"
+                "I40E_10G-SFP_X710"
             ],
             "Target": [
                 "ALL"
@@ -3321,7 +3321,7 @@
                 "freebsd"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710"
+                "I40E_10G-SFP_X710"
             ],
             "Target": [
                 "ALL"
@@ -3349,7 +3349,7 @@
                 "freebsd"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710"
+                "I40E_10G-SFP_X710"
             ],
             "Target": [
                 "ALL"
@@ -3364,7 +3364,7 @@
                 "freebsd"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710"
+                "I40E_10G-SFP_X710"
             ],
             "Target": [
                 "ALL"
@@ -3392,7 +3392,7 @@
                 "freebsd"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710"
+                "I40E_10G-SFP_X710"
             ],
             "Target": [
                 "ALL"
@@ -3691,7 +3691,7 @@
                 "ICE_100G-E810C_QSFP",
 		"ICE_25G-E823C_QSFP",
                 "ICE_25G-E810C_SFP",
-	        "I40E_10G-SFP_XL710",
+	        "I40E_10G-SFP_X710",
 		"I40E_40G-QSFP_A",
 		"I40E_10G-SFP_X722",
 		"I40E_10G-10G_BASE_T_X722",
diff --git a/conf/test_case_supportlist.json b/conf/test_case_supportlist.json
index a127833a..f6a8e2a1 100644
--- a/conf/test_case_supportlist.json
+++ b/conf/test_case_supportlist.json
@@ -5,7 +5,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_25G-25G_SFP28",
                 "I40E_10G-10G_BASE_T_X722",
@@ -28,7 +28,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
 		        "I40E_40G-QSFP_A",
 		        "I40E_25G-25G_SFP28"
             ],
@@ -136,7 +136,7 @@
             ],
             "NIC": [
                 "IGC-I225_LM",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -160,7 +160,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -187,7 +187,7 @@
                 "IGB_1G-I350_COPPER",
                 "IXGBE_10G-82599_SFP",
                 "I40E_25G-25G_SFP28",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_10G-SFP_X722",
@@ -212,7 +212,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -236,7 +236,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -257,7 +257,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -278,7 +278,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -302,7 +302,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -326,7 +326,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28"
@@ -344,7 +344,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28"
@@ -362,7 +362,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28"
@@ -380,7 +380,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28"
@@ -398,7 +398,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28"
@@ -416,7 +416,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28"
@@ -434,7 +434,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28"
@@ -452,7 +452,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28"
@@ -470,7 +470,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28"
@@ -488,7 +488,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28"
@@ -506,7 +506,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28"
@@ -524,7 +524,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28"
@@ -542,7 +542,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "IGC-I225_LM",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
@@ -562,7 +562,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "IGC-I225_LM",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
@@ -582,7 +582,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "IGC-I225_LM",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
@@ -602,7 +602,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -626,7 +626,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -647,7 +647,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -668,7 +668,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -689,7 +689,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -730,7 +730,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "IGC-I225_LM",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
@@ -756,7 +756,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "IGC-I225_LM",
                 "I40E_40G-QSFP_A",
@@ -780,7 +780,7 @@
             "NIC": [
                 "IGB_1G-82580_COPPER",
                 "IGB_1G-I350_COPPER",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
 		"ICE_100G-E810C_QSFP",
 		"ICE_25G-E810C_SFP",
@@ -821,7 +821,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_10G-SFP_X722",
                 "I40E_10G-10G_BASE_T_X722",
@@ -868,7 +868,7 @@
                 "IGC-I225_LM",
                 "IXGBE_10G-X550EM_X_10G_T",
                 "IXGBE_10G-X550T",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
@@ -889,7 +889,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
@@ -914,7 +914,7 @@
                 "IXGBE_10G-82599_SFP",
                 "IXGBE_10G-X550EM_X_10G_T",
                 "IXGBE_10G-X550T",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
@@ -954,7 +954,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
@@ -983,7 +983,7 @@
                 "IXGBE_10G-X550EM_X_10G_T",
                 "IXGBE_10G-X550T",
                 "IGB_1G-I350_COPPER",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
@@ -1043,7 +1043,7 @@
                 "IXGBE_10G-82599_SFP",
                 "IXGBE_10G-X550EM_X_10G_T",
                 "IXGBE_10G-X550T",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
@@ -1065,7 +1065,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
@@ -1519,7 +1519,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_25G-25G_SFP28"
             ],
@@ -1536,7 +1536,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_25G-25G_SFP28"
             ],
@@ -1553,7 +1553,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_25G-25G_SFP28"
             ],
@@ -1570,7 +1570,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_25G-25G_SFP28"
             ],
@@ -1587,7 +1587,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_25G-25G_SFP28"
             ],
@@ -1711,7 +1711,7 @@
                 "cavium_a063",
                 "I40E_10G-SFP_X722",
                 "I40E_10G-10G_BASE_T_X722",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A"
             ],
@@ -1728,7 +1728,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_25G-25G_SFP28",
                 "I40E_10G-10G_BASE_T_BC"
@@ -1746,7 +1746,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_25G-25G_SFP28",
                 "I40E_10G-10G_BASE_T_BC"
@@ -1794,7 +1794,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_25G-25G_SFP28"
             ],
@@ -1827,7 +1827,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1849,7 +1849,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1871,7 +1871,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1893,7 +1893,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1915,7 +1915,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1937,7 +1937,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_10G-SFP_X722",
@@ -1958,7 +1958,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_10G-SFP_X722",
@@ -1979,7 +1979,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -2000,7 +2000,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -2021,7 +2021,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -2042,7 +2042,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -2063,7 +2063,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -2243,7 +2243,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_X722",
@@ -2265,7 +2265,7 @@
                 "ALL"
             ],
             "NIC": [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_X722",
diff --git a/conf/vf_l3fwd.cfg b/conf/vf_l3fwd.cfg
index 69b716b8..366f32fa 100644
--- a/conf/vf_l3fwd.cfg
+++ b/conf/vf_l3fwd.cfg
@@ -1,2 +1,2 @@
 [suite]
-perf_params = {"frame_size": [64, 128, 256, 512, 1024, 1518], "queue_number": {"I40E_40G-QSFP_A" : 2, "I40E_25G-25G_SFP28" : 2, "I40E_10G-SFP_XL710" : 1, "IXGBE_10G-82599_SFP" : 1, "ICE_25G-E810_XXV_SFP" : 2, "ICE_25G-E810C_SFP" : 4, "ICE_100G-E810C_QSFP" : 4}}
+perf_params = {"frame_size": [64, 128, 256, 512, 1024, 1518], "queue_number": {"I40E_40G-QSFP_A" : 2, "I40E_25G-25G_SFP28" : 2, "I40E_10G-SFP_X710" : 1, "IXGBE_10G-82599_SFP" : 1, "ICE_25G-E810_XXV_SFP" : 2, "ICE_25G-E810C_SFP" : 4, "ICE_100G-E810C_QSFP" : 4}}
diff --git a/conf/vf_single_core_perf.cfg b/conf/vf_single_core_perf.cfg
index b0546f48..a87a8db8 100644
--- a/conf/vf_single_core_perf.cfg
+++ b/conf/vf_single_core_perf.cfg
@@ -38,7 +38,7 @@ expected_throughput = {
     'I40E_40G-QSFP_A': {
         '1C/1T': {64: {512: 0.00, 2048: 0.00}},
         '1C/2T': {64: {512: 0.00, 2048: 0.00}}},
-    'I40E_10G-SFP_XL710': {
+    'I40E_10G-SFP_X710': {
         '1C/1T':{64: {512: 0.00, 2048: 0.00}},
         '1C/2T':{64: {512: 0.00, 2048: 0.00}}},
     'IXGBE_10G-82599_SFP': {
