diff --git a/device-types/Opengear/OM2248-L-EU.yaml b/device-types/Opengear/OM2248-L-EU.yaml
index a703babf..1339d244 100644
--- a/device-types/Opengear/OM2248-L-EU.yaml
+++ b/device-types/Opengear/OM2248-L-EU.yaml
@@ -5,7 +5,7 @@ slug: om2248-l-eu
 part_number: OM2248-L-EU
 u_height: 1
 is_full_depth: false
-comments: 'Operations Manager OM2200 - Europe LTE'
+comments: Operations Manager OM2200 - Europe LTE
 console-ports:
   - name: Console
     type: rj-45
diff --git a/device-types/Opengear/OM2248-L.yaml b/device-types/Opengear/OM2248-L.yaml
index bb159500..b67da910 100644
--- a/device-types/Opengear/OM2248-L.yaml
+++ b/device-types/Opengear/OM2248-L.yaml
@@ -5,7 +5,7 @@ slug: om2248-l
 part_number: OM2248-L-EU
 u_height: 1
 is_full_depth: false
-comments: 'Operations Manager OM2200 - Americas LTE'
+comments: Operations Manager OM2200 - Americas LTE
 console-ports:
   - name: Console
     type: rj-45
diff --git a/device-types/Raritan/PX3-5724V.yaml b/device-types/Raritan/PX3-5724V.yaml
index e7cee8e1..a7d4e874 100644
--- a/device-types/Raritan/PX3-5724V.yaml
+++ b/device-types/Raritan/PX3-5724V.yaml
@@ -17,182 +17,182 @@ power-outlets:
     type: iec-60320-c19
     power_port: Inlet1
     feed_leg: A
-    label: 1
+    label: '1'
   - name: Outlet2
     type: iec-60320-c19
     power_port: Inlet1
     feed_leg: A
-    label: 2
+    label: '2'
   - name: Outlet3
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: A
-    label: 3
+    label: '3'
   - name: Outlet4
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: A
-    label: 4
+    label: '4'
   - name: Outlet5
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: A
-    label: 5
+    label: '5'
   - name: Outlet6
     type: iec-60320-c19
     power_port: Inlet1
     feed_leg: A
-    label: 6
+    label: '6'
   - name: Outlet7
     type: iec-60320-c19
     power_port: Inlet1
     feed_leg: A
-    label: 7
+    label: '7'
   - name: Outlet8
     type: iec-60320-c19
     power_port: Inlet1
     feed_leg: A
-    label: 8
+    label: '8'
   - name: Outlet9
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: A
-    label: 9
+    label: '9'
   - name: Outlet10
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: A
-    label: 10
+    label: '10'
   - name: Outlet11
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: A
-    label: 11
+    label: '11'
   - name: Outlet12
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: A
-    label: 12
+    label: '12'
   - name: Outlet13
     type: iec-60320-c19
     power_port: Inlet1
     feed_leg: B
-    label: 13
+    label: '13'
   - name: Outlet14
     type: iec-60320-c19
     power_port: Inlet1
     feed_leg: B
-    label: 14
+    label: '14'
   - name: Outlet15
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: B
-    label: 15
+    label: '15'
   - name: Outlet16
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: B
-    label: 16
+    label: '16'
   - name: Outlet17
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: B
-    label: 17
+    label: '17'
   - name: Outlet18
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: B
-    label: 18
+    label: '18'
   - name: Outlet19
     type: iec-60320-c19
     power_port: Inlet1
     feed_leg: B
-    label: 19
+    label: '19'
   - name: Outlet20
     type: iec-60320-c19
     power_port: Inlet1
     feed_leg: B
-    label: 20
+    label: '20'
   - name: Outlet21
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: B
-    label: 21
+    label: '21'
   - name: Outlet22
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: B
-    label: 22
+    label: '22'
   - name: Outlet23
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: B
-    label: 23
+    label: '23'
   - name: Outlet24
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: B
-    label: 24
+    label: '24'
   - name: Outlet25
     type: iec-60320-c19
     power_port: Inlet1
     feed_leg: C
-    label: 25
+    label: '25'
   - name: Outlet26
     type: iec-60320-c19
     power_port: Inlet1
     feed_leg: C
-    label: 26
+    label: '26'
   - name: Outlet27
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: C
-    label: 27
+    label: '27'
   - name: Outlet28
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: C
-    label: 28
+    label: '28'
   - name: Outlet29
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: C
-    label: 29
+    label: '29'
   - name: Outlet30
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: C
-    label: 30
+    label: '30'
   - name: Outlet31
     type: iec-60320-c19
     power_port: Inlet1
     feed_leg: C
-    label: 31
+    label: '31'
   - name: Outlet32
     type: iec-60320-c19
     power_port: Inlet1
     feed_leg: C
-    label: 32
+    label: '32'
   - name: Outlet33
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: C
-    label: 33
+    label: '33'
   - name: Outlet34
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: C
-    label: 34
+    label: '34'
   - name: Outlet35
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: C
-    label: 35
+    label: '35'
   - name: Outlet36
     type: iec-60320-c13
     power_port: Inlet1
     feed_leg: C
-    label: 36
+    label: '36'
 interfaces:
   - name: Eth1
     type: 1000base-t