diff --git a/device-types/Juniper/ACX1100-AC.yaml b/device-types/Juniper/ACX1100-AC.yaml
index 6a925f5f7d510059b7c5f792ce6cabcb2dfb13ab..158aee6ca16157210efd90e27ae7b0530bc689be 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 63592185576b7af2a1fb372f09ddd04e7dfed8d4..b0493cc7118fd513e4165a64c75afdca9df57b35 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 39ec4e3f8d0eb2320c7b6c78f9ff2d57159bdfba..472ef5eefac1b67ba748e61992c03b6147487529 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 3033c9e9986c39399f5d3aa457baf3854ca1ed7a..275048599b312687a55142ed3d6c60e74e7dbb6b 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 c81e7fa3010c075af795fd8f3c76c87b1b8e6500..08153a84eeecdbd704449767370c66faf7696a31 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 41771e4643a774a67261462a1e46002c0d0c3d5c..03c2a0df2a9a00d0e94514ca9fab9397fe57955e 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 7ab7bf00fcdb54101b1a2725e9c22b1e37506f97..775794b52f2e969e023cd711677045464670d69a 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 3a1e28a3f69313a701c3bf188f970e87612aa096..116c7636f9482eb5b2526fc271819e5d58ebb862 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 f17dc6ffbc9dd608f4b57e22cbc90f4e5ac7c802..e2895d900f7287da280d601982575e700bdd80de 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 211cff3e87c3ed55073148ef2f2d3495cdaa5fee..9fd1b21792d6e0d2e9af65a7ed4002292176e104 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 7b56f0bbce1f93455edb7aeb33995cafffe382cb..eb9d31c793c5c2789fce92a706e52ee11f27dc40 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 582b78b320ef84402dc6cb086e9307581055736e..522633c2644643b8224a8b944a218fcae96517fb 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 b4d16768d62d11d6692b264ff66a6527326477bd..a13d3940fa1adf9a27108d29626846d77f686db7 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 2b844019f5dfbeca6ef60437216fac669cd8a147..1a45ffac98093e9b882dc4d53d3ec8c5f912134a 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 04a0139d56b97f856da6bcc81c775a159ab77718..099b6b9b12ace460e54c5e0dc643bc46b4768a14 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 070c65e5f762c9747dc606052518895640579ab2..66e591e46c83bbc8e2b842efcd8a28fcbbbadc51 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 e21efedf6e79a463991bc6d11a9c448bd3b7ddb8..e123b64af956c0e852793a8746c70c25c53e114d 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 583dd9881d513d1152643f5f9f86e92a0fee3467..46aa43327846d01d6c010cc09c4cd4d0152127fc 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 03808818ec9d92809ae91c0707b760cc5873c8ab..1da7cf89d93696dac1f02b42e0943a96a10508b6 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 1c7e94caa20129a8e8d5f0344c7f794ad6bc717b..5b40f5b948467b49610d6bbacc603b92f1dfbc9d 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 93a298eef1132a517003e6cad4e333ffd4bc6fa4..057fb5668e42045bf059f97d015c882e0ade11cf 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 4c5135f9a0354b7b8a6ca2318398b4b44c63f836..c19a7af29b592fc038413e280c5f7d6194d27577 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 60dc5d0211f883d94013f24952b0bfa3e69863f3..036de0b859678f3b81a5a7dc26ea20a292cf9a22 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 072e51673335f8d2be74335d7cac4f0c834f170d..d48d3c043984dfa153a7f3a6a91c40b61302431d 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 27b5225f1f32a2014205a5d9543144e414c4f5e2..58dfc49d47a2c8babf5168c70050d21f7d771aab 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 a61eed72cc980d27d0d2598c1d17c11b26aecc95..bdf68eac59ff9cbcc30a5cbe77f3c0b93253a241 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 39a00c6113e392f90801a13b67803a2de1a3f7ac..852866b331e35ac86f04028b82f579e864a5e16d 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 fd88996e01703cc34083f2bd6cade738776856e1..5308ab15e110c7399313dda8f3764edc5eb0fd75 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 41fedab3b3d0b861cae28d975cfb4c3cf4d65059..e0ad0f22d88d27ef646e501aa4403179f2537de7 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 db83cf22ccc78b6921b316b9bdd5796fb53005b5..1d87d4586445ebe4ebd7f8f8d29b4693ce756fde 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 a5349189f022280f8cecd8f32fdcccab346f97c7..9640763734ac1a9a4bcd978c16ee079905cbd413 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 c5f71e91b9225f19e9f0a05b6b9801afa1c7fb1d..d73f83cfeb5b7cb41a803b5c09f394daa6cc0dad 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 b831d220d249d6508a487976f33f5c5bcf9a7bb0..4ccd70a1dcd0cfa10973b1aa433f024576dcb017 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 1d39efecb0eac275acb5915f46141778273264f7..92255e3bc8ac0027c5149df2eb583b08d3f4de5a 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 359b7966fadb13a1305b7e48d9f7a43c15723be7..869b4b14d18bb974b9ea2891b46fa3098806f5d7 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 2b266f1cef7db4e48f0b24f6d1aa820abc4dadd3..695597ca5640fd517ea499a5d8087ac0fea8f9b4 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 63537e3b775343ec18e5f6b4afe6cb7d5cb204ca..704f00ba08308e59d282b4817062b66bd3dc15af 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 338159aaf7e2f90301c35ab64351b7fe7a169d11..2f69dd781e5598ca4a81bfdd04bb4d1db2e18a0a 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 cf11d79a04ab8c101951c027b2f9fb4d228c737b..ba6980a3571461e41c3afa50cc9d3adb24a39c76 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 f396a08e171a061cc6f97c1709462ceaf14f3b4d..d531d75a60c19bf4ac4cc0a6a0f9f6c22213a7f4 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 8d71f9bf3078d11e9a502e87488080a455515843..d5dcf7a782488764f979fcdf6131aee86a8dfd28 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 314798e8eec5463c8159f5b46cdffb1d273a8721..1b2e34ffb7894cd1e9881933e23c0c3622570a40 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 d20542f14d224ef55a962b8c6673b7a937443863..b3d74977a73c597d8f1916a76ce0ef260072d5b2 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 92a2d977d5adb140fb269caeb95f3b2ae7d55010..178799a73846fdee826581bce03b2e0284222a93 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 53362e69a5af4f5ef60e7a711cb255a869c78f1b..5fa1d356fb8a7640ec145b9649964baca8de138e 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 8c2991c8b35e1df42307007b9b7c456f5edc20ef..dcaa9f4c8d62c9017255fac775c3164cd4bba204 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 13055196b18946a8117fd303031f3734a23ce615..480cae5bec23f8c6b9fa0fa27f78881f2ae25947 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 a2bb18dd5d63806b01abfb0a2b950305b92ba955..538ddcbd6c1827e0518e4a917105b8d7d9787b32 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 64b53cce786cbe44ad2624024a3e003aac2e41fe..1d970e9aa0be54d8a78b1a08f715b103c3b54bdb 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 d5ceb3eb93fb74c56fa0b26a095f10b6b0fc7d44..c0c1543a19e9a99344bab367451588e66d75c7f4 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 cfa14e283c33bd2b7eeb32abddfb456019967480..44b0d4b5958d8c3432964dd7e6c60060b9a72f9e 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 0e60e6ea273a8b3268b4b33d138eea052a97b94b..26f734357f75c0587a2475707956c80f5ee63205 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 1dc850fafd40fda4b7377aaef5f09ddc174bd122..c989ce6af65091247639785aa9463c9a96d62653 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 2e6b2ba372af1de1c4c96d5ed39cc6aaee27aee2..a98ed293b5d8e298086bc7bf0bc02af987103779 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 bba67e3d60ee51d8db1a9b8ca6bf94f0a86bff17..651b079001018dded9a9c23af0bf336f42f1baef 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 fdd1ffabd7f8420b453aa9a06eb9b1646fc90202..0bfe7484b811516787726978ecc7846c54394681 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 8a678194200dec0ed2586abf462d94b76c6491a9..5e9c25a6272bbbc383c4f7592651bdc961076dd4 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 585aa071bd6d699c01f1f2ee82ebc570c69c296a..3d05ba3f88abcab66b17ec40926a8b2a50ee2133 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 7831dfaed8890138444e3905f630763f821b87ce..5c0ad97c337a2d0f733a37645dd0289146f9e331 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 bc8d550668303727e1ccc0a2cf7662fd023d6618..722107b994494a3d572c2451bf95b89c9d92f644 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 fd9f441463b585d93f70fe72461e8d20e1de2092..d247abc76e5acd0d7f4316a14203a1355938f628 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 ed0da0436c78f5fe5146a14150dddc0e560c2bf4..a610b591158c0b7c6eb4bf74199f04a875a93c65 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 9fb16752089c7509f62c5ae6d932b45e8c1556eb..6595d3dd328176d6584f0cde4fbd36d5172019d3 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 b514d7d1305d7196e9cdd5c2ee6b5cdbeac8e75e..a4d536e148443fe71de6ad0d3df863204564b103 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 952188506e9880607ac1cfeeb851507a3ae3e06b..d09de4fdd99fda43de50d3bb7a6b42ebc1a217d3 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 d3da349d1228c3136aed5178a4bcaa74ed0707d1..a46671fcd0f4eeaaf92fb948a0d6e4f53ada8b05 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 645971a77420c75d34d5978ecbabf0250db8e490..b8969cd087231b43e2b73bd6c64ef7788cff5793 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 394e27fca1c35c5174e4a73d6acef05c4ca3f413..9618e76fac8f7808abc9813a03081204a7b1220f 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 d318bdd32e01337e861ba7904b530221e01bb7cf..17711992e740cf1261795e0fcfa45c05b60a7dab 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 02b9f4a4aa00a8d43fe1b38688a27e184dd9ab76..e2020588b7a48259c4525ad4bec3e19772f5c3e5 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 e76721a53cdd9fe3a817ee3f0670a62ae4143f6e..de0ba2754a63fe270e53414cb831b1ffb742c6b5 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 11780a6fc2c171aba7fc3efbe2e736356893c570..51d721679f4db378b4c0143b8640b3519e71040c 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: |