diff --git a/device-types/Juniper/ACX1100-AC.yaml b/device-types/Juniper/ACX1100-AC.yaml
index 6a925f5f7..158aee6ca 100644
--- a/device-types/Juniper/ACX1100-AC.yaml
+++ b/device-types/Juniper/ACX1100-AC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: ACX1100-AC
-slug: acx1100-ac
+slug: juniper-acx1100-ac
 part_number: ACX1100-AC
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Juniper/ACX4000.yaml b/device-types/Juniper/ACX4000.yaml
index 635921855..b0493cc71 100644
--- a/device-types/Juniper/ACX4000.yaml
+++ b/device-types/Juniper/ACX4000.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: ACX4000
-slug: acx4000
+slug: juniper-acx4000
 u_height: 3
 is_full_depth: false
 comments: 2.5U Height
diff --git a/device-types/Juniper/ACX5448-M.yaml b/device-types/Juniper/ACX5448-M.yaml
index 39ec4e3f8..472ef5eef 100644
--- a/device-types/Juniper/ACX5448-M.yaml
+++ b/device-types/Juniper/ACX5448-M.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: ACX5448-M
-slug: acx5448-m
+slug: juniper-acx5448-m
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/Juniper/ACX710-DC.yaml b/device-types/Juniper/ACX710-DC.yaml
index 3033c9e99..275048599 100644
--- a/device-types/Juniper/ACX710-DC.yaml
+++ b/device-types/Juniper/ACX710-DC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: ACX710DC
-slug: acx710dc
+slug: juniper-acx710dc
 part_number: ACX710DC
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Juniper/EX2200-48T-4G.yaml b/device-types/Juniper/EX2200-48T-4G.yaml
index c81e7fa30..08153a84e 100644
--- a/device-types/Juniper/EX2200-48T-4G.yaml
+++ b/device-types/Juniper/EX2200-48T-4G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX2200-48T-4G
-slug: ex2200-48t-4g
+slug: juniper-ex2200-48t-4g
 u_height: 1
 interfaces:
   - name: ge-0/0/0
diff --git a/device-types/Juniper/EX2200-C-12P.yaml b/device-types/Juniper/EX2200-C-12P.yaml
index 41771e464..03c2a0df2 100644
--- a/device-types/Juniper/EX2200-C-12P.yaml
+++ b/device-types/Juniper/EX2200-C-12P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX2200-C-12P
-slug: ex2200-c-12p
+slug: juniper-ex2200-c-12p
 u_height: 1
 interfaces:
   - name: ge-0/0/0
diff --git a/device-types/Juniper/EX2200-C-12T.yaml b/device-types/Juniper/EX2200-C-12T.yaml
index 7ab7bf00f..775794b52 100644
--- a/device-types/Juniper/EX2200-C-12T.yaml
+++ b/device-types/Juniper/EX2200-C-12T.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX2200-C-12T
-slug: ex2200-c-12t
+slug: juniper-ex2200-c-12t
 u_height: 1
 interfaces:
   - name: ge-0/0/0
diff --git a/device-types/Juniper/EX2300-24T.yaml b/device-types/Juniper/EX2300-24T.yaml
index 3a1e28a3f..116c7636f 100644
--- a/device-types/Juniper/EX2300-24T.yaml
+++ b/device-types/Juniper/EX2300-24T.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX2300-24T
-slug: ex2300-24t
+slug: juniper-ex2300-24t
 part_number: ex2300-24t
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Juniper/EX2300-48T.yaml b/device-types/Juniper/EX2300-48T.yaml
index f17dc6ffb..e2895d900 100644
--- a/device-types/Juniper/EX2300-48T.yaml
+++ b/device-types/Juniper/EX2300-48T.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX2300-48T
-slug: ex2300-48t
+slug: juniper-ex2300-48t
 part_number: ex2300-48t
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Juniper/EX2300-C-12P.yaml b/device-types/Juniper/EX2300-C-12P.yaml
index 211cff3e8..9fd1b2179 100644
--- a/device-types/Juniper/EX2300-C-12P.yaml
+++ b/device-types/Juniper/EX2300-C-12P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX2300-C-12P
-slug: ex2300-c-12p
+slug: juniper-ex2300-c-12p
 u_height: 1
 interfaces:
   - name: ge-0/0/0
