diff --git a/test/case/ietf_interfaces/ipv4_address.py b/test/case/ietf_interfaces/ipv4_address.py
index 7bb8d147..c3b93d79 100755
--- a/test/case/ietf_interfaces/ipv4_address.py
+++ b/test/case/ietf_interfaces/ipv4_address.py
@@ -79,7 +79,7 @@ with infamy.Test() as test:
             "interfaces": {
                 "interface": [{
                     "name": f"{interface_name}",
-                    "type": "iana-if-type:ethernetCsmacd",
+                    "type": "infix-if-type:ethernet",
                     "ipv4": {
                         "address": [{
                             "ip": f"{new_ip_address}",
diff --git a/test/case/ietf_interfaces/routing_basic.py b/test/case/ietf_interfaces/routing_basic.py
index 838fd2b3..8adadd1b 100755
--- a/test/case/ietf_interfaces/routing_basic.py
+++ b/test/case/ietf_interfaces/routing_basic.py
@@ -24,7 +24,7 @@ def config_target(target, tport0, tport1, enable_fwd):
                 "interface": [
                     {
                         "name": tport0,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "ipv4": {
                             "forwarding": enable_fwd,
@@ -36,7 +36,7 @@ def config_target(target, tport0, tport1, enable_fwd):
                     },
                     {
                         "name": tport1,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "ipv4": {
                             "forwarding": enable_fwd,
diff --git a/test/case/ietf_interfaces/vlan_ping.py b/test/case/ietf_interfaces/vlan_ping.py
index 635a4877..f441c72b 100755
--- a/test/case/ietf_interfaces/vlan_ping.py
+++ b/test/case/ietf_interfaces/vlan_ping.py
@@ -15,12 +15,12 @@ with infamy.Test() as test:
                 "interface": [
                     {
                         "name": tport,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                     },
                     {
                         "name": f"{tport}.10",
-                        "type": "iana-if-type:l2vlan",
+                        "type": "infix-if-type:vlan",
                         "parent-interface": tport,
                         "encapsulation": {
                             "dot1q-vlan": {
diff --git a/test/case/infix_interfaces/bridge_basic.py b/test/case/infix_interfaces/bridge_basic.py
index 501adfe1..4c927b8d 100755
--- a/test/case/infix_interfaces/bridge_basic.py
+++ b/test/case/infix_interfaces/bridge_basic.py
@@ -20,7 +20,7 @@ with infamy.Test() as test:
                 "interface": [
                     {
                         "name": "br0",
-                        "type": "iana-if-type:bridge",
+                        "type": "infix-if-type:bridge",
                         "enabled": True,
                         "ipv4": {
                             "address": [
@@ -33,7 +33,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": tport,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "bridge": "br0"
diff --git a/test/case/infix_interfaces/bridge_fwd_dual_dut.py b/test/case/infix_interfaces/bridge_fwd_dual_dut.py
index 99876e88..d33fc50a 100755
--- a/test/case/infix_interfaces/bridge_fwd_dual_dut.py
+++ b/test/case/infix_interfaces/bridge_fwd_dual_dut.py
@@ -36,7 +36,7 @@ with infamy.Test() as test:
                 "interface": [
                     {
                         "name": "br0",
-                        "type": "iana-if-type:bridge",
+                        "type": "infix-if-type:bridge",
                         "enabled": True,
                         "bridge": {
                             "vlans": {
@@ -52,7 +52,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": tport10,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "pvid": 10,
@@ -61,7 +61,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": tport11,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "pvid": 10,
@@ -70,7 +70,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": tport12,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "bridge": "br0",
@@ -85,7 +85,7 @@ with infamy.Test() as test:
                 "interface": [
                     {
                         "name": "br0",
-                        "type": "iana-if-type:bridge",
+                        "type": "infix-if-type:bridge",
                         "enabled": True,
                         "bridge": {
                             "vlans": {
@@ -101,7 +101,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": tport20,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "pvid": 10,
@@ -110,7 +110,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": tport21,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "pvid": 10,
@@ -119,7 +119,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": tport22,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "bridge": "br0",
diff --git a/test/case/infix_interfaces/bridge_fwd_sgl_dut.py b/test/case/infix_interfaces/bridge_fwd_sgl_dut.py
index ff7802c1..fc0272e4 100755
--- a/test/case/infix_interfaces/bridge_fwd_sgl_dut.py
+++ b/test/case/infix_interfaces/bridge_fwd_sgl_dut.py
@@ -31,12 +31,12 @@ with infamy.Test() as test:
                 "interface": [
                     {
                         "name": "br0",
-                        "type": "iana-if-type:bridge",
+                        "type": "infix-if-type:bridge",
                         "enabled": True,
                     },
                     {
                         "name": tport0,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "bridge": "br0"
@@ -44,7 +44,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": tport1,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "bridge": "br0"
diff --git a/test/case/infix_interfaces/bridge_veth.py b/test/case/infix_interfaces/bridge_veth.py
index 1c7e7ccf..034b92e9 100755
--- a/test/case/infix_interfaces/bridge_veth.py
+++ b/test/case/infix_interfaces/bridge_veth.py
@@ -20,12 +20,12 @@ with infamy.Test() as test:
                 "interface": [
                     {
                         "name": "br0",
-                        "type": "iana-if-type:bridge",
+                        "type": "infix-if-type:bridge",
                         "enabled": True,
                     },
                     {
                         "name": tport,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "bridge": "br0"
diff --git a/test/case/infix_interfaces/bridge_vlan.py b/test/case/infix_interfaces/bridge_vlan.py
index 494c2b0c..cfe607d7 100755
--- a/test/case/infix_interfaces/bridge_vlan.py
+++ b/test/case/infix_interfaces/bridge_vlan.py
@@ -22,7 +22,7 @@ with infamy.Test() as test:
                 "interface": [
                     {
                         "name": "br0",
-                        "type": "iana-if-type:bridge",
+                        "type": "infix-if-type:bridge",
                         "enabled": True,
                         "bridge": {
                             "vlans": {
@@ -39,7 +39,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": "vlan10",
-                        "type": "iana-if-type:l2vlan",
+                        "type": "infix-if-type:vlan",
                         "enabled": True,
                         "parent-interface": "br0",
                         "encapsulation": {
@@ -61,7 +61,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": tport,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "pvid": 10,
diff --git a/test/case/infix_interfaces/bridge_vlan_separation.py b/test/case/infix_interfaces/bridge_vlan_separation.py
index 5c66a953..78bc7f11 100755
--- a/test/case/infix_interfaces/bridge_vlan_separation.py
+++ b/test/case/infix_interfaces/bridge_vlan_separation.py
@@ -36,7 +36,7 @@ with infamy.Test() as test:
                 "interface": [
                     {
                         "name": "br0",
-                        "type": "iana-if-type:bridge",
+                        "type": "infix-if-type:bridge",
                         "enabled": True,
                         "bridge": {
                             "vlans": {
@@ -57,7 +57,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": tport10,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "pvid": 10,
@@ -66,7 +66,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": tport11,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "pvid": 20,
@@ -75,7 +75,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": tport12,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "bridge": "br0",
@@ -90,7 +90,7 @@ with infamy.Test() as test:
                 "interface": [
                     {
                         "name": "br0",
-                        "type": "iana-if-type:bridge",
+                        "type": "infix-if-type:bridge",
                         "enabled": True,
                         "bridge": {
                             "vlans": {
@@ -111,7 +111,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": tport20,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "pvid": 10,
@@ -120,7 +120,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": tport21,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "pvid": 20,
@@ -129,7 +129,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": tport22,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "bridge": "br0",
diff --git a/test/case/infix_interfaces/dual_bridge.py b/test/case/infix_interfaces/dual_bridge.py
index 05d11ce8..4a964cef 100755
--- a/test/case/infix_interfaces/dual_bridge.py
+++ b/test/case/infix_interfaces/dual_bridge.py
@@ -20,12 +20,12 @@ with infamy.Test() as test:
                 "interface": [
                     {
                         "name": "br0",
-                        "type": "iana-if-type:bridge",
+                        "type": "infix-if-type:bridge",
                         "enabled": True,
                     },
                     {
                         "name": "br1",
-                        "type": "iana-if-type:bridge",
+                        "type": "infix-if-type:bridge",
                         "enabled": True,
                         "ipv4": {
                             "address": [
@@ -60,7 +60,7 @@ with infamy.Test() as test:
                     },
                     {
                         "name": tport,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "infix-interfaces:bridge-port": {
                             "bridge": "br0"
diff --git a/test/case/infix_interfaces/ipv4_autoconf.py b/test/case/infix_interfaces/ipv4_autoconf.py
index c2c8cf97..c7f982e1 100755
--- a/test/case/infix_interfaces/ipv4_autoconf.py
+++ b/test/case/infix_interfaces/ipv4_autoconf.py
@@ -18,7 +18,7 @@ with infamy.Test() as test:
                 "interface": [
                     {
                         "name": tport,
-                        "type": "iana-if-type:ethernetCsmacd",
+                        "type": "infix-if-type:ethernet",
                         "enabled": True,
                         "ipv4": {
                             "autoconf": {