diff --git a/device-types/Aruba/MC-3200.yaml b/device-types/Aruba/MC-3200.yaml
index a86990cd9..c600c9918 100644
--- a/device-types/Aruba/MC-3200.yaml
+++ b/device-types/Aruba/MC-3200.yaml
@@ -7,16 +7,16 @@ u_height: 1
 interfaces:
   - name: (BASE-X)gigabitethernet 0/0/0
     type: 1000base-x-sfp
-    #comment: Combo port either 1000base-x-sfp or 1000base-t
+    # comments: Combo port either 1000base-x-sfp or 1000base-t
   - name: (BASE-X)gigabitethernet 0/0/1
     type: 1000base-x-sfp
-    #comment: Combo port either 1000base-x-sfp or 1000base-t
+    # comments: Combo port either 1000base-x-sfp or 1000base-t
   - name: (BASE-X)gigabitethernet 0/0/2
     type: 1000base-x-sfp
-    #comment: Combo port either 1000base-x-sfp or 1000base-t
+    # comments: Combo port either 1000base-x-sfp or 1000base-t
   - name: (BASE-X)gigabitethernet 0/0/3
     type: 1000base-x-sfp
-    #comment: Combo port either 1000base-x-sfp or 1000base-t
+    # comments: Combo port either 1000base-x-sfp or 1000base-t
 power-ports:
   - name: PEM0
     type: iec-60320-c14
diff --git a/device-types/Aruba/MC-3400.yaml b/device-types/Aruba/MC-3400.yaml
index cf93f490b..0f83f07b8 100644
--- a/device-types/Aruba/MC-3400.yaml
+++ b/device-types/Aruba/MC-3400.yaml
@@ -7,16 +7,16 @@ u_height: 1
 interfaces:
   - name: (BASE-X)gigabitethernet 0/0/0
     type: 1000base-x-sfp
-    #comment: Combo port either 1000base-x-sfp or 1000base-t
+    # comments: Combo port either 1000base-x-sfp or 1000base-t
   - name: (BASE-X)gigabitethernet 0/0/1
     type: 1000base-x-sfp
-    #comment: Combo port either 1000base-x-sfp or 1000base-t
+    # comments: Combo port either 1000base-x-sfp or 1000base-t
   - name: (BASE-X)gigabitethernet 0/0/2
     type: 1000base-x-sfp
-    #comment: Combo port either 1000base-x-sfp or 1000base-t
+    # comments: Combo port either 1000base-x-sfp or 1000base-t
   - name: (BASE-X)gigabitethernet 0/0/3
     type: 1000base-x-sfp
-    #comment: Combo port either 1000base-x-sfp or 1000base-t
+    # comments: Combo port either 1000base-x-sfp or 1000base-t
 power-ports:
   - name: PEM0
     type: iec-60320-c14
diff --git a/device-types/Avocent/ACS16.yaml b/device-types/Avocent/ACS16.yaml
index 64ed1188e..bb24bb28a 100644
--- a/device-types/Avocent/ACS16.yaml
+++ b/device-types/Avocent/ACS16.yaml
@@ -43,7 +43,7 @@ console-server-ports:
     type: rj-45
   - name: ttyS16
     type: rj-45
-power-port:
+power-ports:
   - name: ps1
     type: iec-60320-c14
     maximum_draw: 35
diff --git a/device-types/Avocent/Cyclades-TS1000.yaml b/device-types/Avocent/Cyclades-TS1000.yaml
index fc7048c2b..eed929118 100644
--- a/device-types/Avocent/Cyclades-TS1000.yaml
+++ b/device-types/Avocent/Cyclades-TS1000.yaml
@@ -43,6 +43,6 @@ console-server-ports:
     type: rj-45
   - name: ttyS16
     type: rj-45
-power-port:
+power-ports:
   - name: Power
     type: iec-60320-c14
diff --git a/device-types/Avocent/PM10-15A.yaml b/device-types/Avocent/PM10-15A.yaml
index 8238f5f2b..65010172e 100644
--- a/device-types/Avocent/PM10-15A.yaml
+++ b/device-types/Avocent/PM10-15A.yaml
@@ -4,7 +4,7 @@ model: PM10-15A
 slug: PM10_15A
 u_height: 1
 is_full_depth: false
-comment: AlterPath PM10-15A
+comments: AlterPath PM10-15A
 console-ports:
   - name: In
     type: rj-45
diff --git a/device-types/Avocent/PM10-20A.yaml b/device-types/Avocent/PM10-20A.yaml
index 6617dcbcb..9c26fbc47 100644
--- a/device-types/Avocent/PM10-20A.yaml
+++ b/device-types/Avocent/PM10-20A.yaml
@@ -4,7 +4,7 @@ model: PM10-20A
 slug: PM10_20A
 u_height: 1
 is_full_depth: false
-comment: AlterPath PM10-20A
+comments: AlterPath PM10-20A
 console-ports:
   - name: In
     type: rj-45
diff --git a/device-types/Avocent/PM10-L20A.yaml b/device-types/Avocent/PM10-L20A.yaml
index 93899fd2a..dbfa85ab9 100644
--- a/device-types/Avocent/PM10-L20A.yaml
+++ b/device-types/Avocent/PM10-L20A.yaml
@@ -4,7 +4,7 @@ model: PM10-L20A
 slug: PM10_L20A
 u_height: 1
 is_full_depth: false
-comment: AlterPath PM10-L20A
+comments: AlterPath PM10-L20A
 console-ports:
   - name: In
     type: rj-45
diff --git a/device-types/Avocent/PM10-L30A.yaml b/device-types/Avocent/PM10-L30A.yaml
index 3fbeecfe1..a43433af4 100644
--- a/device-types/Avocent/PM10-L30A.yaml
+++ b/device-types/Avocent/PM10-L30A.yaml
@@ -4,7 +4,7 @@ model: PM10-L30A
 slug: PM10_L30A
 u_height: 1
 is_full_depth: false
-comment: AlterPath PM10-L30A
+comments: AlterPath PM10-L30A
 console-ports:
   - name: In
     type: rj-45
diff --git a/device-types/Avocent/PM10i-10A.yaml b/device-types/Avocent/PM10i-10A.yaml
index 5fb3fc410..20927e14d 100644
--- a/device-types/Avocent/PM10i-10A.yaml
+++ b/device-types/Avocent/PM10i-10A.yaml
@@ -4,7 +4,7 @@ model: PM10i-10A
 slug: PM10i_10A
 u_height: 1
 is_full_depth: false
-comment: AlterPath PM10i-10A
+comments: AlterPath PM10i-10A
 console-ports:
   - name: In
     type: rj-45
diff --git a/device-types/Avocent/PM10i-15A.yaml b/device-types/Avocent/PM10i-15A.yaml
index 52221d8e9..88986eae2 100644
--- a/device-types/Avocent/PM10i-15A.yaml
+++ b/device-types/Avocent/PM10i-15A.yaml
@@ -4,7 +4,7 @@ model: PM10i-15A
 slug: PM10i_15A
 u_height: 1
 is_full_depth: false
-comment: AlterPath PM10i-15A
+comments: AlterPath PM10i-15A
 console-ports:
   - name: In
     type: rj-45
diff --git a/device-types/Avocent/PM10i-16A.yaml b/device-types/Avocent/PM10i-16A.yaml
index 238bb20a4..a48258128 100644
--- a/device-types/Avocent/PM10i-16A.yaml
+++ b/device-types/Avocent/PM10i-16A.yaml
@@ -4,7 +4,7 @@ model: PM10i-16A
 slug: PM10i_16A
 u_height: 1
 is_full_depth: false
-comment: AlterPath PM10i-16A
+comments: AlterPath PM10i-16A
 console-ports:
   - name: In
     type: rj-45
diff --git a/device-types/Avocent/PM10i-20A.yaml b/device-types/Avocent/PM10i-20A.yaml
index 5da7316e3..f0ce6b33c 100644
--- a/device-types/Avocent/PM10i-20A.yaml
+++ b/device-types/Avocent/PM10i-20A.yaml
@@ -4,7 +4,7 @@ model: PM10i-20A
 slug: PM10i_20A
 u_height: 1
 is_full_depth: false
-comment: AlterPath PM10i-20A
+comments: AlterPath PM10i-20A
 console-ports:
   - name: In
     type: rj-45
diff --git a/device-types/Avocent/PM10i-L30A.yaml b/device-types/Avocent/PM10i-L30A.yaml
index 6af824bfb..c1a7ea667 100644
--- a/device-types/Avocent/PM10i-L30A.yaml
+++ b/device-types/Avocent/PM10i-L30A.yaml
@@ -4,7 +4,7 @@ model: PM10i-L30A
 slug: PM10i_L30A
 u_height: 1
 is_full_depth: false
-comment: AlterPath PM10i-L30A
+comments: AlterPath PM10i-L30A
 console-ports:
   - name: In
     type: rj-45
diff --git a/device-types/Avocent/PM20-20A.yaml b/device-types/Avocent/PM20-20A.yaml
index 4aff0d919..89ed0072e 100644
--- a/device-types/Avocent/PM20-20A.yaml
+++ b/device-types/Avocent/PM20-20A.yaml
@@ -4,7 +4,7 @@ model: PM20-20A
 slug: pm20_20a
 u_height: 0
 is_full_depth: false
-comment: AlterPath PM20-20A
+comments: AlterPath PM20-20A
 console-ports:
   - name: In
     type: rj-45
diff --git a/device-types/Avocent/PM20-L20A.yaml b/device-types/Avocent/PM20-L20A.yaml
index 82bc8bb6d..7e6752fb7 100644
--- a/device-types/Avocent/PM20-L20A.yaml
+++ b/device-types/Avocent/PM20-L20A.yaml
@@ -4,7 +4,7 @@ model: PM20-L20A
 slug: pm20_l20a
 u_height: 0
 is_full_depth: false
-comment: AlterPath PM20-L20A
+comments: AlterPath PM20-L20A
 console-ports:
   - name: In
     type: rj-45
diff --git a/device-types/Avocent/PM20-L30A.yaml b/device-types/Avocent/PM20-L30A.yaml
index 29abaccab..c26afec5b 100644
--- a/device-types/Avocent/PM20-L30A.yaml
+++ b/device-types/Avocent/PM20-L30A.yaml
@@ -4,7 +4,7 @@ model: PM20-L30A
 slug: pm20_l30a
 u_height: 0
 is_full_depth: false
-comment: AlterPath PM20-L30A
+comments: AlterPath PM20-L30A
 console-ports:
   - name: In
     type: rj-45
diff --git a/device-types/Avocent/PM20i-16A.yaml b/device-types/Avocent/PM20i-16A.yaml
index 70342226f..b704d9336 100644
--- a/device-types/Avocent/PM20i-16A.yaml
+++ b/device-types/Avocent/PM20i-16A.yaml
@@ -4,7 +4,7 @@ model: PM20i-16A
 slug: pm20i_16a
 u_height: 0
 is_full_depth: false
-comment: AlterPath PM20i-16A
+comments: AlterPath PM20i-16A
 console-ports:
   - name: In
     type: rj-45
diff --git a/device-types/Avocent/PM20i-20A.yaml b/device-types/Avocent/PM20i-20A.yaml
index 70d102567..22e1d105d 100644
--- a/device-types/Avocent/PM20i-20A.yaml
+++ b/device-types/Avocent/PM20i-20A.yaml
@@ -4,7 +4,7 @@ model: PM20i-20A
 slug: pm20i_20a
 u_height: 0
 is_full_depth: false
-comment: AlterPath PM20i-20A
+comments: AlterPath PM20i-20A
 console-ports:
   - name: In
     type: rj-45
diff --git a/device-types/Avocent/PM20i-L30A.yaml b/device-types/Avocent/PM20i-L30A.yaml
index f363fa2d6..37a02150c 100644
--- a/device-types/Avocent/PM20i-L30A.yaml
+++ b/device-types/Avocent/PM20i-L30A.yaml
@@ -4,7 +4,7 @@ model: PM20i-L30A
 slug: pm20i_l30a
 u_height: 0
 is_full_depth: false
-comment: AlterPath PM20i-L30A
+comments: AlterPath PM20i-L30A
 console-ports:
   - name: In
     type: rj-45