diff --git a/device-types/Juniper/EX2300-C-12T.yaml b/device-types/Juniper/EX2300-C-12T.yaml
index 7b56f0bbc..eb9d31c79 100644
--- a/device-types/Juniper/EX2300-C-12T.yaml
+++ b/device-types/Juniper/EX2300-C-12T.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX2300-C-12T
-slug: ex2300-c-12t
+slug: juniper-ex2300-c-12t
 u_height: 1
 interfaces:
   - name: ge-0/0/0
diff --git a/device-types/Juniper/EX3300-24P.yaml b/device-types/Juniper/EX3300-24P.yaml
index 582b78b32..522633c26 100644
--- a/device-types/Juniper/EX3300-24P.yaml
+++ b/device-types/Juniper/EX3300-24P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX3300-24P
-slug: ex3300-24p
+slug: juniper-ex3300-24p
 u_height: 1
 interfaces:
   - name: ge-0/0/0
diff --git a/device-types/Juniper/EX3300-24T.yaml b/device-types/Juniper/EX3300-24T.yaml
index b4d16768d..a13d3940f 100644
--- a/device-types/Juniper/EX3300-24T.yaml
+++ b/device-types/Juniper/EX3300-24T.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX3300-24T
-slug: ex3300-24t
+slug: juniper-ex3300-24t
 u_height: 1
 interfaces:
   - name: ge-0/0/0
diff --git a/device-types/Juniper/EX3300-48P.yaml b/device-types/Juniper/EX3300-48P.yaml
index 2b844019f..1a45ffac9 100644
--- a/device-types/Juniper/EX3300-48P.yaml
+++ b/device-types/Juniper/EX3300-48P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX3300-48P
-slug: ex3300-48p
+slug: juniper-ex3300-48p
 u_height: 1
 interfaces:
   - name: ge-0/0/0
diff --git a/device-types/Juniper/EX3300-48T.yaml b/device-types/Juniper/EX3300-48T.yaml
index 04a0139d5..099b6b9b1 100644
--- a/device-types/Juniper/EX3300-48T.yaml
+++ b/device-types/Juniper/EX3300-48T.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX3300-48T
-slug: ex3300-48t
+slug: juniper-ex3300-48t
 u_height: 1
 interfaces:
   - name: ge-0/0/0
diff --git a/device-types/Juniper/EX3400-24P.yaml b/device-types/Juniper/EX3400-24P.yaml
index 070c65e5f..66e591e46 100644
--- a/device-types/Juniper/EX3400-24P.yaml
+++ b/device-types/Juniper/EX3400-24P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX3400-24P
-slug: ex3400-24p
+slug: juniper-ex3400-24p
 u_height: 1
 interfaces:
   - name: ge-0/0/0
diff --git a/device-types/Juniper/EX3400-24T.yaml b/device-types/Juniper/EX3400-24T.yaml
index e21efedf6..e123b64af 100644
--- a/device-types/Juniper/EX3400-24T.yaml
+++ b/device-types/Juniper/EX3400-24T.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX3400-24T
-slug: ex3400-24t
+slug: juniper-ex3400-24t
 u_height: 1
 interfaces:
   - name: ge-0/0/0
diff --git a/device-types/Juniper/EX3400-48P.yaml b/device-types/Juniper/EX3400-48P.yaml
index 583dd9881..46aa43327 100644
--- a/device-types/Juniper/EX3400-48P.yaml
+++ b/device-types/Juniper/EX3400-48P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX3400-48P
-slug: ex3400-48p
+slug: juniper-ex3400-48p
 u_height: 1
 interfaces:
   - name: ge-0/0/0
diff --git a/device-types/Juniper/EX3400-48T.yaml b/device-types/Juniper/EX3400-48T.yaml
index 03808818e..1da7cf89d 100644
--- a/device-types/Juniper/EX3400-48T.yaml
+++ b/device-types/Juniper/EX3400-48T.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX3400-48T
-slug: ex3400-48t
+slug: juniper-ex3400-48t
 u_height: 1
 interfaces:
   - name: ge-0/0/0
