diff --git a/device-types/Cisco/ASR-9006.yaml b/device-types/Cisco/ASR-9006.yaml
index f41843f6b..9cff9a486 100644
--- a/device-types/Cisco/ASR-9006.yaml
+++ b/device-types/Cisco/ASR-9006.yaml
@@ -5,7 +5,6 @@ slug: asr-9006
 part_number: ASR-9006
 u_height: 10
 is_full_depth: true
-subdevice_role: parent
 comments: '[Cisco ASR 9000 Series Aggregation Services Routers Data Sheet](https://www.cisco.com/c/en/us/products/collateral/routers/asr-9000-series-aggregation-services-routers/data_sheet_c78-501767.html)'
 power-ports:
   - name: PS0
@@ -20,10 +19,16 @@ power-ports:
   - name: PS3
     type: iec-60320-c14
     maximum_draw: 3000
-device-bays:
-  - name: Slot 0 RSP 0
-  - name: Slot 1 RSP 1
-  - name: Slot 2 Line Card 0
-  - name: Slot 3 Line Card 1
-  - name: Slot 4 Line Card 2
-  - name: Slot 5 Line Card 3
+module-bays:
+  - name: Slot 0
+    label: RSP 0
+  - name: Slot 1
+    label: RSP 1
+  - name: Slot 2
+    label: Line Card 0
+  - name: Slot 3
+    label: Line Card 1
+  - name: Slot 4
+    label: Line Card 2
+  - name: Slot 5
+    label: Line Card 3
diff --git a/device-types/Cisco/FPR2130-NGFW-K9.yaml b/device-types/Cisco/FPR2130-NGFW-K9.yaml
index 355b63d24..c0d55d016 100644
--- a/device-types/Cisco/FPR2130-NGFW-K9.yaml
+++ b/device-types/Cisco/FPR2130-NGFW-K9.yaml
@@ -5,7 +5,6 @@ slug: fpr2130-ngfw-k9
 part_number: FPR2130-NGFW-K9
 u_height: 1
 is_full_depth: true
-subdevice_role: parent
 comments: '[Cisco Firepower 2100 Series Data Sheet](https://www.cisco.com/c/en/us/products/collateral/security/firepower-2100-series/datasheet-c78-742473.html)'
 console-ports:
   - name: Console
@@ -71,5 +70,5 @@ interfaces:
   - name: Management1/1
     type: 1000base-t
     mgmt_only: true
-device-bays:
+module-bays:
   - name: Network Module 1
diff --git a/device-types/Cisco/FPR2140-NGFW-K9.yaml b/device-types/Cisco/FPR2140-NGFW-K9.yaml
index e633c4496..ba97f1861 100644
--- a/device-types/Cisco/FPR2140-NGFW-K9.yaml
+++ b/device-types/Cisco/FPR2140-NGFW-K9.yaml
@@ -5,7 +5,6 @@ slug: fpr2140-ngfw-k9
 part_number: FPR2140-NGFW-K9
 u_height: 1
 is_full_depth: true
-subdevice_role: parent
 comments: '[Cisco Firepower 2100 Series Data Sheet](https://www.cisco.com/c/en/us/products/collateral/security/firepower-2100-series/datasheet-c78-742473.html)'
 console-ports:
   - name: Console
@@ -71,5 +70,5 @@ interfaces:
   - name: Management1/1
     type: 1000base-t
     mgmt_only: true
-device-bays:
+module-bays:
   - name: Network Module 1
diff --git a/device-types/Cisco/FPR4110-NGFW-K9.yaml b/device-types/Cisco/FPR4110-NGFW-K9.yaml
index f26b181a8..a8f30add3 100644
--- a/device-types/Cisco/FPR4110-NGFW-K9.yaml
+++ b/device-types/Cisco/FPR4110-NGFW-K9.yaml
@@ -5,7 +5,6 @@ slug: fpr4110-ngfw-k9
 part_number: FPR4110-NGFW-K9
 u_height: 1
 is_full_depth: true
-subdevice_role: parent
 comments: '[Cisco Firepower 4100 Series Data Sheet](https://www.cisco.com/c/en/us/products/collateral/security/firepower-4100-series/datasheet-c78-742474.html)'
 console-ports:
   - name: Console
