diff --git a/device-types/Adtran/NetVanta-4660.yaml b/device-types/Adtran/NetVanta-4660.yaml
index b4f4a664..8ef1d295 100644
--- a/device-types/Adtran/NetVanta-4660.yaml
+++ b/device-types/Adtran/NetVanta-4660.yaml
@@ -30,3 +30,4 @@ interfaces:
     type: other
 module-bays:
   - name: Slot 1
+    position: '1'
diff --git a/device-types/Alcatel-Lucent/OS6900-X20.yaml b/device-types/Alcatel-Lucent/OS6900-X20.yaml
index 977e7d1f..c1fc481c 100644
--- a/device-types/Alcatel-Lucent/OS6900-X20.yaml
+++ b/device-types/Alcatel-Lucent/OS6900-X20.yaml
@@ -72,5 +72,7 @@ interfaces:
 module-bays:
   - name: SLOT-2
     label: Front
+    position: '2'
   - name: SLOT-3
     label: Rear
+    position: '3'
diff --git a/device-types/Alcatel-Lucent/OS6900-X40.yaml b/device-types/Alcatel-Lucent/OS6900-X40.yaml
index 630f94e9..acd28749 100644
--- a/device-types/Alcatel-Lucent/OS6900-X40.yaml
+++ b/device-types/Alcatel-Lucent/OS6900-X40.yaml
@@ -112,5 +112,7 @@ interfaces:
 module-bays:
   - name: SLOT-2
     label: Front
+    position: '2'
   - name: SLOT-3
     label: Rear
+    position: '3'
diff --git a/device-types/Check Point/SG6200.yaml b/device-types/Check Point/SG6200.yaml
index 91b04dbc..30baeab8 100644
--- a/device-types/Check Point/SG6200.yaml	
+++ b/device-types/Check Point/SG6200.yaml	
@@ -56,3 +56,4 @@ interfaces:
     mgmt_only: true
 module-bays:
   - name: Line card 1
+    position: '1'
diff --git a/device-types/Check Point/SG6400.yaml b/device-types/Check Point/SG6400.yaml
index 850d5c4f..b762fc57 100644
--- a/device-types/Check Point/SG6400.yaml	
+++ b/device-types/Check Point/SG6400.yaml	
@@ -55,3 +55,4 @@ interfaces:
     mgmt_only: true
 module-bays:
   - name: Line card 1
+    position: '1'
diff --git a/device-types/Cisco/C8300-1N1S-6T.yaml b/device-types/Cisco/C8300-1N1S-6T.yaml
index 12a4ae46..7af25281 100644
--- a/device-types/Cisco/C8300-1N1S-6T.yaml
+++ b/device-types/Cisco/C8300-1N1S-6T.yaml
@@ -18,8 +18,11 @@ module-bays:
   - name: PSU1
     position: '1'
   - name: SM 1  # SM = Service Module
+    position: SM1
   - name: NIM 1 # NIM = Network Interface Module
+    position: NIM1
   - name: PIM 1 # PIM = Pluggable Interface Module (LTE/5G)
+    position: PIM1
 interfaces:
   - name: GigabitEthernet0/0/0
     type: 1000base-t
diff --git a/device-types/Cisco/C9200-24P.yaml b/device-types/Cisco/C9200-24P.yaml
index 57e68c1f..2ecb023e 100644
--- a/device-types/Cisco/C9200-24P.yaml
+++ b/device-types/Cisco/C9200-24P.yaml
@@ -124,4 +124,6 @@ module-bays:
   - name: PS-B
     position: PS-B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
diff --git a/device-types/Cisco/C9300-24HX.yaml b/device-types/Cisco/C9300-24HX.yaml
index ed3983f3..a3e83a60 100644
--- a/device-types/Cisco/C9300-24HX.yaml
+++ b/device-types/Cisco/C9300-24HX.yaml
@@ -126,5 +126,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300-24P.yaml b/device-types/Cisco/C9300-24P.yaml
index bc3d334a..395adc5e 100644
--- a/device-types/Cisco/C9300-24P.yaml
+++ b/device-types/Cisco/C9300-24P.yaml
@@ -123,5 +123,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300-24S.yaml b/device-types/Cisco/C9300-24S.yaml
index 71d74d6e..bffe11c7 100644
--- a/device-types/Cisco/C9300-24S.yaml
+++ b/device-types/Cisco/C9300-24S.yaml
@@ -74,5 +74,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300-24T-E.yaml b/device-types/Cisco/C9300-24T-E.yaml
index 890d989f..3925360f 100644
--- a/device-types/Cisco/C9300-24T-E.yaml
+++ b/device-types/Cisco/C9300-24T-E.yaml
@@ -75,5 +75,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300-24T.yaml b/device-types/Cisco/C9300-24T.yaml
index 7f69eb0c..65673e26 100644
--- a/device-types/Cisco/C9300-24T.yaml
+++ b/device-types/Cisco/C9300-24T.yaml
@@ -75,5 +75,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300-24U.yaml b/device-types/Cisco/C9300-24U.yaml
index 9c9db0e2..51d73374 100644
--- a/device-types/Cisco/C9300-24U.yaml
+++ b/device-types/Cisco/C9300-24U.yaml
@@ -123,5 +123,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300-24UX.yaml b/device-types/Cisco/C9300-24UX.yaml
index 8126baa1..279345c6 100644
--- a/device-types/Cisco/C9300-24UX.yaml
+++ b/device-types/Cisco/C9300-24UX.yaml
@@ -123,5 +123,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300-48P-E.yaml b/device-types/Cisco/C9300-48P-E.yaml
index e5c7dd73..df3fc7c8 100644
--- a/device-types/Cisco/C9300-48P-E.yaml
+++ b/device-types/Cisco/C9300-48P-E.yaml
@@ -219,5 +219,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300-48P.yaml b/device-types/Cisco/C9300-48P.yaml
index 7d5f5ea9..ae0bf156 100644
--- a/device-types/Cisco/C9300-48P.yaml
+++ b/device-types/Cisco/C9300-48P.yaml
@@ -219,5 +219,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300-48S.yaml b/device-types/Cisco/C9300-48S.yaml
index 71bdae3e..fe803fc4 100644
--- a/device-types/Cisco/C9300-48S.yaml
+++ b/device-types/Cisco/C9300-48S.yaml
@@ -122,5 +122,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300-48T.yaml b/device-types/Cisco/C9300-48T.yaml
index 6389eef6..42ef7850 100644
--- a/device-types/Cisco/C9300-48T.yaml
+++ b/device-types/Cisco/C9300-48T.yaml
@@ -127,5 +127,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300-48U.yaml b/device-types/Cisco/C9300-48U.yaml
index 9ee3030c..6712a633 100644
--- a/device-types/Cisco/C9300-48U.yaml
+++ b/device-types/Cisco/C9300-48U.yaml
@@ -221,5 +221,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300-48UN.yaml b/device-types/Cisco/C9300-48UN.yaml
index 1e18e788..4a1634d0 100644
--- a/device-types/Cisco/C9300-48UN.yaml
+++ b/device-types/Cisco/C9300-48UN.yaml
@@ -123,5 +123,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300-48UXM.yaml b/device-types/Cisco/C9300-48UXM.yaml
index 980b23c9..8454cfda 100644
--- a/device-types/Cisco/C9300-48UXM.yaml
+++ b/device-types/Cisco/C9300-48UXM.yaml
@@ -219,5 +219,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300L-24P-4G.yaml b/device-types/Cisco/C9300L-24P-4G.yaml
index 4b58a198..a7a9695b 100644
--- a/device-types/Cisco/C9300L-24P-4G.yaml
+++ b/device-types/Cisco/C9300L-24P-4G.yaml
@@ -128,5 +128,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300L-24P-4X.yaml b/device-types/Cisco/C9300L-24P-4X.yaml
index 3ee88933..129d3e9c 100644
--- a/device-types/Cisco/C9300L-24P-4X.yaml
+++ b/device-types/Cisco/C9300L-24P-4X.yaml
@@ -132,5 +132,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300L-24T-4G.yaml b/device-types/Cisco/C9300L-24T-4G.yaml
index 29400c82..34329dac 100644
--- a/device-types/Cisco/C9300L-24T-4G.yaml
+++ b/device-types/Cisco/C9300L-24T-4G.yaml
@@ -84,5 +84,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300L-48P-4G.yaml b/device-types/Cisco/C9300L-48P-4G.yaml
index 1721a8f6..1ba10c26 100644
--- a/device-types/Cisco/C9300L-48P-4G.yaml
+++ b/device-types/Cisco/C9300L-48P-4G.yaml
@@ -224,5 +224,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300L-48P-4X.yaml b/device-types/Cisco/C9300L-48P-4X.yaml
index 9df53252..f8d8272b 100644
--- a/device-types/Cisco/C9300L-48P-4X.yaml
+++ b/device-types/Cisco/C9300L-48P-4X.yaml
@@ -226,5 +226,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300L-48T-4G.yaml b/device-types/Cisco/C9300L-48T-4G.yaml
index 24eb5a84..ba4619a0 100644
--- a/device-types/Cisco/C9300L-48T-4G.yaml
+++ b/device-types/Cisco/C9300L-48T-4G.yaml
@@ -132,5 +132,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300L-48UXG-4X.yaml b/device-types/Cisco/C9300L-48UXG-4X.yaml
index a90fe0f3..318a1d18 100644
--- a/device-types/Cisco/C9300L-48UXG-4X.yaml
+++ b/device-types/Cisco/C9300L-48UXG-4X.yaml
@@ -224,5 +224,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300LM-24U-4Y.yaml b/device-types/Cisco/C9300LM-24U-4Y.yaml
index a5d31604..c18a9b06 100644
--- a/device-types/Cisco/C9300LM-24U-4Y.yaml
+++ b/device-types/Cisco/C9300LM-24U-4Y.yaml
@@ -130,5 +130,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300LM-48U-4Y.yaml b/device-types/Cisco/C9300LM-48U-4Y.yaml
index 7e871425..49928658 100644
--- a/device-types/Cisco/C9300LM-48U-4Y.yaml
+++ b/device-types/Cisco/C9300LM-48U-4Y.yaml
@@ -226,5 +226,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300X-12Y.yaml b/device-types/Cisco/C9300X-12Y.yaml
index a8839dbc..f8629e1a 100644
--- a/device-types/Cisco/C9300X-12Y.yaml
+++ b/device-types/Cisco/C9300X-12Y.yaml
@@ -56,5 +56,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/C9300X-24Y.yaml b/device-types/Cisco/C9300X-24Y.yaml
index 9c0756bf..94f99999 100644
--- a/device-types/Cisco/C9300X-24Y.yaml
+++ b/device-types/Cisco/C9300X-24Y.yaml
@@ -80,8 +80,11 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
 rear-ports:
   - name: S-PWR 1
     type: other