diff --git a/device-types/Avocent/PM3009H.yaml b/device-types/Avocent/PM3009H.yaml
index 290735040..56c96acd9 100644
--- a/device-types/Avocent/PM3009H.yaml
+++ b/device-types/Avocent/PM3009H.yaml
@@ -4,7 +4,6 @@ model: PM3009H
 slug: PM3009H
 u_height: 1
 is_full_depth: false
-# comment:
 console-ports:
   - name: In/Console
     type: rj-45
diff --git a/device-types/Cisco/C9200-24P.yaml b/device-types/Cisco/C9200-24P.yaml
index 52dcb1384..51504f8d7 100644
--- a/device-types/Cisco/C9200-24P.yaml
+++ b/device-types/Cisco/C9200-24P.yaml
@@ -6,12 +6,12 @@ slug: c9200-24p
 u_height: 1
 is_full_depth: false
 comments: '[Cisco Catalyst 9200 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9200-series-switches/nb-06-cat9200-ser-data-sheet-cte-en.html)'
-console_ports:
+console-ports:
   - name: Console
     type: rj-45
   - name: usb
     type: usb-mini-b
-power_ports:
+power-ports:
   - name: PS-1
     type: iec-60320-c14
     maximum_draw: 600
diff --git a/device-types/Cisco/C9200-24T.yaml b/device-types/Cisco/C9200-24T.yaml
index e237ca90e..4646e1392 100644
--- a/device-types/Cisco/C9200-24T.yaml
+++ b/device-types/Cisco/C9200-24T.yaml
@@ -6,12 +6,12 @@ slug: c9200-24t
 u_height: 1
 is_full_depth: false
 comments: '[Cisco Catalyst 9200 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9200-series-switches/nb-06-cat9200-ser-data-sheet-cte-en.html)'
-console_ports:
+console-ports:
   - name: Console
     type: rj-45
   - name: usb
     type: usb-mini-b
-power_ports:
+power-ports:
   - name: PS-1
     type: iec-60320-c14
     maximum_draw: 125
diff --git a/device-types/Cisco/C9200-48P.yaml b/device-types/Cisco/C9200-48P.yaml
index 2ddecdbbc..9f60b018b 100644
--- a/device-types/Cisco/C9200-48P.yaml
+++ b/device-types/Cisco/C9200-48P.yaml
@@ -6,12 +6,12 @@ slug: c9200-48p
 u_height: 1
 is_full_depth: false
 comments: '[Cisco Catalyst 9200 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9200-series-switches/nb-06-cat9200-ser-data-sheet-cte-en.html)'
-console_ports:
+console-ports:
   - name: Console
     type: rj-45
   - name: usb
     type: usb-mini-b
-power_ports:
+power-ports:
   - name: PS-1
     type: iec-60320-c14
     maximum_draw: 740
diff --git a/device-types/Cisco/C9200-48T.yaml b/device-types/Cisco/C9200-48T.yaml
index 2e66e0a91..f77808b2e 100644
--- a/device-types/Cisco/C9200-48T.yaml
+++ b/device-types/Cisco/C9200-48T.yaml
@@ -6,12 +6,12 @@ slug: c9200-48t
 u_height: 1
 is_full_depth: false
 comments: '[Cisco Catalyst 9200 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9200-series-switches/nb-06-cat9200-ser-data-sheet-cte-en.html)'
-console_ports:
+console-ports:
   - name: Console
     type: rj-45
   - name: usb
     type: usb-mini-b
-power_ports:
+power-ports:
   - name: PS-1
     type: iec-60320-c14
     maximum_draw: 125
diff --git a/device-types/Cisco/C9200L-24P-4G.yaml b/device-types/Cisco/C9200L-24P-4G.yaml
index a4df6acc3..39b89ecf4 100644
--- a/device-types/Cisco/C9200L-24P-4G.yaml
+++ b/device-types/Cisco/C9200L-24P-4G.yaml
@@ -6,12 +6,12 @@ slug: c9200l-24p-4g
 u_height: 1
 is_full_depth: false
 comments: '[Cisco Catalyst 9200 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9200-series-switches/nb-06-cat9200-ser-data-sheet-cte-en.html)'
-console_ports:
+console-ports:
   - name: Console
     type: rj-45
   - name: usb
     type: usb-mini-b
-power_ports:
+power-ports:
   - name: PS-1
     type: iec-60320-c14
     maximum_draw: 600
diff --git a/device-types/Cisco/C9200L-24P-4X.yaml b/device-types/Cisco/C9200L-24P-4X.yaml
index e827ac42c..b31e08867 100644
--- a/device-types/Cisco/C9200L-24P-4X.yaml
+++ b/device-types/Cisco/C9200L-24P-4X.yaml
@@ -6,12 +6,12 @@ slug: c9200l-24p-4x
 u_height: 1
 is_full_depth: false
 comments: '[Cisco Catalyst 9200 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9200-series-switches/nb-06-cat9200-ser-data-sheet-cte-en.html)'
-console_ports:
+console-ports:
   - name: Console
     type: rj-45
   - name: usb
     type: usb-mini-b
-power_ports:
+power-ports:
   - name: PS-1
     type: iec-60320-c14
     maximum_draw: 600
diff --git a/device-types/Cisco/C9200L-24T-4G.yaml b/device-types/Cisco/C9200L-24T-4G.yaml
index b628677d2..8bc1774fa 100644
--- a/device-types/Cisco/C9200L-24T-4G.yaml
+++ b/device-types/Cisco/C9200L-24T-4G.yaml
@@ -6,12 +6,12 @@ slug: c9200l-24t-4g
 u_height: 1
 is_full_depth: false
 comments: '[Cisco Catalyst 9200 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9200-series-switches/nb-06-cat9200-ser-data-sheet-cte-en.html)'
-console_ports:
+console-ports:
   - name: Console
     type: rj-45
   - name: usb
     type: usb-mini-b
-power_ports:
+power-ports:
   - name: PS-1
     type: iec-60320-c14
     maximum_draw: 125
diff --git a/device-types/Cisco/C9200L-24T-4X.yaml b/device-types/Cisco/C9200L-24T-4X.yaml
index b1ea9ba05..3a4fef303 100644
--- a/device-types/Cisco/C9200L-24T-4X.yaml
+++ b/device-types/Cisco/C9200L-24T-4X.yaml
@@ -6,12 +6,12 @@ slug: c9200l-24t-4x
 u_height: 1
 is_full_depth: false
 comments: '[Cisco Catalyst 9200 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9200-series-switches/nb-06-cat9200-ser-data-sheet-cte-en.html)'
-console_ports:
+console-ports:
   - name: Console
     type: rj-45
   - name: usb
     type: usb-mini-b
-power_ports:
+power-ports:
   - name: PS-1
     type: iec-60320-c14
     maximum_draw: 125
diff --git a/device-types/Cisco/C9200L-48P-4G.yaml b/device-types/Cisco/C9200L-48P-4G.yaml
index 873637801..517945ace 100644
--- a/device-types/Cisco/C9200L-48P-4G.yaml
+++ b/device-types/Cisco/C9200L-48P-4G.yaml
@@ -6,12 +6,12 @@ slug: c9200l-48p-4g
 u_height: 1
 is_full_depth: false
 comments: '[Cisco Catalyst 9200 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9200-series-switches/nb-06-cat9200-ser-data-sheet-cte-en.html)'
-console_ports:
+console-ports:
   - name: Console
     type: rj-45
   - name: usb
     type: usb-mini-b
-power_ports:
+power-ports:
   - name: PS-1
     type: iec-60320-c14
     maximum_draw: 740
diff --git a/device-types/Cisco/C9200L-48P-4X.yaml b/device-types/Cisco/C9200L-48P-4X.yaml
index 98e118b9a..6aac9624f 100644
--- a/device-types/Cisco/C9200L-48P-4X.yaml
+++ b/device-types/Cisco/C9200L-48P-4X.yaml
@@ -6,12 +6,12 @@ slug: c9200l-48p-4x
 u_height: 1
 is_full_depth: false
 comments: '[Cisco Catalyst 9200 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9200-series-switches/nb-06-cat9200-ser-data-sheet-cte-en.html)'
-console_ports:
+console-ports:
   - name: Console
     type: rj-45
   - name: usb
     type: usb-mini-b
-power_ports:
+power-ports:
   - name: PS-1
     type: iec-60320-c14
     maximum_draw: 740
diff --git a/device-types/Cisco/C9200L-48PL-4G.yaml b/device-types/Cisco/C9200L-48PL-4G.yaml
index c69db4846..ee951d0d8 100644
--- a/device-types/Cisco/C9200L-48PL-4G.yaml
+++ b/device-types/Cisco/C9200L-48PL-4G.yaml
@@ -6,12 +6,12 @@ slug: c9200l-48lp-4g
 u_height: 1
 is_full_depth: false
 comments: '[Cisco Catalyst 9200 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9200-series-switches/nb-06-cat9200-ser-data-sheet-cte-en.html)'
-console_ports:
+console-ports:
   - name: Console
     type: rj-45
   - name: usb
     type: usb-mini-b
-power_ports:
+power-ports:
   - name: PS-1
     type: iec-60320-c14
     maximum_draw: 600
diff --git a/device-types/Cisco/C9200L-48T-4G.yaml b/device-types/Cisco/C9200L-48T-4G.yaml
index 1c44a3d4a..439ecbf64 100644
--- a/device-types/Cisco/C9200L-48T-4G.yaml
+++ b/device-types/Cisco/C9200L-48T-4G.yaml
@@ -6,12 +6,12 @@ slug: c9200l-48t-4g
 u_height: 1
 is_full_depth: false
 comments: '[Cisco Catalyst 9200 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9200-series-switches/nb-06-cat9200-ser-data-sheet-cte-en.html)'
-console_ports:
+console-ports:
   - name: Console
     type: rj-45
   - name: usb
     type: usb-mini-b
-power_ports:
+power-ports:
   - name: PS-1
     type: iec-60320-c14
     maximum_draw: 125
diff --git a/device-types/Cisco/C9200L-48T-4X.yaml b/device-types/Cisco/C9200L-48T-4X.yaml
index c54198012..ffbb28595 100644
--- a/device-types/Cisco/C9200L-48T-4X.yaml
+++ b/device-types/Cisco/C9200L-48T-4X.yaml
@@ -6,12 +6,12 @@ slug: c9200l-48t-4x
 u_height: 1
 is_full_depth: false
 comments: '[Cisco Catalyst 9200 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9200-series-switches/nb-06-cat9200-ser-data-sheet-cte-en.html)'
-console_ports:
+console-ports:
   - name: Console
     type: rj-45
   - name: usb
     type: usb-mini-b
-power_ports:
+power-ports:
   - name: PS-1
     type: iec-60320-c14
     maximum_draw: 125
diff --git a/device-types/Cisco/C9300-24T.yaml b/device-types/Cisco/C9300-24T.yaml
index e07ef1668..1c9b1cb1f 100644
--- a/device-types/Cisco/C9300-24T.yaml
+++ b/device-types/Cisco/C9300-24T.yaml
@@ -5,12 +5,12 @@ part_number: C9300-24T
 slug: c9300-24t
 u_height: 1
 is_full_depth: true
-console_ports:
+console-ports:
   - name: con 0
     type: rj-45
   - name: usb
     type: usb-mini-b
-power_ports:
+power-ports:
   - name: PS-A
     type: iec-60320-c14
     maximum_draw: 350
diff --git a/device-types/Cisco/CISCO2951_K9.yaml b/device-types/Cisco/CISCO2951_K9.yaml
index e2738277c..8e697b805 100644
--- a/device-types/Cisco/CISCO2951_K9.yaml
+++ b/device-types/Cisco/CISCO2951_K9.yaml
@@ -5,11 +5,12 @@ part_number: CISCO2951/K9
 slug: cisco2951_K9
 u_height: 2
 is_full_depth: true
-console_ports:
+console-ports:
   - name: con 0
     type: rj-45
-power_ports:
+power-ports:
   - name: PS-1
+    type: iec-60320-c14
     allocated_draw: 70
     maximum_draw: 340
 interfaces:
diff --git a/device-types/Cisco/CISCO3925.yaml b/device-types/Cisco/CISCO3925.yaml
index 966a502bd..e292673b7 100644
--- a/device-types/Cisco/CISCO3925.yaml
+++ b/device-types/Cisco/CISCO3925.yaml
@@ -5,14 +5,16 @@ part_number: CISCO3925-CHASSIS
 slug: cisco3925
 u_height: 3
 is_full_depth: true
-console_ports:
+console-ports:
   - name: con 0
     type: rj-45
-power_ports:
+power-ports:
   - name: PS-1
+    type: iec-60320-c14
     allocated_draw: 100
     maximum_draw: 420
   - name: PS-2
+    type: iec-60320-c14
     allocated_draw: 100
     maximum_draw: 420
 interfaces:
diff --git a/device-types/Cisco/CS-500.yaml b/device-types/Cisco/CS-500.yaml
index 11ba48b95..eb23f71d5 100644
--- a/device-types/Cisco/CS-500.yaml
+++ b/device-types/Cisco/CS-500.yaml
@@ -72,6 +72,6 @@ console-server-ports:
     type: rj-45
   - name: J16
     type: rj-45
-power-port:
+power-ports:
   - name: Power
     type: iec-60320-c14
diff --git a/device-types/Cisco/WS-C2960CG-8TL.yaml b/device-types/Cisco/WS-C2960CG-8TL.yaml
index ae786896b..505eb13b0 100644
--- a/device-types/Cisco/WS-C2960CG-8TL.yaml
+++ b/device-types/Cisco/WS-C2960CG-8TL.yaml
@@ -8,7 +8,7 @@ is_full_depth: false
 console-ports:
   - name: CON0
     type: rj-45
-power_ports:
+power-ports:
   - name: PSU0
     type: iec-60320-c14
 interfaces:
diff --git a/device-types/CyberPower/CPS-1215RMS.yaml b/device-types/CyberPower/CPS-1215RMS.yaml
index 602c6a2d6..18d0ef8f3 100644
--- a/device-types/CyberPower/CPS-1215RMS.yaml
+++ b/device-types/CyberPower/CPS-1215RMS.yaml
@@ -4,7 +4,7 @@ model: CPS-1215RMS
 slug: CPS-1215RMS
 u_height: 1
 is_full_depth: false
-# comment: CyberPower PDU 1U, 12 outlet 15A 120V
+# comments: CyberPower PDU 1U, 12 outlet 15A 120V
 power-ports:
   - name: Power Port 1
     type: nema-5-15p
diff --git a/device-types/CyberPower/CPS1215RMS.yaml b/device-types/CyberPower/CPS1215RMS.yaml
index e046453f0..9ca7a1088 100644
--- a/device-types/CyberPower/CPS1215RMS.yaml
+++ b/device-types/CyberPower/CPS1215RMS.yaml
@@ -5,7 +5,7 @@ slug: cps1215rms
 part_number: cps1215rms
 u_height: 1
 is_full_depth: false
-# comment: CyberPower PDU 1u, 12 outlet 15A 100-125V
+# comments: CyberPower PDU 1u, 12 outlet 15A 100-125V
 power-ports:
   - name: Power Port 1
     type: nema-5-15p
diff --git a/device-types/CyberPower/OR1000LCDRM1U.yaml b/device-types/CyberPower/OR1000LCDRM1U.yaml
index 8b9c4608a..adb9e5221 100644
--- a/device-types/CyberPower/OR1000LCDRM1U.yaml
+++ b/device-types/CyberPower/OR1000LCDRM1U.yaml
@@ -5,7 +5,7 @@ slug: or1000lcdrm1u
 part_number: or1000lcdrm1u
 u_height: 1
 is_full_depth: true
-comment: Smart App LCD 1000va UPS
+comments: Smart App LCD 1000va UPS
 power-ports:
   - name: AC Input
     type: nema-5-15p
diff --git a/device-types/CyberPower/OR2200LCDRT2U.yaml b/device-types/CyberPower/OR2200LCDRT2U.yaml
index 91eb06fd5..1d3f7144b 100644
--- a/device-types/CyberPower/OR2200LCDRT2U.yaml
+++ b/device-types/CyberPower/OR2200LCDRT2U.yaml
@@ -4,7 +4,7 @@ model: OR2200LCDRT2U
 slug: or2200lcdrt2u
 u_height: 2
 is_full_depth: true
-# comment: Smart App LCD 2200va UPS
+# comments: Smart App LCD 2200va UPS
 power-ports:
   - name: AC Input
     type: nema-5-20p
diff --git a/device-types/CyberPower/PDU15M2F12R.yaml b/device-types/CyberPower/PDU15M2F12R.yaml
index 78c4114a0..e0db04f26 100644
--- a/device-types/CyberPower/PDU15M2F12R.yaml
+++ b/device-types/CyberPower/PDU15M2F12R.yaml
@@ -4,7 +4,7 @@ model: PDU15M2F12R
 slug: PDU15M2F12R
 u_height: 1
 is_full_depth: false
-# comment: CyberPower PDU 1u, 14 outlet 15A 100-125V
+# comments: CyberPower PDU 1u, 14 outlet 15A 100-125V
 power-ports:
   - name: Power Port 1
     type: nema-5-15p
diff --git a/device-types/CyberPower/cps1220rms.yaml b/device-types/CyberPower/cps1220rms.yaml
index fc3b9f1c8..581298543 100644
--- a/device-types/CyberPower/cps1220rms.yaml
+++ b/device-types/CyberPower/cps1220rms.yaml
@@ -5,7 +5,7 @@ slug: cps-1220rms
 part_number: cps1220rms
 u_height: 1
 is_full_depth: false
-# comment: CyberPower PDU 1u, 12 outlet 20A 100-125V
+# comments: CyberPower PDU 1u, 12 outlet 20A 100-125V
 power-ports:
   - name: Power Port 1
     type: nema-5-20p
diff --git a/device-types/Dell/Networking_N3048.yaml b/device-types/Dell/Networking_N3048.yaml
index ea0f4d3a4..9ab86f970 100644
--- a/device-types/Dell/Networking_N3048.yaml
+++ b/device-types/Dell/Networking_N3048.yaml
@@ -106,10 +106,10 @@ interfaces:
     type: 1000base-t
   - name: Gi1/0/47
     type: 1000base-t
-    #comment: Combo port either 1000base-x-sfp or 1000base-t
+    # comments: Combo port either 1000base-x-sfp or 1000base-t
   - name: Gi1/0/48
     type: 1000base-t
-    #comment: Combo port either 1000base-x-sfp or 1000base-t
+    # comments: Combo port either 1000base-x-sfp or 1000base-t
   - name: Te1/0/1
     type: 10gbase-x-sfpp
   - name: Te1/0/2
diff --git a/device-types/Digital Loggers/smart_power_supply_pro.yaml b/device-types/Digital Loggers/smart_power_supply_pro.yaml
index 4250e297a..b8f959ac6 100644
--- a/device-types/Digital Loggers/smart_power_supply_pro.yaml	
+++ b/device-types/Digital Loggers/smart_power_supply_pro.yaml	
@@ -26,9 +26,9 @@ power-outlets:
     type: nema-5-15r
   - name: unswitched  - Down
     type: nema-5-15r
-power-port:
+power-ports:
   - name: AC in
-    type: iec-320-c5
+    type: iec-60320-c20
     maximum_draw: 1500
 interfaces:
   - name: eth0
diff --git a/device-types/Eaton/5PX3000RTN.yaml b/device-types/Eaton/5PX3000RTN.yaml
index c65008a66..e35d33d5d 100644
--- a/device-types/Eaton/5PX3000RTN.yaml
+++ b/device-types/Eaton/5PX3000RTN.yaml
@@ -19,7 +19,7 @@ power-outlets:
     type: nema-5-20r
   - name: L5-30R
     type: nema-5-30r
-power-port:
+power-ports:
   - name: L530R
     type: nema-5-30p
 interfaces:
diff --git a/device-types/Eaton/9PX6K.yaml b/device-types/Eaton/9PX6K.yaml
index 82551d884..3faf852e4 100644
--- a/device-types/Eaton/9PX6K.yaml
+++ b/device-types/Eaton/9PX6K.yaml
@@ -14,7 +14,7 @@ power-outlets:
     type: nema-6-30r
   - name: Outlet 4
     type: nema-6-30r
-power-port:
+power-ports:
   - name: L630R
     type: nema-6-30p
 interfaces:
diff --git a/device-types/Extreme Networks/715W_AC_PSU_FB.yaml b/device-types/Extreme Networks/715W_AC_PSU_FB.yaml
index 225c22c83..b8f27a743 100644
--- a/device-types/Extreme Networks/715W_AC_PSU_FB.yaml	
+++ b/device-types/Extreme Networks/715W_AC_PSU_FB.yaml	
@@ -6,7 +6,6 @@ part_number: '10951'
 u_height: 0
 is_full_depth: false
 subdevice_role: child
-comments: ''
 power-ports:
   - name: PSU
     type: iec-60320-c14
diff --git a/device-types/Extreme Networks/X460-G2-24t-10GE4.yaml b/device-types/Extreme Networks/X460-G2-24t-10GE4.yaml
index 19a83e6b9..0b4768fb9 100644
--- a/device-types/Extreme Networks/X460-G2-24t-10GE4.yaml	
+++ b/device-types/Extreme Networks/X460-G2-24t-10GE4.yaml	
@@ -6,7 +6,6 @@ part_number: '16701'
 u_height: 1
 is_full_depth: false
 subdevice_role: parent
-comments: ''
 console-ports:
   - name: Console
     type: rj-45
diff --git a/device-types/Extreme Networks/X460-G2-48p-10GE4.yaml b/device-types/Extreme Networks/X460-G2-48p-10GE4.yaml
index 2d54cb4e3..7dafa7fbb 100644
--- a/device-types/Extreme Networks/X460-G2-48p-10GE4.yaml	
+++ b/device-types/Extreme Networks/X460-G2-48p-10GE4.yaml	
@@ -6,7 +6,6 @@ part_number: '16704'
 u_height: 1
 is_full_depth: true
 subdevice_role: parent
-comments: ''
 console-ports:
   - name: Console
     type: rj-45
diff --git a/device-types/Extreme Networks/X460-G2_VIM-2x.yaml b/device-types/Extreme Networks/X460-G2_VIM-2x.yaml
index 72088b53e..84f655ecc 100644
--- a/device-types/Extreme Networks/X460-G2_VIM-2x.yaml	
+++ b/device-types/Extreme Networks/X460-G2_VIM-2x.yaml	
@@ -6,7 +6,6 @@ part_number: '16711'
 u_height: 0
 is_full_depth: false
 subdevice_role: child
-comments: ''
 interfaces:
   - name: '33'
     type: 10gbase-x-sfpp
diff --git a/device-types/FS/FMU-1UFMX-N.yaml b/device-types/FS/FMU-1UFMX-N.yaml
index 09c3d40d0..b6560d180 100644
--- a/device-types/FS/FMU-1UFMX-N.yaml
+++ b/device-types/FS/FMU-1UFMX-N.yaml
@@ -2,7 +2,7 @@
 manufacturer: FS
 model: FMU-1UFMX-N
 slug: fmu-1ufmx-n
-comment: FMU 2-Slot 1U Rack-Chassis
+comments: FMU 2-Slot 1U Rack-Chassis
 part_number: FMU-1UFMX-N
 u_height: 1
 is_full_depth: false
diff --git a/device-types/FS/FMU-MC082745.yaml b/device-types/FS/FMU-MC082745.yaml
index f1dc229f6..ace1cbcb8 100644
--- a/device-types/FS/FMU-MC082745.yaml
+++ b/device-types/FS/FMU-MC082745.yaml
@@ -2,7 +2,7 @@
 manufacturer: FS
 model: FMU-MC082745
 slug: fmu-mc082745
-comment: 8Ch CWDM MUX 1270-1450 (Skip 1390,1410)
+comments: 8Ch CWDM MUX 1270-1450 (Skip 1390,1410)
 part_number: '42937'
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-200F.yaml b/device-types/Fortinet/FG-200F.yaml
index 6fda9c8b4..ab2250931 100644
--- a/device-types/Fortinet/FG-200F.yaml
+++ b/device-types/Fortinet/FG-200F.yaml
@@ -5,7 +5,6 @@ slug: fg-200f
 part_number: FG-200F
 u_height: 1
 is_full_depth: false