@@ -47,6 +46,6 @@ interfaces:
   - name: eth0
     type: 1000base-x-sfp
     mgmt_only: true
-device-bays:
+module-bays:
   - name: Network Module 2
   - name: Network Module 3
diff --git a/device-types/Cisco/FPR4112-NGFW-K9.yaml b/device-types/Cisco/FPR4112-NGFW-K9.yaml
index 3898c292e..92cfd2076 100644
--- a/device-types/Cisco/FPR4112-NGFW-K9.yaml
+++ b/device-types/Cisco/FPR4112-NGFW-K9.yaml
@@ -5,7 +5,6 @@ slug: fpr4112-ngfw-k9
 part_number: FPR4112-NGFW-K9
 u_height: 1
 is_full_depth: true
-subdevice_role: parent
 comments: '[Cisco Firepower 4100 Series Data Sheet](https://www.cisco.com/c/en/us/products/collateral/security/firepower-4100-series/datasheet-c78-742474.html)'
 console-ports:
   - name: Console
@@ -47,6 +46,6 @@ interfaces:
   - name: eth0
     type: 1000base-x-sfp
     mgmt_only: true
-device-bays:
+module-bays:
   - name: Network Module 2
   - name: Network Module 3
diff --git a/device-types/Cisco/FPR4115-NGFW-K9.yaml b/device-types/Cisco/FPR4115-NGFW-K9.yaml
index 9095ebf7a..57780e474 100644
--- a/device-types/Cisco/FPR4115-NGFW-K9.yaml
+++ b/device-types/Cisco/FPR4115-NGFW-K9.yaml
@@ -5,7 +5,6 @@ slug: fpr4115-ngfw-k9
 part_number: FPR4115-NGFW-K9
 u_height: 1
 is_full_depth: true
-subdevice_role: parent
 comments: '[Cisco Firepower 4100 Series Data Sheet](https://www.cisco.com/c/en/us/products/collateral/security/firepower-4100-series/datasheet-c78-742474.html)'
 console-ports:
   - name: Console
@@ -47,6 +46,6 @@ interfaces:
   - name: eth0
     type: 1000base-x-sfp
     mgmt_only: true
-device-bays:
+module-bays:
   - name: Network Module 2
   - name: Network Module 3
diff --git a/device-types/Cisco/FPR4120-NGFW-K9.yaml b/device-types/Cisco/FPR4120-NGFW-K9.yaml
index 1c4f7719c..04947d8f8 100644
--- a/device-types/Cisco/FPR4120-NGFW-K9.yaml
+++ b/device-types/Cisco/FPR4120-NGFW-K9.yaml
@@ -5,7 +5,6 @@ slug: fpr4120-ngfw-k9
 part_number: FPR4120-NGFW-K9
 u_height: 1
 is_full_depth: true
-subdevice_role: parent
 comments: '[Cisco Firepower 4100 Series Data Sheet](https://www.cisco.com/c/en/us/products/collateral/security/firepower-4100-series/datasheet-c78-742474.html)'
 console-ports:
   - name: Console
@@ -47,6 +46,6 @@ interfaces:
   - name: eth0
     type: 1000base-x-sfp
     mgmt_only: true
-device-bays:
+module-bays:
   - name: Network Module 2
   - name: Network Module 3
diff --git a/device-types/Cisco/FPR4125-NGFW-K9.yaml b/device-types/Cisco/FPR4125-NGFW-K9.yaml
index 992a43ed4..26adce8b4 100644
--- a/device-types/Cisco/FPR4125-NGFW-K9.yaml
+++ b/device-types/Cisco/FPR4125-NGFW-K9.yaml
@@ -5,7 +5,6 @@ slug: fpr4125-ngfw-k9
 part_number: FPR4125-NGFW-K9
 u_height: 1
 is_full_depth: true
-subdevice_role: parent
 comments: '[Cisco Firepower 4100 Series Data Sheet](https://www.cisco.com/c/en/us/products/collateral/security/firepower-4100-series/datasheet-c78-742474.html)'
 console-ports:
   - name: Console
@@ -47,6 +46,6 @@ interfaces:
   - name: eth0
     type: 1000base-x-sfp
     mgmt_only: true
-device-bays:
+module-bays:
   - name: Network Module 2
   - name: Network Module 3