diff --git a/device-types/Cisco/C9300X-48HX.yaml b/device-types/Cisco/C9300X-48HX.yaml
index bf765979..c925eaf4 100644
--- a/device-types/Cisco/C9300X-48HX.yaml
+++ b/device-types/Cisco/C9300X-48HX.yaml
@@ -222,5 +222,8 @@ module-bays:
   - name: PS-B
     position: B
   - name: FAN 1
+    position: '1'
   - name: FAN 2
+    position: '2'
   - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/FPR2130-NGFW-K9.yaml b/device-types/Cisco/FPR2130-NGFW-K9.yaml
index 8feeeada..8a43cbf1 100644
--- a/device-types/Cisco/FPR2130-NGFW-K9.yaml
+++ b/device-types/Cisco/FPR2130-NGFW-K9.yaml
@@ -56,3 +56,4 @@ interfaces:
     mgmt_only: true
 module-bays:
   - name: Network Module 1
+    position: '1'
diff --git a/device-types/Cisco/FPR2140-NGFW-K9.yaml b/device-types/Cisco/FPR2140-NGFW-K9.yaml
index f58fa341..8b820db9 100644
--- a/device-types/Cisco/FPR2140-NGFW-K9.yaml
+++ b/device-types/Cisco/FPR2140-NGFW-K9.yaml
@@ -56,3 +56,4 @@ interfaces:
     mgmt_only: true
 module-bays:
   - name: Network Module 1
+    position: '1'
diff --git a/device-types/Cisco/ISR-1127-8PLTEP.yaml b/device-types/Cisco/ISR-1127-8PLTEP.yaml
index 220322d4..02d0d00f 100644
--- a/device-types/Cisco/ISR-1127-8PLTEP.yaml
+++ b/device-types/Cisco/ISR-1127-8PLTEP.yaml
@@ -31,6 +31,7 @@ interfaces:
     type: 1000base-t
 module-bays:
   - name: Cellular
+    position: '1'
 console-ports:
   - name: con 0
     type: rj-45
diff --git a/device-types/Cisco/ISR2821.yaml b/device-types/Cisco/ISR2821.yaml
index 1a51d256..16691ad1 100644
--- a/device-types/Cisco/ISR2821.yaml
+++ b/device-types/Cisco/ISR2821.yaml
@@ -26,15 +26,19 @@ interfaces:
 module-bays:
   - name: AIM slot 0
     label: AIM 0
+    position: AIM0
     description: Advanced Integration Module Slot
   - name: AIM slot 1
     label: AIM 1
+    position: AIM1
     description: Advanced Integration Module Slot
   - name: Slot 0 SubSlot 4
     label: PVDM0
+    position: PVDM0
     description: Packet Voice Digital Signal Processor Module Slot
   - name: Slot 0 SubSlot 5
     label: PVDM1
+    position: PVDM1
     description: Packet Voice Digital Signal Processor Module Slot
   - name: Slot 0/0
     label: HWIC0
diff --git a/device-types/Dell/PowerEdge-MX7000.yaml b/device-types/Dell/PowerEdge-MX7000.yaml
index 1c0a3c24..b8191f0b 100644
--- a/device-types/Dell/PowerEdge-MX7000.yaml
+++ b/device-types/Dell/PowerEdge-MX7000.yaml
@@ -10,31 +10,6 @@ airflow: front-to-rear
 weight: 105.0
 weight_unit: lb
 comments: '[Product Page](https://www.dell.com/en-us/shop/ipovw/poweredge-mx7000)'
-power-ports:
-  - name: PSU.IN.1
-    type: iec-60320-c22
-    max_draw: 3000
-    label: '1'
-  - name: PSU.IN.2
-    type: iec-60320-c22
-    max_draw: 3000
-    label: '2'
-  - name: PSU.IN.3
-    type: iec-60320-c22
-    max_draw: 3000
-    label: '3'
-  - name: PSU.IN.4
-    type: iec-60320-c22
-    max_draw: 3000
-    label: '4'
-  - name: PSU.IN.5
-    type: iec-60320-c22
-    max_draw: 3000
-    label: '5'
-  - name: PSU.IN.6
-    type: iec-60320-c22
-    max_draw: 3000
-    label: '6'
 module-bays:
   - name: IOM-A1
     position: A1
@@ -53,11 +28,17 @@ module-bays:
   - name: MM-2
     position: MM-2
   - name: PSU.Slot.1
+    position: '1'
   - name: PSU.Slot.2
+    position: '2'
   - name: PSU.Slot.3
+    position: '3'
   - name: PSU.Slot.4
+    position: '4'
   - name: PSU.Slot.5
+    position: '5'
   - name: PSU.Slot.6
+    position: '6'
 device-bays:
   - name: Sled-1
   - name: Sled-2
diff --git a/device-types/Delta/SG-11M-A.yaml b/device-types/Delta/SG-11M-A.yaml
index 51041e92..2904fc40 100644
--- a/device-types/Delta/SG-11M-A.yaml
+++ b/device-types/Delta/SG-11M-A.yaml
@@ -56,13 +56,19 @@ interfaces:
 module-bays:  # has a bay for some kind of COMM card but I have no details about it
   - name: psu-1a
     label: 1A
+    position: 1A
   - name: psu-2a
     label: 2A
+    position: 2A
   - name: psu-3a
     label: 3A
+    position: 3A
   - name: psu-1b
     label: 1B
+    position: 1B
   - name: psu-2b
     label: 2B
+    position: 2B
   - name: psu-3b
     label: 3B
+    position: 3B
diff --git a/device-types/Delta/SG110-A.yaml b/device-types/Delta/SG110-A.yaml
index 56f5d7ad..8eee830c 100644
--- a/device-types/Delta/SG110-A.yaml
+++ b/device-types/Delta/SG110-A.yaml
@@ -38,13 +38,19 @@ interfaces:
 module-bays:
   - name: psu-1a
     label: 1A
+    position: 1A
   - name: psu-2a
     label: 2A
+    position: 2A
   - name: psu-3a
     label: 3A
+    position: 3A
   - name: psu-1b
     label: 1B
+    position: 1B
   - name: psu-2b
     label: 2B
+    position: 2B
   - name: psu-3b
     label: 3B
+    position: 3B
diff --git a/device-types/Diamond SA/Diamond-Flexos-BGT-3-plus-1HE.yml b/device-types/Diamond SA/Diamond-Flexos-BGT-3-plus-1HE.yml
index db9d1af2..6efa55a4 100644
--- a/device-types/Diamond SA/Diamond-Flexos-BGT-3-plus-1HE.yml	
+++ b/device-types/Diamond SA/Diamond-Flexos-BGT-3-plus-1HE.yml	
@@ -10,14 +10,26 @@ front_image: false
 is_full_depth: false
 module-bays:
   - name: Slot 1
+    position: '1'
   - name: Slot 2
+    position: '2'
   - name: Slot 3
+    position: '3'
   - name: Slot 4
+    position: '4'
   - name: Slot 5
+    position: '5'
   - name: Slot 6
+    position: '6'
   - name: Slot 7
+    position: '7'
   - name: Slot 8
+    position: '8'
   - name: Slot 9
+    position: '9'
   - name: Slot 10
+    position: '10'
   - name: Slot 11
+    position: '11'
   - name: Slot 12
+    position: '12'
diff --git a/device-types/Eaton/9PX3000iRT2U.yaml b/device-types/Eaton/9PX3000iRT2U.yaml
index 7a4944ac..a86cbd08 100644
--- a/device-types/Eaton/9PX3000iRT2U.yaml
+++ b/device-types/Eaton/9PX3000iRT2U.yaml
@@ -69,6 +69,10 @@ interfaces:
     label: Batt detection
 module-bays:
   - name: Communication card slot
+    position: '1'
   - name: Environmental Sensor 1
+    position: '1'
   - name: Environmental Sensor 2
+    position: '2'
   - name: Environmental Sensor 3
+    position: '3'
diff --git a/device-types/Eaton/Tripp-Lite-PDUMH15AT.yaml b/device-types/Eaton/Tripp-Lite-PDUMH15AT.yaml
index 632828ec..62fafd16 100644
--- a/device-types/Eaton/Tripp-Lite-PDUMH15AT.yaml
+++ b/device-types/Eaton/Tripp-Lite-PDUMH15AT.yaml
@@ -38,3 +38,4 @@ power-outlets:
     type: nema-5-15r
 module-bays:
   - name: Accessory Slot
+    position: '1'
diff --git a/device-types/Eaton/Tripp-Lite-PDUMH15ATS.yaml b/device-types/Eaton/Tripp-Lite-PDUMH15ATS.yaml
index 74753395..9a4754c3 100644
--- a/device-types/Eaton/Tripp-Lite-PDUMH15ATS.yaml
+++ b/device-types/Eaton/Tripp-Lite-PDUMH15ATS.yaml
@@ -37,3 +37,4 @@ power-outlets:
     type: nema-5-15r
 module-bays:
   - name: Accessory Slot
+    position: '1'
diff --git a/device-types/Eaton/Tripp-Lite-PDUMNH15AT1.yaml b/device-types/Eaton/Tripp-Lite-PDUMNH15AT1.yaml
index 714b7d8b..b748f17a 100644
--- a/device-types/Eaton/Tripp-Lite-PDUMNH15AT1.yaml
+++ b/device-types/Eaton/Tripp-Lite-PDUMNH15AT1.yaml
@@ -37,3 +37,4 @@ power-outlets:
     type: nema-5-15r
 module-bays:
   - name: Accessory Slot
+    position: '1'
diff --git a/device-types/Eaton/Tripp-Lite-SMART2200CRMXL.yaml b/device-types/Eaton/Tripp-Lite-SMART2200CRMXL.yaml
index a4090d21..5e9d7e94 100644
--- a/device-types/Eaton/Tripp-Lite-SMART2200CRMXL.yaml
+++ b/device-types/Eaton/Tripp-Lite-SMART2200CRMXL.yaml
@@ -46,3 +46,4 @@ power-outlets:
     type: nema-5-20r
 module-bays:
   - name: Accessory Slot