-comments:
 console-ports:
   - name: Console
     type: rj-45
diff --git a/device-types/Generic/shelf-1he.yaml b/device-types/Generic/shelf-1he.yaml
index 375f758b9..967411b1d 100644
--- a/device-types/Generic/shelf-1he.yaml
+++ b/device-types/Generic/shelf-1he.yaml
@@ -3,4 +3,4 @@ manufacturer: Generic
 model: shelf-1he
 slug: shelf-1he
 u_height: 1
-full_depth: false
+is_full_depth: false
diff --git a/device-types/Generic/shelf-2he.yaml b/device-types/Generic/shelf-2he.yaml
index a22f54454..4f1aebbf6 100644
--- a/device-types/Generic/shelf-2he.yaml
+++ b/device-types/Generic/shelf-2he.yaml
@@ -3,4 +3,4 @@ manufacturer: Generic
 model: shelf-2he
 slug: shelf-2he
 u_height: 2
-full_depth: false
+is_full_depth: false
diff --git a/device-types/Mellanox/SB7800.yml b/device-types/Mellanox/SB7800.yml
index aac28d8bc..502ee83ea 100644
--- a/device-types/Mellanox/SB7800.yml
+++ b/device-types/Mellanox/SB7800.yml
@@ -4,10 +4,10 @@ model: SB7800
 slug: sb7800
 u_height: 1
 is_full_depth: false
-console_ports:
+console-ports:
   - name: Console
     type: rj-45
-power_ports:
+power-ports:
   - name: ps1
     type: iec-60320-c14
     maximum_draw: 460
diff --git a/device-types/MikroTik/RB951G-2HnD.yaml b/device-types/MikroTik/RB951G-2HnD.yaml
index a87acb4f1..b6ece0478 100644
--- a/device-types/MikroTik/RB951G-2HnD.yaml
+++ b/device-types/MikroTik/RB951G-2HnD.yaml
@@ -2,7 +2,7 @@
 manufacturer: MikroTik
 model: RB951G-2HnD
 slug: rb951g-2hnd
-console-server-port:
+console-server-ports:
   - name: usb
     type: usb-a
 power-ports:
diff --git a/device-types/Rockwell Automation/1783-BMS06SA.yaml b/device-types/Rockwell Automation/1783-BMS06SA.yaml
index 1a4c2482f..6efd9d2f6 100644
--- a/device-types/Rockwell Automation/1783-BMS06SA.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS06SA.yaml	
@@ -25,7 +25,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 15
diff --git a/device-types/Rockwell Automation/1783-BMS06SGA.yaml b/device-types/Rockwell Automation/1783-BMS06SGA.yaml
index f9e1da374..918291d5a 100644
--- a/device-types/Rockwell Automation/1783-BMS06SGA.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS06SGA.yaml	
@@ -25,7 +25,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 15
diff --git a/device-types/Rockwell Automation/1783-BMS06SGL.yaml b/device-types/Rockwell Automation/1783-BMS06SGL.yaml
index 9caba6d24..77445362a 100644
--- a/device-types/Rockwell Automation/1783-BMS06SGL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS06SGL.yaml	
@@ -25,7 +25,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 15
diff --git a/device-types/Rockwell Automation/1783-BMS06SL.yaml b/device-types/Rockwell Automation/1783-BMS06SL.yaml
index ee4ea2e0f..cb18ff867 100644
--- a/device-types/Rockwell Automation/1783-BMS06SL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS06SL.yaml	
@@ -25,7 +25,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 15
diff --git a/device-types/Rockwell Automation/1783-BMS06TA.yaml b/device-types/Rockwell Automation/1783-BMS06TA.yaml
index ad8210394..f6bccd50a 100644
--- a/device-types/Rockwell Automation/1783-BMS06TA.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS06TA.yaml	
@@ -25,7 +25,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 15
diff --git a/device-types/Rockwell Automation/1783-BMS06TGA.yaml b/device-types/Rockwell Automation/1783-BMS06TGA.yaml
index 246035781..f9e708ff8 100644
--- a/device-types/Rockwell Automation/1783-BMS06TGA.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS06TGA.yaml	
@@ -25,7 +25,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 15
diff --git a/device-types/Rockwell Automation/1783-BMS06TGL.yaml b/device-types/Rockwell Automation/1783-BMS06TGL.yaml
index e00cd93a0..331ee693d 100644
--- a/device-types/Rockwell Automation/1783-BMS06TGL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS06TGL.yaml	
@@ -25,7 +25,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 15
diff --git a/device-types/Rockwell Automation/1783-BMS06TL.yaml b/device-types/Rockwell Automation/1783-BMS06TL.yaml
index e3b61eef1..0809d031a 100644
--- a/device-types/Rockwell Automation/1783-BMS06TL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS06TL.yaml	
@@ -25,7 +25,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 15
diff --git a/device-types/Rockwell Automation/1783-BMS10CA.yaml b/device-types/Rockwell Automation/1783-BMS10CA.yaml
index d08bf9acc..9d564b9aa 100644
--- a/device-types/Rockwell Automation/1783-BMS10CA.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS10CA.yaml	
@@ -33,7 +33,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 17
diff --git a/device-types/Rockwell Automation/1783-BMS10CGA.yaml b/device-types/Rockwell Automation/1783-BMS10CGA.yaml
index 78330e40a..1b3c6e97b 100644
--- a/device-types/Rockwell Automation/1783-BMS10CGA.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS10CGA.yaml	
@@ -33,7 +33,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 17
diff --git a/device-types/Rockwell Automation/1783-BMS10CGL.yaml b/device-types/Rockwell Automation/1783-BMS10CGL.yaml
index 12c1f3be0..b0d8223e3 100644
--- a/device-types/Rockwell Automation/1783-BMS10CGL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS10CGL.yaml	
@@ -33,7 +33,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 17
diff --git a/device-types/Rockwell Automation/1783-BMS10CGN.yaml b/device-types/Rockwell Automation/1783-BMS10CGN.yaml
index cce77cb59..5eefcb43a 100644
--- a/device-types/Rockwell Automation/1783-BMS10CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS10CGN.yaml	
@@ -33,7 +33,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 20
diff --git a/device-types/Rockwell Automation/1783-BMS10CGP.yaml b/device-types/Rockwell Automation/1783-BMS10CGP.yaml
index 14245aaaf..878c65c02 100644
--- a/device-types/Rockwell Automation/1783-BMS10CGP.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS10CGP.yaml	
@@ -33,7 +33,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 20
diff --git a/device-types/Rockwell Automation/1783-BMS10CL.yaml b/device-types/Rockwell Automation/1783-BMS10CL.yaml
index 8bb57cb25..a7b96b37e 100644
--- a/device-types/Rockwell Automation/1783-BMS10CL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS10CL.yaml	
@@ -33,7 +33,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 17
diff --git a/device-types/Rockwell Automation/1783-BMS20CA.yaml b/device-types/Rockwell Automation/1783-BMS20CA.yaml
index 4c49f14a5..ef2e93758 100644
--- a/device-types/Rockwell Automation/1783-BMS20CA.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS20CA.yaml	
@@ -53,7 +53,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 30
diff --git a/device-types/Rockwell Automation/1783-BMS20CGL.yaml b/device-types/Rockwell Automation/1783-BMS20CGL.yaml
index e7a9b1ac5..9348036d6 100644
--- a/device-types/Rockwell Automation/1783-BMS20CGL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS20CGL.yaml	
@@ -53,7 +53,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 30
diff --git a/device-types/Rockwell Automation/1783-BMS20CGN.yaml b/device-types/Rockwell Automation/1783-BMS20CGN.yaml
index 159f781ca..9e5c8b319 100644
--- a/device-types/Rockwell Automation/1783-BMS20CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS20CGN.yaml	
@@ -53,7 +53,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 30
diff --git a/device-types/Rockwell Automation/1783-BMS20CGP.yaml b/device-types/Rockwell Automation/1783-BMS20CGP.yaml
index edc12ac0d..2c9927314 100644
--- a/device-types/Rockwell Automation/1783-BMS20CGP.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS20CGP.yaml	
@@ -53,7 +53,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 30
diff --git a/device-types/Rockwell Automation/1783-BMS20CGPK.yaml b/device-types/Rockwell Automation/1783-BMS20CGPK.yaml
index d7e40b585..f0366afef 100644
--- a/device-types/Rockwell Automation/1783-BMS20CGPK.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS20CGPK.yaml	
@@ -53,7 +53,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 30
diff --git a/device-types/Rockwell Automation/1783-BMS20CL.yaml b/device-types/Rockwell Automation/1783-BMS20CL.yaml
index 2598796ec..9adee701e 100644
--- a/device-types/Rockwell Automation/1783-BMS20CL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS20CL.yaml	
@@ -53,7 +53,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 30
diff --git a/device-types/Rockwell Automation/1783-BMS4S2SGA.yaml b/device-types/Rockwell Automation/1783-BMS4S2SGA.yaml
index a93b4df63..241847a58 100644
--- a/device-types/Rockwell Automation/1783-BMS4S2SGA.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS4S2SGA.yaml	
@@ -25,7 +25,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 14
diff --git a/device-types/Rockwell Automation/1783-BMS4S2SGL.yaml b/device-types/Rockwell Automation/1783-BMS4S2SGL.yaml
index 1b7fffe2d..48b537ba4 100644
--- a/device-types/Rockwell Automation/1783-BMS4S2SGL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS4S2SGL.yaml	
@@ -25,7 +25,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 14
diff --git a/device-types/Rockwell Automation/1783-HMS16T4CGN.yaml b/device-types/Rockwell Automation/1783-HMS16T4CGN.yaml
index 51e2c227f..2f6c5f9cc 100644
--- a/device-types/Rockwell Automation/1783-HMS16T4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS16T4CGN.yaml	
@@ -53,7 +53,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 89
diff --git a/device-types/Rockwell Automation/1783-HMS16TG4CGN.yaml b/device-types/Rockwell Automation/1783-HMS16TG4CGN.yaml
index 514faa5a1..328e15c75 100644
--- a/device-types/Rockwell Automation/1783-HMS16TG4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS16TG4CGN.yaml	
@@ -53,7 +53,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 104
diff --git a/device-types/Rockwell Automation/1783-HMS16TG4CGR.yaml b/device-types/Rockwell Automation/1783-HMS16TG4CGR.yaml
index 1342c058b..09ea548ca 100644
--- a/device-types/Rockwell Automation/1783-HMS16TG4CGR.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS16TG4CGR.yaml	
@@ -53,7 +53,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 104
diff --git a/device-types/Rockwell Automation/1783-HMS4C4CGN.yaml b/device-types/Rockwell Automation/1783-HMS4C4CGN.yaml
index 3641a687e..d63f7ef38 100644
--- a/device-types/Rockwell Automation/1783-HMS4C4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS4C4CGN.yaml	
@@ -29,7 +29,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 103
diff --git a/device-types/Rockwell Automation/1783-HMS4EG8CGN.yaml b/device-types/Rockwell Automation/1783-HMS4EG8CGN.yaml
index f88b08f43..8d2d39807 100644
--- a/device-types/Rockwell Automation/1783-HMS4EG8CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS4EG8CGN.yaml	
@@ -37,7 +37,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 224
diff --git a/device-types/Rockwell Automation/1783-HMS4EG8CGR.yaml b/device-types/Rockwell Automation/1783-HMS4EG8CGR.yaml
index afa6a1bad..416367b97 100644
--- a/device-types/Rockwell Automation/1783-HMS4EG8CGR.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS4EG8CGR.yaml	
@@ -37,7 +37,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 224
diff --git a/device-types/Rockwell Automation/1783-HMS4S8E4CGN.yaml b/device-types/Rockwell Automation/1783-HMS4S8E4CGN.yaml
index 54378d69a..8ee885a04 100644
--- a/device-types/Rockwell Automation/1783-HMS4S8E4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS4S8E4CGN.yaml	
@@ -45,7 +45,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 224
diff --git a/device-types/Rockwell Automation/1783-HMS4SG8EG4CGN.yaml b/device-types/Rockwell Automation/1783-HMS4SG8EG4CGN.yaml
index 01c5d9b23..f63b59eac 100644
--- a/device-types/Rockwell Automation/1783-HMS4SG8EG4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS4SG8EG4CGN.yaml	
@@ -45,7 +45,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 224
diff --git a/device-types/Rockwell Automation/1783-HMS4SG8EG4CGR.yaml b/device-types/Rockwell Automation/1783-HMS4SG8EG4CGR.yaml
index 528f2fdca..b27ba230e 100644
--- a/device-types/Rockwell Automation/1783-HMS4SG8EG4CGR.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS4SG8EG4CGR.yaml	
@@ -45,7 +45,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 224
diff --git a/device-types/Rockwell Automation/1783-HMS4T4E4CGN.yaml b/device-types/Rockwell Automation/1783-HMS4T4E4CGN.yaml
index 764cd608e..a8b6a487b 100644
--- a/device-types/Rockwell Automation/1783-HMS4T4E4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS4T4E4CGN.yaml	
@@ -37,7 +37,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 193
diff --git a/device-types/Rockwell Automation/1783-HMS8S4CGN.yaml b/device-types/Rockwell Automation/1783-HMS8S4CGN.yaml
index 442929566..2d87592c6 100644
--- a/device-types/Rockwell Automation/1783-HMS8S4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS8S4CGN.yaml	
@@ -37,7 +37,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/1783-HMS8SG4CGN.yaml b/device-types/Rockwell Automation/1783-HMS8SG4CGN.yaml
index ef99defed..15ff6b98e 100644
--- a/device-types/Rockwell Automation/1783-HMS8SG4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS8SG4CGN.yaml	
@@ -37,7 +37,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/1783-HMS8SG4CGR.yaml b/device-types/Rockwell Automation/1783-HMS8SG4CGR.yaml
index 6294e3a8d..9c5fb7f36 100644
--- a/device-types/Rockwell Automation/1783-HMS8SG4CGR.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS8SG4CGR.yaml	
@@ -37,7 +37,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/1783-HMS8T4CGN.yaml b/device-types/Rockwell Automation/1783-HMS8T4CGN.yaml
index 7bfef8c53..acabfa5f8 100644
--- a/device-types/Rockwell Automation/1783-HMS8T4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS8T4CGN.yaml	
@@ -37,7 +37,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 89
diff --git a/device-types/Rockwell Automation/1783-HMS8TG4CGN.yaml b/device-types/Rockwell Automation/1783-HMS8TG4CGN.yaml
index 0f98bff97..586f338b9 100644
--- a/device-types/Rockwell Automation/1783-HMS8TG4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS8TG4CGN.yaml	
@@ -37,7 +37,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 89
diff --git a/device-types/Rockwell Automation/1783-HMS8TG4CGR.yaml b/device-types/Rockwell Automation/1783-HMS8TG4CGR.yaml
index 75426f8b3..3f2eea422 100644
--- a/device-types/Rockwell Automation/1783-HMS8TG4CGR.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS8TG4CGR.yaml	
@@ -37,7 +37,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 89
diff --git a/device-types/Rockwell Automation/1783-HMS8TG8EG4CGN.yaml b/device-types/Rockwell Automation/1783-HMS8TG8EG4CGN.yaml
index cb87a8ebd..49e703f07 100644
--- a/device-types/Rockwell Automation/1783-HMS8TG8EG4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS8TG8EG4CGN.yaml	
@@ -53,7 +53,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 224
diff --git a/device-types/Rockwell Automation/1783-HMS8TG8EG4CGR.yaml b/device-types/Rockwell Automation/1783-HMS8TG8EG4CGR.yaml
index c76ee2429..4d12dbbae 100644
--- a/device-types/Rockwell Automation/1783-HMS8TG8EG4CGR.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS8TG8EG4CGR.yaml	
@@ -53,7 +53,7 @@ console-ports:
     type: usb-mini-b
   - name: con 0
     type: rj-45
