diff --git a/device-types/Cisco/N3K-C3048TP-1GE.yaml b/device-types/Cisco/N3K-C3048TP-1GE.yaml
index 94acd8e9..5d5b6a58 100644
--- a/device-types/Cisco/N3K-C3048TP-1GE.yaml
+++ b/device-types/Cisco/N3K-C3048TP-1GE.yaml
@@ -4,10 +4,10 @@ part_number: N3K-C3048TP-1GE
 slug: n3k-c3048tp-1ge
 u_height: 1
 is_full_depth: true
-console_ports:
+console-ports:
   - name: Console
     type: rj-45
-power_ports:
+power-ports:
   - name: PS1
     type: iec-60320-c14
   - name: PS2
diff --git a/device-types/Cisco/N9K-C93180YC-EX.yaml b/device-types/Cisco/N9K-C93180YC-EX.yaml
index bf71e85c..784b93fb 100644
--- a/device-types/Cisco/N9K-C93180YC-EX.yaml
+++ b/device-types/Cisco/N9K-C93180YC-EX.yaml
@@ -4,11 +4,14 @@ part_number: N9K-C93180YC-EX
 slug: n9k-c93180yc-ex
 u_height: 1
 is_full_depth: true
-console_ports:
+console-ports:
   - name: console
-power_ports:
+    type: rj-45
+power-ports:
   - name: Power Supply 1
+    type: iec-60320-c14
   - name: Power Supply 2
+    type: iec-60320-c14
 interfaces:
   - name: Ethernet1/1
     type: 10gbase-x-sfpp
diff --git a/device-types/Cisco/N9K-C9348GC-FXP.yaml b/device-types/Cisco/N9K-C9348GC-FXP.yaml
index c4854950..972ba5a3 100644
--- a/device-types/Cisco/N9K-C9348GC-FXP.yaml
+++ b/device-types/Cisco/N9K-C9348GC-FXP.yaml
@@ -4,11 +4,14 @@ part_number: N9K-C9348GC-FXP
 slug: n9k-c9348gc-fxp
 u_height: 1
 is_full_depth: true
-console_ports:
+console-ports:
   - name: console
-power_ports:
+    type: rj-45
+power-ports:
   - name: Power Supply 1
+    type: iec-60320-c14
   - name: Power Supply 2
+    type: iec-60320-c14
 interfaces:
   - name: Ethernet1/1
     type: 1000base-t
diff --git a/device-types/Cisco/N9K-C9364C.yaml b/device-types/Cisco/N9K-C9364C.yaml
index cc476245..f7fbdd6f 100644
--- a/device-types/Cisco/N9K-C9364C.yaml
+++ b/device-types/Cisco/N9K-C9364C.yaml
@@ -4,11 +4,14 @@ part_number: N9K-C9364C
 slug: n9k-c9364c
 u_height: 2
 is_full_depth: true
-console_ports:
+console-ports:
   - name: console
-power_ports:
+    type: rj-45
+power-ports:
   - name: Power Supply 1
+    type: iec-60320-c14
   - name: Power Supply 2
+    type: iec-60320-c14
 interfaces:
   - name: Ethernet1/1
     type: 100gbase-x-qsfp28
diff --git a/device-types/Cisco/asr1002-hx.yaml b/device-types/Cisco/asr1002-hx.yaml
index 5702e2d2..fa6cdd3e 100644
--- a/device-types/Cisco/asr1002-hx.yaml
+++ b/device-types/Cisco/asr1002-hx.yaml
@@ -3,11 +3,14 @@ model: ASR1002-HX
 slug: asr1002-hx
 u_height: 2
 is_full_depth: true
-console_ports:
+console-ports:
   - name: con 0
-power_ports:
+    type: rj-45
+power-ports:
   - name: P0
+    type: iec-60320-c14
   - name: P1
+    type: iec-60320-c14
 interfaces:
   - name: GigabitEthernet0/0/0
     type: 1000base-x-sfp
diff --git a/device-types/Cisco/n9k-c9336c-fx2.yaml b/device-types/Cisco/n9k-c9336c-fx2.yaml
index 1ef4767d..43bca2c6 100644
--- a/device-types/Cisco/n9k-c9336c-fx2.yaml
+++ b/device-types/Cisco/n9k-c9336c-fx2.yaml
@@ -4,11 +4,14 @@ part_number: N9K-C9336C-FX2
 slug: n9k-c9336c-fx2
 u_height: 1
 is_full_depth: true
-console_ports:
+console-ports:
   - name: console
-power_ports:
+    type: rj-45
+power-ports:
   - name: Power Supply 1
+    type: iec-60320-c14
   - name: Power Supply 2
+    type: iec-60320-c14
 interfaces:
   - name: Ethernet1/1
     type: 100gbase-x-qsfp28
diff --git a/device-types/Cisco/n9k-c9372px.yaml b/device-types/Cisco/n9k-c9372px.yaml
index 4744a4fe..f0ebcee4 100644
--- a/device-types/Cisco/n9k-c9372px.yaml
+++ b/device-types/Cisco/n9k-c9372px.yaml
@@ -4,11 +4,14 @@ part_number: N9K-C9372PX
 slug: n9k-C9372px
 u_height: 1
 is_full_depth: true
-console_ports:
+console-ports:
   - name: console
-power_ports:
+    type: rj-45
+power-ports:
   - name: Power Supply 1
+    type: iec-60320-c14
   - name: Power Supply 2
+    type: iec-60320-c14
 interfaces:
   - name: Ethernet1/1
     type: 10gbase-x-sfpp
diff --git a/device-types/Cisco/ws-c2960-24pc-l.yaml b/device-types/Cisco/ws-c2960-24pc-l.yaml
index f622fc90..7b6aa5d6 100644
--- a/device-types/Cisco/ws-c2960-24pc-l.yaml
+++ b/device-types/Cisco/ws-c2960-24pc-l.yaml
@@ -4,10 +4,12 @@ part_number: WS-C2960-24PC-L
 slug: ws-c2960-24pc-l
 u_height: 1
 is_full_depth: true
-console_ports:
+console-ports:
   - name: con 0
-power_ports:
+    type: rj-45
+power-ports:
   - name: POWER
+    type: iec-60320-c14
 interfaces:
   - name: FastEthernet0/1
     type: 100base-tx