+    position: '1'
diff --git a/device-types/Extreme Networks/5520-12MW-36W-FabricEngine.yaml b/device-types/Extreme Networks/5520-12MW-36W-FabricEngine.yaml
index c064510e..addf7edc 100644
--- a/device-types/Extreme Networks/5520-12MW-36W-FabricEngine.yaml	
+++ b/device-types/Extreme Networks/5520-12MW-36W-FabricEngine.yaml	
@@ -211,6 +211,7 @@ interfaces:
     mgmt_only: true
 module-bays:
   - name: 5520-VIM-4
+    position: VIM
   - name: Ps#1
     position: '1'
   - name: Ps#2
diff --git a/device-types/Extreme Networks/5520-12MW-36W.yaml b/device-types/Extreme Networks/5520-12MW-36W.yaml
index 86f75744..cda50c0f 100644
--- a/device-types/Extreme Networks/5520-12MW-36W.yaml	
+++ b/device-types/Extreme Networks/5520-12MW-36W.yaml	
@@ -216,5 +216,8 @@ interfaces:
     description: Connects at 1x40Gb, 2x 50Gb, 4x 25Gb, or 4x 10Gb, but not 1x 100Gb.  Or use for stacking.
 module-bays:
   - name: PSU-1
+    position: '1'
   - name: PSU-2
+    position: '2'
   - name: VIM
+    position: VIM
diff --git a/device-types/Extreme Networks/5520-24T.yaml b/device-types/Extreme Networks/5520-24T.yaml
index ecda7ca8..312c8da4 100644
--- a/device-types/Extreme Networks/5520-24T.yaml	
+++ b/device-types/Extreme Networks/5520-24T.yaml	
@@ -72,5 +72,8 @@ interfaces:
     description: Connects at 1x40Gb, 2x 50Gb, 4x 25Gb, or 4x 10Gb, but not 1x 100Gb.  Or use for stacking.
 module-bays:
   - name: PSU-1
+    position: '1'
   - name: PSU-2
+    position: '2'
   - name: VIM
+    position: VIM
diff --git a/device-types/Extreme Networks/5520-24W.yaml b/device-types/Extreme Networks/5520-24W.yaml
index ce7a1ca8..c225ab64 100644
--- a/device-types/Extreme Networks/5520-24W.yaml	
+++ b/device-types/Extreme Networks/5520-24W.yaml	
@@ -120,5 +120,8 @@ interfaces:
     description: Connects at 1x40Gb, 2x 50Gb, 4x 25Gb, or 4x 10Gb, but not 1x 100Gb.  Or use for stacking.
 module-bays:
   - name: PSU-1
+    position: '1'
   - name: PSU-2
+    position: '2'
   - name: VIM
+    position: VIM
diff --git a/device-types/Extreme Networks/5520-24X.yaml b/device-types/Extreme Networks/5520-24X.yaml
index f38def04..ad32cc40 100644
--- a/device-types/Extreme Networks/5520-24X.yaml	
+++ b/device-types/Extreme Networks/5520-24X.yaml	
@@ -72,5 +72,8 @@ interfaces:
     description: Connects at 1x40Gb, 2x 50Gb, 4x 25Gb, or 4x 10Gb, but not 1x 100Gb.  Or use for stacking.
 module-bays:
   - name: PSU-1
+    position: '1'
   - name: PSU-2
+    position: '2'
   - name: VIM
+    position: VIM
diff --git a/device-types/Extreme Networks/5520-48SE.yaml b/device-types/Extreme Networks/5520-48SE.yaml
index fc5f40b3..658d0a2e 100644
--- a/device-types/Extreme Networks/5520-48SE.yaml	
+++ b/device-types/Extreme Networks/5520-48SE.yaml	
@@ -120,5 +120,8 @@ interfaces:
     description: Connects at 1x40Gb, 2x 50Gb, 4x 25Gb, or 4x 10Gb, but not 1x 100Gb.  Or use for stacking.
 module-bays:
   - name: PSU-1
+    position: '1'
   - name: PSU-2
+    position: '2'
   - name: VIM
+    position: VIM
diff --git a/device-types/Extreme Networks/5520-48T.yaml b/device-types/Extreme Networks/5520-48T.yaml
index 9544921d..db940b5f 100644
--- a/device-types/Extreme Networks/5520-48T.yaml	
+++ b/device-types/Extreme Networks/5520-48T.yaml	
@@ -120,5 +120,8 @@ interfaces:
     description: Connects at 1x40Gb, 2x 50Gb, 4x 25Gb, or 4x 10Gb, but not 1x 100Gb.  Or use for stacking.
 module-bays:
   - name: PSU-1
+    position: '1'
   - name: PSU-2
+    position: '2'
   - name: VIM
+    position: VIM
diff --git a/device-types/Extreme Networks/5520-48W.yaml b/device-types/Extreme Networks/5520-48W.yaml
index 39a7e961..41cb6855 100644
--- a/device-types/Extreme Networks/5520-48W.yaml	
+++ b/device-types/Extreme Networks/5520-48W.yaml	
@@ -216,5 +216,8 @@ interfaces:
     description: Connects at 1x40Gb, 2x 50Gb, 4x 25Gb, or 4x 10Gb, but not 1x 100Gb.  Or use for stacking.
 module-bays:
   - name: PSU-1
+    position: '1'
   - name: PSU-2
+    position: '2'
   - name: VIM
+    position: VIM
diff --git a/device-types/Extreme Networks/5720-24MW.yaml b/device-types/Extreme Networks/5720-24MW.yaml
index 012e9427..cc662df1 100644
--- a/device-types/Extreme Networks/5720-24MW.yaml	
+++ b/device-types/Extreme Networks/5720-24MW.yaml	
@@ -14,6 +14,7 @@ module-bays:
   - name: PS#2
     position: '2'
   - name: VIM
+    position: VIM
 console-ports:
   - name: Console
     type: rj-45
diff --git a/device-types/Extreme Networks/5720-24MXW.yaml b/device-types/Extreme Networks/5720-24MXW.yaml
index 7f02b701..20ff3959 100644
--- a/device-types/Extreme Networks/5720-24MXW.yaml	
+++ b/device-types/Extreme Networks/5720-24MXW.yaml	
@@ -14,6 +14,7 @@ module-bays:
   - name: PS#2
     position: '2'
   - name: VIM
+    position: VIM
 console-ports:
   - name: Console
     type: rj-45
diff --git a/device-types/Extreme Networks/BR-MLXE-16-MR2-AC.yaml b/device-types/Extreme Networks/BR-MLXE-16-MR2-AC.yaml
index e398fbfc..04c1bdc1 100755
--- a/device-types/Extreme Networks/BR-MLXE-16-MR2-AC.yaml	
+++ b/device-types/Extreme Networks/BR-MLXE-16-MR2-AC.yaml	
@@ -5,62 +5,67 @@ slug: extreme-networks-br-mlxe-16-mr2-ac
 part_number: BR-MLXE-16-MR2-AC
 u_height: 14
 is_full_depth: true
-power-ports:
-  - name: PSU1
-    type: iec-60320-c20
-    maximum_draw: 1800
-  - name: PSU2
-    type: iec-60320-c20
-    maximum_draw: 1800
-  - name: PSU3
-    type: iec-60320-c20
-    maximum_draw: 1800
-  - name: PSU4
-    type: iec-60320-c20
-    maximum_draw: 1800
-  - name: PSU5
-    type: iec-60320-c20
-    maximum_draw: 1800
-  - name: PSU6
-    type: iec-60320-c20
-    maximum_draw: 1800
-  - name: PSU7
-    type: iec-60320-c20
-    maximum_draw: 1800
-  - name: PSU8
-    type: iec-60320-c20
-    maximum_draw: 1800
 module-bays:
   - name: F1
+    position: F1
   - name: F2
+    position: F2
   - name: F3
+    position: F3
   - name: F4
+    position: F4
   - name: M1
+    position: M1
   - name: M2
+    position: M2
   - name: PSU1
+    position: '1'
   - name: PSU2
+    position: '2'
   - name: PSU3
+    position: '3'
   - name: PSU4
+    position: '4'
   - name: PSU5
+    position: '5'
   - name: PSU6
+    position: '6'
   - name: PSU7
+    position: '7'
   - name: PSU8
+    position: '8'
   - name: S1
+    position: S1
   - name: S2
+    position: S2
   - name: S3
+    position: S3
   - name: S4
+    position: S4
   - name: S5
+    position: S5
   - name: S6
+    position: S6
   - name: S7
+    position: S7
   - name: S8
+    position: S8
   - name: S9
+    position: S9
   - name: S10
+    position: S10
   - name: S11
+    position: S11
   - name: S12
+    position: S12
   - name: S13
+    position: S13
   - name: S14
+    position: S14
   - name: S15
+    position: S15
   - name: S16
+    position: S16
 console-ports:
   - name: Serial
     type: de-9
diff --git a/device-types/Extreme Networks/BR-MLXE-32-MR2-AC.yaml b/device-types/Extreme Networks/BR-MLXE-32-MR2-AC.yaml
index 22eae5b6..b197a0ad 100755
--- a/device-types/Extreme Networks/BR-MLXE-32-MR2-AC.yaml	
+++ b/device-types/Extreme Networks/BR-MLXE-32-MR2-AC.yaml	
@@ -5,82 +5,107 @@ slug: extreme-networks-br-mlxe-32-mr2-ac
 part_number: BR-MLXE-32-MR2-AC
 u_height: 33
 is_full_depth: true
-power-ports:
-  - name: PSU1
-    type: iec-60320-c20
-    maximum_draw: 3000
-  - name: PSU2
-    type: iec-60320-c20
-    maximum_draw: 3000
-  - name: PSU3
-    type: iec-60320-c20
-    maximum_draw: 3000
-  - name: PSU4
-    type: iec-60320-c20
-    maximum_draw: 3000
-  - name: PSU5
-    type: iec-60320-c20
-    maximum_draw: 3000
-  - name: PSU6
-    type: iec-60320-c20
-    maximum_draw: 3000
-  - name: PSU7
-    type: iec-60320-c20
-    maximum_draw: 3000
-  - name: PSU8
-    type: iec-60320-c20
-    maximum_draw: 3000
 module-bays:
   - name: F1