-power-port:
+power-ports:
   - name: Pwr-A
     type: dc-terminal
     maximum_draw: 224
diff --git a/device-types/Rockwell Automation/5069-AEN2TR.yaml b/device-types/Rockwell Automation/5069-AEN2TR.yaml
index b8174de63..3ea236833 100644
--- a/device-types/Rockwell Automation/5069-AEN2TR.yaml	
+++ b/device-types/Rockwell Automation/5069-AEN2TR.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-AENTR.yaml b/device-types/Rockwell Automation/5069-AENTR.yaml
index eed435821..166b2cbb8 100644
--- a/device-types/Rockwell Automation/5069-AENTR.yaml	
+++ b/device-types/Rockwell Automation/5069-AENTR.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-AENTRK.yaml b/device-types/Rockwell Automation/5069-AENTRK.yaml
index 3a5574f07..cf1c9549c 100644
--- a/device-types/Rockwell Automation/5069-AENTRK.yaml	
+++ b/device-types/Rockwell Automation/5069-AENTRK.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L306ER.yaml b/device-types/Rockwell Automation/5069-L306ER.yaml
index 8a757fd29..5a2bf5c32 100644
--- a/device-types/Rockwell Automation/5069-L306ER.yaml	
+++ b/device-types/Rockwell Automation/5069-L306ER.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L306ERM.yaml b/device-types/Rockwell Automation/5069-L306ERM.yaml
index ae9d053bc..3fd01eff8 100644
--- a/device-types/Rockwell Automation/5069-L306ERM.yaml	
+++ b/device-types/Rockwell Automation/5069-L306ERM.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L306ERMS2.yaml b/device-types/Rockwell Automation/5069-L306ERMS2.yaml
index 956a5043e..f7da9b228 100644
--- a/device-types/Rockwell Automation/5069-L306ERMS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L306ERMS2.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L306ERMS3.yaml b/device-types/Rockwell Automation/5069-L306ERMS3.yaml
index 166dbe638..9b2c72af7 100644
--- a/device-types/Rockwell Automation/5069-L306ERMS3.yaml	
+++ b/device-types/Rockwell Automation/5069-L306ERMS3.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L306ERS2.yaml b/device-types/Rockwell Automation/5069-L306ERS2.yaml
index 25af726e3..85fac0449 100644
--- a/device-types/Rockwell Automation/5069-L306ERS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L306ERS2.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L3100ERM.yaml b/device-types/Rockwell Automation/5069-L3100ERM.yaml
index 54b6a24e1..b78555cc6 100644
--- a/device-types/Rockwell Automation/5069-L3100ERM.yaml	
+++ b/device-types/Rockwell Automation/5069-L3100ERM.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L3100ERMS2.yaml b/device-types/Rockwell Automation/5069-L3100ERMS2.yaml
index 44acf7f01..4d5c8e08f 100644
--- a/device-types/Rockwell Automation/5069-L3100ERMS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L3100ERMS2.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L3100ERMS3.yaml b/device-types/Rockwell Automation/5069-L3100ERMS3.yaml
index 09ae6a9e3..1c93bcf81 100644
--- a/device-types/Rockwell Automation/5069-L3100ERMS3.yaml	
+++ b/device-types/Rockwell Automation/5069-L3100ERMS3.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L3100ERS2.yaml b/device-types/Rockwell Automation/5069-L3100ERS2.yaml
index bd65ba0bb..55b1faa7c 100644
--- a/device-types/Rockwell Automation/5069-L3100ERS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L3100ERS2.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L310ER-NSE.yaml b/device-types/Rockwell Automation/5069-L310ER-NSE.yaml
index d5f0944da..9a6e9fadf 100644
--- a/device-types/Rockwell Automation/5069-L310ER-NSE.yaml	
+++ b/device-types/Rockwell Automation/5069-L310ER-NSE.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L310ER.yaml b/device-types/Rockwell Automation/5069-L310ER.yaml
index 3dbb42c7e..07297d367 100644
--- a/device-types/Rockwell Automation/5069-L310ER.yaml	
+++ b/device-types/Rockwell Automation/5069-L310ER.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L310ERM.yaml b/device-types/Rockwell Automation/5069-L310ERM.yaml
index 73f9217e1..77a69aa69 100644
--- a/device-types/Rockwell Automation/5069-L310ERM.yaml	
+++ b/device-types/Rockwell Automation/5069-L310ERM.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L310ERMS2.yaml b/device-types/Rockwell Automation/5069-L310ERMS2.yaml
index b17a78da6..d46ed94a1 100644
--- a/device-types/Rockwell Automation/5069-L310ERMS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L310ERMS2.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L310ERMS3.yaml b/device-types/Rockwell Automation/5069-L310ERMS3.yaml
index 9435d4c70..4112b061d 100644
--- a/device-types/Rockwell Automation/5069-L310ERMS3.yaml	
+++ b/device-types/Rockwell Automation/5069-L310ERMS3.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L310ERS2.yaml b/device-types/Rockwell Automation/5069-L310ERS2.yaml
index 7f900a828..e83fd1289 100644
--- a/device-types/Rockwell Automation/5069-L310ERS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L310ERS2.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L320ER.yaml b/device-types/Rockwell Automation/5069-L320ER.yaml
index 5dfcaa576..86e60a84e 100644
--- a/device-types/Rockwell Automation/5069-L320ER.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ER.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L320ERM.yaml b/device-types/Rockwell Automation/5069-L320ERM.yaml
index 0ccb64f81..8e4677ca2 100644
--- a/device-types/Rockwell Automation/5069-L320ERM.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERM.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L320ERMK.yaml b/device-types/Rockwell Automation/5069-L320ERMK.yaml
index 72a76810e..594f5370a 100644
--- a/device-types/Rockwell Automation/5069-L320ERMK.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERMK.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L320ERMS2.yaml b/device-types/Rockwell Automation/5069-L320ERMS2.yaml
index 43de6d1f8..9535185dd 100644
--- a/device-types/Rockwell Automation/5069-L320ERMS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERMS2.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L320ERMS2K.yaml b/device-types/Rockwell Automation/5069-L320ERMS2K.yaml
index 5bf6ffd2d..ce99fb04d 100644
--- a/device-types/Rockwell Automation/5069-L320ERMS2K.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERMS2K.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L320ERMS3.yaml b/device-types/Rockwell Automation/5069-L320ERMS3.yaml
index 81467e7ec..df62a30b1 100644
--- a/device-types/Rockwell Automation/5069-L320ERMS3.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERMS3.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L320ERMS3K.yaml b/device-types/Rockwell Automation/5069-L320ERMS3K.yaml
index 85046af90..4d444f91f 100644
--- a/device-types/Rockwell Automation/5069-L320ERMS3K.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERMS3K.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L320ERP.yaml b/device-types/Rockwell Automation/5069-L320ERP.yaml
index b48a4e458..30160f703 100644
--- a/device-types/Rockwell Automation/5069-L320ERP.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERP.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L320ERS2.yaml b/device-types/Rockwell Automation/5069-L320ERS2.yaml
index 82abe9c7d..40cd62405 100644
--- a/device-types/Rockwell Automation/5069-L320ERS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERS2.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L320ERS2K.yaml b/device-types/Rockwell Automation/5069-L320ERS2K.yaml
index dadd23baa..c98129913 100644
--- a/device-types/Rockwell Automation/5069-L320ERS2K.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERS2K.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L330ER.yaml b/device-types/Rockwell Automation/5069-L330ER.yaml
index 6956da550..82a61c742 100644
--- a/device-types/Rockwell Automation/5069-L330ER.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ER.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L330ERM.yaml b/device-types/Rockwell Automation/5069-L330ERM.yaml
index cfc89bf36..2657cbea9 100644
--- a/device-types/Rockwell Automation/5069-L330ERM.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ERM.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L330ERMK.yaml b/device-types/Rockwell Automation/5069-L330ERMK.yaml
index 7f7845ec5..16edb766d 100644
--- a/device-types/Rockwell Automation/5069-L330ERMK.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ERMK.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L330ERMS2.yaml b/device-types/Rockwell Automation/5069-L330ERMS2.yaml
index 136440f02..012f16bdf 100644
--- a/device-types/Rockwell Automation/5069-L330ERMS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ERMS2.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L330ERMS2K.yaml b/device-types/Rockwell Automation/5069-L330ERMS2K.yaml
index ad0543c04..3d5970a75 100644
--- a/device-types/Rockwell Automation/5069-L330ERMS2K.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ERMS2K.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L330ERMS3.yaml b/device-types/Rockwell Automation/5069-L330ERMS3.yaml
index ceb92ef8f..d6d9806c5 100644
--- a/device-types/Rockwell Automation/5069-L330ERMS3.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ERMS3.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L330ERMS3K.yaml b/device-types/Rockwell Automation/5069-L330ERMS3K.yaml
index 1440699c5..d7492ca40 100644
--- a/device-types/Rockwell Automation/5069-L330ERMS3K.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ERMS3K.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L330ERS2.yaml b/device-types/Rockwell Automation/5069-L330ERS2.yaml
index 72b3c6519..7fbcda5f2 100644
--- a/device-types/Rockwell Automation/5069-L330ERS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ERS2.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L330ERS2K.yaml b/device-types/Rockwell Automation/5069-L330ERS2K.yaml
index 0db035b03..8265324ab 100644
--- a/device-types/Rockwell Automation/5069-L330ERS2K.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ERS2K.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L340ER.yaml b/device-types/Rockwell Automation/5069-L340ER.yaml
index 8ca852537..50d6aee82 100644
--- a/device-types/Rockwell Automation/5069-L340ER.yaml	
+++ b/device-types/Rockwell Automation/5069-L340ER.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L340ERM.yaml b/device-types/Rockwell Automation/5069-L340ERM.yaml
index 0bcef0e81..649de8082 100644
--- a/device-types/Rockwell Automation/5069-L340ERM.yaml	
+++ b/device-types/Rockwell Automation/5069-L340ERM.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L340ERMS2.yaml b/device-types/Rockwell Automation/5069-L340ERMS2.yaml
index 22ef20cc6..3e4a41690 100644
--- a/device-types/Rockwell Automation/5069-L340ERMS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L340ERMS2.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L340ERMS3.yaml b/device-types/Rockwell Automation/5069-L340ERMS3.yaml
index 87653bc03..93d9a4c7c 100644
--- a/device-types/Rockwell Automation/5069-L340ERMS3.yaml	
+++ b/device-types/Rockwell Automation/5069-L340ERMS3.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L340ERP.yaml b/device-types/Rockwell Automation/5069-L340ERP.yaml
index 2bd0e56e4..4aecdfaf4 100644
--- a/device-types/Rockwell Automation/5069-L340ERP.yaml	
+++ b/device-types/Rockwell Automation/5069-L340ERP.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L340ERS2.yaml b/device-types/Rockwell Automation/5069-L340ERS2.yaml
index b1522f043..aa5b8394a 100644
--- a/device-types/Rockwell Automation/5069-L340ERS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L340ERS2.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L350ERM.yaml b/device-types/Rockwell Automation/5069-L350ERM.yaml
index 8b9661eda..1ff46721c 100644
--- a/device-types/Rockwell Automation/5069-L350ERM.yaml	
+++ b/device-types/Rockwell Automation/5069-L350ERM.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L350ERMK.yaml b/device-types/Rockwell Automation/5069-L350ERMK.yaml
index 2ed6aa430..236209f11 100644
--- a/device-types/Rockwell Automation/5069-L350ERMK.yaml	
+++ b/device-types/Rockwell Automation/5069-L350ERMK.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L350ERMS2.yaml b/device-types/Rockwell Automation/5069-L350ERMS2.yaml
index b3a14ce5b..3289aa0e8 100644
--- a/device-types/Rockwell Automation/5069-L350ERMS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L350ERMS2.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L350ERMS2K.yaml b/device-types/Rockwell Automation/5069-L350ERMS2K.yaml
index 3f3212c3a..b2b2f95f7 100644
--- a/device-types/Rockwell Automation/5069-L350ERMS2K.yaml	
+++ b/device-types/Rockwell Automation/5069-L350ERMS2K.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L350ERMS3.yaml b/device-types/Rockwell Automation/5069-L350ERMS3.yaml
index e5516e73e..2d00c6191 100644
--- a/device-types/Rockwell Automation/5069-L350ERMS3.yaml	
+++ b/device-types/Rockwell Automation/5069-L350ERMS3.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L350ERMS3K.yaml b/device-types/Rockwell Automation/5069-L350ERMS3K.yaml
index 5260b81e7..5d1ac90a3 100644
--- a/device-types/Rockwell Automation/5069-L350ERMS3K.yaml	
+++ b/device-types/Rockwell Automation/5069-L350ERMS3K.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L350ERS2.yaml b/device-types/Rockwell Automation/5069-L350ERS2.yaml
index f36dccf2f..e668a5ad6 100644
--- a/device-types/Rockwell Automation/5069-L350ERS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L350ERS2.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L350ERS2K.yaml b/device-types/Rockwell Automation/5069-L350ERS2K.yaml
index a2fe567ab..47984d663 100644
--- a/device-types/Rockwell Automation/5069-L350ERS2K.yaml	
+++ b/device-types/Rockwell Automation/5069-L350ERS2K.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L380ERM.yaml b/device-types/Rockwell Automation/5069-L380ERM.yaml
index 50d2d2ba6..8ab56f023 100644
--- a/device-types/Rockwell Automation/5069-L380ERM.yaml	
+++ b/device-types/Rockwell Automation/5069-L380ERM.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L380ERMS2.yaml b/device-types/Rockwell Automation/5069-L380ERMS2.yaml
index 874841886..18a34667a 100644
--- a/device-types/Rockwell Automation/5069-L380ERMS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L380ERMS2.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L380ERMS3.yaml b/device-types/Rockwell Automation/5069-L380ERMS3.yaml
index 83c9c60a3..770a31ca3 100644
--- a/device-types/Rockwell Automation/5069-L380ERMS3.yaml	
+++ b/device-types/Rockwell Automation/5069-L380ERMS3.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L380ERS2.yaml b/device-types/Rockwell Automation/5069-L380ERS2.yaml
index f86b4ce1b..a81b7e862 100644
--- a/device-types/Rockwell Automation/5069-L380ERS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L380ERS2.yaml	
@@ -13,7 +13,7 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 120
diff --git a/device-types/Rockwell Automation/5069-L4100ERW.yaml b/device-types/Rockwell Automation/5069-L4100ERW.yaml
index 1cc16a47d..4ab2f0762 100644
--- a/device-types/Rockwell Automation/5069-L4100ERW.yaml	
+++ b/device-types/Rockwell Automation/5069-L4100ERW.yaml	
@@ -15,12 +15,12 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-console-server-port:
+console-server-ports:
   - name: usb-1
     type: usb-a
   - name: usb-2
     type: usb-a
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L4200ERW.yaml b/device-types/Rockwell Automation/5069-L4200ERW.yaml
index c808cfada..ccb26525f 100644
--- a/device-types/Rockwell Automation/5069-L4200ERW.yaml	
+++ b/device-types/Rockwell Automation/5069-L4200ERW.yaml	
@@ -15,12 +15,12 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-console-server-port:
+console-server-ports:
   - name: usb-1
     type: usb-a
   - name: usb-2
     type: usb-a
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L430ERW.yaml b/device-types/Rockwell Automation/5069-L430ERW.yaml
index d7269ea69..a0195319f 100644
--- a/device-types/Rockwell Automation/5069-L430ERW.yaml	
+++ b/device-types/Rockwell Automation/5069-L430ERW.yaml	
@@ -15,12 +15,12 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-console-server-port:
+console-server-ports:
   - name: usb-1
     type: usb-a
   - name: usb-2
     type: usb-a
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/Rockwell Automation/5069-L450ERW.yaml b/device-types/Rockwell Automation/5069-L450ERW.yaml
index 788e65b23..e2ce68bcc 100644
--- a/device-types/Rockwell Automation/5069-L450ERW.yaml	
+++ b/device-types/Rockwell Automation/5069-L450ERW.yaml	
@@ -15,12 +15,12 @@ interfaces:
 console-ports:
   - name: usb
     type: usb-b