diff --git a/device-types/Cisco/FPR4140-NGFW-K9.yaml b/device-types/Cisco/FPR4140-NGFW-K9.yaml
index 3d96b0463..c3bc1791e 100644
--- a/device-types/Cisco/FPR4140-NGFW-K9.yaml
+++ b/device-types/Cisco/FPR4140-NGFW-K9.yaml
@@ -5,7 +5,6 @@ slug: fpr4140-ngfw-k9
 part_number: FPR4140-NGFW-K9
 u_height: 1
 is_full_depth: true
-subdevice_role: parent
 comments: '[Cisco Firepower 4100 Series Data Sheet](https://www.cisco.com/c/en/us/products/collateral/security/firepower-4100-series/datasheet-c78-742474.html)'
 console-ports:
   - name: Console
@@ -47,6 +46,6 @@ interfaces:
   - name: eth0
     type: 1000base-x-sfp
     mgmt_only: true
-device-bays:
+module-bays:
   - name: Network Module 2
   - name: Network Module 3
diff --git a/device-types/Cisco/FPR4145-NGFW-K9.yaml b/device-types/Cisco/FPR4145-NGFW-K9.yaml
index a778c3eb8..f6ca8192f 100644
--- a/device-types/Cisco/FPR4145-NGFW-K9.yaml
+++ b/device-types/Cisco/FPR4145-NGFW-K9.yaml
@@ -5,7 +5,6 @@ slug: fpr4145-ngfw-k9
 part_number: FPR4145-NGFW-K9
 u_height: 1
 is_full_depth: true
-subdevice_role: parent
 comments: '[Cisco Firepower 4100 Series Data Sheet](https://www.cisco.com/c/en/us/products/collateral/security/firepower-4100-series/datasheet-c78-742474.html)'
 console-ports:
   - name: Console
@@ -47,6 +46,6 @@ interfaces:
   - name: eth0
     type: 1000base-x-sfp
     mgmt_only: true
-device-bays:
+module-bays:
   - name: Network Module 2
   - name: Network Module 3
diff --git a/device-types/Cisco/FPR4150-NGFW-K9.yaml b/device-types/Cisco/FPR4150-NGFW-K9.yaml
index 14630c3e4..dbb2156b7 100644
--- a/device-types/Cisco/FPR4150-NGFW-K9.yaml
+++ b/device-types/Cisco/FPR4150-NGFW-K9.yaml
@@ -5,7 +5,6 @@ slug: fpr4150-ngfw-k9
 part_number: FPR4150-NGFW-K9
 u_height: 1
 is_full_depth: true
-subdevice_role: parent
 comments: '[Cisco Firepower 4100 Series Data Sheet](https://www.cisco.com/c/en/us/products/collateral/security/firepower-4100-series/datasheet-c78-742474.html)'
 console-ports:
   - name: Console
@@ -47,6 +46,6 @@ interfaces:
   - name: eth0
     type: 1000base-x-sfp
     mgmt_only: true
-device-bays:
+module-bays:
   - name: Network Module 2
   - name: Network Module 3
diff --git a/device-types/Cisco/N5K-C5648Q.yaml b/device-types/Cisco/N5K-C5648Q.yaml
index 7e96001c6..5c7c60786 100644
--- a/device-types/Cisco/N5K-C5648Q.yaml
+++ b/device-types/Cisco/N5K-C5648Q.yaml
@@ -3,7 +3,6 @@ manufacturer: Cisco
 model: Nexus 5648Q Chassis
 part_number: N5K-C5648Q
 slug: n5k-c5648q
-subdevice_role: parent
 u_height: 2
 interfaces:
   - name: mgmt0
@@ -65,6 +64,6 @@ power-ports:
 console-ports:
   - name: Console
     type: rj-45
-device-bays:
+module-bays:
   - name: slot 3
   - name: slot 4
diff --git a/device-types/Extreme Networks/BR-MLXE-16-MR2-M-AC.yaml b/device-types/Extreme Networks/BR-MLXE-16-MR2-M-AC.yaml
index 65a6e7d2d..b5071af1d 100755
--- a/device-types/Extreme Networks/BR-MLXE-16-MR2-M-AC.yaml	
+++ b/device-types/Extreme Networks/BR-MLXE-16-MR2-M-AC.yaml	
@@ -5,7 +5,6 @@ slug: br-mlxe-16-mr2
 part_number: BR-MLXE-16-MR2-AC
 u_height: 14
 is_full_depth: true