+    position: F1
   - name: F2
+    position: F2
   - name: F3
+    position: F3
   - name: F4
+    position: F4
   - name: F5
+    position: F5
   - name: F6
+    position: F6
   - name: F7
+    position: F7
   - name: F8
+    position: F8
   - name: M1
+    position: M1
   - name: M2
+    position: M2
   - name: PSU1
+    position: '1'
   - name: PSU2
+    position: '2'
   - name: PSU3
+    position: '3'
   - name: PSU4
+    position: '4'
   - name: PSU5
+    position: '5'
   - name: PSU6
+    position: '6'
   - name: PSU7
+    position: '7'
   - name: PSU8
+    position: '8'
   - name: S1
+    position: S1
   - name: S2
+    position: S2
   - name: S3
+    position: S3
   - name: S4
+    position: S4
   - name: S5
+    position: S5
   - name: S6
+    position: S6
   - name: S7
+    position: S7
   - name: S8
+    position: S8
   - name: S9
+    position: S9
   - name: S10
+    position: S10
   - name: S11
+    position: S11
   - name: S12
+    position: S12
   - name: S13
+    position: S13
   - name: S14
+    position: S14
   - name: S15
+    position: S15
   - name: S16
+    position: S16
   - name: S17
+    position: S17
   - name: S18
+    position: S18
   - name: S19
+    position: S19
   - name: S20
+    position: S20
   - name: S21
+    position: S21
   - name: S22
+    position: S22
   - name: S23
+    position: S23
   - name: S24
+    position: S24
   - name: S25
+    position: S25
   - name: S26
+    position: S26
   - name: S27
+    position: S27
   - name: S28
+    position: S28
   - name: S29
+    position: S29
   - name: S30
+    position: S30
   - name: S31
+    position: S31
   - name: S32
+    position: S32
 console-ports:
   - name: Serial
     type: de-9
diff --git a/device-types/Extreme Networks/BR-MLXE-4-MR2-AC.yaml b/device-types/Extreme Networks/BR-MLXE-4-MR2-AC.yaml
index 8b39960b..77b1f32e 100755
--- a/device-types/Extreme Networks/BR-MLXE-4-MR2-AC.yaml	
+++ b/device-types/Extreme Networks/BR-MLXE-4-MR2-AC.yaml	
@@ -5,33 +5,33 @@ slug: extreme-networks-br-mlxe-4-mr2-ac
 part_number: BR-MLXE-4-MR2-AC
 u_height: 5
 is_full_depth: true
-power-ports:
-  - name: PSU1
-    type: iec-60320-c20
-    maximum_draw: 1800
-  - name: PSU2
-    type: iec-60320-c20
-    maximum_draw: 1800
-  - name: PSU3
-    type: iec-60320-c20
-    maximum_draw: 1800
-  - name: PSU4
-    type: iec-60320-c20
-    maximum_draw: 1800
 module-bays:
   - name: F1
+    position: F1
   - name: F2
+    position: F2
   - name: F3
+    position: F3
   - name: M1
+    position: M1
   - name: M2
+    position: M2
   - name: PSU1
+    position: PSU1
   - name: PSU2
+    position: PSU2
   - name: PSU3
+    position: PSU3
   - name: PSU4
+    position: PSU4
   - name: S1
+    position: S1
   - name: S2
+    position: S2
   - name: S3
+    position: S3
   - name: S4
+    position: S4
 console-ports:
   - name: Serial
     type: de-9
diff --git a/device-types/Extreme Networks/BR-MLXE-8-MR2-AC.yaml b/device-types/Extreme Networks/BR-MLXE-8-MR2-AC.yaml
index 5d8e2eda..2ad14b39 100755
--- a/device-types/Extreme Networks/BR-MLXE-8-MR2-AC.yaml	
+++ b/device-types/Extreme Networks/BR-MLXE-8-MR2-AC.yaml	
@@ -5,37 +5,41 @@ slug: extreme-networks-br-mlxe-8-mr2-ac
 part_number: BR-MLXE-8-MR2-AC
 u_height: 7
 is_full_depth: true
-power-ports:
-  - name: PSU1
-    type: iec-60320-c20
-    maximum_draw: 1800
-  - name: PSU2
-    type: iec-60320-c20
-    maximum_draw: 1800
-  - name: PSU3
-    type: iec-60320-c20
-    maximum_draw: 1800
-  - name: PSU4
-    type: iec-60320-c20
-    maximum_draw: 1800
 module-bays:
   - name: F1
+    position: F1
   - name: F2
+    position: F2
   - name: F3
+    position: F3
   - name: M1
+    position: M1
   - name: M2
+    position: M2
   - name: PSU1
+    position: PSU1
   - name: PSU2
+    position: PSU2
   - name: PSU3
+    position: PSU3
   - name: PSU4
+    position: PSU4
   - name: S1
+    position: S1
   - name: S2
+    position: S2
   - name: S3
+    position: S3
   - name: S4
+    position: S4
   - name: S5
+    position: S5
   - name: S6
+    position: S6
   - name: S7
+    position: S7
   - name: S8
+    position: S8
 console-ports:
   - name: Serial
     type: de-9
diff --git a/device-types/Extreme Networks/X460-G2-24t-10GE4.yaml b/device-types/Extreme Networks/X460-G2-24t-10GE4.yaml
index d97ae1ee..8daba55a 100644
--- a/device-types/Extreme Networks/X460-G2-24t-10GE4.yaml	
+++ b/device-types/Extreme Networks/X460-G2-24t-10GE4.yaml	
@@ -89,5 +89,8 @@ interfaces:
     mgmt_only: true
 module-bays:
   - name: PSU-1
+    position: PSU-1
   - name: PSU-2
+    position: PSU-2
   - name: VIM-2
+    position: VIM
diff --git a/device-types/Extreme Networks/X460-G2-48p-10GE4.yaml b/device-types/Extreme Networks/X460-G2-48p-10GE4.yaml
index 7fe561be..62864a80 100644
--- a/device-types/Extreme Networks/X460-G2-48p-10GE4.yaml	
+++ b/device-types/Extreme Networks/X460-G2-48p-10GE4.yaml	
@@ -119,6 +119,8 @@ interfaces:
     mgmt_only: true
 module-bays:
   - name: PSU-1
+    position: PSU-1
   - name: PSU-2
+    position: PSU-2
   - name: VIM-2
     position: VIM
diff --git a/device-types/Extreme Networks/X670-G2-72x.yaml b/device-types/Extreme Networks/X670-G2-72x.yaml
index 2671bbd9..5e7aa5de 100644
--- a/device-types/Extreme Networks/X670-G2-72x.yaml	
+++ b/device-types/Extreme Networks/X670-G2-72x.yaml	
@@ -163,3 +163,4 @@ module-bays:
   - name: PSU-1
     position: PSU-1
   - name: PSU-2
+    position: PSU-2
diff --git a/device-types/Fortinet/FS-224D-FPOE.yaml b/device-types/Fortinet/FS-224D-FPOE.yaml
index 8c7fe166..cde786a2 100644
--- a/device-types/Fortinet/FS-224D-FPOE.yaml
+++ b/device-types/Fortinet/FS-224D-FPOE.yaml
@@ -13,7 +13,7 @@ comments: '[FortiSwitch Secure Access Series Datasheet](https://www.fortinet.com
 console-ports:
   - name: Console
     type: rj-45
-module-bays:
+power-ports:
   - name: PS1
     type: iec-60320-c14
     maximum_draw: 397
diff --git a/device-types/HPE/Aruba-2920-24G-PoEP.yml b/device-types/HPE/Aruba-2920-24G-PoEP.yml
index b4aed1f9..9226415c 100644
--- a/device-types/HPE/Aruba-2920-24G-PoEP.yml
+++ b/device-types/HPE/Aruba-2920-24G-PoEP.yml
@@ -75,5 +75,6 @@ module-bays:
   - name: Module B
     position: B
   - name: Stacking Module
+    position: Stack
   - name: Power Supply
     position: '1'
diff --git a/device-types/HPE/Aruba-2920-24G.yaml b/device-types/HPE/Aruba-2920-24G.yaml
index 132944ae..6b0f318d 100644
--- a/device-types/HPE/Aruba-2920-24G.yaml
+++ b/device-types/HPE/Aruba-2920-24G.yaml
@@ -75,5 +75,6 @@ module-bays:
   - name: Module B
     position: B
   - name: Stacking Module
+    position: Stack
   - name: Power Supply
     position: '1'
diff --git a/device-types/HPE/Aruba-2920-48G-PoEP-740W.yaml b/device-types/HPE/Aruba-2920-48G-PoEP-740W.yaml
index 5915b0d6..de2dcde4 100644
--- a/device-types/HPE/Aruba-2920-48G-PoEP-740W.yaml
+++ b/device-types/HPE/Aruba-2920-48G-PoEP-740W.yaml
@@ -123,5 +123,6 @@ module-bays:
   - name: Module B
     position: B
   - name: Stacking Module
+    position: Stack
   - name: Power Supply
     position: '1'
diff --git a/device-types/HPE/Aruba-2920-48G-PoEP.yaml b/device-types/HPE/Aruba-2920-48G-PoEP.yaml
index bab23205..20fe6558 100644
--- a/device-types/HPE/Aruba-2920-48G-PoEP.yaml
+++ b/device-types/HPE/Aruba-2920-48G-PoEP.yaml
@@ -123,5 +123,6 @@ module-bays:
   - name: Module B
     position: B
   - name: Stacking Module
+    position: Stack
   - name: Power Supply
     position: '1'
diff --git a/device-types/HPE/Aruba-2920-48G.yaml b/device-types/HPE/Aruba-2920-48G.yaml
index a074160f..cbda70e5 100644
--- a/device-types/HPE/Aruba-2920-48G.yaml
+++ b/device-types/HPE/Aruba-2920-48G.yaml
@@ -123,5 +123,6 @@ module-bays:
   - name: Module B
     position: B
   - name: Stacking Module
+    position: Stack
   - name: Power Supply
     position: '1'
diff --git a/device-types/HPE/Aruba-2930M-24G.yaml b/device-types/HPE/Aruba-2930M-24G.yaml
index cd5fff30..4330beb1 100644
--- a/device-types/HPE/Aruba-2930M-24G.yaml
+++ b/device-types/HPE/Aruba-2930M-24G.yaml
@@ -14,6 +14,7 @@ module-bays:
   - name: Uplink
     position: A
   - name: Stacking Module