-console-server-port:
+console-server-ports:
   - name: usb-1
     type: usb-a
   - name: usb-2
     type: usb-a
-power-port:
+power-ports:
   - name: MOD
     type: dc-terminal
     maximum_draw: 240
diff --git a/device-types/WTI/CPM-1600-1-EC.yaml b/device-types/WTI/CPM-1600-1-EC.yaml
index 594ae5b6a..ec0eeaab7 100644
--- a/device-types/WTI/CPM-1600-1-EC.yaml
+++ b/device-types/WTI/CPM-1600-1-EC.yaml
@@ -5,7 +5,7 @@ slug: cpm-1600-1-ec
 part_number: CPM-1600-1-EC
 is_full_depth: false
 u_height: 2
-# comment: WTI CPM 2U, 2 ethernet, 16 outlet 120V, 16 serial ports
+# comments: WTI CPM 2U, 2 ethernet, 16 outlet 120V, 16 serial ports
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/CPM-1600-1-ECAM.yaml b/device-types/WTI/CPM-1600-1-ECAM.yaml
index 45a8452ab..0aa215c99 100644
--- a/device-types/WTI/CPM-1600-1-ECAM.yaml
+++ b/device-types/WTI/CPM-1600-1-ECAM.yaml
@@ -5,7 +5,7 @@ slug: cpm-1600-1-ecam
 part_number: CPM-1600-1-ECAM
 is_full_depth: false
 u_height: 2
-# comment: WTI CPM 2U, 2 ethernet, 16 outlet 120V, 8 serial ports, ATS
+# comments: WTI CPM 2U, 2 ethernet, 16 outlet 120V, 8 serial ports, ATS
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/CPM-800-1-A-VZW.yaml b/device-types/WTI/CPM-800-1-A-VZW.yaml
index a1f1977d3..aff087896 100644
--- a/device-types/WTI/CPM-800-1-A-VZW.yaml
+++ b/device-types/WTI/CPM-800-1-A-VZW.yaml
@@ -5,7 +5,7 @@ slug: cpm-800-1-a-vzw
 part_number: CPM-800-1-A-VZW
 is_full_depth: false
 u_height: 1
-# comment: WTI CPM 1U, 1 ethernet, 8 outlet 15A 120V, 8 serial ports, ATS, Verizon Cell modem
+# comments: WTI CPM 1U, 1 ethernet, 8 outlet 15A 120V, 8 serial ports, ATS, Verizon Cell modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/CPM-800-1-A.yaml b/device-types/WTI/CPM-800-1-A.yaml
index bf4979492..970c9708b 100644
--- a/device-types/WTI/CPM-800-1-A.yaml
+++ b/device-types/WTI/CPM-800-1-A.yaml
@@ -5,7 +5,7 @@ slug: cpm-800-1-a
 part_number: CPM-800-1-A
 is_full_depth: false
 u_height: 1
-# comment: WTI CPM 1U, 1 ethernet, 8 outlet 15A 120V, 8 serial ports, ATS
+# comments: WTI CPM 1U, 1 ethernet, 8 outlet 15A 120V, 8 serial ports, ATS
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/CPM-800-1-AM.yaml b/device-types/WTI/CPM-800-1-AM.yaml
index 560ae7954..84735a943 100644
--- a/device-types/WTI/CPM-800-1-AM.yaml
+++ b/device-types/WTI/CPM-800-1-AM.yaml
@@ -5,7 +5,7 @@ slug: cpm-800-1-am
 part_number: CPM-800-1-AM
 is_full_depth: false
 u_height: 1
-# comment: WTI CPM 1U, 1 ethernet, 8 outlet 15A 120V, 8 serial ports, V.92 Analog Modem, ATS
+# comments: WTI CPM 1U, 1 ethernet, 8 outlet 15A 120V, 8 serial ports, V.92 Analog Modem, ATS
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/CPM-800-1-E.yaml b/device-types/WTI/CPM-800-1-E.yaml
index 63c9e7de3..f6ec0b5b3 100644
--- a/device-types/WTI/CPM-800-1-E.yaml
+++ b/device-types/WTI/CPM-800-1-E.yaml
@@ -5,7 +5,7 @@ slug: cpm-800-1-e
 part_number: CPM-800-1-E
 is_full_depth: false
 u_height: 1
