diff --git a/module-types/Juniper/EX-UM-2QSFP-MR.yaml b/module-types/Juniper/EX-UM-2QSFP-MR.yaml
new file mode 100644
index 000000000..a7376c73a
--- /dev/null
+++ b/module-types/Juniper/EX-UM-2QSFP-MR.yaml
@@ -0,0 +1,10 @@
+---
+manufacturer: Juniper
+model: EX-UM-2QSFP-MR
+part_number: EX-UM-2QSFP-MR
+comments: Compatible with EX4300MP Only
+interfaces:
+  - name: et-0/{module}/0
+    type: 100gbase-x-qsfp28
+  - name: et-0/{module}/1
+    type: 100gbase-x-qsfp28
diff --git a/module-types/Juniper/EX-UM-2QSFP.yaml b/module-types/Juniper/EX-UM-2QSFP.yaml
new file mode 100644
index 000000000..5e6c6e0d8
--- /dev/null
+++ b/module-types/Juniper/EX-UM-2QSFP.yaml
@@ -0,0 +1,10 @@
+---
+manufacturer: Juniper
+model: EX-UM-2QSFP
+part_number: EX-UM-2QSFP
+comments: Compatible with EX4300-32F
+interfaces:
+  - name: et-0/{module}/0
+    type: 40gbase-x-qsfpp
+  - name: et-0/{module}/1
+    type: 40gbase-x-qsfpp
diff --git a/module-types/Juniper/EX-UM-4SFPP-MR.yaml b/module-types/Juniper/EX-UM-4SFPP-MR.yaml
new file mode 100644
index 000000000..2cb98d1b6
--- /dev/null
+++ b/module-types/Juniper/EX-UM-4SFPP-MR.yaml
@@ -0,0 +1,14 @@
+---
+manufacturer: Juniper
+model: EX-UM-4SFPP-MR
+part_number: EX-UM-4SFPP-MR
+comments: Compatible with EX4300MP only
+interfaces:
+  - name: xe-0/{module}/0
+    type: 10gbase-x-sfpp
+  - name: xe-0/{module}/1
+    type: 10gbase-x-sfpp
+  - name: xe-0/{module}/2
+    type: 10gbase-x-sfpp
+  - name: xe-0/{module}/3
+    type: 10gbase-x-sfpp
diff --git a/module-types/Juniper/EX-UM-4x4SFP.yaml b/module-types/Juniper/EX-UM-4x4SFP.yaml
index 6bc75c58d..7729bb6e3 100644
--- a/module-types/Juniper/EX-UM-4x4SFP.yaml
+++ b/module-types/Juniper/EX-UM-4x4SFP.yaml
@@ -2,15 +2,8 @@
 manufacturer: Juniper
 model: EX-UM-4x4SFP
 part_number: EX-UM-4x4SFP
+comments: Compatible with EX4300
 interfaces:
-  - name: ge-0/2/0
-    type: 1000base-x-sfp
-  - name: ge-0/2/1
-    type: 1000base-x-sfp
-  - name: ge-0/2/2
-    type: 1000base-x-sfp
-  - name: ge-0/2/3
-    type: 1000base-x-sfp
   - name: xe-0/2/0
     type: 10gbase-x-sfpp
   - name: xe-0/2/1
diff --git a/module-types/Juniper/EX-UM-8X8SFP.yaml b/module-types/Juniper/EX-UM-8X8SFP.yaml
index 9f5db1e61..4295b5dbb 100644
--- a/module-types/Juniper/EX-UM-8X8SFP.yaml
+++ b/module-types/Juniper/EX-UM-8X8SFP.yaml
@@ -2,14 +2,15 @@
 manufacturer: Juniper
 model: EX-UM-8X8SFP
 part_number: EX-UM-8X8SFP
+comments: Compatible with EX4300-32F
 interfaces:
-  - name: ge-0/2/0
+  - name: xe-0/2/0
     type: 10gbase-x-sfpp
-  - name: ge-0/2/1
+  - name: xe-0/2/1
     type: 10gbase-x-sfpp
-  - name: ge-0/2/2
+  - name: xe-0/2/2
     type: 10gbase-x-sfpp
-  - name: ge-0/2/3
+  - name: xe-0/2/3
     type: 10gbase-x-sfpp
   - name: xe-0/2/4
     type: 10gbase-x-sfpp
diff --git a/module-types/Juniper/ex4100-fan-afi.yaml b/module-types/Juniper/EX4100-FAN-AFI.yaml
similarity index 86%
rename from module-types/Juniper/ex4100-fan-afi.yaml
rename to module-types/Juniper/EX4100-FAN-AFI.yaml
index 99e16ce85..630df508a 100644
--- a/module-types/Juniper/ex4100-fan-afi.yaml
+++ b/module-types/Juniper/EX4100-FAN-AFI.yaml
@@ -2,6 +2,5 @@
 manufacturer: Juniper
 model: EX4100-FAN-AFI
 comments: |
-  fan with back-to-front airflow
-
+  Fan with back-to-front airflow
   [Juniper EX4100 Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/switches/ex4100-line-of-ethernet-switches-datasheet.pdf)
diff --git a/module-types/Juniper/ex4100-fan-afo.yaml b/module-types/Juniper/EX4100-FAN-AFO.yaml
similarity index 99%
rename from module-types/Juniper/ex4100-fan-afo.yaml
rename to module-types/Juniper/EX4100-FAN-AFO.yaml
index 9f79ae03f..8e29761d8 100644
--- a/module-types/Juniper/ex4100-fan-afo.yaml
+++ b/module-types/Juniper/EX4100-FAN-AFO.yaml
@@ -4,5 +4,4 @@ model: EX4100-FAN-AFO
 part_number: 660-156849
 comments: |
   fan with front-to-back airflow