+    position: Stack
   - name: PS1
     position: '1'
   - name: PS2
diff --git a/device-types/HPE/Aruba-2930M-24SR-PoEP.yaml b/device-types/HPE/Aruba-2930M-24SR-PoEP.yaml
index ec283248..a4bebb16 100644
--- a/device-types/HPE/Aruba-2930M-24SR-PoEP.yaml
+++ b/device-types/HPE/Aruba-2930M-24SR-PoEP.yaml
@@ -13,6 +13,7 @@ module-bays:
   - name: Uplink
     position: A
   - name: Stacking Module
+    position: Stack
   - name: PS1
     position: '1'
   - name: PS2
diff --git a/device-types/HPE/Aruba-2930M-40G-8SR-POE6.yaml b/device-types/HPE/Aruba-2930M-40G-8SR-POE6.yaml
index 52fa59ed..5431b4c5 100644
--- a/device-types/HPE/Aruba-2930M-40G-8SR-POE6.yaml
+++ b/device-types/HPE/Aruba-2930M-40G-8SR-POE6.yaml
@@ -12,6 +12,7 @@ module-bays:
   - name: Uplink
     position: A
   - name: Stacking Module
+    position: Stack
   - name: PS1
     position: '1'
   - name: PS2
diff --git a/device-types/HPE/Aruba-2930M-48G-PoEP.yaml b/device-types/HPE/Aruba-2930M-48G-PoEP.yaml
index ecb864af..842fcdb3 100644
--- a/device-types/HPE/Aruba-2930M-48G-PoEP.yaml
+++ b/device-types/HPE/Aruba-2930M-48G-PoEP.yaml
@@ -14,6 +14,7 @@ module-bays:
   - name: Uplink
     position: A
   - name: Stacking Module
+    position: Stack
   - name: PS1
     position: '1'
   - name: PS2
diff --git a/device-types/HPE/Aruba-2930M-48G.yaml b/device-types/HPE/Aruba-2930M-48G.yaml
index 6d864ba8..f790135a 100644
--- a/device-types/HPE/Aruba-2930M-48G.yaml
+++ b/device-types/HPE/Aruba-2930M-48G.yaml
@@ -14,6 +14,7 @@ module-bays:
   - name: Uplink
     position: A
   - name: Stacking Module
+    position: Stack
   - name: PS1
     position: '1'
   - name: PS2
diff --git a/device-types/HPE/Aruba-3810M-24G-1-slot-Switch.yaml b/device-types/HPE/Aruba-3810M-24G-1-slot-Switch.yaml
index 01097825..3941a2ed 100644
--- a/device-types/HPE/Aruba-3810M-24G-1-slot-Switch.yaml
+++ b/device-types/HPE/Aruba-3810M-24G-1-slot-Switch.yaml
@@ -15,6 +15,7 @@ module-bays:
   - name: Network Module
     position: A
   - name: Stacking Module
+    position: Stack
   - name: PS1
     position: '1'
   - name: PS2
diff --git a/device-types/HPE/Aruba-3810M-40G-8SR.yaml b/device-types/HPE/Aruba-3810M-40G-8SR.yaml
index 333dc30e..11f71748 100644
--- a/device-types/HPE/Aruba-3810M-40G-8SR.yaml
+++ b/device-types/HPE/Aruba-3810M-40G-8SR.yaml
@@ -12,6 +12,7 @@ module-bays:
   - name: Network Module
     position: A
   - name: Stacking Module
+    position: Stack
   - name: PS1
     position: '1'
   - name: PS2
diff --git a/device-types/HPE/Aruba-3810M-48G-PoEP-1-slot.yaml b/device-types/HPE/Aruba-3810M-48G-PoEP-1-slot.yaml
index 4daebe49..a16b45b1 100644
--- a/device-types/HPE/Aruba-3810M-48G-PoEP-1-slot.yaml
+++ b/device-types/HPE/Aruba-3810M-48G-PoEP-1-slot.yaml
@@ -15,6 +15,7 @@ module-bays:
   - name: Network Module
     position: A
   - name: Stacking Module
+    position: Stack
   - name: PS1
     position: '1'
   - name: PS2
diff --git a/device-types/Huawei/ATN910C-B.yaml b/device-types/Huawei/ATN910C-B.yaml
index 626b0bc2..200e58a6 100644
--- a/device-types/Huawei/ATN910C-B.yaml
+++ b/device-types/Huawei/ATN910C-B.yaml
@@ -20,7 +20,9 @@ console-ports:
     type: rj-45
 module-bays:
   - name: PWR1
+    position: '1'
   - name: PWR2
+    position: '2'
 interfaces:
   - name: MEthernet0/0/0
     label: ETH/OAM
diff --git a/device-types/Huawei/ATN910C-M.yaml b/device-types/Huawei/ATN910C-M.yaml
index 32d0a975..d738a568 100644
--- a/device-types/Huawei/ATN910C-M.yaml
+++ b/device-types/Huawei/ATN910C-M.yaml
@@ -18,7 +18,9 @@ console-ports:
     type: rj-45
 module-bays:
   - name: PWR1
+    position: '1'
   - name: PWR2
+    position: '2'
 interfaces:
   - name: MEthernet0/0/0
     label: ETH/OAM
diff --git a/device-types/Huawei/CE5855-48T4S2Q-EI.yaml b/device-types/Huawei/CE5855-48T4S2Q-EI.yaml
index 786751ac..349aa6f9 100644
--- a/device-types/Huawei/CE5855-48T4S2Q-EI.yaml
+++ b/device-types/Huawei/CE5855-48T4S2Q-EI.yaml
@@ -13,7 +13,9 @@ console-ports:
     type: rj-45
 module-bays:
   - name: FAN1
+    position: '1'
   - name: FAN2
+    position: '2'
 power-ports:
   - name: PWR1
     type: iec-60320-c14
diff --git a/device-types/Huawei/CE6856-48T6Q-HI.yaml b/device-types/Huawei/CE6856-48T6Q-HI.yaml
index f4262da5..2256a915 100644
--- a/device-types/Huawei/CE6856-48T6Q-HI.yaml
+++ b/device-types/Huawei/CE6856-48T6Q-HI.yaml
@@ -13,7 +13,9 @@ console-ports:
     type: rj-45
 module-bays:
   - name: FAN1
+    position: '1'
   - name: FAN2
+    position: '2'
   - name: PWR1
     position: PWR1
   - name: PWR2
diff --git a/device-types/Huawei/CE8850-64CQ-EI.yaml b/device-types/Huawei/CE8850-64CQ-EI.yaml
index 8f31dc40..b5739348 100644
--- a/device-types/Huawei/CE8850-64CQ-EI.yaml
+++ b/device-types/Huawei/CE8850-64CQ-EI.yaml
@@ -10,8 +10,11 @@ weight: 22.2
 weight_unit: kg
 module-bays:
   - name: FAN1
+    position: '1'
   - name: FAN2
+    position: '2'
   - name: FAN3
+    position: '3'
   - name: PWR1
     position: '1'
   - name: PWR2
diff --git a/device-types/Huawei/CE8861-4C-EI.yaml b/device-types/Huawei/CE8861-4C-EI.yaml
index 74f6310c..5473e255 100644
--- a/device-types/Huawei/CE8861-4C-EI.yaml
+++ b/device-types/Huawei/CE8861-4C-EI.yaml
@@ -10,7 +10,9 @@ weight: 21.3
 weight_unit: kg
 module-bays:
   - name: FAN1
+    position: '1'
   - name: FAN2
+    position: '2'
   - name: PWR1
     position: '1'
   - name: PWR2
diff --git a/device-types/Huawei/CloudEngine-S5732-H48XUM2CC.yaml b/device-types/Huawei/CloudEngine-S5732-H48XUM2CC.yaml
index 613d60da..f9877d1b 100644
--- a/device-types/Huawei/CloudEngine-S5732-H48XUM2CC.yaml
+++ b/device-types/Huawei/CloudEngine-S5732-H48XUM2CC.yaml
@@ -171,7 +171,12 @@ interfaces:
     type: 40gbase-x-qsfpp
 module-bays:
   - name: FAN1
+    position: '1'
   - name: FAN2
+    position: '2'
   - name: PWR1
+    position: '1'
   - name: PWR2
+    position: '2'
   - name: RearCardSlot
+    position: '1'
diff --git a/device-types/Huawei/NE8000-F1A-8H20Q.yaml b/device-types/Huawei/NE8000-F1A-8H20Q.yaml
index 67ac5237..eda0e296 100644
--- a/device-types/Huawei/NE8000-F1A-8H20Q.yaml
+++ b/device-types/Huawei/NE8000-F1A-8H20Q.yaml
@@ -127,4 +127,6 @@ interfaces:
     type: 100gbase-x-qsfp28
 module-bays:
   - name: PSU 1
+    position: '1'
   - name: PSU 2
+    position: '2'
diff --git a/device-types/Huawei/NE8000-X16.yaml b/device-types/Huawei/NE8000-X16.yaml
index 470883db..772a288e 100644
--- a/device-types/Huawei/NE8000-X16.yaml
+++ b/device-types/Huawei/NE8000-X16.yaml
@@ -53,7 +53,7 @@ module-bays:
   - name: SFU 3
     position: SFU3
   - name: SFU 4
-    postiion: SFU4
+    position: SFU4
   - name: SFU 5
     position: SFU5
   - name: SFU 6
diff --git a/device-types/Huawei/NE8000-X4.yaml b/device-types/Huawei/NE8000-X4.yaml
index e009aeeb..127088bb 100644
--- a/device-types/Huawei/NE8000-X4.yaml
+++ b/device-types/Huawei/NE8000-X4.yaml
@@ -29,7 +29,7 @@ module-bays:
   - name: SFU 3
     position: SFU3
   - name: SFU 4
-    postiion: SFU4
+    position: SFU4
   - name: SFU 5
     position: SFU5
   - name: SFU 6
diff --git a/device-types/Huawei/NE8000-X8.yaml b/device-types/Huawei/NE8000-X8.yaml
index 0411ce6b..fd77a959 100644
--- a/device-types/Huawei/NE8000-X8.yaml
+++ b/device-types/Huawei/NE8000-X8.yaml
@@ -37,7 +37,7 @@ module-bays:
   - name: SFU 3
     position: SFU3
   - name: SFU 4
