diff --git a/device-types/Cisco/CBS350-24P-4G.yaml b/device-types/Cisco/CBS350-24P-4G.yaml
index 468fef1ee9..ef5c94ab23 100644
--- a/device-types/Cisco/CBS350-24P-4G.yaml
+++ b/device-types/Cisco/CBS350-24P-4G.yaml
@@ -8,61 +8,61 @@ is_full_depth: false
 front_image: true
 u_height: 1
 interfaces:
-  - name: GigabitEthernet1
+  - name: GigabitEthernet1/0/1
     type: 1000base-t
-  - name: GigabitEthernet2
+  - name: GigabitEthernet1/0/2
     type: 1000base-t
-  - name: GigabitEthernet3
+  - name: GigabitEthernet1/0/3
     type: 1000base-t
-  - name: GigabitEthernet4
+  - name: GigabitEthernet1/0/4
     type: 1000base-t
-  - name: GigabitEthernet5
+  - name: GigabitEthernet1/0/5
     type: 1000base-t
-  - name: GigabitEthernet6
+  - name: GigabitEthernet1/0/6
     type: 1000base-t
-  - name: GigabitEthernet7
+  - name: GigabitEthernet1/0/7
     type: 1000base-t
-  - name: GigabitEthernet8
+  - name: GigabitEthernet1/0/8
     type: 1000base-t
-  - name: GigabitEthernet9
+  - name: GigabitEthernet1/0/9
     type: 1000base-t
-  - name: GigabitEthernet10
+  - name: GigabitEthernet1/0/10
     type: 1000base-t
-  - name: GigabitEthernet11
+  - name: GigabitEthernet1/0/11
     type: 1000base-t
-  - name: GigabitEthernet12
+  - name: GigabitEthernet1/0/12
     type: 1000base-t
-  - name: GigabitEthernet13
+  - name: GigabitEthernet1/0/13
     type: 1000base-t
-  - name: GigabitEthernet14
+  - name: GigabitEthernet1/0/14
     type: 1000base-t
-  - name: GigabitEthernet15
+  - name: GigabitEthernet1/0/15
     type: 1000base-t
-  - name: GigabitEthernet16
+  - name: GigabitEthernet1/0/16
     type: 1000base-t
-  - name: GigabitEthernet17
+  - name: GigabitEthernet1/0/17
     type: 1000base-t
-  - name: GigabitEthernet18
+  - name: GigabitEthernet1/0/18
     type: 1000base-t
-  - name: GigabitEthernet19
+  - name: GigabitEthernet1/0/19
     type: 1000base-t
-  - name: GigabitEthernet20
+  - name: GigabitEthernet1/0/20
     type: 1000base-t
-  - name: GigabitEthernet21
+  - name: GigabitEthernet1/0/21
     type: 1000base-t
-  - name: GigabitEthernet22
+  - name: GigabitEthernet1/0/22
     type: 1000base-t
-  - name: GigabitEthernet23
+  - name: GigabitEthernet1/0/23
     type: 1000base-t
-  - name: GigabitEthernet24
+  - name: GigabitEthernet1/0/24
     type: 1000base-t
-  - name: GigabitEthernet25
+  - name: GigabitEthernet1/0/25
     type: 1000base-x-sfp
-  - name: GigabitEthernet26
+  - name: GigabitEthernet1/0/26
     type: 1000base-x-sfp
-  - name: GigabitEthernet27
+  - name: GigabitEthernet1/0/27
     type: 1000base-x-sfp
-  - name: GigabitEthernet28
+  - name: GigabitEthernet1/0/28
     type: 1000base-x-sfp
   - name: Vlan1
     type: virtual
diff --git a/device-types/Cisco/CBS350-24T-4X.yaml b/device-types/Cisco/CBS350-24T-4X.yaml
index 50057f9d45..2caa14efd2 100644
--- a/device-types/Cisco/CBS350-24T-4X.yaml
+++ b/device-types/Cisco/CBS350-24T-4X.yaml
@@ -10,61 +10,61 @@ weight_unit: kg
 is_full_depth: false
 u_height: 1
 interfaces:
-  - name: GigabitEthernet1
+  - name: GigabitEthernet1/0/1
     type: 1000base-t
-  - name: GigabitEthernet2
+  - name: GigabitEthernet1/0/2
     type: 1000base-t
-  - name: GigabitEthernet3
+  - name: GigabitEthernet1/0/3
     type: 1000base-t
-  - name: GigabitEthernet4
+  - name: GigabitEthernet1/0/4
     type: 1000base-t
-  - name: GigabitEthernet5
+  - name: GigabitEthernet1/0/5
     type: 1000base-t
-  - name: GigabitEthernet6
+  - name: GigabitEthernet1/0/6
     type: 1000base-t
-  - name: GigabitEthernet7
+  - name: GigabitEthernet1/0/7
     type: 1000base-t
-  - name: GigabitEthernet8
+  - name: GigabitEthernet1/0/8
     type: 1000base-t
-  - name: GigabitEthernet9
+  - name: GigabitEthernet1/0/9
     type: 1000base-t
-  - name: GigabitEthernet10
+  - name: GigabitEthernet1/0/10
     type: 1000base-t
-  - name: GigabitEthernet11
+  - name: GigabitEthernet1/0/11
     type: 1000base-t
-  - name: GigabitEthernet12
+  - name: GigabitEthernet1/0/12
     type: 1000base-t
-  - name: GigabitEthernet13
+  - name: GigabitEthernet1/0/13
     type: 1000base-t
-  - name: GigabitEthernet14
+  - name: GigabitEthernet1/0/14
     type: 1000base-t
-  - name: GigabitEthernet15
+  - name: GigabitEthernet1/0/15
     type: 1000base-t
-  - name: GigabitEthernet16
+  - name: GigabitEthernet1/0/16
     type: 1000base-t
-  - name: GigabitEthernet17
+  - name: GigabitEthernet1/0/17
     type: 1000base-t
-  - name: GigabitEthernet18
+  - name: GigabitEthernet1/0/18
     type: 1000base-t
-  - name: GigabitEthernet19
+  - name: GigabitEthernet1/0/19
     type: 1000base-t
-  - name: GigabitEthernet20
+  - name: GigabitEthernet1/0/20
     type: 1000base-t
-  - name: GigabitEthernet21
+  - name: GigabitEthernet1/0/21
     type: 1000base-t
-  - name: GigabitEthernet22
+  - name: GigabitEthernet1/0/22
     type: 1000base-t
-  - name: GigabitEthernet23
+  - name: GigabitEthernet1/0/23
     type: 1000base-t
-  - name: GigabitEthernet24
+  - name: GigabitEthernet1/0/24
     type: 1000base-t
-  - name: TenGigabitEthernet1
+  - name: TenGigabitEthernet1/0/1
     type: 10gbase-x-sfpp
-  - name: TenGigabitEthernet2
+  - name: TenGigabitEthernet1/0/2
     type: 10gbase-x-sfpp
-  - name: TenGigabitEthernet3
+  - name: TenGigabitEthernet1/0/3
     type: 10gbase-x-sfpp
-  - name: TenGigabitEthernet4
+  - name: TenGigabitEthernet1/0/4
     type: 10gbase-x-sfpp
   - name: Vlan1
     type: virtual