-# comment: WTI CPM 1U, 2 ethernet, 8 outlet 15A 120V, 8 serial ports, No ATS
+# comments: WTI CPM 1U, 2 ethernet, 8 outlet 15A 120V, 8 serial ports, No ATS
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/CPM-800-1-EA.yaml b/device-types/WTI/CPM-800-1-EA.yaml
index 1bba15a9c..dbd7eb3cc 100644
--- a/device-types/WTI/CPM-800-1-EA.yaml
+++ b/device-types/WTI/CPM-800-1-EA.yaml
@@ -5,7 +5,7 @@ slug: cpm-800-1-ea
 part_number: CPM-800-1-EA
 is_full_depth: false
 u_height: 1
-# comment: WTI CPM 1U, 2 ethernet, 8 outlet 15A 120V, 8 serial ports, ATS
+# comments: WTI CPM 1U, 2 ethernet, 8 outlet 15A 120V, 8 serial ports, ATS
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/CPM-800-1-ECA.yaml b/device-types/WTI/CPM-800-1-ECA.yaml
index d0059c8e0..30d8bb367 100644
--- a/device-types/WTI/CPM-800-1-ECA.yaml
+++ b/device-types/WTI/CPM-800-1-ECA.yaml
@@ -5,7 +5,7 @@ slug: cpm-800-1-eca
 part_number: CPM-800-1-ECA
 is_full_depth: false
 u_height: 1
-# comment: WTI CPM 1U, 2 ethernet, 8 outlet 15A 120V, 8 serial ports, ATS, Current Monitoring
+# comments: WTI CPM 1U, 2 ethernet, 8 outlet 15A 120V, 8 serial ports, ATS, Current Monitoring
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/CPM-800-2-A-VZW.yaml b/device-types/WTI/CPM-800-2-A-VZW.yaml
index 04c2605b5..5d08d7ae6 100644
--- a/device-types/WTI/CPM-800-2-A-VZW.yaml
+++ b/device-types/WTI/CPM-800-2-A-VZW.yaml
@@ -5,7 +5,7 @@ slug: cpm-800-2-a-vzw
 part_number: CPM-800-2-A-VZW
 is_full_depth: false
 u_height: 1
-# comment: WTI CPM 1U, 1 ethernet, 8 outlet 15A 120V, 8 serial ports, ATS, Verizon Cell modem
+# comments: WTI CPM 1U, 1 ethernet, 8 outlet 15A 120V, 8 serial ports, ATS, Verizon Cell modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/CPM-800-2-A.yaml b/device-types/WTI/CPM-800-2-A.yaml
index ae7f84b37..3d9de8d33 100644
--- a/device-types/WTI/CPM-800-2-A.yaml
+++ b/device-types/WTI/CPM-800-2-A.yaml
@@ -5,7 +5,7 @@ slug: cpm-800-2-a
 part_number: CPM-800-2-A
 is_full_depth: false
 u_height: 1
-# comment: WTI CPM 1U, 1 ethernet, 8 outlet 15A 120V, 8 serial ports, ATS
+# comments: WTI CPM 1U, 1 ethernet, 8 outlet 15A 120V, 8 serial ports, ATS
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/CPM-800-2-AM.yaml b/device-types/WTI/CPM-800-2-AM.yaml
index 97a32926f..a8d64fa8c 100644
--- a/device-types/WTI/CPM-800-2-AM.yaml
+++ b/device-types/WTI/CPM-800-2-AM.yaml
@@ -5,7 +5,7 @@ slug: cpm-800-2-am
 part_number: CPM-800-2-AM
 is_full_depth: false
 u_height: 1
-# comment: WTI CPM 1U, 1 ethernet, 8 outlet 15A 120V, 8 serial ports, V.92 Analog Modem, ATS
+# comments: WTI CPM 1U, 1 ethernet, 8 outlet 15A 120V, 8 serial ports, V.92 Analog Modem, ATS
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/CPM-800-2-E.yaml b/device-types/WTI/CPM-800-2-E.yaml
index 0e4f77988..ee207571b 100644
--- a/device-types/WTI/CPM-800-2-E.yaml
+++ b/device-types/WTI/CPM-800-2-E.yaml
@@ -5,7 +5,7 @@ slug: cpm-800-2-e
 part_number: CPM-800-2-E
 is_full_depth: false
 u_height: 1
-# comment: WTI CPM 1U, 2 ethernet,  8 outlet 15A 120V, 8 serial ports, No ATS
+# comments: WTI CPM 1U, 2 ethernet,  8 outlet 15A 120V, 8 serial ports, No ATS
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/CPM-800-2-EA.yaml b/device-types/WTI/CPM-800-2-EA.yaml
index 3519693d7..b40015098 100644
--- a/device-types/WTI/CPM-800-2-EA.yaml
+++ b/device-types/WTI/CPM-800-2-EA.yaml
@@ -5,7 +5,7 @@ slug: cpm-800-2-ea
 part_number: CPM-800-2-EA
 is_full_depth: false
 u_height: 1
-# comment: WTI CPM 1U, 2 ethernet, 8 outlet 15A 120V, 8 serial ports, ATS
+# comments: WTI CPM 1U, 2 ethernet, 8 outlet 15A 120V, 8 serial ports, ATS
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/NBB-20VD20-1.yml b/device-types/WTI/NBB-20VD20-1.yml
index e7227941d..5f046a9e8 100644
--- a/device-types/WTI/NBB-20VD20-1.yml
+++ b/device-types/WTI/NBB-20VD20-1.yml
@@ -5,7 +5,7 @@ slug: nbb-20vd20-1
 part_number: NBB-20VD20-1
 is_full_depth: false
 u_height: 0
-# comment: WTI NBB 0U, 1 ethernet, 20 outlet 20A 120V
+# comments: WTI NBB 0U, 1 ethernet, 20 outlet 20A 120V
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/NPS-8H20-ATS-1.yml b/device-types/WTI/NPS-8H20-ATS-1.yml
index a06aa6634..cc1db18e5 100644
--- a/device-types/WTI/NPS-8H20-ATS-1.yml
+++ b/device-types/WTI/NPS-8H20-ATS-1.yml
@@ -5,7 +5,7 @@ slug: nps-8h20-ats-1
 part_number: NPS-8H20-ATS-1
 is_full_depth: false
 u_height: 1