-    postiion: SFU4
+    position: SFU4
   - name: SFU 5
     position: SFU5
   - name: SFU 6
diff --git a/device-types/Huawei/NE9000-20-DC.yaml b/device-types/Huawei/NE9000-20-DC.yaml
index ade15500..1ec6a429 100644
--- a/device-types/Huawei/NE9000-20-DC.yaml
+++ b/device-types/Huawei/NE9000-20-DC.yaml
@@ -71,14 +71,26 @@ module-bays:
   - name: SFU 30
     position: '30'
   - name: FAN1
+    position: '1'
   - name: FAN2
+    position: '2'
   - name: FAN3
+    position: '3'
   - name: FAN4
+    position: '4'
   - name: FAN5
+    position: '5'
   - name: FAN6
+    position: '6'
   - name: FAN7
+    position: '7'
   - name: FAN8
+    position: '8'
   - name: FAN9
+    position: '9'
   - name: FAN10
+    position: '10'
   - name: FAN11
+    position: '11'
   - name: FAN12
+    position: '12'
diff --git a/device-types/Huawei/NE9000-8-DC.yaml b/device-types/Huawei/NE9000-8-DC.yaml
index 5ebe571e..8c5c8500 100644
--- a/device-types/Huawei/NE9000-8-DC.yaml
+++ b/device-types/Huawei/NE9000-8-DC.yaml
@@ -47,10 +47,18 @@ module-bays:
   - name: SFU 18
     position: '18'
   - name: FAN1
+    position: '1'
   - name: FAN2
+    position: '2'
   - name: FAN3
+    position: '3'
   - name: FAN4
+    position: '4'
   - name: FAN5
+    position: '5'
   - name: PWRA
+    position: A
   - name: PWRB
+    position: B
   - name: PWRC
+    position: C
diff --git a/device-types/Huawei/S6730-H28Y4C.yaml b/device-types/Huawei/S6730-H28Y4C.yaml
index 9abf2685..eb604c8b 100644
--- a/device-types/Huawei/S6730-H28Y4C.yaml
+++ b/device-types/Huawei/S6730-H28Y4C.yaml
@@ -11,7 +11,9 @@ console-ports:
     type: rj-45
 module-bays:
   - name: PWR1
+    position: '1'
   - name: PWR2
+    position: '2'
 interfaces:
   - name: MEth0/0/1
     type: 1000base-t
diff --git a/device-types/Juniper/ACX4000.yaml b/device-types/Juniper/ACX4000.yaml
index b0493cc7..1e052af1 100644
--- a/device-types/Juniper/ACX4000.yaml
+++ b/device-types/Juniper/ACX4000.yaml
@@ -45,4 +45,6 @@ interfaces:
     mgmt_only: true
 module-bays:
   - name: MIC0
+    position: '0'
   - name: MIC1
+    position: '1'
diff --git a/device-types/Juniper/ACX7024-AC.yaml b/device-types/Juniper/ACX7024-AC.yaml
index fbc376ba..8c10209c 100644
--- a/device-types/Juniper/ACX7024-AC.yaml
+++ b/device-types/Juniper/ACX7024-AC.yaml
@@ -84,3 +84,4 @@ module-bays:
     maximum_draw: 150
     position: '1'
   - name: Fan Module 0
+    position: '0'
diff --git a/device-types/Juniper/ACX7100-32C-AC-AO.yaml b/device-types/Juniper/ACX7100-32C-AC-AO.yaml
index dd224877..b2eb0665 100644
--- a/device-types/Juniper/ACX7100-32C-AC-AO.yaml
+++ b/device-types/Juniper/ACX7100-32C-AC-AO.yaml
@@ -98,8 +98,14 @@ module-bays:
     maximum_draw: 1600
     position: '1'
   - name: Fan Module 0
+    position: '0'
   - name: Fan Module 1
+    position: '1'
   - name: Fan Module 2
+    position: '2'
   - name: Fan Module 3
+    position: '3'
   - name: Fan Module 4
+    position: '4'
   - name: Fan Module 5
+    position: '5'
diff --git a/device-types/Juniper/ACX7100-32C-DC-AO.yaml b/device-types/Juniper/ACX7100-32C-DC-AO.yaml
index d2ce79bb..9ef33be5 100644
--- a/device-types/Juniper/ACX7100-32C-DC-AO.yaml
+++ b/device-types/Juniper/ACX7100-32C-DC-AO.yaml
@@ -98,8 +98,14 @@ module-bays:
     maximum_draw: 1600
     position: '1'
   - name: Fan Module 0
+    position: '0'
   - name: Fan Module 1
+    position: '1'
   - name: Fan Module 2
+    position: '2'
   - name: Fan Module 3
+    position: '3'
   - name: Fan Module 4
+    position: '4'
   - name: Fan Module 5
+    position: '5'
diff --git a/device-types/Juniper/ACX7100-48L-AC-AI.yaml b/device-types/Juniper/ACX7100-48L-AC-AI.yaml
index 0a3f47f5..1fc42d7d 100644
--- a/device-types/Juniper/ACX7100-48L-AC-AI.yaml
+++ b/device-types/Juniper/ACX7100-48L-AC-AI.yaml
@@ -132,10 +132,16 @@ module-bays:
   - name: PSM 1
     # Comment: Power Supply Module 1
     maximum_draw: 1600
-    poisition: '1'
+    position: '1'
   - name: Fan Module 0
+    position: '0'
   - name: Fan Module 1
+    position: '1'
   - name: Fan Module 2
+    position: '2'
   - name: Fan Module 3
+    position: '3'
   - name: Fan Module 4
+    position: '4'
   - name: Fan Module 5
+    position: '5'
diff --git a/device-types/Juniper/ACX7100-48L-AC-AO.yaml b/device-types/Juniper/ACX7100-48L-AC-AO.yaml
index c3ca0052..695abbf0 100644
--- a/device-types/Juniper/ACX7100-48L-AC-AO.yaml
+++ b/device-types/Juniper/ACX7100-48L-AC-AO.yaml
@@ -132,10 +132,16 @@ module-bays:
   - name: PSM 1
     # Comment: Power Supply Module 1
     maximum_draw: 1600
-    poisition: '1'
+    position: '1'
   - name: Fan Module 0
+    position: '0'
   - name: Fan Module 1
+    position: '1'
   - name: Fan Module 2
+    position: '2'
   - name: Fan Module 3
+    position: '3'
   - name: Fan Module 4
+    position: '4'
   - name: Fan Module 5
+    position: '5'
diff --git a/device-types/Juniper/ACX7100-48L-DC-AI.yaml b/device-types/Juniper/ACX7100-48L-DC-AI.yaml
index f6604100..531d7d88 100644
--- a/device-types/Juniper/ACX7100-48L-DC-AI.yaml
+++ b/device-types/Juniper/ACX7100-48L-DC-AI.yaml
@@ -132,10 +132,16 @@ module-bays:
   - name: PSM 1
     # Comment: Power Supply Module 1
     maximum_draw: 1600
-    poisition: '1'
+    position: '1'
   - name: Fan Module 0
+    position: '0'
   - name: Fan Module 1
+    position: '1'
   - name: Fan Module 2
+    position: '2'
   - name: Fan Module 3
+    position: '3'
   - name: Fan Module 4
+    position: '4'
   - name: Fan Module 5
+    position: '5'
diff --git a/device-types/Juniper/ACX7100-48L-DC-AO.yaml b/device-types/Juniper/ACX7100-48L-DC-AO.yaml
index 386f1e6b..12484679 100644
--- a/device-types/Juniper/ACX7100-48L-DC-AO.yaml
+++ b/device-types/Juniper/ACX7100-48L-DC-AO.yaml
@@ -132,10 +132,16 @@ module-bays:
   - name: PSM 1
     # Comment: Power Supply Module 1
     maximum_draw: 1600
-    poisition: '1'
+    position: '1'
   - name: Fan Module 0
+    position: '0'
   - name: Fan Module 1
+    position: '1'
   - name: Fan Module 2
+    position: '2'
   - name: Fan Module 3
+    position: '3'
   - name: Fan Module 4
+    position: '4'
   - name: Fan Module 5
+    position: '5'
diff --git a/device-types/Juniper/ACX7332.yaml b/device-types/Juniper/ACX7332.yaml
index 829b6778..a09af6bd 100644
--- a/device-types/Juniper/ACX7332.yaml
+++ b/device-types/Juniper/ACX7332.yaml
@@ -117,6 +117,10 @@ module-bays:
   - name: RE 1
     position: '1'
   - name: Fan Tray 0
+    position: '0'
   - name: Fan Tray 1
+    position: '1'
   - name: Fan Tray 2
+    position: '2'
   - name: Fan Tray 3
+    position: '3'
diff --git a/device-types/Juniper/EX4500-40F.yaml b/device-types/Juniper/EX4500-40F.yaml
index 1ea41811..05dfa6dc 100644
--- a/device-types/Juniper/EX4500-40F.yaml
+++ b/device-types/Juniper/EX4500-40F.yaml
@@ -100,6 +100,7 @@ console-ports:
     type: rj-45
 module-bays:
   - name: Fan Tray
+    position: '0'
   - name: PEM0
     position: '0'
   - name: PEM1
diff --git a/device-types/Juniper/EX9204.yaml b/device-types/Juniper/EX9204.yaml
index e1d2c820..b4f76dae 100644
--- a/device-types/Juniper/EX9204.yaml
+++ b/device-types/Juniper/EX9204.yaml
@@ -21,4 +21,4 @@ module-bays:
   - name: PSU2
     position: '2'
   - name: PSU3
-    positions: '3'
+    position: '3'
diff --git a/device-types/Juniper/EX9208.yaml b/device-types/Juniper/EX9208.yaml
index 03a19725..9844d924 100644
--- a/device-types/Juniper/EX9208.yaml
+++ b/device-types/Juniper/EX9208.yaml
@@ -32,4 +32,4 @@ module-bays:
   - name: PSU2
     position: '2'
   - name: PSU3
-    positions: '3'
+    position: '3'
diff --git a/device-types/Juniper/EX9214.yaml b/device-types/Juniper/EX9214.yaml
index 91595f3e..7aef5d6d 100644
--- a/device-types/Juniper/EX9214.yaml
+++ b/device-types/Juniper/EX9214.yaml
@@ -44,4 +44,4 @@ module-bays:
   - name: PSU2
     position: '2'
   - name: PSU3