-subdevice_role: parent
 comments: ''
 power-ports:
   - name: PSU1
@@ -32,7 +31,7 @@ power-ports:
   - name: PSU8
     type: iec-60320-c20
     maximum_draw: 1800
-device-bays:
+module-bays:
   - name: F1
   - name: F2
   - name: F3
diff --git a/device-types/Extreme Networks/BR-MLXE-32-MR2-M-AC.yaml b/device-types/Extreme Networks/BR-MLXE-32-MR2-M-AC.yaml
index 6974f4fb5..6cc47931c 100755
--- a/device-types/Extreme Networks/BR-MLXE-32-MR2-M-AC.yaml	
+++ b/device-types/Extreme Networks/BR-MLXE-32-MR2-M-AC.yaml	
@@ -5,7 +5,6 @@ slug: br-mlxe-32-mr2
 part_number: BR-MLXE-32-MR2-AC
 u_height: 33
 is_full_depth: true
-subdevice_role: parent
 comments: ''
 power-ports:
   - name: PSU1
@@ -32,7 +31,7 @@ power-ports:
   - name: PSU8
     type: iec-60320-c20
     maximum_draw: 3000
-device-bays:
+module-bays:
   - name: F1
   - name: F2
   - name: F3
diff --git a/device-types/Extreme Networks/BR-MLXE-4-MR2-M-AC.yaml b/device-types/Extreme Networks/BR-MLXE-4-MR2-M-AC.yaml
index 251179f26..f1f94fdef 100755
--- a/device-types/Extreme Networks/BR-MLXE-4-MR2-M-AC.yaml	
+++ b/device-types/Extreme Networks/BR-MLXE-4-MR2-M-AC.yaml	
@@ -5,7 +5,6 @@ slug: br-mlxe-4-mr2
 part_number: BR-MLXE-4-MR2-AC
 u_height: 5
 is_full_depth: true
-subdevice_role: parent
 comments: ''
 power-ports:
   - name: PSU1
@@ -20,7 +19,7 @@ power-ports:
   - name: PSU4
     type: iec-60320-c20
     maximum_draw: 1800
-device-bays:
+module-bays:
   - name: F1
   - name: F2
   - name: F3
diff --git a/device-types/Extreme Networks/BR-MLXE-8-MR2-M-AC.yaml b/device-types/Extreme Networks/BR-MLXE-8-MR2-M-AC.yaml
index 2c7c11528..22307e7af 100755
--- a/device-types/Extreme Networks/BR-MLXE-8-MR2-M-AC.yaml	
+++ b/device-types/Extreme Networks/BR-MLXE-8-MR2-M-AC.yaml	
@@ -5,7 +5,6 @@ slug: br-mlxe-8-mr2
 part_number: BR-MLXE-8-MR2-AC
 u_height: 7
 is_full_depth: true
-subdevice_role: parent
 comments: ''
 power-ports:
   - name: PSU1
@@ -20,7 +19,7 @@ power-ports:
   - name: PSU4
     type: iec-60320-c20
     maximum_draw: 1800
-device-bays:
+module-bays:
   - name: F1
   - name: F2
   - name: F3
diff --git a/device-types/Juniper/ACX4000.yaml b/device-types/Juniper/ACX4000.yaml
index 30bff6911..7c7540e02 100644
--- a/device-types/Juniper/ACX4000.yaml
+++ b/device-types/Juniper/ACX4000.yaml
@@ -5,7 +5,6 @@ slug: acx4000
 part_number: ''
 u_height: 3
 is_full_depth: false
-subdevice_role: parent
 comments: 2.5U Height
 console-ports:
   - name: Console
@@ -57,6 +56,6 @@ interfaces:
   - name: fxp0
     type: 1000base-t
     mgmt_only: true
-device-bays:
+module-bays:
   - name: MIC0
   - name: MIC1
diff --git a/device-types/Juniper/SRX3600.yaml b/device-types/Juniper/SRX3600.yaml
index 5dfdae4c2..645971a77 100644
--- a/device-types/Juniper/SRX3600.yaml
+++ b/device-types/Juniper/SRX3600.yaml
@@ -4,19 +4,18 @@ model: SRX3600
 slug: srx3600
 u_height: 5
 is_full_depth: true