diff --git a/device-types/Juniper/EX4200-48T.yaml b/device-types/Juniper/EX4200-48T.yaml
index 1c7e94caa..5b40f5b94 100644
--- a/device-types/Juniper/EX4200-48T.yaml
+++ b/device-types/Juniper/EX4200-48T.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX4200-48T
-slug: ex4200-48t
+slug: juniper-ex4200-48t
 u_height: 1
 is_full_depth: true
 comments: '[Juniper EX4200 Data Sheet](https://www.juniper.net/assets/us/en/local/pdf/datasheets/1000215-en.pdf)'
diff --git a/device-types/Juniper/EX4300-24P.yaml b/device-types/Juniper/EX4300-24P.yaml
index 93a298eef..057fb5668 100644
--- a/device-types/Juniper/EX4300-24P.yaml
+++ b/device-types/Juniper/EX4300-24P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX4300-24P
-slug: ex4300-24p
+slug: juniper-ex4300-24p
 interfaces:
   - name: ge-0/0/0
     type: 1000base-t
diff --git a/device-types/Juniper/EX4300-24T.yaml b/device-types/Juniper/EX4300-24T.yaml
index 4c5135f9a..c19a7af29 100644
--- a/device-types/Juniper/EX4300-24T.yaml
+++ b/device-types/Juniper/EX4300-24T.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX4300-24T
-slug: ex4300-24t
+slug: juniper-ex4300-24t
 interfaces:
   - name: ge-0/0/0
     type: 1000base-t
diff --git a/device-types/Juniper/EX4300-32F.yaml b/device-types/Juniper/EX4300-32F.yaml
index 60dc5d021..036de0b85 100644
--- a/device-types/Juniper/EX4300-32F.yaml
+++ b/device-types/Juniper/EX4300-32F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX4300-32F
-slug: ex4300-32f
+slug: juniper-ex4300-32f
 interfaces:
   - name: ge-0/0/0
     type: 1000base-x-sfp
diff --git a/device-types/Juniper/EX4300-48MP.yaml b/device-types/Juniper/EX4300-48MP.yaml
index 072e51673..d48d3c043 100644
--- a/device-types/Juniper/EX4300-48MP.yaml
+++ b/device-types/Juniper/EX4300-48MP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX4300-48MP
-slug: ex4300-48mp
+slug: juniper-ex4300-48mp
 part_number: EX4300-48MP
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Juniper/EX4300-48P.yaml b/device-types/Juniper/EX4300-48P.yaml
index 27b5225f1..58dfc49d4 100644
--- a/device-types/Juniper/EX4300-48P.yaml
+++ b/device-types/Juniper/EX4300-48P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX4300-48P
-slug: ex4300-48p
+slug: juniper-ex4300-48p
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
diff --git a/device-types/Juniper/EX4300-48T.yaml b/device-types/Juniper/EX4300-48T.yaml
index a61eed72c..bdf68eac5 100644
--- a/device-types/Juniper/EX4300-48T.yaml
+++ b/device-types/Juniper/EX4300-48T.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX4300-48T
-slug: ex4300-48t
+slug: juniper-ex4300-48t
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
diff --git a/device-types/Juniper/EX4500-40F.yaml b/device-types/Juniper/EX4500-40F.yaml
index 39a00c611..852866b33 100644
--- a/device-types/Juniper/EX4500-40F.yaml
+++ b/device-types/Juniper/EX4500-40F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX4500-40F
-slug: ex4500-40f
+slug: juniper-ex4500-40f
 part_number: EX4500-40F-VC1-BF-C
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Juniper/EX4550-32F.yaml b/device-types/Juniper/EX4550-32F.yaml
index fd88996e0..5308ab15e 100644
--- a/device-types/Juniper/EX4550-32F.yaml
+++ b/device-types/Juniper/EX4550-32F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: ex4550-32f
-slug: ex4550-32f
+slug: juniper-ex4550-32f
 is_full_depth: false
 part_number: ex4550-32f
 u_height: 1
diff --git a/device-types/Juniper/EX9204.yaml b/device-types/Juniper/EX9204.yaml
index 41fedab3b..e0ad0f22d 100644
--- a/device-types/Juniper/EX9204.yaml
+++ b/device-types/Juniper/EX9204.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX9204
-slug: ex9204
+slug: juniper-ex9204
 u_height: 5
 is_full_depth: true
 subdevice_role: parent