-# comment: WTI NPS 1U, 1 ethernet, 8 outlet 20A 120V, ATS
+# comments: WTI NPS 1U, 1 ethernet, 8 outlet 20A 120V, ATS
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-0R4-1-E.yaml b/device-types/WTI/REM-0R4-1-E.yaml
index 5f82055d9..b54c8bdce 100644
--- a/device-types/WTI/REM-0R4-1-E.yaml
+++ b/device-types/WTI/REM-0R4-1-E.yaml
@@ -5,7 +5,7 @@ slug: rem-0r4-1-e
 part_number: REM-0R4-1-E
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 2 USB host ports
+# comments: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 2 USB host ports
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-0R4-1-N.yaml b/device-types/WTI/REM-0R4-1-N.yaml
index 5670d96c9..e4678693c 100644
--- a/device-types/WTI/REM-0R4-1-N.yaml
+++ b/device-types/WTI/REM-0R4-1-N.yaml
@@ -5,7 +5,7 @@ slug: rem-0r4-1-n
 part_number: REM-0R4-1-N
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 2 USB host ports, North American Cell Modem
+# comments: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 2 USB host ports, North American Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-0R4-1-NE.yaml b/device-types/WTI/REM-0R4-1-NE.yaml
index 1f0cc67f4..fb4b33d9a 100644
--- a/device-types/WTI/REM-0R4-1-NE.yaml
+++ b/device-types/WTI/REM-0R4-1-NE.yaml
@@ -5,7 +5,7 @@ slug: rem-0r4-1-ne
 part_number: REM-0R4-1-NE
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 2 USB host ports, North American Cell Modem
+# comments: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 2 USB host ports, North American Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-0R4-1-W.yaml b/device-types/WTI/REM-0R4-1-W.yaml
index e015320fe..532b11789 100644
--- a/device-types/WTI/REM-0R4-1-W.yaml
+++ b/device-types/WTI/REM-0R4-1-W.yaml
@@ -5,7 +5,7 @@ slug: rem-0r4-1-w
 part_number: REM-0R4-1-W
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 2 USB host ports, World Cell Modem
+# comments: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 2 USB host ports, World Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-0R4-1-WE.yaml b/device-types/WTI/REM-0R4-1-WE.yaml
index 4017d333f..7363c65c5 100644
--- a/device-types/WTI/REM-0R4-1-WE.yaml
+++ b/device-types/WTI/REM-0R4-1-WE.yaml
@@ -5,7 +5,7 @@ slug: rem-0r4-1-we
 part_number: REM-0R4-1-WE
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 2 USB host ports, World Cell Modem
+# comments: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 2 USB host ports, World Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-0R4-1.yaml b/device-types/WTI/REM-0R4-1.yaml
index 9b9eeafa4..c6db1a33d 100644
--- a/device-types/WTI/REM-0R4-1.yaml
+++ b/device-types/WTI/REM-0R4-1.yaml
@@ -5,7 +5,7 @@ slug: rem-0r4-1
 part_number: REM-0R4-1
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 2 USB host ports
+# comments: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 2 USB host ports
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-0R4-2-E.yaml b/device-types/WTI/REM-0R4-2-E.yaml
index 1f08f10e2..1ba6139f8 100644
--- a/device-types/WTI/REM-0R4-2-E.yaml
+++ b/device-types/WTI/REM-0R4-2-E.yaml
@@ -5,7 +5,7 @@ slug: rem-0r4-2-e
 part_number: REM-0R4-2-E
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 2 USB host ports
+# comments: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 2 USB host ports
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-0R4-2-N.yaml b/device-types/WTI/REM-0R4-2-N.yaml
index dbea67e3e..6fc676dad 100644
--- a/device-types/WTI/REM-0R4-2-N.yaml
+++ b/device-types/WTI/REM-0R4-2-N.yaml
@@ -5,7 +5,7 @@ slug: rem-0r4-2-n
 part_number: REM-0R4-2-N
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 2 USB host ports, North American Cell Modem
+# comments: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 2 USB host ports, North American Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-0R4-2-NE.yaml b/device-types/WTI/REM-0R4-2-NE.yaml
index 2f0da2e3e..823bfdaac 100644
--- a/device-types/WTI/REM-0R4-2-NE.yaml
+++ b/device-types/WTI/REM-0R4-2-NE.yaml
@@ -5,7 +5,7 @@ slug: rem-0r4-2-ne
 part_number: REM-0R4-2-NE
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 2 USB host ports, North American Cell Modem
+# comments: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 2 USB host ports, North American Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-0R4-2-W.yaml b/device-types/WTI/REM-0R4-2-W.yaml
index 242655501..98702a6d6 100644
--- a/device-types/WTI/REM-0R4-2-W.yaml
+++ b/device-types/WTI/REM-0R4-2-W.yaml
@@ -5,7 +5,7 @@ slug: rem-0r4-2-w
 part_number: REM-0R4-2-W
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 2 USB host ports, World Cell Modem
+# comments: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 2 USB host ports, World Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-0R4-2-WE.yaml b/device-types/WTI/REM-0R4-2-WE.yaml
index 04c29b592..41493e6aa 100644
--- a/device-types/WTI/REM-0R4-2-WE.yaml
+++ b/device-types/WTI/REM-0R4-2-WE.yaml
@@ -5,7 +5,7 @@ slug: rem-0r4-2-we
 part_number: REM-0R4-2-WE
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 2 USB host ports, World Cell Modem
+# comments: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 2 USB host ports, World Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-0R4-2.yaml b/device-types/WTI/REM-0R4-2.yaml
index c91a0f8e7..ce959b267 100644
--- a/device-types/WTI/REM-0R4-2.yaml
+++ b/device-types/WTI/REM-0R4-2.yaml
@@ -5,7 +5,7 @@ slug: rem-0r4-2
 part_number: REM-0R4-2
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 2 USB host ports
+# comments: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 2 USB host ports
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R0-E.yaml b/device-types/WTI/REM-4R0-E.yaml
index 61add4faa..7c53080d6 100644
--- a/device-types/WTI/REM-4R0-E.yaml
+++ b/device-types/WTI/REM-4R0-E.yaml
@@ -5,7 +5,7 @@ slug: rem-4r0-e
 part_number: REM-4R0-E
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 2 ethernet, 4 serial ports, 2 USB host ports
+# comments: WTI REM 1U, 2 ethernet, 4 serial ports, 2 USB host ports
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R0-NE.yaml b/device-types/WTI/REM-4R0-NE.yaml
index 0de68a14a..25adcebda 100644
--- a/device-types/WTI/REM-4R0-NE.yaml
+++ b/device-types/WTI/REM-4R0-NE.yaml
@@ -5,7 +5,7 @@ slug: rem-4r0-ne
 part_number: REM-4R0-NE
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 2 ethernet, 4 serial ports, 2 USB host ports, North American Cell Modem
+# comments: WTI REM 1U, 2 ethernet, 4 serial ports, 2 USB host ports, North American Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R0-W.yaml b/device-types/WTI/REM-4R0-W.yaml
index e11fb82c0..d730caf76 100644
--- a/device-types/WTI/REM-4R0-W.yaml
+++ b/device-types/WTI/REM-4R0-W.yaml
@@ -5,7 +5,7 @@ slug: rem-4r0-w
 part_number: REM-4R0-W
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 1 ethernet, 4 serial ports, 2 USB host ports, World Cell Modem
+# comments: WTI REM 1U, 1 ethernet, 4 serial ports, 2 USB host ports, World Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R0-WE.yaml b/device-types/WTI/REM-4R0-WE.yaml
index 61e6257fb..13440e599 100644
--- a/device-types/WTI/REM-4R0-WE.yaml
+++ b/device-types/WTI/REM-4R0-WE.yaml
@@ -5,7 +5,7 @@ slug: rem-4r0-we
 part_number: REM-4R0-WE
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 2 ethernet, 4 serial ports, 2 USB host ports, World Cell Modem
+# comments: WTI REM 1U, 2 ethernet, 4 serial ports, 2 USB host ports, World Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R0.yaml b/device-types/WTI/REM-4R0.yaml
index 893f88a1c..a428e24ea 100644
--- a/device-types/WTI/REM-4R0.yaml
+++ b/device-types/WTI/REM-4R0.yaml
@@ -5,7 +5,7 @@ slug: rem-4r0
 part_number: REM-4R0
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 1 ethernet, 4 serial ports, 2 USB host ports
+# comments: WTI REM 1U, 1 ethernet, 4 serial ports, 2 USB host ports
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R4-1-E.yaml b/device-types/WTI/REM-4R4-1-E.yaml
index 20d490fc8..8f7886829 100644
--- a/device-types/WTI/REM-4R4-1-E.yaml
+++ b/device-types/WTI/REM-4R4-1-E.yaml
@@ -5,7 +5,7 @@ slug: rem-4r4-1-e
 part_number: REM-4R4-1-E
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports
+# comments: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R4-1-N.yaml b/device-types/WTI/REM-4R4-1-N.yaml
index 535b1a127..7b021f279 100644
--- a/device-types/WTI/REM-4R4-1-N.yaml
+++ b/device-types/WTI/REM-4R4-1-N.yaml
@@ -5,7 +5,7 @@ slug: rem-4r4-1-n
 part_number: REM-4R4-1-N
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports, North American Cell Modem
+# comments: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports, North American Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R4-1-NE.yaml b/device-types/WTI/REM-4R4-1-NE.yaml
index 9cced1ab8..bdde86cf5 100644
--- a/device-types/WTI/REM-4R4-1-NE.yaml
+++ b/device-types/WTI/REM-4R4-1-NE.yaml
@@ -5,7 +5,7 @@ slug: rem-4r4-1-ne
 part_number: REM-4R4-1-NE
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports, North American Cell Modem
+# comments: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports, North American Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R4-1-W.yaml b/device-types/WTI/REM-4R4-1-W.yaml
index 4fa64185c..9abe37ae6 100644
--- a/device-types/WTI/REM-4R4-1-W.yaml
+++ b/device-types/WTI/REM-4R4-1-W.yaml
@@ -5,7 +5,7 @@ slug: rem-4r4-1-w
 part_number: REM-4R4-1-W
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports, World Cell Modem
+# comments: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports, World Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R4-1-WE.yaml b/device-types/WTI/REM-4R4-1-WE.yaml
index 8118f50bd..cd57922c5 100644
--- a/device-types/WTI/REM-4R4-1-WE.yaml
+++ b/device-types/WTI/REM-4R4-1-WE.yaml
@@ -5,7 +5,7 @@ slug: rem-4r4-1-we
 part_number: REM-4R4-1-WE
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports, World Cell Modem
+# comments: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports, World Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R4-1.yaml b/device-types/WTI/REM-4R4-1.yaml
index f4cbea412..f84969a0a 100644
--- a/device-types/WTI/REM-4R4-1.yaml
+++ b/device-types/WTI/REM-4R4-1.yaml
@@ -5,7 +5,7 @@ slug: rem-4r4-1
 part_number: REM-4R4-1
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports
+# comments: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R4-2-E.yaml b/device-types/WTI/REM-4R4-2-E.yaml
index d876fe082..54a2185e2 100644
--- a/device-types/WTI/REM-4R4-2-E.yaml
+++ b/device-types/WTI/REM-4R4-2-E.yaml
@@ -5,7 +5,7 @@ slug: rem-4r4-2-e
 part_number: REM-4R4-2-E
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports
+# comments: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R4-2-N.yaml b/device-types/WTI/REM-4R4-2-N.yaml
index 2b31e08ce..20930c398 100644
--- a/device-types/WTI/REM-4R4-2-N.yaml
+++ b/device-types/WTI/REM-4R4-2-N.yaml
@@ -5,7 +5,7 @@ slug: rem-4r4-2-n
 part_number: REM-4R4-2-N
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports, North American Cell Modem
+# comments: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports, North American Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R4-2-NE.yaml b/device-types/WTI/REM-4R4-2-NE.yaml
index 2573a2141..747989670 100644
--- a/device-types/WTI/REM-4R4-2-NE.yaml
+++ b/device-types/WTI/REM-4R4-2-NE.yaml
@@ -5,7 +5,7 @@ slug: rem-4r4-2-ne
 part_number: REM-4R4-2-NE
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports, North American Cell Modem
+# comments: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports, North American Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R4-2-W.yaml b/device-types/WTI/REM-4R4-2-W.yaml
index 19e3f053a..ed1da01aa 100644
--- a/device-types/WTI/REM-4R4-2-W.yaml
+++ b/device-types/WTI/REM-4R4-2-W.yaml
@@ -5,7 +5,7 @@ slug: rem-4r4-2-w
 part_number: REM-4R4-2-W
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports, World Cell Modem
+# comments: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports, World Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R4-2-WE.yaml b/device-types/WTI/REM-4R4-2-WE.yaml
index 6cc31fa99..1d7f0db0b 100644
--- a/device-types/WTI/REM-4R4-2-WE.yaml
+++ b/device-types/WTI/REM-4R4-2-WE.yaml
@@ -5,7 +5,7 @@ slug: rem-4r4-2-we
 part_number: REM-4R4-2-WE
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports, World Cell Modem
+# comments: WTI REM 1U, 2 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports, World Cell Modem
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/REM-4R4-2.yaml b/device-types/WTI/REM-4R4-2.yaml
index b7aa839b4..f5085a698 100644
--- a/device-types/WTI/REM-4R4-2.yaml
+++ b/device-types/WTI/REM-4R4-2.yaml
@@ -5,7 +5,7 @@ slug: rem-4r4-2
 part_number: REM-4R4-2
 is_full_depth: false
 u_height: 1
-# comment: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports
+# comments: WTI REM 1U, 1 ethernet, 4 outlet 15A 120V, 4 serial ports, 2 USB host ports
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/VMR-16HD20-2.yaml b/device-types/WTI/VMR-16HD20-2.yaml
index a567b6ed8..323f102a3 100644
--- a/device-types/WTI/VMR-16HD20-2.yaml
+++ b/device-types/WTI/VMR-16HD20-2.yaml
@@ -5,7 +5,7 @@ slug: vmr-16hd20-2
 part_number: VMR-16HD20-2
 is_full_depth: false
 u_height: 2
-# comment: WTI VMR 2U, 1 ethernet, 16 outlet 20A 120V
+# comments: WTI VMR 2U, 1 ethernet, 16 outlet 20A 120V
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/VMR-8H20-ATS-1.yaml b/device-types/WTI/VMR-8H20-ATS-1.yaml
index 22d1303f5..6b58235f2 100644
--- a/device-types/WTI/VMR-8H20-ATS-1.yaml
+++ b/device-types/WTI/VMR-8H20-ATS-1.yaml
@@ -5,7 +5,7 @@ slug: vmr-8h20-ats-1
 part_number: VMR-8H20-ATS-1
 is_full_depth: false
 u_height: 1
-# comment: WTI VMR 1U, 1 ethernet, 8 outlet 20A 120V, ATS
+# comments: WTI VMR 1U, 1 ethernet, 8 outlet 20A 120V, ATS
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/VMR-8H20-ATS-2.yaml b/device-types/WTI/VMR-8H20-ATS-2.yaml
index 4ef43bfc1..0b4caeba9 100644
--- a/device-types/WTI/VMR-8H20-ATS-2.yaml
+++ b/device-types/WTI/VMR-8H20-ATS-2.yaml
@@ -5,7 +5,7 @@ slug: vmr-8h20-ats-2
 part_number: VMR-8H20-ATS-2
 is_full_depth: false
 u_height: 1
-# comment: WTI VMR 1U, 1 ethernet, 8 outlet 20A 200-240V, ATS
+# comments: WTI VMR 1U, 1 ethernet, 8 outlet 20A 200-240V, ATS
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/VMR-8HS20-1.yaml b/device-types/WTI/VMR-8HS20-1.yaml
index 81d09e862..23d0cc9c4 100644
--- a/device-types/WTI/VMR-8HS20-1.yaml
+++ b/device-types/WTI/VMR-8HS20-1.yaml
@@ -5,7 +5,7 @@ slug: vmr-8hs20-1
 part_number: VMR-8HS20-1
 is_full_depth: false
 u_height: 1
-# comment: WTI VMR 1U, 1 ethernet, 8 outlet 20A 120V
+# comments: WTI VMR 1U, 1 ethernet, 8 outlet 20A 120V
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/VMR-8HS20-2.yaml b/device-types/WTI/VMR-8HS20-2.yaml
index 34d526f56..c3027eb25 100644
--- a/device-types/WTI/VMR-8HS20-2.yaml
+++ b/device-types/WTI/VMR-8HS20-2.yaml
@@ -5,7 +5,7 @@ slug: vmr-8hs20-2
 part_number: VMR-8HS20-2
 is_full_depth: false
 u_height: 1
-# comment: WTI VMR 1U, 1 ethernet, 8 outlet 20A 120V
+# comments: WTI VMR 1U, 1 ethernet, 8 outlet 20A 120V
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/device-types/WTI/VMR-HD4D16H.yaml b/device-types/WTI/VMR-HD4D16H.yaml
index ce77c2588..cc46b85c8 100644
--- a/device-types/WTI/VMR-HD4D16H.yaml
+++ b/device-types/WTI/VMR-HD4D16H.yaml
@@ -5,7 +5,7 @@ slug: vmr-hd4d16h
 part_number: VMR-HD4D16H
 is_full_depth: false
 u_height: 1
-# comment: WTI VMR 1U, 1 ethernet, 4 outlet 16A 120V
+# comments: WTI VMR 1U, 1 ethernet, 4 outlet 16A 120V
 interfaces:
   - name: ETH0
     type: 1000base-t
diff --git a/tests/schema.json b/tests/schema.json
index a476c2380..ff1157347 100644
--- a/tests/schema.json
+++ b/tests/schema.json
@@ -87,9 +87,13 @@
             "items": {
                 "$ref": "#/definitions/inventory-item"
             }
+        },
+        "comments": {
+            "type": "string"
         }
     },
     "required": ["manufacturer", "model", "slug"],
+    "additionalProperties": false,
 
     "definitions": {