diff --git a/device-types/Arista/DCS-7358-F.yaml b/device-types/Arista/DCS-7358-F.yaml
new file mode 100644
index 00000000..4033091a
--- /dev/null
+++ b/device-types/Arista/DCS-7358-F.yaml
@@ -0,0 +1,50 @@
+---
+manufacturer: Arista
+model: DCS-7358-F
+slug: arista-dcs-7358-f
+part_number: DCS-7358-F
+u_height: 4
+weight: 13.6
+weight_unit: kg
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Arista 7358X4 Series 100/200/400G Data Center Switches](https://www.arista.com/assets/data/pdf/Datasheets/7358X4-Datasheet.pdf'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PSU 1
+    position: '0'
+  - name: PSU 2
+    position: '1'
+  - name: PSU 3
+    position: '2'
+  - name: PSU 4
+    position: '3'
+  - name: Slot 1
+    position: '1'
+    label: Supervisor
+  - name: Slot 2
+    position: '2'
+    label: Line Card
+  - name: Slot 3
+    position: '3'
+    label: Line Card
+  - name: Slot 4
+    position: '4'
+    label: Line Card
+  - name: Slot 5
+    position: '5'
+    label: Line Card
+  - name: Slot 6
+    position: '6'
+    label: Line Card
+  - name: Slot 7
+    position: '7'
+    label: Line Card
+  - name: Slot 8
+    position: '8'
+    label: Line Card
+  - name: Slot 9
+    position: '9'
+    label: Line Card
diff --git a/device-types/Arista/DCS-7358-R.yaml b/device-types/Arista/DCS-7358-R.yaml
new file mode 100644
index 00000000..d8b8d019
--- /dev/null
+++ b/device-types/Arista/DCS-7358-R.yaml
@@ -0,0 +1,50 @@
+---
+manufacturer: Arista
+model: DCS-7358-R
+slug: arista-dcs-7358-r
+part_number: DCS-7358-R
+u_height: 4
+weight: 13.6
+weight_unit: kg
+airflow: rear-to-front
+is_full_depth: false
+comments: '[Arista 7358X4 Series 100/200/400G Data Center Switches](https://www.arista.com/assets/data/pdf/Datasheets/7358X4-Datasheet.pdf'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PSU 1
+    position: '0'
+  - name: PSU 2
+    position: '1'
+  - name: PSU 3
+    position: '2'
+  - name: PSU 4
+    position: '3'
+  - name: Slot 1
+    position: '1'
+    label: Supervisor
+  - name: Slot 2
+    position: '2'
+    label: Line Card
+  - name: Slot 3
+    position: '3'
+    label: Line Card
+  - name: Slot 4
+    position: '4'
+    label: Line Card
+  - name: Slot 5
+    position: '5'
+    label: Line Card
+  - name: Slot 6
+    position: '6'
+    label: Line Card
+  - name: Slot 7
+    position: '7'
+    label: Line Card
+  - name: Slot 8
+    position: '8'
+    label: Line Card
+  - name: Slot 9
+    position: '9'
+    label: Line Card
diff --git a/module-types/Arista/DCS-7358-16C.yaml b/module-types/Arista/DCS-7358-16C.yaml
new file mode 100644
index 00000000..4ff4bdc3
--- /dev/null
+++ b/module-types/Arista/DCS-7358-16C.yaml
@@ -0,0 +1,39 @@
+---
+manufacturer: Arista
+model: DCS-7358-16C
+part_number: DCS-7358-16C
+comments: '[Arista 7358 Series Overview](https://www.arista.com/en/products/7358x4-series)'
+interfaces:
+# QSFP28(100G) ports can be broke into 4x25 with a model of [1-16]/[1-4]
+  - name: Ethernet{module}/1/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet{module}/2/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet{module}/3/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet{module}/4/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet{module}/5/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet{module}/6/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet{module}/7/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet{module}/8/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet{module}/9/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet{module}/10/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet{module}/11/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet{module}/12/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet{module}/13/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet{module}/14/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet{module}/15/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet{module}/16/1
+    type: 100gbase-x-qsfp28
diff --git a/module-types/Arista/PWR-1900AC-F.yaml b/module-types/Arista/PWR-1900-AC-F.yaml
similarity index 73%
rename from module-types/Arista/PWR-1900AC-F.yaml
rename to module-types/Arista/PWR-1900-AC-F.yaml
index 4e3b1f54..51605f8f 100644
--- a/module-types/Arista/PWR-1900AC-F.yaml
+++ b/module-types/Arista/PWR-1900-AC-F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
-model: PWR-1900AC-F
-part_number: PWR-1900AC-F
+model: PWR-1900-AC-F
+part_number: PWR-1900-AC-F
 # airflow: front-to-rear
 power-ports:
   - name: '{module}'
diff --git a/module-types/Arista/PWR-1900AC-R.yaml b/module-types/Arista/PWR-1900-AC-R.yaml
similarity index 73%
rename from module-types/Arista/PWR-1900AC-R.yaml
rename to module-types/Arista/PWR-1900-AC-R.yaml
index a9e8516b..ef7c040f 100644
--- a/module-types/Arista/PWR-1900AC-R.yaml
+++ b/module-types/Arista/PWR-1900-AC-R.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
-model: PWR-1900AC-R
-part_number: PWR-1900AC-R
+model: PWR-1900-AC-R
+part_number: PWR-1900-AC-R
 # airflow: rear-to-front
 power-ports:
   - name: '{module}'