diff --git a/device-types/Juniper/EX9214.yaml b/device-types/Juniper/EX9214.yaml
index db83cf22c..1d87d4586 100644
--- a/device-types/Juniper/EX9214.yaml
+++ b/device-types/Juniper/EX9214.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: EX9214
-slug: ex9214
+slug: juniper-ex9214
 u_height: 16
 is_full_depth: true
 subdevice_role: parent
diff --git a/device-types/Juniper/MX10003-BASE.yaml b/device-types/Juniper/MX10003-BASE.yaml
index a5349189f..964076373 100644
--- a/device-types/Juniper/MX10003-BASE.yaml
+++ b/device-types/Juniper/MX10003-BASE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: MX10003-BASE
-slug: mx10003-base
+slug: juniper-mx10003-base
 u_height: 3
 interfaces:
   - name: fxp0
diff --git a/device-types/Juniper/MX10003-PREMIUM.yaml b/device-types/Juniper/MX10003-PREMIUM.yaml
index c5f71e91b..d73f83cfe 100644
--- a/device-types/Juniper/MX10003-PREMIUM.yaml
+++ b/device-types/Juniper/MX10003-PREMIUM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: MX10003-PREMIUM
-slug: mx10003-premium
+slug: juniper-mx10003-premium
 u_height: 3
 interfaces:
   - name: fxp0 (re0)
diff --git a/device-types/Juniper/MX104-BASE.yaml b/device-types/Juniper/MX104-BASE.yaml
index b831d220d..4ccd70a1d 100644
--- a/device-types/Juniper/MX104-BASE.yaml
+++ b/device-types/Juniper/MX104-BASE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: MX104-BASE
-slug: mx104-base
+slug: juniper-mx104-base
 is_full_depth: false
 u_height: 4
 interfaces:
diff --git a/device-types/Juniper/MX104-PREMIUM.yaml b/device-types/Juniper/MX104-PREMIUM.yaml
index 1d39efecb..92255e3bc 100644
--- a/device-types/Juniper/MX104-PREMIUM.yaml
+++ b/device-types/Juniper/MX104-PREMIUM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: MX104-PREMIUM
-slug: mx104-premium
+slug: juniper-mx104-premium
 is_full_depth: false
 u_height: 4
 interfaces:
diff --git a/device-types/Juniper/MX204.yaml b/device-types/Juniper/MX204.yaml
index 359b7966f..869b4b14d 100644
--- a/device-types/Juniper/MX204.yaml
+++ b/device-types/Juniper/MX204.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: MX204
-slug: mx204
+slug: juniper-mx204
 interfaces:
   - name: fxp0
     type: 1000base-t
diff --git a/device-types/Juniper/MX240.yaml b/device-types/Juniper/MX240.yaml
index 2b266f1ce..695597ca5 100644
--- a/device-types/Juniper/MX240.yaml
+++ b/device-types/Juniper/MX240.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: MX240
-slug: mx240
+slug: juniper-mx240
 u_height: 5
 is_full_depth: true
 comments: '[Juniper MX240 Data Sheet](https://www.juniper.net/us/en/products-services/routing/mx-series/mx240/)'
diff --git a/device-types/Juniper/MX480.yaml b/device-types/Juniper/MX480.yaml
index 63537e3b7..704f00ba0 100644
--- a/device-types/Juniper/MX480.yaml
+++ b/device-types/Juniper/MX480.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: MX480
-slug: mx480
+slug: juniper-mx480
 u_height: 8
 is_full_depth: true
 comments: '[Juniper MX480 Data Sheet](https://www.juniper.net/us/en/products-services/routing/mx-series/mx480/)'
diff --git a/device-types/Juniper/MX80.yaml b/device-types/Juniper/MX80.yaml
index 338159aaf..2f69dd781 100644
--- a/device-types/Juniper/MX80.yaml
+++ b/device-types/Juniper/MX80.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: MX80
-slug: mx80
+slug: juniper-mx80
 is_full_depth: true
 u_height: 2
 interfaces:
diff --git a/device-types/Juniper/MX960.yaml b/device-types/Juniper/MX960.yaml
index cf11d79a0..ba6980a35 100644
--- a/device-types/Juniper/MX960.yaml
+++ b/device-types/Juniper/MX960.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: MX960
-slug: mx960
+slug: juniper-mx960
 u_height: 16
 is_full_depth: true
 comments: '[Juniper MX960 Data Sheet](https://www.juniper.net/us/en/products-services/routing/mx-series/mx960/)'
diff --git a/device-types/Juniper/NFX250.yaml b/device-types/Juniper/NFX250.yaml
index f396a08e1..d531d75a6 100644
--- a/device-types/Juniper/NFX250.yaml
+++ b/device-types/Juniper/NFX250.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: NFX250
-slug: nfx250
+slug: juniper-nfx250
 part_number: NFX250-S2
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Juniper/QFX10002-36Q.yaml b/device-types/Juniper/QFX10002-36Q.yaml
index 8d71f9bf3..d5dcf7a78 100644
--- a/device-types/Juniper/QFX10002-36Q.yaml
+++ b/device-types/Juniper/QFX10002-36Q.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: QFX10002-36Q
-slug: qfx10002-36q
+slug: juniper-qfx10002-36q
 u_height: 2
 is_full_depth: true
 comments: '[Juniper QFX10002 Data Sheet](https://www.juniper.net/assets/us/en/local/pdf/datasheets/1000531-en.pdf)'
diff --git a/device-types/Juniper/QFX10002-72Q.yaml b/device-types/Juniper/QFX10002-72Q.yaml
index 314798e8e..1b2e34ffb 100644
--- a/device-types/Juniper/QFX10002-72Q.yaml
+++ b/device-types/Juniper/QFX10002-72Q.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: QFX10002-72Q
-slug: qfx10002-72q
+slug: juniper-qfx10002-72q
 u_height: 2
 is_full_depth: true
 comments: '[Juniper QFX10002 Data Sheet](https://www.juniper.net/assets/us/en/local/pdf/datasheets/1000531-en.pdf)'
diff --git a/device-types/Juniper/QFX3500-48S4Q.yaml b/device-types/Juniper/QFX3500-48S4Q.yaml
index d20542f14..b3d74977a 100644
--- a/device-types/Juniper/QFX3500-48S4Q.yaml
+++ b/device-types/Juniper/QFX3500-48S4Q.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: QFX3500-48S4Q
-slug: qfx3500-48s4q
+slug: juniper-qfx3500-48s4q
 u_height: 1
 is_full_depth: true
 comments: |
diff --git a/device-types/Juniper/QFX5100-48S-3AFO.yaml b/device-types/Juniper/QFX5100-48S-3AFO.yaml
index 92a2d977d..178799a73 100644
--- a/device-types/Juniper/QFX5100-48S-3AFO.yaml
+++ b/device-types/Juniper/QFX5100-48S-3AFO.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: QFX5100-48S-3afo
-slug: qfx5100-48s-3afo
+slug: juniper-qfx5100-48s-3afo
 is_full_depth: true
 part_number: QFX5100-48S-3AFO
 interfaces:
diff --git a/device-types/Juniper/QFX5100-48S-6Q.yaml b/device-types/Juniper/QFX5100-48S-6Q.yaml
index 53362e69a..5fa1d356f 100644
--- a/device-types/Juniper/QFX5100-48S-6Q.yaml
+++ b/device-types/Juniper/QFX5100-48S-6Q.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: QFX5100-48S-6q
-slug: qfx5100-48s-6q
+slug: juniper-qfx5100-48s-6q
 part_number: QFX5100-48S-6Q
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Juniper/QFX5100-48T-6Q.yaml b/device-types/Juniper/QFX5100-48T-6Q.yaml
index 8c2991c8b..dcaa9f4c8 100644
--- a/device-types/Juniper/QFX5100-48T-6Q.yaml
+++ b/device-types/Juniper/QFX5100-48T-6Q.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: QFX5100-48T-6Q
-slug: qfx5100-48t-6q
+slug: juniper-qfx5100-48t-6q
 is_full_depth: true
 comments: '[Juniper QFX5100 Data Sheet](https://www.juniper.net/us/en/products-services/switching/qfx-series/qfx5100/)'
 u_height: 1
