diff --git a/device-types/Cisco/c9300-48u.yaml b/device-types/Cisco/c9300-48u.yaml
index 2ee814707..72e39f55d 100644
--- a/device-types/Cisco/c9300-48u.yaml
+++ b/device-types/Cisco/c9300-48u.yaml
@@ -10,101 +10,101 @@ power_ports:
   - name: PS-1
 interfaces:
   - name: GigabitEthernet1/0/1
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/2
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/3
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/4
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/5
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/6
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/7
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/8
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/9
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/10
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/11
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/12
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/13
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/14
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/15
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/16
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/17
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/18
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/19
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/20
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/21
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/22
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/23
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/24
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/25
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/26
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/27
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/28
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/29
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/30
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/31
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/32
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/33
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/34
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/35
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/36
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/37
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/38
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/39
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/40
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/41
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/42
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/43
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/44
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/45
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/46
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/47
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet1/0/48
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet0
-    type: 1000base-t (1GE)
+    type: 1000base-t
     mgmt_only: true
diff --git a/device-types/Cisco/n9k-c9336c-fx2.yaml b/device-types/Cisco/n9k-c9336c-fx2.yaml
index 57a57cc11..8aa80b579 100644
--- a/device-types/Cisco/n9k-c9336c-fx2.yaml
+++ b/device-types/Cisco/n9k-c9336c-fx2.yaml
@@ -11,77 +11,77 @@ power_ports:
   - name: Power Supply 2
 interfaces:
   - name: Ethernet1/1
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/2
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/3
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/4
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/5
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/6
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/7
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/8
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/9
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/10
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/11
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/12
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/13
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/14
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/15
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/16
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/17
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/18
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/19
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/20
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/21
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/22
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/23
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/24
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/25
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/26
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/27
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/28
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/29
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/30
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/31
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/32
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/33
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/34
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/35
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: Ethernet1/36
-    type: 100gbase-x-qsfp28"
+    type: 100gbase-x-qsfp28
   - name: mgmt0
     type: 1000base-t
     mgmt_only: true
diff --git a/device-types/Cisco/ws-c2960-24lt-l.yaml b/device-types/Cisco/ws-c2960-24lt-l.yaml
index 0886c9e1c..3ab41d52a 100644
--- a/device-types/Cisco/ws-c2960-24lt-l.yaml
+++ b/device-types/Cisco/ws-c2960-24lt-l.yaml
@@ -58,6 +58,6 @@ interfaces:
   - name: FastEthernet0/24
     type: 100base-tx
   - name: GigabitEthernet0/1
-    type: 1000base-t (1GE)
+    type: 1000base-t
   - name: GigabitEthernet0/2
-    type: 1000base-t (1GE)
+    type: 1000base-t