-    positions: '3'
+    position: '3'
diff --git a/device-types/Juniper/MX80.yaml b/device-types/Juniper/MX80.yaml
index 576b2bee..944edb35 100644
--- a/device-types/Juniper/MX80.yaml
+++ b/device-types/Juniper/MX80.yaml
@@ -35,7 +35,8 @@ console-ports:
     type: rj-45
 module-bays:
   - name: MIC0
-    position: '1'
+    position: '0'
   - name: MIC1
-    position: '2'
+    position: '1'
   - name: Fan Tray
+    position: '0'
diff --git a/device-types/Juniper/NetScreen-SSG-140.yaml b/device-types/Juniper/NetScreen-SSG-140.yaml
index dc66828f..0d9ad521 100644
--- a/device-types/Juniper/NetScreen-SSG-140.yaml
+++ b/device-types/Juniper/NetScreen-SSG-140.yaml
@@ -42,6 +42,10 @@ interfaces:
     type: 1000base-t
 module-bays:
   - name: PIM Slot 1
+    position: '1'
   - name: PIM Slot 2
+    position: '2'
   - name: PIM Slot 3
+    position: '3'
   - name: PIM Slot 4
+    position: '4'
diff --git a/device-types/Juniper/QFX10016.yml b/device-types/Juniper/QFX10016.yml
index 58120380..4096ccdc 100644
--- a/device-types/Juniper/QFX10016.yml
+++ b/device-types/Juniper/QFX10016.yml
@@ -32,6 +32,7 @@ module-bays:
     position: PSU4
   - name: PEM5
     label: PSU 5
+    position: PSU5
   - name: PEM6
     label: PSU 6
     position: PSU6
diff --git a/device-types/Juniper/QFX3500-48S4Q.yaml b/device-types/Juniper/QFX3500-48S4Q.yaml
index b3d74977..17c68c8e 100644
--- a/device-types/Juniper/QFX3500-48S4Q.yaml
+++ b/device-types/Juniper/QFX3500-48S4Q.yaml
@@ -118,9 +118,14 @@ interfaces:
     type: 100gbase-x-qsfp28
 module-bays:
   - name: PSU0
+    position: '0'
     # Comment: Power Supply 0
   - name: PSU1
+    position: '1'
     # Comment: Power Supply 1
   - name: Fan Tray 0
+    position: '0'
   - name: Fan Tray 1
+    position: '1'
   - name: Fan Tray 2
+    position: '2'
diff --git a/device-types/Juniper/SRX3600.yaml b/device-types/Juniper/SRX3600.yaml
index b8969cd0..f926c7f8 100644
--- a/device-types/Juniper/SRX3600.yaml
+++ b/device-types/Juniper/SRX3600.yaml
@@ -10,18 +10,24 @@ console-ports:
     type: rj-45
 module-bays:
   - name: Slot 0
+    position: '0'
   - name: Slot 1
+    position: '1'
   - name: Slot 2
+    position: '2'
   - name: Slot 3
+    position: '3'
   - name: Slot 4
+    position: '4'
   - name: Slot 5
+    position: '5'
   - name: Slot 6
-power-ports:
+    position: '6'
   - name: PEM0
-    type: iec-60320-c20
+    position: '0'
   - name: PEM1
-    type: iec-60320-c20
+    position: '1'
   - name: PEM2
-    type: iec-60320-c20
+    position: '2'
   - name: PEM3
-    type: iec-60320-c20
+    position: '3'
diff --git a/device-types/Juniper/SRX650.yaml b/device-types/Juniper/SRX650.yaml
index 51d72167..4d34cdbe 100644
--- a/device-types/Juniper/SRX650.yaml
+++ b/device-types/Juniper/SRX650.yaml
@@ -19,26 +19,38 @@ interfaces:
     type: 1000base-t
 module-bays:
   - name: PIM1
+    position: '1'
     # Comment: PIM 1 ()
   - name: PIM2
+    position: '2'
     # Comment: PIM 2 (10-gigabit XPIM,PoE Capable)
   - name: PIM3
+    position: '3'
     # Comment: PIM 3 ()
   - name: PIM4
+    position: '4'
     # Comment: PIM 4 (PoE Capable)
   - name: PIM5
+    position: '5'
     # Comment: PIM 5 (SATA High-Disk)
   - name: PIM6
+    position: '6'
     # Comment: PIM 6 (10-gigabit XPIM,PoE Capable)
   - name: PIM7
+    position: '7'
     # Comment: PIM 7 (SATA High-Disk)
   - name: PIM8
+    position: '8'
     # Comment: PIM 8 (PoE Capable)
   - name: SRE0
+    position: RE0
     # Comment: Services and Routing Engine 0
   - name: SRE1
+    position: RE1
     # Comment: Services and Routing Engine 1
   - name: PSU0
+    position: '0'
     # Comment: Power Supply 0
   - name: PSU1
+    position: '1'
     # Comment: Power Supply 1
diff --git a/device-types/LiteOn/PF-2273-2L1M-LF.yaml b/device-types/LiteOn/PF-2273-2L1M-LF.yaml
index 1f8205cf..c049c718 100644
--- a/device-types/LiteOn/PF-2273-2L1M-LF.yaml
+++ b/device-types/LiteOn/PF-2273-2L1M-LF.yaml
@@ -62,24 +62,35 @@ power-outlets:
     type: dc-terminal
 module-bays:
   - name: psc
+    position: psc
     description: Power Shelf Controller
   - name: psu-01
+    position: '1'
     label: N+1 R
   - name: psu-02
+    position: '2'
     label: S
   - name: psu-03
+    position: '3'
     label: T
   - name: psu-04
+    position: '4'
     label: R
   - name: psu-05
+    position: '5'
     label: S
   - name: psu-06
+    position: '6'
     label: T
   - name: psu-07
+    position: '7'
     label: R
   - name: psu-08
+    position: '8'
     label: S
   - name: psu-09
+    position: '9'
     label: T
   - name: psu-10
+    position: '10'
     label: R
diff --git a/device-types/NetApp/FAS8200.yaml b/device-types/NetApp/FAS8200.yaml
index 4ee0411d..11ece424 100644
--- a/device-types/NetApp/FAS8200.yaml
+++ b/device-types/NetApp/FAS8200.yaml
@@ -12,4 +12,6 @@ power-ports:
     type: iec-60320-c14
 module-bays:
   - name: A
+    position: A
   - name: B
+    position: B
diff --git a/device-types/Netgate/7100-Security-Gateway.yaml b/device-types/Netgate/7100-Security-Gateway.yaml
index 081c3553..01b6837f 100644
--- a/device-types/Netgate/7100-Security-Gateway.yaml
+++ b/device-types/Netgate/7100-Security-Gateway.yaml
@@ -57,3 +57,4 @@ interfaces:
 module-bays:
   - name: pci1
     description: PCI-E 3.0 4x
+    position: PCI1
diff --git a/device-types/Nokia/7210-SAS-M-1.yaml b/device-types/Nokia/7210-SAS-M-1.yaml
index 59da8a95..83462789 100644
--- a/device-types/Nokia/7210-SAS-M-1.yaml
+++ b/device-types/Nokia/7210-SAS-M-1.yaml
@@ -66,6 +66,10 @@ interfaces:
     type: 10gbase-x-xfp
 module-bays:
   - name: mda-m2-xfp
+    position: '1'
   - name: Power Supply 1
+    position: '1'
   - name: Power Supply 2
+    position: '2'
   - name: Fan Tray 1
+    position: '1'
diff --git a/device-types/Nokia/7210-SAS-M-24F-2XFP.yaml b/device-types/Nokia/7210-SAS-M-24F-2XFP.yaml
index 80488109..74f59f6e 100644
--- a/device-types/Nokia/7210-SAS-M-24F-2XFP.yaml
+++ b/device-types/Nokia/7210-SAS-M-24F-2XFP.yaml
@@ -70,6 +70,10 @@ interfaces:
     type: 10gbase-x-xfp
 module-bays:
   - name: mda-m2-xfp
+    position: '1'
   - name: Power Supply 1
+    position: '1'
   - name: Power Supply 2
+    position: '2'
   - name: Fan Tray 1
+    position: '1'
diff --git a/device-types/Nokia/7210-SAS-Mxp-22F2C-4SFPP.yaml b/device-types/Nokia/7210-SAS-Mxp-22F2C-4SFPP.yaml
index 0e0fbc20..049dc4fd 100644
--- a/device-types/Nokia/7210-SAS-Mxp-22F2C-4SFPP.yaml
+++ b/device-types/Nokia/7210-SAS-Mxp-22F2C-4SFPP.yaml
@@ -70,5 +70,8 @@ interfaces:
     type: 10gbase-x-sfpp
 module-bays:
   - name: Power Supply 1
+    position: '1'
   - name: Power Supply 2
+    position: '2'
   - name: Fan Tray 1
+    position: '1'
diff --git a/device-types/Nokia/7210-SAS-T-12F10T-4XFP.yaml b/device-types/Nokia/7210-SAS-T-12F10T-4XFP.yaml
index a6beeefb..56162518 100644
--- a/device-types/Nokia/7210-SAS-T-12F10T-4XFP.yaml
+++ b/device-types/Nokia/7210-SAS-T-12F10T-4XFP.yaml
@@ -66,5 +66,8 @@ interfaces:
     type: 10gbase-x-xfp
 module-bays:
   - name: Power Supply 1
+    position: '1'
   - name: Power Supply 2
+    position: '2'
   - name: Fan Tray 1
+    position: '1'
diff --git a/device-types/Panduit/FRME1.yaml b/device-types/Panduit/FRME1.yaml
index 319b3bd3..9544821b 100644
--- a/device-types/Panduit/FRME1.yaml
+++ b/device-types/Panduit/FRME1.yaml
@@ -9,5 +9,8 @@ subdevice_role: parent
 is_powered: false
 module-bays:
   - name: A
+    position: A
   - name: B
+    position: B
   - name: C
+    position: C
diff --git a/device-types/Panduit/FRME2.yaml b/device-types/Panduit/FRME2.yaml
index 3f4b8723..3aff1314 100644
--- a/device-types/Panduit/FRME2.yaml
+++ b/device-types/Panduit/FRME2.yaml
@@ -9,8 +9,14 @@ subdevice_role: parent
 is_powered: false
 module-bays:
   - name: A