-subdevice_role: parent
 comments: '[Juniper SRX3600 Data Sheet](https://www.juniper.net/assets/us/en/local/pdf/datasheets/1000267-en.pdf)'
 console-ports:
   - name: Console
     type: rj-45
-device-bays:
-  - name: DeviceBay0
-  - name: DeviceBay1
-  - name: DeviceBay2
-  - name: DeviceBay3
-  - name: DeviceBay4
-  - name: DeviceBay5
-  - name: DeviceBay6
+module-bays:
+  - name: Slot 0
+  - name: Slot 1
+  - name: Slot 2
+  - name: Slot 3
+  - name: Slot 4
+  - name: Slot 5
+  - name: Slot 6
 power-ports:
   - name: PEM0
     type: iec-60320-c20
diff --git a/device-types/NetApp/FAS2750.yaml b/device-types/NetApp/FAS2750.yaml
index 46f3561f2..6ca04e91e 100644
--- a/device-types/NetApp/FAS2750.yaml
+++ b/device-types/NetApp/FAS2750.yaml
@@ -5,7 +5,6 @@ slug: fas2750
 part_number: FAS2750
 u_height: 2
 is_full_depth: true
-subdevice_role: parent
 console-ports:
   - name: con0
     type: rj-45
@@ -14,6 +13,6 @@ power-ports:
     type: iec-60320-c14
   - name: PSU2
     type: iec-60320-c14
-device-bays:
+module-bays:
   - name: A
   - name: B
diff --git a/device-types/NetApp/FAS8200.yaml b/device-types/NetApp/FAS8200.yaml
index 79fd0173f..cfcfa065a 100644
--- a/device-types/NetApp/FAS8200.yaml
+++ b/device-types/NetApp/FAS8200.yaml
@@ -5,12 +5,11 @@ slug: fas8200
 part_number: FAS8200A
 u_height: 3
 is_full_depth: true
-subdevice_role: parent
 power-ports:
   - name: PSU1
     type: iec-60320-c14
   - name: PSU2
     type: iec-60320-c14
-device-bays:
+module-bays:
   - name: A
   - name: B
diff --git a/device-types/Synology/RS3617RPxs.yaml b/device-types/Synology/RS3617RPxs.yaml
index 94593475c..e6053f365 100644
--- a/device-types/Synology/RS3617RPxs.yaml
+++ b/device-types/Synology/RS3617RPxs.yaml
@@ -5,7 +5,6 @@ slug: synology-rs3617rpxs
 part_number: RS3617RPxs
 u_height: 2
 is_full_depth: true
-subdevice_role: parent
 power-ports:
   - name: PSU 1
     type: iec-60320-c14
@@ -20,19 +19,6 @@ interfaces:
     type: 1000base-t
   - name: Ethernet 4
     type: 1000base-t
-device-bays:
-  - name: Sled 1
-  - name: Sled 2
-  - name: Sled 3
-  - name: Sled 4
-  - name: Sled 5
-  - name: Sled 6
-  - name: Sled 7
-  - name: Sled 8
-  - name: Sled 9
-  - name: Sled 10
-  - name: Sled 11
-  - name: Sled 12
 console-server-ports:
   - name: Rear USB1
     type: usb-a
diff --git a/device-types/Synology/RS820+.yaml b/device-types/Synology/RS820+.yaml
index ba9b152fe..6b33930cd 100644
--- a/device-types/Synology/RS820+.yaml
+++ b/device-types/Synology/RS820+.yaml
@@ -5,7 +5,6 @@ slug: synology-rs820-plus
 part_number: RS820+
 u_height: 1
 is_full_depth: true
-subdevice_role: parent
 comments: '[RS820 Series Datasheet](https://www.synology.com/en-us/products/RS820+#specs)'
 power-ports:
   - name: PSU 1
@@ -19,11 +18,6 @@ interfaces:
     type: 1000base-t
   - name: Ethernet 4
     type: 1000base-t
-device-bays:
-  - name: Sled 1
-  - name: Sled 2
-  - name: Sled 3
-  - name: Sled 4
 console-server-ports:
   - name: Rear USB1
     type: usb-a