diff --git a/device-types/Juniper/QFX5100-96S-8Q.yaml b/device-types/Juniper/QFX5100-96S-8Q.yaml
index 13055196b..480cae5be 100644
--- a/device-types/Juniper/QFX5100-96S-8Q.yaml
+++ b/device-types/Juniper/QFX5100-96S-8Q.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: QFX5100-96S-8Q
-slug: qfx5100-96s-8q
+slug: juniper-qfx5100-96s-8q
 part_number: QFX5100-96S-8Q
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Juniper/QFX5110-48S-4C.yaml b/device-types/Juniper/QFX5110-48S-4C.yaml
index a2bb18dd5..538ddcbd6 100644
--- a/device-types/Juniper/QFX5110-48S-4C.yaml
+++ b/device-types/Juniper/QFX5110-48S-4C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: QFX5110-48S-4C
-slug: qfx5110-48s-4c
+slug: juniper-qfx5110-48s-4c
 interfaces:
   - name: fxp0
     type: 1000base-t
diff --git a/device-types/Juniper/QFX5120-32C.yaml b/device-types/Juniper/QFX5120-32C.yaml
index 64b53cce7..1d970e9aa 100644
--- a/device-types/Juniper/QFX5120-32C.yaml
+++ b/device-types/Juniper/QFX5120-32C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: QFX5120-32C
-slug: qfx5120-32c
+slug: juniper-qfx5120-32c
 comments: '[Juniper QFX5200 Data Sheet](https://www.juniper.net/us/en/products-services/switching/qfx-series/qfx5120/)'
 u_height: 1
 interfaces:
diff --git a/device-types/Juniper/QFX5120-48T.yaml b/device-types/Juniper/QFX5120-48T.yaml
index d5ceb3eb9..c0c1543a1 100644
--- a/device-types/Juniper/QFX5120-48T.yaml
+++ b/device-types/Juniper/QFX5120-48T.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: QFX5120-48T
-slug: qfx5120-48t
+slug: juniper-qfx5120-48t
 comments: '[Juniper QFX5200 Data Sheet](https://www.juniper.net/us/en/products-services/switching/qfx-series/qfx5120/)'
 u_height: 1
 interfaces:
diff --git a/device-types/Juniper/QFX5120-48Y.yaml b/device-types/Juniper/QFX5120-48Y.yaml
index cfa14e283..44b0d4b59 100644
--- a/device-types/Juniper/QFX5120-48Y.yaml
+++ b/device-types/Juniper/QFX5120-48Y.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: QFX5120-48Y
-slug: qfx5120-48y
+slug: juniper-qfx5120-48y
 comments: '[Juniper QFX5200 Data Sheet](https://www.juniper.net/us/en/products-services/switching/qfx-series/qfx5120/)'
 u_height: 1
 interfaces:
diff --git a/device-types/Juniper/QFX5130-32CD.yaml b/device-types/Juniper/QFX5130-32CD.yaml
index 0e60e6ea2..26f734357 100644
--- a/device-types/Juniper/QFX5130-32CD.yaml
+++ b/device-types/Juniper/QFX5130-32CD.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: QFX5130-32CD
-slug: qfx5130-32cd
+slug: juniper-qfx5130-32cd
 comments: '[Juniper QFX5200 Data Sheet](https://www.juniper.net/us/en/products-services/switching/qfx-series/qfx5130/)'
 u_height: 1
 interfaces:
diff --git a/device-types/Juniper/QFX5200-32C.yaml b/device-types/Juniper/QFX5200-32C.yaml
index 1dc850faf..c989ce6af 100644
--- a/device-types/Juniper/QFX5200-32C.yaml
+++ b/device-types/Juniper/QFX5200-32C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: QFX5200-32C
-slug: qfx5200-32c
+slug: juniper-qfx5200-32c
 interfaces:
   - name: fxp0
     type: 1000base-t
diff --git a/device-types/Juniper/QFX5200-48Y.yaml b/device-types/Juniper/QFX5200-48Y.yaml
index 2e6b2ba37..a98ed293b 100644
--- a/device-types/Juniper/QFX5200-48Y.yaml
+++ b/device-types/Juniper/QFX5200-48Y.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: QFX5200-48Y
-slug: qfx5200-48y
+slug: juniper-qfx5200-48y
 comments: '[Juniper QFX5200 Data Sheet](https://www.juniper.net/us/en/products-services/switching/qfx-series/qfx5200/)'
 u_height: 1
 interfaces:
diff --git a/device-types/Juniper/QFX5210-128C.yaml b/device-types/Juniper/QFX5210-128C.yaml
index bba67e3d6..651b07900 100644
--- a/device-types/Juniper/QFX5210-128C.yaml
+++ b/device-types/Juniper/QFX5210-128C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: QFX5210-128C
-slug: qfx5210-128c
+slug: juniper-qfx5210-128c
 comments: '[Juniper QFX5200 Data Sheet](https://www.juniper.net/us/en/products-services/switching/qfx-series/qfx5200/)'
 u_height: 1
 interfaces:
diff --git a/device-types/Juniper/QFX5210-64C.yaml b/device-types/Juniper/QFX5210-64C.yaml
index fdd1ffabd..0bfe7484b 100644
--- a/device-types/Juniper/QFX5210-64C.yaml
+++ b/device-types/Juniper/QFX5210-64C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: QFX5210-64C
-slug: qfx5210-64c
+slug: juniper-qfx5210-64c
 comments: '[Juniper QFX5200 Data Sheet](https://www.juniper.net/us/en/products-services/switching/qfx-series/qfx5200/)'
 u_height: 1
 interfaces:
diff --git a/device-types/Juniper/SRX-1500.yaml b/device-types/Juniper/SRX-1500.yaml
index 8a6781942..5e9c25a62 100644
--- a/device-types/Juniper/SRX-1500.yaml
+++ b/device-types/Juniper/SRX-1500.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: SRX1500
-slug: srx1500
+slug: juniper-srx1500
 u_height: 1
 is_full_depth: true
 interfaces:
diff --git a/device-types/Juniper/SRX-4100.yaml b/device-types/Juniper/SRX-4100.yaml
index 585aa071b..3d05ba3f8 100644
--- a/device-types/Juniper/SRX-4100.yaml
+++ b/device-types/Juniper/SRX-4100.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: SRX4100
-slug: srx4100
+slug: juniper-srx4100
 is_full_depth: true
 part_number: SRX4100-SYS-JB-AC
 interfaces:
diff --git a/device-types/Juniper/SRX110H2-VA.yaml b/device-types/Juniper/SRX110H2-VA.yaml
index 7831dfaed..5c0ad97c3 100644
--- a/device-types/Juniper/SRX110H2-VA.yaml
+++ b/device-types/Juniper/SRX110H2-VA.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: SRX110H2-VA
-slug: srx110h2-va
+slug: juniper-srx110h2-va
 part_number: srx110h2-va
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Juniper/SRX210HE2.yaml b/device-types/Juniper/SRX210HE2.yaml
index bc8d55066..722107b99 100644
--- a/device-types/Juniper/SRX210HE2.yaml
+++ b/device-types/Juniper/SRX210HE2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: SRX21HE2
-slug: srx210he2
+slug: juniper-srx210he2
 is_full_depth: false
 interfaces:
   - name: ge-0/0/0
diff --git a/device-types/Juniper/SRX240H2-POE.yaml b/device-types/Juniper/SRX240H2-POE.yaml
index fd9f44146..d247abc76 100644
--- a/device-types/Juniper/SRX240H2-POE.yaml
+++ b/device-types/Juniper/SRX240H2-POE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: SRX240H2-POE
-slug: srx240h2-poe
+slug: juniper-srx240h2-poe
 u_height: 1
 is_full_depth: true
 comments: '[Juniper SRX240 Data Sheet](https://www.juniper.net/us/en/local/pdf/datasheets/1000281-en.pdf)'
diff --git a/device-types/Juniper/SRX240H2.yaml b/device-types/Juniper/SRX240H2.yaml
index ed0da0436..a610b5911 100644
--- a/device-types/Juniper/SRX240H2.yaml
+++ b/device-types/Juniper/SRX240H2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: SRX240H2
-slug: srx240h2
+slug: juniper-srx240h2
 is_full_depth: false
 interfaces:
   - name: ge-0/0/0