+    position: A
   - name: B
+    position: B
   - name: C
+    position: C
   - name: D
+    position: D
   - name: E
+    position: E
   - name: F
+    position: F
diff --git a/device-types/Panduit/FRME4.yaml b/device-types/Panduit/FRME4.yaml
index 5ca666ba..cac3116a 100644
--- a/device-types/Panduit/FRME4.yaml
+++ b/device-types/Panduit/FRME4.yaml
@@ -9,14 +9,26 @@ subdevice_role: parent
 is_powered: false
 module-bays:
   - name: A
+    position: A
   - name: B
+    position: B
   - name: C
+    position: C
   - name: D
+    position: D
   - name: E
+    position: E
   - name: F
+    position: F
   - name: G
+    position: G
   - name: H
+    position: H
   - name: J
+    position: J
   - name: K
+    position: K
   - name: L
+    position: L
   - name: M
+    position: M
diff --git a/device-types/QNAP/TS-873.yml b/device-types/QNAP/TS-873.yml
index fdd1b79d..a642342e 100644
--- a/device-types/QNAP/TS-873.yml
+++ b/device-types/QNAP/TS-873.yml
@@ -7,7 +7,9 @@ is_full_depth: false
 u_height: 0
 module-bays:
   - name: Slot 1
+    position: '1'
   - name: Slot 2
+    position: '2'
 comments: '[TS-873 | Hardware Specs | QNAP](https://www.qnap.com/en-me/product/ts-873/specs/hardware)'
 power-ports:
   - name: PSU
diff --git a/device-types/Schweitzer Engineering Laboratories/sel-2242-10-bay-chassis-backplane.yml b/device-types/Schweitzer Engineering Laboratories/sel-2242-10-bay-chassis-backplane.yml
index 055a9cf3..504d5181 100644
--- a/device-types/Schweitzer Engineering Laboratories/sel-2242-10-bay-chassis-backplane.yml	
+++ b/device-types/Schweitzer Engineering Laboratories/sel-2242-10-bay-chassis-backplane.yml	
@@ -6,15 +6,24 @@ description: The SEL-2242 10-bay Chassis/Backplane is a 10-slot chassis for SEL
 u_height: 2
 is_full_depth: false
 is_powered: true
-
 module-bays:
   - name: Slot A
+    position: A
   - name: Slot B
+    position: B
   - name: Slot C
+    position: C
   - name: Slot D
+    position: D
   - name: Slot E
+    position: E
   - name: Slot F
+    position: F
   - name: Slot G
+    position: G
   - name: Slot H
+    position: H
   - name: Slot I
+    position: I
   - name: Slot J
+    position: J
diff --git a/device-types/Schweitzer Engineering Laboratories/sel-2242-4-bay-chassis-backplane.yml b/device-types/Schweitzer Engineering Laboratories/sel-2242-4-bay-chassis-backplane.yml
index 3b485007..ba5f73dd 100644
--- a/device-types/Schweitzer Engineering Laboratories/sel-2242-4-bay-chassis-backplane.yml	
+++ b/device-types/Schweitzer Engineering Laboratories/sel-2242-4-bay-chassis-backplane.yml	
@@ -6,9 +6,12 @@ description: The SEL-2242 4-bay Chassis/Backplane is a 4-slot chassis for SEL Ax
 u_height: 2
 is_full_depth: false
 is_powered: true
-
 module-bays:
   - name: Slot A
+    position: A
   - name: Slot B
+    position: B
   - name: Slot C
+    position: C
   - name: Slot D
+    position: D
diff --git a/device-types/SonicWall/NSa2650.yaml b/device-types/SonicWall/NSa2650.yaml
index f9cd225b..8902f6e3 100644
--- a/device-types/SonicWall/NSa2650.yaml
+++ b/device-types/SonicWall/NSa2650.yaml
@@ -14,6 +14,7 @@ module-bays:
   - name: PSU Slot 2
     position: '2'
   - name: Expansion Module
+    position: '1'
 inventory-items:
   - name: Storage-Module
     manufacturer: SonicWall
diff --git a/device-types/SonicWall/NSa3650.yaml b/device-types/SonicWall/NSa3650.yaml
index 56265fa2..67ec6c5d 100644
--- a/device-types/SonicWall/NSa3650.yaml
+++ b/device-types/SonicWall/NSa3650.yaml
@@ -14,6 +14,7 @@ module-bays:
   - name: PSU Slot 2
     position: '2'
   - name: Expansion Module
+    position: '1'
 inventory-items:
   - name: Storage-Module
     manufacturer: SonicWall
diff --git a/device-types/SonicWall/NSa4650.yaml b/device-types/SonicWall/NSa4650.yaml
index 0d015d97..ae1e754a 100644
--- a/device-types/SonicWall/NSa4650.yaml
+++ b/device-types/SonicWall/NSa4650.yaml
@@ -14,6 +14,7 @@ module-bays:
   - name: PSU Slot 2
     position: '2'
   - name: Expansion Module
+    position: '1'
 inventory-items:
   - name: Storage-Module
     manufacturer: SonicWall
diff --git a/device-types/SonicWall/NSa4700.yaml b/device-types/SonicWall/NSa4700.yaml
index 605b16a6..e7b49ef3 100644
--- a/device-types/SonicWall/NSa4700.yaml
+++ b/device-types/SonicWall/NSa4700.yaml
@@ -14,6 +14,7 @@ module-bays:
   - name: PSU Slot 2
     position: '2'
   - name: Expansion Module
+    position: '1'
 inventory-items:
   - name: Storage-Module
     manufacturer: SonicWall
diff --git a/device-types/SonicWall/NSa5650.yaml b/device-types/SonicWall/NSa5650.yaml
index 8d03ef94..0b585d57 100644
--- a/device-types/SonicWall/NSa5650.yaml
+++ b/device-types/SonicWall/NSa5650.yaml
@@ -14,6 +14,7 @@ module-bays:
   - name: PSU Slot 2
     position: '2'
   - name: Expansion Module
+    position: '1'
 inventory-items:
   - name: Storage-Module
     manufacturer: SonicWall
diff --git a/device-types/SonicWall/NSa5700.yaml b/device-types/SonicWall/NSa5700.yaml
index 5cf71890..999fea40 100644
--- a/device-types/SonicWall/NSa5700.yaml
+++ b/device-types/SonicWall/NSa5700.yaml
@@ -14,6 +14,7 @@ module-bays:
   - name: PSU Slot 2
     position: '2'
   - name: Expansion Module
+    position: '1'
 inventory-items:
   - name: Storage-Module
     manufacturer: SonicWall
diff --git a/device-types/SonicWall/NSa6700.yaml b/device-types/SonicWall/NSa6700.yaml
index 5f7f3842..5558d4ba 100644
--- a/device-types/SonicWall/NSa6700.yaml
+++ b/device-types/SonicWall/NSa6700.yaml
@@ -14,6 +14,7 @@ module-bays:
   - name: PSU Slot 2
     position: '2'
   - name: Expansion Module
+    position: '1'
 inventory-items:
   - name: Storage-Module
     manufacturer: SonicWall
diff --git a/device-types/SonicWall/NSsp13700.yaml b/device-types/SonicWall/NSsp13700.yaml
index ef40b1fc..3c7e667c 100644
--- a/device-types/SonicWall/NSsp13700.yaml
+++ b/device-types/SonicWall/NSsp13700.yaml
@@ -14,6 +14,7 @@ module-bays:
   - name: PSU Slot 2
     position: '2'
   - name: Expansion Module
+    position: '1'
 inventory-items:
   - name: Storage-Module
     manufacturer: SonicWall
diff --git a/device-types/SonicWall/NSsp15700.yaml b/device-types/SonicWall/NSsp15700.yaml
index 8feaeca6..4ddc3064 100644
--- a/device-types/SonicWall/NSsp15700.yaml
+++ b/device-types/SonicWall/NSsp15700.yaml
@@ -14,6 +14,7 @@ module-bays:
   - name: PSU Slot 2
     position: '2'
   - name: Expansion Module
+    position: '1'
 inventory-items:
   - name: Storage-Module 1
     manufacturer: SonicWall
diff --git a/device-types/Synology/RS2416RP+.yaml b/device-types/Synology/RS2416RP+.yaml
index 745f3eb3..2dfe0e33 100644
--- a/device-types/Synology/RS2416RP+.yaml
+++ b/device-types/Synology/RS2416RP+.yaml
@@ -26,6 +26,7 @@ interfaces:
     type: 1000base-t
 module-bays:
   - name: PCIe Expansion
+    position: PCIe1
   - name: PSU 1
     position: PSU1
   - name: PSU 2
diff --git a/device-types/Synology/RS2418+.yaml b/device-types/Synology/RS2418+.yaml
index ce97decf..affb6c67 100644
--- a/device-types/Synology/RS2418+.yaml
+++ b/device-types/Synology/RS2418+.yaml
@@ -28,3 +28,4 @@ interfaces:
     type: 1000base-t
 module-bays:
   - name: PCIe Expansion
+    position: PCIe1
diff --git a/device-types/Synology/RS2418RP+.yaml b/device-types/Synology/RS2418RP+.yaml
index 5715e961..230e31d6 100644
--- a/device-types/Synology/RS2418RP+.yaml
+++ b/device-types/Synology/RS2418RP+.yaml
@@ -32,3 +32,4 @@ interfaces:
     type: 1000base-t
 module-bays:
   - name: PCIe Expansion
+    position: PCIe1
diff --git a/device-types/Testing/Test-1000.yaml b/device-types/Testing/Test-1000.yaml
index c2cfb8ec..75d21a2b 100644
--- a/device-types/Testing/Test-1000.yaml
+++ b/device-types/Testing/Test-1000.yaml
@@ -65,8 +65,11 @@ front-ports:
     rear_port: Rear Port 3
 module-bays:
   - name: Module Bay 1
+    position: '1'
   - name: Module Bay 2
+    position: '2'
   - name: Module Bay 3
+    position: '3'
 device-bays:
   - name: Device Bay 1
   - name: Device Bay 2
diff --git a/schema/components.json b/schema/components.json
index 082a13b6..75e77d1b 100644
--- a/schema/components.json
+++ b/schema/components.json
@@ -189,7 +189,8 @@
         }
       },
       "required": [
-        "name"
+        "name",
+        "position"
       ]
     },
     "device-bay": {