-
   [Juniper EX4100 Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/switches/ex4100-line-of-ethernet-switches-datasheet.pdf)
diff --git a/module-types/Juniper/EX4600-EM-8F.yaml b/module-types/Juniper/EX4600-EM-8F.yaml
index 06ad65dff..c411aa60b 100644
--- a/module-types/Juniper/EX4600-EM-8F.yaml
+++ b/module-types/Juniper/EX4600-EM-8F.yaml
@@ -3,19 +3,19 @@ manufacturer: Juniper
 model: EX4600-EM-8F
 part_number: EX4600-EM-8F
 interfaces:
-  - name: xe-{module}/0/0
+  - name: xe-0/{module}/0
     type: 10gbase-x-sfpp
-  - name: xe-{module}/0/1
+  - name: xe-0/{module}/1
     type: 10gbase-x-sfpp
-  - name: xe-{module}/0/2
+  - name: xe-0/{module}/2
     type: 10gbase-x-sfpp
-  - name: xe-{module}/0/3
+  - name: xe-0/{module}/3
     type: 10gbase-x-sfpp
-  - name: xe-{module}/0/4
+  - name: xe-0/{module}/4
     type: 10gbase-x-sfpp
-  - name: xe-{module}/0/5
+  - name: xe-0/{module}/5
     type: 10gbase-x-sfpp
-  - name: xe-{module}/0/6
+  - name: xe-0/{module}/6
     type: 10gbase-x-sfpp
-  - name: xe-{module}/0/7
+  - name: xe-0/{module}/7
     type: 10gbase-x-sfpp
diff --git a/module-types/Juniper/jpsu-150-ac-afi.yaml b/module-types/Juniper/JPSU-150-AC-AFI.yaml
similarity index 99%
rename from module-types/Juniper/jpsu-150-ac-afi.yaml
rename to module-types/Juniper/JPSU-150-AC-AFI.yaml
index 0805e3cbd..ad71774d7 100644
--- a/module-types/Juniper/jpsu-150-ac-afi.yaml
+++ b/module-types/Juniper/JPSU-150-AC-AFI.yaml
@@ -4,11 +4,9 @@ model: JPSU-150-AC-AFI
 part_number: 640-060604
 comments: |
   EX Series 150 W AC power supply (back-to-front airflow)
-
   Compatible with
   * EX3400 non-PoE models
   * EX4100 non-PoE models
-
   [Juniper EX4100 Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/switches/ex4100-line-of-ethernet-switches-datasheet.pdf)
 power-ports:
   - name: Power Supply {module}
diff --git a/module-types/Juniper/jpsu-150-ac-afo.yaml b/module-types/Juniper/JPSU-150-AC-AFO.yaml
similarity index 99%
rename from module-types/Juniper/jpsu-150-ac-afo.yaml
rename to module-types/Juniper/JPSU-150-AC-AFO.yaml
index 6cf9f1d5b..fcf0464b6 100644
--- a/module-types/Juniper/jpsu-150-ac-afo.yaml
+++ b/module-types/Juniper/JPSU-150-AC-AFO.yaml
@@ -4,11 +4,9 @@ model: JPSU-150-AC-AFO
 part_number: 640-060603
 comments: |
   EX Series 150 W AC power supply (front-to-back airflow)
-
   Compatible with
   * EX3400 non-PoE models
   * EX4100 non-PoE models
-
   [Juniper EX4100 Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/switches/ex4100-line-of-ethernet-switches-datasheet.pdf)
 power-ports:
   - name: Power Supply {module}
diff --git a/module-types/Juniper/jpsu-150-dc-afo.yaml b/module-types/Juniper/JPSU-150-DC-AFO.yaml
similarity index 99%
rename from module-types/Juniper/jpsu-150-dc-afo.yaml
rename to module-types/Juniper/JPSU-150-DC-AFO.yaml
index 3e0f8b0c3..e311a4df3 100644
--- a/module-types/Juniper/jpsu-150-dc-afo.yaml
+++ b/module-types/Juniper/JPSU-150-DC-AFO.yaml
@@ -4,11 +4,9 @@ model: JPSU-150-DC-AFO
 part_number: 640-061542
 comments: |
   EX Series 150 W DC power supply (front-to-back airflow)
-
   Compatible with
   * EX3400 non-PoE models
   * EX4100 non-PoE models
-
   [Juniper EX4100 Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/switches/ex4100-line-of-ethernet-switches-datasheet.pdf)
 power-ports:
   - name: Power Supply {module}
diff --git a/module-types/Juniper/JPSU-350-AC-AFI.yaml b/module-types/Juniper/JPSU-350-AC-AFI.yaml
new file mode 100644
index 000000000..4cda25159
--- /dev/null
+++ b/module-types/Juniper/JPSU-350-AC-AFI.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Juniper
+model: JPSU-350-AC-AFI
+comments: |
+  EX Series 350 W AC power supply (back-to-front airflow) for EX4300-32F
+power-ports:
+  - name: Power Supply {module}
+    type: iec-60320-c14
+    maximum_draw: 350
diff --git a/module-types/Juniper/JPSU-350-AC-AFO.yaml b/module-types/Juniper/JPSU-350-AC-AFO.yaml
new file mode 100644
index 000000000..1aad62e64
--- /dev/null
+++ b/module-types/Juniper/JPSU-350-AC-AFO.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Juniper
+model: JPSU-350-AC-AFO
+comments: |
+  EX Series 350 W AC power supply (front-to-back airflow) for EX4300-32F
+power-ports:
+  - name: Power Supply {module}
+    type: iec-60320-c14
+    maximum_draw: 350