diff --git a/device-types/Juniper/SRX300.yaml b/device-types/Juniper/SRX300.yaml
index 9fb167520..6595d3dd3 100644
--- a/device-types/Juniper/SRX300.yaml
+++ b/device-types/Juniper/SRX300.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: SRX300
-slug: srx300
+slug: juniper-srx300
 u_height: 1
 is_full_depth: false
 comments: '[Juniper SRX300 Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/security/srx300-line-services-gateways-branch-datasheet.pdf)'
diff --git a/device-types/Juniper/SRX320.yaml b/device-types/Juniper/SRX320.yaml
index b514d7d13..a4d536e14 100644
--- a/device-types/Juniper/SRX320.yaml
+++ b/device-types/Juniper/SRX320.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: SRX320
-slug: srx320
+slug: juniper-srx320
 u_height: 1
 is_full_depth: false
 comments: '[Juniper SRX320 Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/security/srx300-line-services-gateways-branch-datasheet.pdf)'
diff --git a/device-types/Juniper/SRX340.yaml b/device-types/Juniper/SRX340.yaml
index 952188506..d09de4fdd 100644
--- a/device-types/Juniper/SRX340.yaml
+++ b/device-types/Juniper/SRX340.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: SRX340
-slug: srx340
+slug: juniper-srx340
 u_height: 1
 is_full_depth: false
 comments: '[Juniper SRX340 Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/security/srx300-line-services-gateways-branch-datasheet.pdf)'
diff --git a/device-types/Juniper/SRX345.yaml b/device-types/Juniper/SRX345.yaml
index d3da349d1..a46671fcd 100644
--- a/device-types/Juniper/SRX345.yaml
+++ b/device-types/Juniper/SRX345.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: SRX345
-slug: srx345
+slug: juniper-srx345
 u_height: 1
 is_full_depth: false
 comments: '[Juniper SRX345 Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/security/srx300-line-services-gateways-branch-datasheet.pdf)'
diff --git a/device-types/Juniper/SRX3600.yaml b/device-types/Juniper/SRX3600.yaml
index 645971a77..b8969cd08 100644
--- a/device-types/Juniper/SRX3600.yaml
+++ b/device-types/Juniper/SRX3600.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: SRX3600
-slug: srx3600
+slug: juniper-srx3600
 u_height: 5
 is_full_depth: true
 comments: '[Juniper SRX3600 Data Sheet](https://www.juniper.net/assets/us/en/local/pdf/datasheets/1000267-en.pdf)'
diff --git a/device-types/Juniper/SRX380-P.yaml b/device-types/Juniper/SRX380-P.yaml
index 394e27fca..9618e76fa 100644
--- a/device-types/Juniper/SRX380-P.yaml
+++ b/device-types/Juniper/SRX380-P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: JNP-SRX380-P
-slug: srx380
+slug: juniper-srx380
 part_number: SRX380-P
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Juniper/SRX4200.yaml b/device-types/Juniper/SRX4200.yaml
index d318bdd32..17711992e 100644
--- a/device-types/Juniper/SRX4200.yaml
+++ b/device-types/Juniper/SRX4200.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: SRX4200
-slug: srx4200
+slug: juniper-srx4200
 is_full_depth: true
 u_height: 1
 part_number: SRX4200-SYS-JB-AC
diff --git a/device-types/Juniper/SRX4600.yaml b/device-types/Juniper/SRX4600.yaml
index 02b9f4a4a..e2020588b 100644
--- a/device-types/Juniper/SRX4600.yaml
+++ b/device-types/Juniper/SRX4600.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: SRX4600
-slug: srx4600
+slug: juniper-srx4600
 is_full_depth: false
 interfaces:
   - name: fxp0
diff --git a/device-types/Juniper/SRX550.yaml b/device-types/Juniper/SRX550.yaml
index e76721a53..de0ba2754 100644
--- a/device-types/Juniper/SRX550.yaml
+++ b/device-types/Juniper/SRX550.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: SRX550
-slug: srx550
+slug: juniper-srx550
 is_full_depth: false
 u_height: 2
 comments: |
diff --git a/device-types/Juniper/SRX650.yaml b/device-types/Juniper/SRX650.yaml
index 11780a6fc..51d721679 100644
--- a/device-types/Juniper/SRX650.yaml
+++ b/device-types/Juniper/SRX650.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: SRX650
-slug: srx650
+slug: juniper-srx650
 u_height: 2
 is_full_depth: false
 comments: |