diff --git a/.gitignore b/.gitignore
index ca2bab3d3bb692267f9d44d0dcd6cdfc7deff369..b51323fe30d38d2514d10d019c8756adf74caf96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 .DS_Store
 venv/
 .vscode
+device-types/migrate.py
diff --git a/device-types/3Com/4200G-12_Port.yml b/device-types/3Com/4200G-12_Port.yml
index c187e3c7c230ec0393ada4c7737c71ab6ab4ca9f..e58279b83b4ef7cf771ad895a075bb89416078ea 100644
--- a/device-types/3Com/4200G-12_Port.yml
+++ b/device-types/3Com/4200G-12_Port.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: 3Com
-model: 4200G 12-port
-slug: 4200g-12port
+model: 4200G 12 port
+slug: 3com-4200g-12-port
 part_number: 3CR17660-91
 u_height: 1
 is_full_depth: false
diff --git a/device-types/3Com/4200G-24_Port.yml b/device-types/3Com/4200G-24_Port.yml
index 21cf0bd4dbd573a18be7eddc16281a9e11efbe28..8530d2407eb7063afcba8ce27f79f2614bab4b94 100644
--- a/device-types/3Com/4200G-24_Port.yml
+++ b/device-types/3Com/4200G-24_Port.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: 3Com
-model: 4200G 24-port
-slug: 4200g-24port
+model: 4200G 24 port
+slug: 3com-4200g-24-port
 part_number: 3CR17661-91
 u_height: 1
 is_full_depth: false
diff --git a/device-types/3Com/4200G-48_Port.yml b/device-types/3Com/4200G-48_Port.yml
index 042ddca0c5c9a7857d80aac945a60f57128edc98..0095a376213b7ac5d76629fa2cd8142c3473b0de 100644
--- a/device-types/3Com/4200G-48_Port.yml
+++ b/device-types/3Com/4200G-48_Port.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: 3Com
-model: 4200G 48-port
-slug: 4200g-48port
+model: 4200G 48 port
+slug: 3com-4200g-48-port
 part_number: 3CR17662-91
 u_height: 1
 is_full_depth: false
diff --git a/device-types/3Com/4200G-PWR-24_port.yml b/device-types/3Com/4200G-PWR-24_port.yml
index 6d79c9bcdbba1661791ff210789186e34c5c0041..d8710c21feaafb28fdbe080465dd78365d84c53f 100644
--- a/device-types/3Com/4200G-PWR-24_port.yml
+++ b/device-types/3Com/4200G-PWR-24_port.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: 3Com
-model: 4200G PWR 24-port
-slug: 4200g-pwr-24port
+model: 4200G PWR 24 port
+slug: 3com-4200g-pwr-24-port
 part_number: 3CR17671-91
 u_height: 1
 is_full_depth: false
diff --git a/device-types/3Com/4210G-24_Port.yml b/device-types/3Com/4210G-24_Port.yml
index 7e637f07e0f7eca00bef5f459d20c01c67c87d7e..e2f17563f00cdb14410dbebd54622eff40f63202 100644
--- a/device-types/3Com/4210G-24_Port.yml
+++ b/device-types/3Com/4210G-24_Port.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: 3Com
-model: 4210G 24-port
-slug: 4210g-24port
+model: 4210G 24 port
+slug: 3com-4210g-24-port
 part_number: 3CRS42G-24-91
 u_height: 1
 is_full_depth: false
diff --git a/device-types/3Com/4210G-48_Port.yml b/device-types/3Com/4210G-48_Port.yml
index dc67334bab7e4b0a6ad5c2a8b59e07baa465ea2d..72ca55c231880a0115bbdbd425c56e99f23d4df0 100644
--- a/device-types/3Com/4210G-48_Port.yml
+++ b/device-types/3Com/4210G-48_Port.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: 3Com
-model: 4210G 48-port
-slug: 4210g-48port
+model: 4210G 48 port
+slug: 3com-4210g-48-port
 part_number: 3CRS42G-48-91
 u_height: 1
 is_full_depth: false
diff --git a/device-types/3Com/4210G-PWR-24_Port.yml b/device-types/3Com/4210G-PWR-24_Port.yml
index fd664ec4c30d43c8955cc6483873f4da8e6fe79e..5670758dcd8f2b96301888863d47a8d3c7b2cb93 100644
--- a/device-types/3Com/4210G-PWR-24_Port.yml
+++ b/device-types/3Com/4210G-PWR-24_Port.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: 3Com
-model: 4210G PWR 24-port
-slug: 4210g-pwr-24port
+model: 4210G PWR 24 port
+slug: 3com-4210g-pwr-24-port
 part_number: 3CRS42G-24P-91
 u_height: 1
 is_full_depth: false
diff --git a/device-types/A10/TH4440.yaml b/device-types/A10/TH4440.yaml
index 0f2386b1d679059ae6e999a25205d93e6147ae65..5508e6892666282b0e8ba707558bd5b678abfd03 100644
--- a/device-types/A10/TH4440.yaml
+++ b/device-types/A10/TH4440.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: A10
 model: Thunder 4440 ADC
-slug: th4440
+slug: a10-thunder-4440-adc
 part_number: TH4440
 u_height: 1
 comments: '[A10 Thunder 4440 Applcation Delivery Controller Datasheet](https://www.a10networks.com/wp-content/uploads/A10-DS-Thunder-ADC.pdf)'
diff --git a/device-types/A10/TH6430.yaml b/device-types/A10/TH6430.yaml
index 6dd9258e1c871c383567370562880fcaaa1313c9..13bdff2e31012de988ec6d93cd617319d7e9f01a 100644
--- a/device-types/A10/TH6430.yaml
+++ b/device-types/A10/TH6430.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: A10
 model: Thunder 6430
-slug: th6430
+slug: a10-thunder-6430
 part_number: TH6430
 u_height: 1
 comments: '[A10 Thunder 6430 Appliance Datasheet](https://www.loadbalanceworks.com/datasheets/DS-A10_Thunder_6430_and_6430S.pdf)'
diff --git a/device-types/ADVA/FSP_150-XG120PRO-SH.yaml b/device-types/ADVA/FSP_150-XG120PRO-SH.yaml
index 2e7c40228015720708da6f8a9245c45af0625162..0f2bcd3c8d75c59c5f0af548720b3ef5edaaec7b 100644
--- a/device-types/ADVA/FSP_150-XG120PRO-SH.yaml
+++ b/device-types/ADVA/FSP_150-XG120PRO-SH.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: ADVA
-model: FSP 150-XG120Pro (SH)
-slug: fsp-150-xg120pro-sh
+model: FSP 150-XG120Pro SH
+slug: adva-fsp-150-xg120pro-sh
 part_number: 1078904481-01
 u_height: 1
 is_full_depth: false
diff --git a/device-types/ADVA/FSP_150-XG418-100G-CFP2.yaml b/device-types/ADVA/FSP_150-XG418-100G-CFP2.yaml
index 16e0fe4f39dfff7c4c365a112ce86b82dbbf8caa..721b0519bd663792b94418d9a9d8c044051374db 100644
--- a/device-types/ADVA/FSP_150-XG418-100G-CFP2.yaml
+++ b/device-types/ADVA/FSP_150-XG418-100G-CFP2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: ADVA
 model: FSP 150-XG418-100G-CFP2
-slug: xg418-100g-cfp2
+slug: adva-fsp-150-xg418-100g-cfp2
 part_number: 1078901052-01
 u_height: 1
 is_full_depth: false
diff --git a/device-types/ADVA/FSP_150-XG418-100G.yaml b/device-types/ADVA/FSP_150-XG418-100G.yaml
index 3527e29f639d0ef1b26ec81e52dbd0218f991221..8050c5dbe3e5a0e6002b1640e9193d9dd5470464 100644
--- a/device-types/ADVA/FSP_150-XG418-100G.yaml
+++ b/device-types/ADVA/FSP_150-XG418-100G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: ADVA
 model: FSP 150-XG418-100G
-slug: xg418-100g
+slug: adva-fsp-150-xg418-100g
 part_number: 1078901053-01
 u_height: 1
 is_full_depth: false
diff --git a/device-types/ADVA/FSP_150-XG480-100G-CFP2.yaml b/device-types/ADVA/FSP_150-XG480-100G-CFP2.yaml
index 1547ea36a536ad57a9bf969df12a26e1c727b747..e70200ad63c4d64ea6e3a3e46eec344bb9672401 100644
--- a/device-types/ADVA/FSP_150-XG480-100G-CFP2.yaml
+++ b/device-types/ADVA/FSP_150-XG480-100G-CFP2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: ADVA
 model: XG480-100G-CFP2
-slug: xg480-100g-cfp2
+slug: adva-xg480-100g-cfp2
 part_number: 1078901003-01
 u_height: 2
 is_full_depth: false
diff --git a/device-types/ADVA/FSP_150-XG480-100G.yaml b/device-types/ADVA/FSP_150-XG480-100G.yaml
index ad843feca5338a650aeaea64599253bf5c091c75..a9d2c79a5461343a02caed8010441991cce813de 100644
--- a/device-types/ADVA/FSP_150-XG480-100G.yaml
+++ b/device-types/ADVA/FSP_150-XG480-100G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: ADVA
 model: XG480-100G
-slug: xg480-100g
+slug: adva-xg480-100g
 part_number: 1078901001-01
 u_height: 2
 is_full_depth: false
diff --git a/device-types/ADVA/FSP_150-XG480-25G-100G.yaml b/device-types/ADVA/FSP_150-XG480-25G-100G.yaml
index a5f7975df579e28003e532b8f7207d3dbeab4398..7b0c5505bb64c7491a847202f13af4ccf63d5ebc 100644
--- a/device-types/ADVA/FSP_150-XG480-25G-100G.yaml
+++ b/device-types/ADVA/FSP_150-XG480-25G-100G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: ADVA
 model: FSP 150-XG480-25G-100G
-slug: fsp_150-xg480-25g-100g
+slug: adva-fsp-150-xg480-25g-100g
 part_number: 1078901002-01
 u_height: 2
 is_full_depth: false
diff --git a/device-types/APC/AP4431.yaml b/device-types/APC/AP4431.yaml
index 29d030d2d08c72a2347f9bd0663f8090f9235792..01064cd06b3c503d1f78199cc41e6a6a9030bbb3 100644
--- a/device-types/APC/AP4431.yaml
+++ b/device-types/APC/AP4431.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP4431
-slug: ap4431
+slug: apc-ap4431
 part_number: AP4431
 u_height: 2
 is_full_depth: false
diff --git a/device-types/APC/AP7721.yaml b/device-types/APC/AP7721.yaml
index 3795da391e0643cd75a8600fdab4b58f65595966..cb5cf7a2dbd1674081ad8c4dfca5f543cabe0fab 100644
--- a/device-types/APC/AP7721.yaml
+++ b/device-types/APC/AP7721.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP7721
-slug: ap7721
+slug: apc-ap7721
 part_number: AP7721
 u_height: 1
 is_full_depth: false
diff --git a/device-types/APC/AP7723.yaml b/device-types/APC/AP7723.yaml
index 5eaa2b34457c7f959dd7f7c92cd29b4066584d07..4991ff16a5223da465398b73e6cbd23f35042182 100644
--- a/device-types/APC/AP7723.yaml
+++ b/device-types/APC/AP7723.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP7723
-slug: ap7723
+slug: apc-ap7723
 part_number: AP7723
 u_height: 1
 is_full_depth: false
diff --git a/device-types/APC/AP7821.yaml b/device-types/APC/AP7821.yaml
index 7cec6d15d83c6a3095784763980b1d2022a46529..079f0b37a446674cc86924c02ed77866198d6e7a 100644
--- a/device-types/APC/AP7821.yaml
+++ b/device-types/APC/AP7821.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP7821
-slug: ap7821
+slug: apc-ap7821
 part_number: AP7821
 u_height: 1
 is_full_depth: false
diff --git a/device-types/APC/AP7830.yaml b/device-types/APC/AP7830.yaml
index 6522fd095abef4a6ef407168090f14301d28d9e5..9f218cdae9ec56240ab0556421cf410edb178b8b 100644
--- a/device-types/APC/AP7830.yaml
+++ b/device-types/APC/AP7830.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP7830
-slug: ap7830
+slug: apc-ap7830
 part_number: AP7830
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/AP7854.yml b/device-types/APC/AP7854.yml
index d7b273d6bac054240f8f75b6ac05b292635515e3..48f95485ad2a78a58ffa5c1ec52c90b299a6cfb5 100644
--- a/device-types/APC/AP7854.yml
+++ b/device-types/APC/AP7854.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP7854
-slug: ap7854
+slug: apc-ap7854
 part_number: AP7854
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/AP7901B.yaml b/device-types/APC/AP7901B.yaml
index c798e1b4b462782e598bf23e36c41ea37e0d25be..57f2b981c481c7d0846d6f4078eeec5a950ee586 100644
--- a/device-types/APC/AP7901B.yaml
+++ b/device-types/APC/AP7901B.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP7901B
-slug: ap7901b
+slug: apc-ap7901b
 part_number: AP7901B
 u_height: 1
 is_full_depth: false
diff --git a/device-types/APC/AP7920.yaml b/device-types/APC/AP7920.yaml
index 8b1ffcf82633d2aa42a909b13f17ae290bd6cde9..c4b1b25ff267ee201c6ad1721ba05ae5da6eb789 100644
--- a/device-types/APC/AP7920.yaml
+++ b/device-types/APC/AP7920.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP7920
-slug: ap7920
+slug: apc-ap7920
 part_number: AP7920
 u_height: 1
 is_full_depth: false
diff --git a/device-types/APC/AP7921B.yaml b/device-types/APC/AP7921B.yaml
index ff59d058c5f8610c8b29652d1d583f7ccfcee17d..2ecb462b16e44e8344ae4c4dd563fe3702255100 100644
--- a/device-types/APC/AP7921B.yaml
+++ b/device-types/APC/AP7921B.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP7921B
-slug: ap7921b
+slug: apc-ap7921b
 part_number: AP7921B
 u_height: 1
 is_full_depth: false
diff --git a/device-types/APC/AP7922B.yaml b/device-types/APC/AP7922B.yaml
index b586df9bced4044fe56fb322ede69ff00c271ef5..bbbc8d53de0646e9bb305ecfe3387629dff3e214 100644
--- a/device-types/APC/AP7922B.yaml
+++ b/device-types/APC/AP7922B.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP7922B
-slug: ap7922b
+slug: apc-ap7922b
 part_number: AP7922B
 u_height: 2
 is_full_depth: false
diff --git a/device-types/APC/AP7941.yaml b/device-types/APC/AP7941.yaml
index d2001406d9259edfdee2f6cbbb0dcc9a136974e3..283809f11356d7b150cd4e28dd2adc2ef5b1fdfb 100644
--- a/device-types/APC/AP7941.yaml
+++ b/device-types/APC/AP7941.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP7941
-slug: ap7941
+slug: apc-ap7941
 part_number: AP7941
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/AP8641.yaml b/device-types/APC/AP8641.yaml
index 41b8db2bc2a3720cca614a5a2414ce01117bbbc6..5a0100f4a5fd87f09fe54dfad054f1fee477735c 100644
--- a/device-types/APC/AP8641.yaml
+++ b/device-types/APC/AP8641.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP8641
-slug: ap8641
+slug: apc-ap8641
 part_number: AP8641
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/AP8853.yaml b/device-types/APC/AP8853.yaml
index 63729fc2c9866643ba69936afb0e423959b10fcd..987d8f8788471bbc9a74b48c808ada40275f8c26 100644
--- a/device-types/APC/AP8853.yaml
+++ b/device-types/APC/AP8853.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP8853
-slug: ap8853
+slug: apc-ap8853
 part_number: AP8853
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/AP8865.yaml b/device-types/APC/AP8865.yaml
index d05651f0b22cd5b490192e4ed353a34875cd819c..5a9da04dc47aa67d006bfa23e2042fe6429ef704 100644
--- a/device-types/APC/AP8865.yaml
+++ b/device-types/APC/AP8865.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP8865
-slug: ap8865
+slug: apc-ap8865
 part_number: AP8865
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/AP8868.yaml b/device-types/APC/AP8868.yaml
index a7f0ca3c2199aad9fdc5f6e990ee37efc0b559db..364c5251b240682d4672f806e13e66214faa0642 100644
--- a/device-types/APC/AP8868.yaml
+++ b/device-types/APC/AP8868.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP8868
-slug: ap8868
+slug: apc-ap8868
 part_number: AP8868
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/AP8886.yaml b/device-types/APC/AP8886.yaml
index 336cb540b4154ac4887e41d68281092c01d5185a..e54fe40316a3d28fc37391a674c9826c238422f1 100644
--- a/device-types/APC/AP8886.yaml
+++ b/device-types/APC/AP8886.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP8886
-slug: ap8886
+slug: apc-ap8886
 part_number: AP8886
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/AP8932.yaml b/device-types/APC/AP8932.yaml
index 713ce6cbab3c4acaaa9f0eaa2778d1cbde1d1474..3a40a92ddf2a69c586b4a11a0c55c28c3ab4e338 100644
--- a/device-types/APC/AP8932.yaml
+++ b/device-types/APC/AP8932.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP8932
-slug: ap8932
+slug: apc-ap8932
 part_number: AP8932
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/AP8941.yaml b/device-types/APC/AP8941.yaml
index ada8dd3b712177b32b951274ca9e684a21091a1a..de53823aa24a7b10bdd54b061f357dcd699ed539 100644
--- a/device-types/APC/AP8941.yaml
+++ b/device-types/APC/AP8941.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP8941
-slug: ap8941
+slug: apc-ap8941
 part_number: AP8941
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/AP8953.yaml b/device-types/APC/AP8953.yaml
index 8254b50f47bef704f13331881c75f1efa4bcc16f..8cbc95c6b7548460a691a80590a5158d7fdc6009 100644
--- a/device-types/APC/AP8953.yaml
+++ b/device-types/APC/AP8953.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP8953
-slug: ap8953
+slug: apc-ap8953
 part_number: AP8953
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/AP8958.yaml b/device-types/APC/AP8958.yaml
index c2a7535c291575fbe473a0e70838ff1fb2cd5766..cd7a0cde13d0a0bc8f75155a4cfc2a07e6a5cb5b 100644
--- a/device-types/APC/AP8958.yaml
+++ b/device-types/APC/AP8958.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP8958
-slug: ap8958
+slug: apc-ap8958
 part_number: AP8958
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/AP8959.yaml b/device-types/APC/AP8959.yaml
index e5b903deb813cd00400bae3408b10bc6b8aac6e0..c097c3ab4ace481fb121a95d2de50221d8fdedc4 100644
--- a/device-types/APC/AP8959.yaml
+++ b/device-types/APC/AP8959.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP8959
-slug: ap8959
+slug: apc-ap8959
 part_number: AP8959
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/AP8959EU3.yml b/device-types/APC/AP8959EU3.yml
index 403cf6048e189c9069ae253ada0b9034bd25f106..6e75c7d4cb43dfe2b8b3fdd9eaf0610e91c488e2 100644
--- a/device-types/APC/AP8959EU3.yml
+++ b/device-types/APC/AP8959EU3.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP8959EU3
-slug: ap8959eu3
+slug: apc-ap8959eu3
 part_number: AP8959EU3
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/AP8965.yaml b/device-types/APC/AP8965.yaml
index b7d88f5d090f743a81c24f8d2c01f37ffe1a1738..4526a830788f1428426251a023494967a2f8eacc 100644
--- a/device-types/APC/AP8965.yaml
+++ b/device-types/APC/AP8965.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP8965
-slug: ap8965
+slug: apc-ap8965
 part_number: AP8965
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/AP9319.yaml b/device-types/APC/AP9319.yaml
index a52e0d9db65e5dd4a1e944b04ba3bf2ccf11dc51..9f495d0885956137c668373dec4dc4058769c45d 100644
--- a/device-types/APC/AP9319.yaml
+++ b/device-types/APC/AP9319.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AP9319
-slug: ap9319
+slug: apc-ap9319
 part_number: AP9319
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/APDU9941.yaml b/device-types/APC/APDU9941.yaml
index bc826d34b835b71a7f3fbff260773e8b3506f64c..8aac2737dcbecfc06b10f37bfcf17167033cacf2 100644
--- a/device-types/APC/APDU9941.yaml
+++ b/device-types/APC/APDU9941.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: APDU9941
-slug: apdu9941
+slug: apc-apdu9941
 part_number: APDU9941
 u_height: 0
 is_full_depth: false
diff --git a/device-types/APC/APTF10KT01.yaml b/device-types/APC/APTF10KT01.yaml
index 7903f541fd8acd068fbe4808f222925440e7e1f9..ac579670e76b1ea4e4766d05d3ad836f24066eba 100644
--- a/device-types/APC/APTF10KT01.yaml
+++ b/device-types/APC/APTF10KT01.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: APTF10KT01
-slug: aptf10kt01
+slug: apc-aptf10kt01
 part_number: APTF10KT01
 comments: APC 208V/120V 10KVA Step down Transformer
 u_height: 4
diff --git a/device-types/APC/AR8425A.yaml b/device-types/APC/AR8425A.yaml
index 84f58a6d7c348844fae7dd7843ce20f9f17ae75e..2ee11409ed471a95be6a032e80185be9760d29b9 100644
--- a/device-types/APC/AR8425A.yaml
+++ b/device-types/APC/AR8425A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: AR8425A
-slug: ar8425a
+slug: apc-ar8425a
 part_number: AR8425A
 u_height: 1
 is_full_depth: false
diff --git a/device-types/APC/BN450M.yaml b/device-types/APC/BN450M.yaml
index bd30b976cf9d8f0c89dc6bda3a844d87370f437c..44d80ec779a8f25e9f706aee0c582da09933f02f 100644
--- a/device-types/APC/BN450M.yaml
+++ b/device-types/APC/BN450M.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: BN450M
-slug: bn450m
+slug: apc-bn450m
 u_height: 3
 is_full_depth: false
 comments: '[APC BN450M Datasheet](https://www.se.com/ww/en/product/download-pdf/BN450M)'
diff --git a/device-types/APC/SMT1000.yaml b/device-types/APC/SMT1000.yaml
index 24b00e4f01fd3ea28044c1eb9d837abf24aba633..7c1e529ba389cf5782641fb8ec7e6e71540081e0 100644
--- a/device-types/APC/SMT1000.yaml
+++ b/device-types/APC/SMT1000.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: SMT1000
-slug: smt1000
+slug: apc-smt1000
 part_number: SMT1000
 comments: "APC Smart-UPS, Line Interactive, 1000VA, Tower, 120V, 8x NEMA 5-15R outlets, SmartSlot, AVR, LCD\n \n | RBC Information |      |\n | ---------------\
   \ | ---- |\n | RBC Replacement | RBC6 |\n | RBC Quantity    | 1    |"
diff --git a/device-types/APC/SMT1500.yaml b/device-types/APC/SMT1500.yaml
index 231ff9e4365316c37afcee4714cddf077f669a1e..f0ac06c0049c113107e252efbd1a8824a47cc176 100644
--- a/device-types/APC/SMT1500.yaml
+++ b/device-types/APC/SMT1500.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: Smart-UPS SMT1500
-slug: smt1500
+slug: apc-smt1500
 part_number: SMT1500
 comments: "APC Smart-UPS, Line Interactive, 1500VA, Tower, 120V, 8x NEMA 5-15R outlets, SmartSlot, AVR, LCD\n \n | RBC Information |      |\n | ---------------\
   \ | ---- |\n | RBC Replacement | RBC7 |\n | RBC Quantity    | 1    |"
diff --git a/device-types/APC/SMT1500RM2U.yaml b/device-types/APC/SMT1500RM2U.yaml
index 68f136b94c9ce90f2fe997c078616c78420f8db9..e1dd8e830544071995b21d07cb3e01c287cc7c77 100644
--- a/device-types/APC/SMT1500RM2U.yaml
+++ b/device-types/APC/SMT1500RM2U.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: Smart-UPS SMT1500RM2U
-slug: smt1500rm2u
+slug: apc-smt1500rm2u
 part_number: SMT1500RM2U
 comments: "APC Smart-UPS, Line Interactive, 1500VA, Rackmount 2U, 120V, 6x NEMA 5-15R outlets, SmartSlot, AVR, LCD\n \n | RBC Information |           |\n\
   \ | --------------- | --------- |\n | RBC Replacement | APCRBC133 |\n | RBC Quantity    | 1         |"
diff --git a/device-types/APC/SMT1500RM2UC.yaml b/device-types/APC/SMT1500RM2UC.yaml
index 9c0dd41e079bb2c0cf5aafc9881a62e74bfef351..37e69799a37a498019d176a2cd5a402e9abfb70b 100644
--- a/device-types/APC/SMT1500RM2UC.yaml
+++ b/device-types/APC/SMT1500RM2UC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: Smart-UPS 1500VA, Rack Mount, LCD 120V with SmartConnect Port
-slug: smart-ups-1500va-rack-mount-lcd-120v-with-smartconnect-port
+slug: apc-smart-ups-1500va-rack-mount-lcd-120v-with-smartconnect-port
 part_number: SMT1500RM2UC
 u_height: 2
 is_full_depth: true
diff --git a/device-types/APC/SMT1500RMI2U.yaml b/device-types/APC/SMT1500RMI2U.yaml
index 4881da1361fbe0f26bf2b87335e6e4fc4ca721b1..25dc8d3590e0e5ec8731bdf4669cb93da87f30fa 100644
--- a/device-types/APC/SMT1500RMI2U.yaml
+++ b/device-types/APC/SMT1500RMI2U.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: SMT1500RMI2U
-slug: smt1500rmi2u
+slug: apc-smt1500rmi2u
 part_number: SMT1500RMI2U
 u_height: 2
 is_full_depth: true
diff --git a/device-types/APC/SMT2200RMI2UNC.yaml b/device-types/APC/SMT2200RMI2UNC.yaml
index 15a7b372693e04a8559133e132cf2a020244c71c..e09b349aa80fb6baf18c6db061f458b4895686c5 100644
--- a/device-types/APC/SMT2200RMI2UNC.yaml
+++ b/device-types/APC/SMT2200RMI2UNC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: SMT2200RMI2UNC
-slug: smt2200rmi2unc
+slug: apc-smt2200rmi2unc
 part_number: SMT2200RMI2UNC
 u_height: 2
 is_full_depth: true
diff --git a/device-types/APC/SMT3000RMI2UC.yaml b/device-types/APC/SMT3000RMI2UC.yaml
index 47b59d5be8b2a0432dec2ff9f6b0998368bfebb9..ea80b52d83fee40f31cfb45761c988dbdca4d635 100644
--- a/device-types/APC/SMT3000RMI2UC.yaml
+++ b/device-types/APC/SMT3000RMI2UC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: SMT3000RMI2UC
-slug: smt3000rmi2uc
+slug: apc-smt3000rmi2uc
 part_number: SMT3000RMI2UC
 u_height: 2
 is_full_depth: true
diff --git a/device-types/APC/SMX1000I.yaml b/device-types/APC/SMX1000I.yaml
index b5f463a9d4cb2c53d997ef774579542444d9e93d..d72f7c36d1b4e444bd529d041b72422cc1aca8fb 100644
--- a/device-types/APC/SMX1000I.yaml
+++ b/device-types/APC/SMX1000I.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: Smart-UPS X 1000VA, Rack Mount, LCD 230V
-slug: smart-ups-x-1000va-rack-mount-lcd-230v
+slug: apc-smart-ups-x-1000va-rack-mount-lcd-230v
 part_number: SMX1000I
 u_height: 2
 is_full_depth: true
diff --git a/device-types/APC/SMX120BP.yaml b/device-types/APC/SMX120BP.yaml
index c0398c3ba3c1c2d9d0670339f66f8858908d5858..58c1000a9da0233a713a47d731b2144e6f3f9c6d 100644
--- a/device-types/APC/SMX120BP.yaml
+++ b/device-types/APC/SMX120BP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: SMX120BP
-slug: smx120bp
+slug: apc-smx120bp
 part_number: SMX120BP
 comments: APC Smart-UPS X 120V External Battery Pack Rack/Tower
 u_height: 4
diff --git a/device-types/APC/SMX2200HV.yaml b/device-types/APC/SMX2200HV.yaml
index 0c941ab9664d81f4403939d88bfc79250bda03b5..7cd743fafc99e7e349ebc377d428cb2697fd8fe8 100644
--- a/device-types/APC/SMX2200HV.yaml
+++ b/device-types/APC/SMX2200HV.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: SMX2200HV
-slug: smx2200hv
+slug: apc-smx2200hv
 part_number: SMX2200HV
 comments: "APC Smart-UPS X, Line Interactive, 2200VA, Rack/tower convertible 4U, 208V-230V, 8x C13+1x C19 IEC, SmartSlot, Extended runtime\n \n | RBC Information\
   \ |             |\n | --------------- | ----------- |\n | RBC Replacement | APCRBC143US |\n | RBC Quantity    | 1           |"
diff --git a/device-types/APC/SMX3000HVNC.yaml b/device-types/APC/SMX3000HVNC.yaml
index 880d28646e7d663942beaea496b08cd7a03e97a5..f44651f7807fe41d75ada3d1c146bc3dc3d3a648 100644
--- a/device-types/APC/SMX3000HVNC.yaml
+++ b/device-types/APC/SMX3000HVNC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: SMX3000HV
-slug: smx3000hv
+slug: apc-smx3000hv
 part_number: SMX3000HV
 comments: APC Smart-UPS X, Line Interactive, 3000VA, Rack/tower convertible 4U, 208V-230V, 8x C13+1x C19 IEC, SmartSlot, Extended runtime
 u_height: 4
diff --git a/device-types/APC/SRT2200RMXLI.yaml b/device-types/APC/SRT2200RMXLI.yaml
index 5252146eada2379f72ed2d13b17e91fa14aa1a15..c0c04e73891615edc5ec6efffecfd9a69380c1fd 100644
--- a/device-types/APC/SRT2200RMXLI.yaml
+++ b/device-types/APC/SRT2200RMXLI.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: Smart-UPS SRT 2200VA RM
-slug: smart-ups-srt-2200va-rm
+slug: apc-smart-ups-srt-2200va-rm
 part_number: SRT2200RMXLI
 u_height: 2
 is_full_depth: true
diff --git a/device-types/APC/SRT3000RMXLT.yaml b/device-types/APC/SRT3000RMXLT.yaml
index 076dd350376776a6cbecd9565f2aec37436c8fbf..1443c4d07d926e2e3b0f9da8182c15dadc0617dc 100644
--- a/device-types/APC/SRT3000RMXLT.yaml
+++ b/device-types/APC/SRT3000RMXLT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: Smart-UPS SRT3000RMXLT
-slug: srt3000rmxlt
+slug: apc-srt3000rmxlt
 part_number: SRT3000RMXLT
 comments: "APC Smart-UPS On-Line, 3kVA, Rackmount 2U, 208V, 2x L6-20R+1x L6-30R NEMA outlets, SmartSlot, Extended runtime, W/ rail kit\n \n | RBC Information\
   \ |           |\n | --------------- | --------- |\n | RBC Replacement | APCRBC152 |\n | RBC Quantity    | 1         |"
diff --git a/device-types/APC/SRT5KRMXLI.yaml b/device-types/APC/SRT5KRMXLI.yaml
index f510522488c66b81ce4cb91f9a8168ba17c74af6..bfe094bb4eb43f2232be77771d42fb9ba60ac335 100644
--- a/device-types/APC/SRT5KRMXLI.yaml
+++ b/device-types/APC/SRT5KRMXLI.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: Smart-UPS SRT 5000VA RM 230V
-slug: smart-ups-srt-5000va-rm-230v
+slug: apc-smart-ups-srt-5000va-rm-230v
 part_number: SRT5KRMXLI
 u_height: 3
 is_full_depth: true
diff --git a/device-types/APC/SRT5KRMXLT-IEC.yaml b/device-types/APC/SRT5KRMXLT-IEC.yaml
index e3700e34926230c35f30f728a9257ac8b2ca3639..c09599bf17f620572ce8e465cdf115d75a75d3db 100644
--- a/device-types/APC/SRT5KRMXLT-IEC.yaml
+++ b/device-types/APC/SRT5KRMXLT-IEC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: Smart-UPS SRT 5000VA RM 208V IEC
-slug: smart-ups-srt-5000va-rm-208v-iec
+slug: apc-smart-ups-srt-5000va-rm-208v-iec
 part_number: SRT5KRMXLT-IEC
 u_height: 3
 is_full_depth: true
diff --git a/device-types/APC/SRT5KRMXLT.yaml b/device-types/APC/SRT5KRMXLT.yaml
index d1d290ed8064b55e85a76c6d3d64a0ff2cd2aad9..ebe2c1ebbcb83b98e002a725c6c0839f1d5ffcac 100644
--- a/device-types/APC/SRT5KRMXLT.yaml
+++ b/device-types/APC/SRT5KRMXLT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: Smart-UPS SRT5KRMXLT
-slug: srt5krmxlt
+slug: apc-srt5krmxlt
 part_number: SRT5KRMXLT
 comments: APC Smart-UPS On-Line, 5.4kVA, Rackmount 3U, 208V, 2x L6-20R+2x L6-30R NEMA outlets, Network Card+SmartSlot, Extended runtime, W/ rail kit
 u_height: 3
diff --git a/device-types/APC/SRT5KRMXLW-HW.yaml b/device-types/APC/SRT5KRMXLW-HW.yaml
index 1763d8500493154f2ff10b710a5b46bd3c5aadc9..2abb2a7ec340ad20d629894f7966f2878c114300 100644
--- a/device-types/APC/SRT5KRMXLW-HW.yaml
+++ b/device-types/APC/SRT5KRMXLW-HW.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: Smart-UPS SRT 5000VA RM 208/230V HW
-slug: smart-ups-srt-5000va-rm-208-230v-hw
+slug: apc-smart-ups-srt-5000va-rm-208-230v-hw
 part_number: SRT5KRMXLW-HW
 u_height: 3
 is_full_depth: true
diff --git a/device-types/APC/SRT5KXLJ.yaml b/device-types/APC/SRT5KXLJ.yaml
index ed6ed8e95241b3e0fb20e807c9c17984b73ad292..783a6968cc30457906d353e4c3e275f64f06b8fb 100644
--- a/device-types/APC/SRT5KXLJ.yaml
+++ b/device-types/APC/SRT5KXLJ.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: Smart-UPS SRT 5000VA 200V
-slug: smart-ups-srt-5000va-200v
+slug: apc-smart-ups-srt-5000va-200v
 part_number: SRT5KXLJ
 u_height: 3
 is_full_depth: true
diff --git a/device-types/APC/SRT6KRMXLI.yaml b/device-types/APC/SRT6KRMXLI.yaml
index 0bd1ccdbf785ee7afd31f66d7a914fa45da2d9cb..444a23ad0f0b4bd5870fe82c7b28adc1ccdc6454 100644
--- a/device-types/APC/SRT6KRMXLI.yaml
+++ b/device-types/APC/SRT6KRMXLI.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: Smart-UPS SRT 6000VA RM 230V
-slug: smart-ups-srt-6000va-rm-230v
+slug: apc-smart-ups-srt-6000va-rm-230v
 part_number: SRT6KRMXLI
 u_height: 4
 is_full_depth: true
diff --git a/device-types/APC/SRT8KRMXLT.yaml b/device-types/APC/SRT8KRMXLT.yaml
index 5a283f70a4d346237a120f6428f2f820963acda1..0589f2dc9e96d61de5c404ec737af2b8ead8b6e4 100644
--- a/device-types/APC/SRT8KRMXLT.yaml
+++ b/device-types/APC/SRT8KRMXLT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: Smart-UPS SRT 8000VA RM 208V
-slug: smart-ups-srt-8000va-rm-208v
+slug: apc-smart-ups-srt-8000va-rm-208v
 part_number: SRT8KRMXLT
 u_height: 6
 is_full_depth: true
diff --git a/device-types/APC/SUA1500RMI2U.yaml b/device-types/APC/SUA1500RMI2U.yaml
index f01fe8f5c23c6c207d7d9bf5dc6aa71d7a0a8e30..5099a7f019e1ee3dfa6bec26f29ab42fb0574c81 100644
--- a/device-types/APC/SUA1500RMI2U.yaml
+++ b/device-types/APC/SUA1500RMI2U.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: SUA1500RMI2U
-slug: sua1500rmi2u
+slug: apc-sua1500rmi2u
 part_number: SUA1500RMI2U
 u_height: 2
 is_full_depth: true
diff --git a/device-types/APC/SURT192RMXLBP2.yaml b/device-types/APC/SURT192RMXLBP2.yaml
index 0f1490f2c7ddb32fee75e97ce58832f77973408e..d4b79a1485e9a6e5ab2c75926aad19aeac6a2d35 100644
--- a/device-types/APC/SURT192RMXLBP2.yaml
+++ b/device-types/APC/SURT192RMXLBP2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: SURT192RMXLBP2
-slug: surt192rmxlbp2
+slug: apc-surt192rmxlbp2
 part_number: SURT192RMXLBP2
 comments: "APC Smart-UPS RT192V RM Battery Pack 2 Rows\n \n | RBC Information |           |\n | --------------- | --------- |\n | RBC Replacement | APCRBC140\
   \ |\n | RBC Quantity    | 4         |"
diff --git a/device-types/APC/SURT2000RMXLI.yaml b/device-types/APC/SURT2000RMXLI.yaml
index d07bb2d4a7c790a254797a0e8b47ac37b467905d..aae82a0285a08b1d5ee2fbff39b738092e525a32 100644
--- a/device-types/APC/SURT2000RMXLI.yaml
+++ b/device-types/APC/SURT2000RMXLI.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: Smart-UPS RT 2000VA RM
-slug: smart-ups-rt-2000va-rm
+slug: apc-smart-ups-rt-2000va-rm
 part_number: SURT2000RMXLI
 u_height: 2
 is_full_depth: true
diff --git a/device-types/APC/SURT20KRMXLT.yaml b/device-types/APC/SURT20KRMXLT.yaml
index 4a1b8fb8985c0efddf60ca52360d07108c9c2013..f8a48462809eba9c89ebbe7609897a386ef9cd6f 100644
--- a/device-types/APC/SURT20KRMXLT.yaml
+++ b/device-types/APC/SURT20KRMXLT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: SURT20KRMXLT
-slug: surt20krmxlt
+slug: apc-surt20krmxlt
 part_number: SURT20KRMXLT
 comments: "APC Smart-UPS RT 20kVA, 208V, LCD, rackmount, 12U, 4x NEMA L6-20R & 2x NEMA L6-30R outlets\n \n | RBC Information |           |\n | ---------------\
   \ | --------- |\n | RBC Replacement | APCRBC140 |\n | RBC Quantity    | 4         |"
diff --git a/device-types/APC/ats-4421.yml b/device-types/APC/ats-4421.yml
index cb28901a9fd0282acb5c01e1438d3476d2f502c9..7869ee5079c9477e1cf0b021deb5c7220afbbe98 100644
--- a/device-types/APC/ats-4421.yml
+++ b/device-types/APC/ats-4421.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: ATS AP4421
-slug: ats-ap4421
+slug: apc-ats-ap4421
 part_number: ATS-AP4421
 u_height: 1
 is_full_depth: false
diff --git a/device-types/APC/ats-7723.yml b/device-types/APC/ats-7723.yml
index b978bfec11e4ae78f8faddd5cd264cea3dd5f6c3..baf3feb4ba9e963502c9e99dd86b4876931e315e 100644
--- a/device-types/APC/ats-7723.yml
+++ b/device-types/APC/ats-7723.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: ATS AP7723
-slug: ats-ap7723
+slug: apc-ats-ap7723
 part_number: ATS-AP7723
 u_height: 1
 is_full_depth: false
diff --git a/device-types/APC/epdu1016b.yml b/device-types/APC/epdu1016b.yml
index 552223ec652a985dd2b7e4d8136e3b5ead178595..be3bf358358b18af925b6d0ff2fb74f4d9a0b165 100644
--- a/device-types/APC/epdu1016b.yml
+++ b/device-types/APC/epdu1016b.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: APC
 model: EPDU1016b
-slug: epdu1016b
+slug: apc-epdu1016b
 part_number: EPDU1016b
 u_height: 1
 is_full_depth: false
diff --git a/device-types/AVM/7530.yaml b/device-types/AVM/7530.yaml
index 0a149872d33aee49968301dd4f03a08b4c3f2f67..a6c063aabf93550b38de38cb7e85470ac5a80871 100644
--- a/device-types/AVM/7530.yaml
+++ b/device-types/AVM/7530.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: AVM
 model: FRITZ!Box 7530
-slug: fritzbox-7530
+slug: avm-fritzbox-7530
 part_number: '20002839'
 u_height: 0
 is_full_depth: false
diff --git a/device-types/AVM/7590.yaml b/device-types/AVM/7590.yaml
index 1a62b7cd0b2143b9f4458569fe756e5cec17620d..bcca9a2323d249543d98fe2fb246d635b3ac7e0e 100644
--- a/device-types/AVM/7590.yaml
+++ b/device-types/AVM/7590.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: AVM
 model: FRITZ!Box 7590
-slug: fritzbox-7590
+slug: avm-fritzbox-7590
 part_number: '20002784'
 u_height: 0
 is_full_depth: false
diff --git a/device-types/ActionTec/C1000A.yaml b/device-types/ActionTec/C1000A.yaml
index 124ed56d402b16dc9fbede85e7dc5e42bf414909..3013e2b2562171bd8d83fa422afa6dd058fc3bcf 100644
--- a/device-types/ActionTec/C1000A.yaml
+++ b/device-types/ActionTec/C1000A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: ActionTec
 model: C1000A
-slug: c1000a
+slug: actiontec-c1000a
 u_height: 0
 is_full_depth: false
 power-ports:
diff --git a/device-types/ActionTec/GT724R.yaml b/device-types/ActionTec/GT724R.yaml
index 5444afede18c30ad9fb3d7a0328bfba71f64e1a5..98cb0b590845545e181fccab60374105b3e325e6 100644
--- a/device-types/ActionTec/GT724R.yaml
+++ b/device-types/ActionTec/GT724R.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: ActionTec
 model: GT724R
-slug: gt724r
+slug: actiontec-gt724r
 u_height: 0
 is_full_depth: false
 power-ports:
diff --git a/device-types/Adtran/MX2800.yaml b/device-types/Adtran/MX2800.yaml
index 7b88aedbd518ef3ae915e1f277c5ccb974dbcde6..490cf199aa66d79acd1638270b4b30acf4f42f5f 100644
--- a/device-types/Adtran/MX2800.yaml
+++ b/device-types/Adtran/MX2800.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Adtran
 model: MX2800
-slug: mx2800
+slug: adtran-mx2800
 part_number: 1200290L1
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Adtran/NV4660.yaml b/device-types/Adtran/NV4660.yaml
index 3b1f38579c8012f48163500369803a694e61245e..b394af3709b16bfbd72dc72f392ff42818230e18 100644
--- a/device-types/Adtran/NV4660.yaml
+++ b/device-types/Adtran/NV4660.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Adtran
 model: NetVanta 4660
-slug: nv4660
+slug: adtran-netvanta-4660
 part_number: 17004660F1
 weight: 3.2
 weight_unit: kg
diff --git a/device-types/Adtran/TA-5000-23in.yaml b/device-types/Adtran/TA-5000-23in.yaml
index 328028d4598f916038723ee4f00f20673c84f0b3..f6503759866feb725655636b84bff94e62e809cb 100644
--- a/device-types/Adtran/TA-5000-23in.yaml
+++ b/device-types/Adtran/TA-5000-23in.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Adtran
 model: Total Access 5000 23-Inch Chassis
-slug: total-access_5000_23-inch_chassis
+slug: adtran-total-access-5000-23-inch-chassis
 part_number: 1187001G1
 u_height: 8.0
 is_full_depth: false
diff --git a/device-types/Alcatel-Lucent/OS6450-24.yaml b/device-types/Alcatel-Lucent/OS6450-24.yaml
index 024ef6d6f592cf552e68a396b75f803bd093bf66..c6d0176ddc9c681732e4f098a199d523dd7c2612 100644
--- a/device-types/Alcatel-Lucent/OS6450-24.yaml
+++ b/device-types/Alcatel-Lucent/OS6450-24.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Alcatel-Lucent
 model: OS6450-24
-slug: os6450-24
+slug: alcatel-lucent-os6450-24
 part_number: 903772-90
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Alcatel-Lucent/OS6450-48.yaml b/device-types/Alcatel-Lucent/OS6450-48.yaml
index 74863ddac57a8fe455a1f81ec199e238d986a052..b3a8c06a5bfd00b5b8c5c3d19ec174fbdeceb425 100644
--- a/device-types/Alcatel-Lucent/OS6450-48.yaml
+++ b/device-types/Alcatel-Lucent/OS6450-48.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Alcatel-Lucent
 model: OS6450-48
-slug: os6450-48
+slug: alcatel-lucent-os6450-48
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Alcatel-Lucent/OS6450-P24.yaml b/device-types/Alcatel-Lucent/OS6450-P24.yaml
index 74b32ab5fe4a6de8b76d7762699526a10181e689..d543ee9392c8e660ba3e9a3f6529d5619a2dbf47 100644
--- a/device-types/Alcatel-Lucent/OS6450-P24.yaml
+++ b/device-types/Alcatel-Lucent/OS6450-P24.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Alcatel-Lucent
 model: OS6450-P24
-slug: os6450-p24
+slug: alcatel-lucent-os6450-p24
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Alcatel-Lucent/OS6450-P48.yaml b/device-types/Alcatel-Lucent/OS6450-P48.yaml
index e1a92dc2921a79812dae54e418e995df60fd84ef..6dc9e96899e1ef95f34c2b9b9b536c653f3ecb58 100644
--- a/device-types/Alcatel-Lucent/OS6450-P48.yaml
+++ b/device-types/Alcatel-Lucent/OS6450-P48.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Alcatel-Lucent
 model: OS6450-P48
-slug: os6450-p48
+slug: alcatel-lucent-os6450-p48
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Alcatel-Lucent/OS6860-48.yaml b/device-types/Alcatel-Lucent/OS6860-48.yaml
index f64b9f3f539b8f2191d479e279be5abcddcbf3f6..825dc6c0f3c2e3ce450ba068ada6caed14d05b52 100644
--- a/device-types/Alcatel-Lucent/OS6860-48.yaml
+++ b/device-types/Alcatel-Lucent/OS6860-48.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Alcatel-Lucent
 model: OS6860-48
-slug: os6860-48
+slug: alcatel-lucent-os6860-48
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Alcatel-Lucent/OS6860E-24.yaml b/device-types/Alcatel-Lucent/OS6860E-24.yaml
index 799aaad918f2daeafaf51600dbcd5603e8df85f5..d28b36f674dc668a83a4ab32cffe727a49e3a6e8 100644
--- a/device-types/Alcatel-Lucent/OS6860E-24.yaml
+++ b/device-types/Alcatel-Lucent/OS6860E-24.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Alcatel-Lucent
 model: OS6860E-24
-slug: os6860e-24
+slug: alcatel-lucent-os6860e-24
 part_number: 903963-90
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Alcatel-Lucent/OS6860E-48.yaml b/device-types/Alcatel-Lucent/OS6860E-48.yaml
index e4301cb79c037595e86be11a8b90084e7a67a4bd..97beaebfd9e8051a0e0e16451d7d84fe4d8b3980 100644
--- a/device-types/Alcatel-Lucent/OS6860E-48.yaml
+++ b/device-types/Alcatel-Lucent/OS6860E-48.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Alcatel-Lucent
 model: OS6860E-48
-slug: os6860e-48
+slug: alcatel-lucent-os6860e-48
 part_number: 903965-90
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Alcatel-Lucent/OS6860E-U28.yaml b/device-types/Alcatel-Lucent/OS6860E-U28.yaml
index cef34c77e758a9590b6c28bb8b2da906071f172e..208aab4471dec0d3febcea7b5b77f0d4fc2e15fc 100644
--- a/device-types/Alcatel-Lucent/OS6860E-U28.yaml
+++ b/device-types/Alcatel-Lucent/OS6860E-U28.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Alcatel-Lucent
 model: OS6860E-U28
-slug: os6860e-u28
+slug: alcatel-lucent-os6860e-u28
 part_number: 903712-90
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Alcatel-Lucent/OS6900-X20.yaml b/device-types/Alcatel-Lucent/OS6900-X20.yaml
index fa013cd30c1004124a41c5ac82e05cbb1b766d1d..977e7d1f691253be549bbf8624698a1c8a72996e 100644
--- a/device-types/Alcatel-Lucent/OS6900-X20.yaml
+++ b/device-types/Alcatel-Lucent/OS6900-X20.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Alcatel-Lucent
 model: OS6900-X20
-slug: os6900-x20
+slug: alcatel-lucent-os6900-x20
 part_number: 903167-90
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Alcatel-Lucent/OS6900-X40.yaml b/device-types/Alcatel-Lucent/OS6900-X40.yaml
index 2ef98d642f0be16b35fb2920e30245b4f3ba85ea..630f94e968bc9632813b6cc39bbba8bc01cccbbb 100644
--- a/device-types/Alcatel-Lucent/OS6900-X40.yaml
+++ b/device-types/Alcatel-Lucent/OS6900-X40.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Alcatel-Lucent
 model: OS6900-X40
-slug: os6900-x40
+slug: alcatel-lucent-os6900-x40
 part_number: 903168-90
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Allied Telesis/AR1050V.yaml b/device-types/Allied Telesis/AR1050V.yaml
index f93fe7c144170f53b94282860c7a63111290422e..3fa1455fe1bb11e309c5ced0b4f97289dffb9e7c 100644
--- a/device-types/Allied Telesis/AR1050V.yaml	
+++ b/device-types/Allied Telesis/AR1050V.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: AR1050V
-slug: ar1050v
+slug: allied-telesis-ar1050v
 part_number: AT-AR1050V
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/AR2010V.yaml b/device-types/Allied Telesis/AR2010V.yaml
index 620558e8fa8e006fe5cbe0ff9eb94e65bb4f7dd4..27ef886f063088605f8b21546ef31bfa56793d44 100644
--- a/device-types/Allied Telesis/AR2010V.yaml	
+++ b/device-types/Allied Telesis/AR2010V.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: AR2010V
-slug: ar2010v
+slug: allied-telesis-ar2010v
 part_number: AT-AR2010V
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/AR2050V.yaml b/device-types/Allied Telesis/AR2050V.yaml
index cc40ee4fba1e6498f47f71337b7a52ce73daa97c..41523d1be0eb02d4d6094e5425e4ab5964511538 100644
--- a/device-types/Allied Telesis/AR2050V.yaml	
+++ b/device-types/Allied Telesis/AR2050V.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: AR2050V
-slug: ar2050v
+slug: allied-telesis-ar2050v
 part_number: AT-AR2050V
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/AR3050S.yaml b/device-types/Allied Telesis/AR3050S.yaml
index eb5b8932e684db47505e2c41042d49b15a01fac5..d4fcfb7911f65f2b6af0f9dda4e9c77ec6a586e6 100644
--- a/device-types/Allied Telesis/AR3050S.yaml	
+++ b/device-types/Allied Telesis/AR3050S.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: AR3050S
-slug: ar3050s
+slug: allied-telesis-ar3050s
 part_number: AT-AR3050S
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/AR4050S.yaml b/device-types/Allied Telesis/AR4050S.yaml
index a6f0442d21283942f679fe71eac304c21d14f1f5..fdb668cc8768583a18a511a85e33fe65de41906e 100644
--- a/device-types/Allied Telesis/AR4050S.yaml	
+++ b/device-types/Allied Telesis/AR4050S.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: AR4050S
-slug: ar4050s
+slug: allied-telesis-ar4050s
 part_number: AT-AR4050S
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/AT-MCR12.yaml b/device-types/Allied Telesis/AT-MCR12.yaml
index 9cf8e723a1beec8b36dda96b997768a58f0f81b5..ff9aaa9e87f84ea98b50acbe8b342e5b65bca5e2 100644
--- a/device-types/Allied Telesis/AT-MCR12.yaml	
+++ b/device-types/Allied Telesis/AT-MCR12.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: AT-MCR12
-slug: allied-telesis-mcr12
+slug: allied-telesis-at-mcr12
 part_number: AT-MCR12
 u_height: 3
 is_full_depth: false
diff --git a/device-types/Allied Telesis/GS980MX-10HSm.yaml b/device-types/Allied Telesis/GS980MX-10HSm.yaml
index 21afbf8d37b4fb8737fa6db8bef8f85b34a14bc1..681138444d9e74b6bc139dc30f7fa0b5aa685bd6 100644
--- a/device-types/Allied Telesis/GS980MX-10HSm.yaml	
+++ b/device-types/Allied Telesis/GS980MX-10HSm.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: GS980MX/10HSm
-slug: gs980mx-10hsm
+slug: allied-telesis-gs980mx-10hsm
 part_number: AT-GS980MX/10HSm
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/GS980MX-18HSm.yaml b/device-types/Allied Telesis/GS980MX-18HSm.yaml
index 69483172cf8e3e3554fbcd60da12ce482d4fff76..481ed42223ada18c48f4d603f2af1f2a930c442c 100644
--- a/device-types/Allied Telesis/GS980MX-18HSm.yaml	
+++ b/device-types/Allied Telesis/GS980MX-18HSm.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: GS980MX/18HSm
-slug: gs980mx-18hsm
+slug: allied-telesis-gs980mx-18hsm
 part_number: AT-GS980MX/18HSm
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/GS980MX-28.yaml b/device-types/Allied Telesis/GS980MX-28.yaml
index e94cedfe1e72f1c7348df7d93a6e4c9dcde0dadd..461cc58adbca92238469c7db0fd800fd707d307a 100644
--- a/device-types/Allied Telesis/GS980MX-28.yaml	
+++ b/device-types/Allied Telesis/GS980MX-28.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: GS980MX/28
-slug: gs980mx-28
+slug: allied-telesis-gs980mx-28
 part_number: AT-GS980MX/28
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/GS980MX-28PSm.yaml b/device-types/Allied Telesis/GS980MX-28PSm.yaml
index 37b3b5648979d72fd6d02cc008712169f6374ec4..79f9473c9fec10cfc3a9e150e571b08f30195d1f 100644
--- a/device-types/Allied Telesis/GS980MX-28PSm.yaml	
+++ b/device-types/Allied Telesis/GS980MX-28PSm.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: GS980MX/28PSm
-slug: gs980mx-28psm
+slug: allied-telesis-gs980mx-28psm
 part_number: AT-GS980MX/28PSm
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/GS980MX-52.yaml b/device-types/Allied Telesis/GS980MX-52.yaml
index 7b2508602b1963f467a5130f58b67ea8b0f7dd74..82f8ebc4278369f3c69e435cbe356a806fc49ebd 100644
--- a/device-types/Allied Telesis/GS980MX-52.yaml	
+++ b/device-types/Allied Telesis/GS980MX-52.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: GS980MX/52
-slug: gs980mx-52
+slug: allied-telesis-gs980mx-52
 part_number: AT-GS980MX/52
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/GS980MX-52PSm.yaml b/device-types/Allied Telesis/GS980MX-52PSm.yaml
index 348839713cb6ede4d754132ca03b6e166b01e0c6..4e710c4c3e5858cf40b4a1fbdedd7b3e9d2d4c39 100644
--- a/device-types/Allied Telesis/GS980MX-52PSm.yaml	
+++ b/device-types/Allied Telesis/GS980MX-52PSm.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: GS980MX/52PSm
-slug: gs980mx-52psm
+slug: allied-telesis-gs980mx-52psm
 part_number: AT-GS980MX/52PSm
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/IE200-6FP.yaml b/device-types/Allied Telesis/IE200-6FP.yaml
index a68773274fd531c78a218865a838a52e9593deab..d1a7f7f9af61119dcc6ba466490bf7f8abfe67f8 100644
--- a/device-types/Allied Telesis/IE200-6FP.yaml	
+++ b/device-types/Allied Telesis/IE200-6FP.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: IE200-6FP
-slug: ie200-6fp
+slug: allied-telesis-ie200-6fp
 part_number: AT-IE200-6FP
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Allied Telesis/IE200-6FT.yaml b/device-types/Allied Telesis/IE200-6FT.yaml
index b5276b629db28c9fa62944032ff298da8ff9e493..5db6399782f81b5a67d85c8d59facff4c0717688 100644
--- a/device-types/Allied Telesis/IE200-6FT.yaml	
+++ b/device-types/Allied Telesis/IE200-6FT.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: IE200-6FT
-slug: ie200-6ft
+slug: allied-telesis-ie200-6ft
 part_number: AT-IE200-6FT
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Allied Telesis/IE200-6GP.yaml b/device-types/Allied Telesis/IE200-6GP.yaml
index 3c07df49ac6d81a385c3c1856ef6c524fc6a78e0..98afc730cc71cae46ae240f9fceff1a1c20cb94e 100644
--- a/device-types/Allied Telesis/IE200-6GP.yaml	
+++ b/device-types/Allied Telesis/IE200-6GP.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: IE200-6GP
-slug: ie200-6gp
+slug: allied-telesis-ie200-6gp
 part_number: AT-IE200-6GP
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Allied Telesis/IE200-6GT.yaml b/device-types/Allied Telesis/IE200-6GT.yaml
index 8095d816c6ac3ad9fac68cd3bf233f3e86327d90..cf4212d2c1683b7b2b0a965c0005943cac96e0c9 100644
--- a/device-types/Allied Telesis/IE200-6GT.yaml	
+++ b/device-types/Allied Telesis/IE200-6GT.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: IE200-6GT
-slug: ie200-6gt
+slug: allied-telesis-ie200-6gt
 part_number: AT-IE200-6GT
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Allied Telesis/IE300-12GP.yaml b/device-types/Allied Telesis/IE300-12GP.yaml
index 90f70da38280cfbd22a7db7dff8dd43176d45452..2037532c17a49e1a53b6c4ab9fd1643525d2bdb4 100644
--- a/device-types/Allied Telesis/IE300-12GP.yaml	
+++ b/device-types/Allied Telesis/IE300-12GP.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: IE300-12GP
-slug: ie300-12gp
+slug: allied-telesis-ie300-12gp
 part_number: AT-IE300-12GP
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Allied Telesis/IE300-12GT.yaml b/device-types/Allied Telesis/IE300-12GT.yaml
index 9e7ef9e023620761e41ab8b302cdde9bbdf94cad..ef1db63c8113772b569fa4f840cb2bb52a7ca14a 100644
--- a/device-types/Allied Telesis/IE300-12GT.yaml	
+++ b/device-types/Allied Telesis/IE300-12GT.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: IE300-12GT
-slug: ie300-12gt
+slug: allied-telesis-ie300-12gt
 part_number: AT-IE300-12GT
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Allied Telesis/IE340-12GP.yaml b/device-types/Allied Telesis/IE340-12GP.yaml
index e43192c0f8b78ead8bffaa85b78f0d481592b492..784555ba8eeeb8a04607929ffab563125dab4638 100644
--- a/device-types/Allied Telesis/IE340-12GP.yaml	
+++ b/device-types/Allied Telesis/IE340-12GP.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: IE340-12GP
-slug: ie340-12gp
+slug: allied-telesis-ie340-12gp
 part_number: AT-IE340-12GP
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Allied Telesis/IE340-12GT.yaml b/device-types/Allied Telesis/IE340-12GT.yaml
index 1c2bd212d3072de03345545cb1d4099e6ed00678..080e8c03f7cf862ee991a61a7280aeee31de09bc 100644
--- a/device-types/Allied Telesis/IE340-12GT.yaml	
+++ b/device-types/Allied Telesis/IE340-12GT.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: IE340-12GT
-slug: ie340-12gt
+slug: allied-telesis-ie340-12gt
 part_number: AT-IE340-12GT
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Allied Telesis/IE340-20GP.yaml b/device-types/Allied Telesis/IE340-20GP.yaml
index d8d7a8607bc6efd8bafa69a89a3ec6004c3787a6..db0de0011fac15fc3d6fe1aa2ef79df093bb2365 100644
--- a/device-types/Allied Telesis/IE340-20GP.yaml	
+++ b/device-types/Allied Telesis/IE340-20GP.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: IE340-20GP
-slug: ie340-20gp
+slug: allied-telesis-ie340-20gp
 part_number: AT-IE340-20GP
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Allied Telesis/IE340L-18GP.yaml b/device-types/Allied Telesis/IE340L-18GP.yaml
index 25814276358eff87e290ddde06bbf0e662f61693..2c4f0358ec7a23737ce350a43bc2bd7f291ed2ef 100644
--- a/device-types/Allied Telesis/IE340L-18GP.yaml	
+++ b/device-types/Allied Telesis/IE340L-18GP.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: IE340L-18GP
-slug: ie340l-18gp
+slug: allied-telesis-ie340l-18gp
 part_number: AT-IE340L-18GP
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x230-10GP.yaml b/device-types/Allied Telesis/x230-10GP.yaml
index aaede10799f4865fb55d6269b441428922035f0b..d9b1e01fd208f2a272428ef8c449e23decea272f 100644
--- a/device-types/Allied Telesis/x230-10GP.yaml	
+++ b/device-types/Allied Telesis/x230-10GP.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x230-10GP
-slug: x230-10gp
+slug: allied-telesis-x230-10gp
 part_number: AT-x230-10Gp
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x230-10GT.yaml b/device-types/Allied Telesis/x230-10GT.yaml
index 433394222b026cc3dd4b0707360511467514db21..ee04c6c8b35c2ec2c040351154517608c1d1c831 100644
--- a/device-types/Allied Telesis/x230-10GT.yaml	
+++ b/device-types/Allied Telesis/x230-10GT.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x230-10GT
-slug: x230-10gt
+slug: allied-telesis-x230-10gt
 part_number: AT-x230-10GT
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x230-18GP.yaml b/device-types/Allied Telesis/x230-18GP.yaml
index 51ae05eb055448b8326ec591aaba96e4918c9b5e..2b6f6ad22bb6e5461ce2d9c4a0e1b3c6552d9833 100644
--- a/device-types/Allied Telesis/x230-18GP.yaml	
+++ b/device-types/Allied Telesis/x230-18GP.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x230-18GP
-slug: x230-18gp
+slug: allied-telesis-x230-18gp
 part_number: AT-x230-18GP
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x230-18GT.yaml b/device-types/Allied Telesis/x230-18GT.yaml
index 8ed694400c6e0a58f761d54311dbc5b08b675c6c..6fd1bbbd8db6add7672ce2fa4d66eaa8c4f0c960 100644
--- a/device-types/Allied Telesis/x230-18GT.yaml	
+++ b/device-types/Allied Telesis/x230-18GT.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x230-18GT
-slug: x230-18gt
+slug: allied-telesis-x230-18gt
 part_number: AT-x230-18GT
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x230-28GP.yaml b/device-types/Allied Telesis/x230-28GP.yaml
index b19a5e75fd511be5553a5fffcae4e1c10ccacc27..c1fee0af3a1e3a4e926a08d55cbd0c6417df5864 100644
--- a/device-types/Allied Telesis/x230-28GP.yaml	
+++ b/device-types/Allied Telesis/x230-28GP.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x230-28GP
-slug: x230-28gp
+slug: allied-telesis-x230-28gp
 part_number: AT-x230-28GP
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x230-28GT.yaml b/device-types/Allied Telesis/x230-28GT.yaml
index 44c0fe7d784bcabd0ee9547b00a6d2ba6158c9e0..e5b9c63de49123ede61d97cdca1d5be604483b02 100644
--- a/device-types/Allied Telesis/x230-28GT.yaml	
+++ b/device-types/Allied Telesis/x230-28GT.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x230-28GT
-slug: x230-28gt
+slug: allied-telesis-x230-28gt
 part_number: AT-x230-28GT
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x230L-17GT.yaml b/device-types/Allied Telesis/x230L-17GT.yaml
index 93794c30201675d7afc222e69360c4ba4a806309..140112ce526f327f87b66404f5daa296da8abc68 100644
--- a/device-types/Allied Telesis/x230L-17GT.yaml	
+++ b/device-types/Allied Telesis/x230L-17GT.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x230L-17GT
-slug: x230l-17gt
+slug: allied-telesis-x230l-17gt
 part_number: AT-x230L-17GT
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x230L-26GT.yaml b/device-types/Allied Telesis/x230L-26GT.yaml
index 2e2c3bf2e948d4b43329d2bfa9a59668440b64f1..a1cde7f2865ba933201d355fca37624884d16dc5 100644
--- a/device-types/Allied Telesis/x230L-26GT.yaml	
+++ b/device-types/Allied Telesis/x230L-26GT.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x230L-26GT
-slug: x230l-26gt
+slug: allied-telesis-x230l-26gt
 part_number: AT-x230L-26GT
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x510-28GPX.yaml b/device-types/Allied Telesis/x510-28GPX.yaml
index fb886fd98b72f1faee164d79100018816a9595d9..09c6821a79c3aba8dc962e8b848e931de14cc453 100644
--- a/device-types/Allied Telesis/x510-28GPX.yaml	
+++ b/device-types/Allied Telesis/x510-28GPX.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x510-28GPX
-slug: x510-28gpx
+slug: allied-telesis-x510-28gpx
 part_number: AT-x510-28GPX
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x510-28GSX.yaml b/device-types/Allied Telesis/x510-28GSX.yaml
index c8a5e7544e9891617671c0b88968722e307ded08..9ba4ff5838107959c54edf064d3c218b97d9ec6c 100644
--- a/device-types/Allied Telesis/x510-28GSX.yaml	
+++ b/device-types/Allied Telesis/x510-28GSX.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x510-28GSX
-slug: x510-28gsx
+slug: allied-telesis-x510-28gsx
 part_number: AT-x510-28GSX
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x510-28GTX.yaml b/device-types/Allied Telesis/x510-28GTX.yaml
index 79c439ebc84540dabe336d2ed29d89b59104997a..1326341a9e6bb3c86804b117c76a42643ebd4d4a 100644
--- a/device-types/Allied Telesis/x510-28GTX.yaml	
+++ b/device-types/Allied Telesis/x510-28GTX.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x510-28GTX
-slug: x510-28gtx
+slug: allied-telesis-x510-28gtx
 part_number: AT-x510-28GTX
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x510-52GPX.yaml b/device-types/Allied Telesis/x510-52GPX.yaml
index cfb44c28e7d3d6e8a7312ed4faf3d1f6718ca9c0..308a5f2a557a70a6ea461eaa6b55df9ebfb59249 100644
--- a/device-types/Allied Telesis/x510-52GPX.yaml	
+++ b/device-types/Allied Telesis/x510-52GPX.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x510-52GPX
-slug: x510-52gpx
+slug: allied-telesis-x510-52gpx
 part_number: AT-x510-52GPX
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x510-52GTX.yaml b/device-types/Allied Telesis/x510-52GTX.yaml
index 74fc501e496814f0f4035026d95f93d674365f3d..c83e471354c884c67f4b16f71d95ce2fadeecd66 100644
--- a/device-types/Allied Telesis/x510-52GTX.yaml	
+++ b/device-types/Allied Telesis/x510-52GTX.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x510-52GTX
-slug: x510-52gtx
+slug: allied-telesis-x510-52gtx
 part_number: AT-x510-52GTX
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x510L-28GP.yaml b/device-types/Allied Telesis/x510L-28GP.yaml
index 284c9bb895dab51bccc21454cbe0a486ac09df4c..6aa0c7259b10d0e89aa81a27191f647ac04101fb 100644
--- a/device-types/Allied Telesis/x510L-28GP.yaml	
+++ b/device-types/Allied Telesis/x510L-28GP.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x510L-28GP
-slug: x510l-28gp
+slug: allied-telesis-x510l-28gp
 part_number: AT-x510L-28GP
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x510L-28GT.yaml b/device-types/Allied Telesis/x510L-28GT.yaml
index 1e0c2e5d45e533d78222f6a1e0752966f65468da..8c70bdfe943c8f1d4d7114cc86d6249ccc1917dc 100644
--- a/device-types/Allied Telesis/x510L-28GT.yaml	
+++ b/device-types/Allied Telesis/x510L-28GT.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x510L-28GT
-slug: x510l-28gt
+slug: allied-telesis-x510l-28gt
 part_number: AT-x510L-28GT
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x510L-52GP.yaml b/device-types/Allied Telesis/x510L-52GP.yaml
index e9e6aaa2e281a808fe595229883ec0de4bfb8285..f1b534db3656579d946cbc8780f76f92ad77ec2c 100644
--- a/device-types/Allied Telesis/x510L-52GP.yaml	
+++ b/device-types/Allied Telesis/x510L-52GP.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x510L-52GP
-slug: x510l-52gp
+slug: allied-telesis-x510l-52gp
 part_number: AT-x510L-52GP
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x510L-52GT.yaml b/device-types/Allied Telesis/x510L-52GT.yaml
index 7b01924ef53665f5450738b5d92a8a79b96a981c..176556f82a2aa788e2d7e1ee10ad204c61e567dd 100644
--- a/device-types/Allied Telesis/x510L-52GT.yaml	
+++ b/device-types/Allied Telesis/x510L-52GT.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x510L-52GT
-slug: x510l-52gt
+slug: allied-telesis-x510l-52gt
 part_number: AT-x510L-52GT
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x530-10GHXm.yaml b/device-types/Allied Telesis/x530-10GHXm.yaml
index 71b3e32b3181ed7c8d01f731b2aef7c363e9f740..3fe8fb5976dc262049cc623fafddbf9e5790f1fd 100644
--- a/device-types/Allied Telesis/x530-10GHXm.yaml	
+++ b/device-types/Allied Telesis/x530-10GHXm.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x530-10GHXm
-slug: x530-10ghxm
+slug: allied-telesis-x530-10ghxm
 part_number: AT-x530-10GHXm
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x530-18GHXm.yaml b/device-types/Allied Telesis/x530-18GHXm.yaml
index 0d77e4d1f9a35440540538bc898c1df83081096d..a867a240d137f2a856009ee7e307aadc67283b56 100644
--- a/device-types/Allied Telesis/x530-18GHXm.yaml	
+++ b/device-types/Allied Telesis/x530-18GHXm.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x530-18GHXm
-slug: x530-18ghxm
+slug: allied-telesis-x530-18ghxm
 part_number: AT-x530-18GHXm
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x530-28GPXm.yaml b/device-types/Allied Telesis/x530-28GPXm.yaml
index e05ceaa9ed1769751a609069581fd819e94a83f4..3826d025842410705a01080837133d6d61397778 100644
--- a/device-types/Allied Telesis/x530-28GPXm.yaml	
+++ b/device-types/Allied Telesis/x530-28GPXm.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x530-28GPXm
-slug: x530-28gpxm
+slug: allied-telesis-x530-28gpxm
 part_number: AT-x530-28GPXm
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x530-28GTXm.yaml b/device-types/Allied Telesis/x530-28GTXm.yaml
index e1009b1a9d95a511050c6ceb2fb5e97599fdf391..1fe7d140460abb1ee8d007e7959e727ac19e4cfb 100644
--- a/device-types/Allied Telesis/x530-28GTXm.yaml	
+++ b/device-types/Allied Telesis/x530-28GTXm.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x530-28GTXm
-slug: x530-28gtxm
+slug: allied-telesis-x530-28gtxm
 part_number: AT-x530-28GTXm
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x530-52GPXm.yaml b/device-types/Allied Telesis/x530-52GPXm.yaml
index 2e6b81734e5b71b83d11fb7601f0e866f791d3b5..6e92e884c4b7bcf41a26c674b55f2c2c9f216a8f 100644
--- a/device-types/Allied Telesis/x530-52GPXm.yaml	
+++ b/device-types/Allied Telesis/x530-52GPXm.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x530-52GPXm
-slug: x530-52gpxm
+slug: allied-telesis-x530-52gpxm
 part_number: AT-x530-52GPXm
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x530-52GTXm.yaml b/device-types/Allied Telesis/x530-52GTXm.yaml
index 24532d20e538e657c0e8d1d89a40bb74275dfa3e..05ffb531de3e8e00c33f9889d4a480763e2296f9 100644
--- a/device-types/Allied Telesis/x530-52GTXm.yaml	
+++ b/device-types/Allied Telesis/x530-52GTXm.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x530-52GTXm
-slug: x530-52gtxm
+slug: allied-telesis-x530-52gtxm
 part_number: AT-x530-52GTXm
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x530DP-28GHXm.yaml b/device-types/Allied Telesis/x530DP-28GHXm.yaml
index 60630d6a66635ffcecec7ceb40a97eae59ba225d..8fb96e977eab3a99dbddc2721cff494ba6acbc64 100644
--- a/device-types/Allied Telesis/x530DP-28GHXm.yaml	
+++ b/device-types/Allied Telesis/x530DP-28GHXm.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x530DP-28GHXm
-slug: x530dp-28ghxm
+slug: allied-telesis-x530dp-28ghxm
 part_number: AT-x530DP-28GHXm
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x530DP-52GHXm.yaml b/device-types/Allied Telesis/x530DP-52GHXm.yaml
index 72389799e4367161a50a79c02bfcbc7a8c8b0c4a..5fd9c49d25adf9dfefa06998c18c11f86c09a819 100644
--- a/device-types/Allied Telesis/x530DP-52GHXm.yaml	
+++ b/device-types/Allied Telesis/x530DP-52GHXm.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x530DP-52GHXm
-slug: x530dp-52ghxm
+slug: allied-telesis-x530dp-52ghxm
 part_number: AT-x530DP-52GHXm
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x530L-10GHXm.yaml b/device-types/Allied Telesis/x530L-10GHXm.yaml
index b8ad0d477016ae9f74133ebea57c6c9fdd92b3ba..9255a6f60718f80381318c1e5e9c9449c1a74d4b 100644
--- a/device-types/Allied Telesis/x530L-10GHXm.yaml	
+++ b/device-types/Allied Telesis/x530L-10GHXm.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x530L-10GHXm
-slug: x530l-10ghxm
+slug: allied-telesis-x530l-10ghxm
 part_number: AT-x530L-10GHXm
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x530L-18GHXm.yaml b/device-types/Allied Telesis/x530L-18GHXm.yaml
index 314a7aaee9c1cce0794fd256f84613d262293131..14be9bf006248c8feb9f17380cb278f2ec32070f 100644
--- a/device-types/Allied Telesis/x530L-18GHXm.yaml	
+++ b/device-types/Allied Telesis/x530L-18GHXm.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x530L-18GHXm
-slug: x530l-18ghxm
+slug: allied-telesis-x530l-18ghxm
 part_number: AT-x530L-18GHXm
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x530L-28GPX.yaml b/device-types/Allied Telesis/x530L-28GPX.yaml
index e2f3dcc33f25258c31d351e48d86dc21dfe199cd..27d4bd71eb43167822afb81acdfa4d398cd94d19 100644
--- a/device-types/Allied Telesis/x530L-28GPX.yaml	
+++ b/device-types/Allied Telesis/x530L-28GPX.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x530L-28GPX
-slug: x530l-28gpx
+slug: allied-telesis-x530l-28gpx
 part_number: AT-x530L-28GPX
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x530L-28GTX.yaml b/device-types/Allied Telesis/x530L-28GTX.yaml
index 25f6ee601bd99c10ae93498a99c7760db42656ca..86e85ce4292c9d46e12ce9d34e404f18b725eafc 100644
--- a/device-types/Allied Telesis/x530L-28GTX.yaml	
+++ b/device-types/Allied Telesis/x530L-28GTX.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x530L-28GTX
-slug: x530l-28gtx
+slug: allied-telesis-x530l-28gtx
 part_number: AT-x530L-28GTX
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x530L-52GPX.yaml b/device-types/Allied Telesis/x530L-52GPX.yaml
index a5f37d1519fa124c033c54806567c2907699d987..65ebd52278b074a060e3b10967226f22e581790a 100644
--- a/device-types/Allied Telesis/x530L-52GPX.yaml	
+++ b/device-types/Allied Telesis/x530L-52GPX.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x530L-52GPX
-slug: x530l-52gpx
+slug: allied-telesis-x530l-52gpx
 part_number: AT-x530L-52GPX
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x530L-52GTX.yaml b/device-types/Allied Telesis/x530L-52GTX.yaml
index 183d4fe1d51022d66b6816c72789ab3c200d236e..5d8bd0582ec097633fe56e12e8cf09302df28c61 100644
--- a/device-types/Allied Telesis/x530L-52GTX.yaml	
+++ b/device-types/Allied Telesis/x530L-52GTX.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x530L-52GTX
-slug: x530l-52gtx
+slug: allied-telesis-x530l-52gtx
 part_number: AT-x530L-52GTX
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x8106.yaml b/device-types/Allied Telesis/x8106.yaml
index b155af65538da843cd2e8722c663d1f60a49a469..f2da4f2a8b763a4a39d9d6531aee3a23fedfc094 100644
--- a/device-types/Allied Telesis/x8106.yaml	
+++ b/device-types/Allied Telesis/x8106.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: SwitchBlade x8106
-slug: sbx8106
+slug: allied-telesis-switchblade-x8106
 part_number: AT-SBx8106
 u_height: 4
 is_full_depth: true
diff --git a/device-types/Allied Telesis/x8112.yaml b/device-types/Allied Telesis/x8112.yaml
index c8b1a70ae03f45de214e8c975a909e5681ec8448..0575a5887a172360f7caba9e784ccc0b09d6cb5b 100644
--- a/device-types/Allied Telesis/x8112.yaml	
+++ b/device-types/Allied Telesis/x8112.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: SwitchBlade x8112
-slug: sbx8112
+slug: allied-telesis-switchblade-x8112
 part_number: AT-SBx8112
 u_height: 7
 is_full_depth: true
diff --git a/device-types/Allied Telesis/x908Gen2.yaml b/device-types/Allied Telesis/x908Gen2.yaml
index 48855ba81554dd8f8d61c2df5a54204d88394727..39b355fba7bab187a909bfa8dcbd7daa13c621ed 100644
--- a/device-types/Allied Telesis/x908Gen2.yaml	
+++ b/device-types/Allied Telesis/x908Gen2.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: SwitchBlade x908 Gen2
-slug: sbx908-gen2
+slug: allied-telesis-switchblade-x908-gen2
 part_number: AT-SBx908GEN2
 u_height: 3
 is_full_depth: true
diff --git a/device-types/Allied Telesis/x930-28GPX.yaml b/device-types/Allied Telesis/x930-28GPX.yaml
index b90bf09ae15ab338bde880474775073420783964..f279555640a49f47a77008db75db90aefa6f0fa6 100644
--- a/device-types/Allied Telesis/x930-28GPX.yaml	
+++ b/device-types/Allied Telesis/x930-28GPX.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x930-28GPX
-slug: x930-28gpx
+slug: allied-telesis-x930-28gpx
 part_number: AT-x930-28GPx
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x930-28GSTX.yaml b/device-types/Allied Telesis/x930-28GSTX.yaml
index ab3c53411288c2b67c3359894e5e052a0f44a51f..09b2c293e58ca4671fa700b95de0d752660f1d9f 100644
--- a/device-types/Allied Telesis/x930-28GSTX.yaml	
+++ b/device-types/Allied Telesis/x930-28GSTX.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x930-28GSTX
-slug: x930-28gstx
+slug: allied-telesis-x930-28gstx
 part_number: AT-x930-28GSTX
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x930-28GTX.yaml b/device-types/Allied Telesis/x930-28GTX.yaml
index f50a7fa1614cf830c074ccbc0266a6b01d2389b2..e6ba496f5a81d06a8eebf0e41655998f12f1b75f 100644
--- a/device-types/Allied Telesis/x930-28GTX.yaml	
+++ b/device-types/Allied Telesis/x930-28GTX.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x930-28GTX
-slug: x930-28gtx
+slug: allied-telesis-x930-28gtx
 part_number: AT-x930-28GTX
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x930-52GPX.yaml b/device-types/Allied Telesis/x930-52GPX.yaml
index 92747655d132add8ba6b0d2f3105b014538364ab..345f3408833ecfabab7115ffc2908cabef06a09e 100644
--- a/device-types/Allied Telesis/x930-52GPX.yaml	
+++ b/device-types/Allied Telesis/x930-52GPX.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x930-52GPX
-slug: x930-52gpx
+slug: allied-telesis-x930-52gpx
 part_number: AT-x930-52GPX
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x930-52GTX.yaml b/device-types/Allied Telesis/x930-52GTX.yaml
index 30322dc24e7066459d938a238e61751056db8083..dd66f5f520b1dedbe3f0b25952d7220417bfba1a 100644
--- a/device-types/Allied Telesis/x930-52GTX.yaml	
+++ b/device-types/Allied Telesis/x930-52GTX.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x930-52GTX
-slug: x930-52gtx
+slug: allied-telesis-x930-52gtx
 part_number: AT-x930-52GTX
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Allied Telesis/x950-28XSQ.yaml b/device-types/Allied Telesis/x950-28XSQ.yaml
index 5ec5a6007dd793916b43e2ac0eb36c790aa894d9..0226945e6d0366e9c863585af3d011a0003b2e23 100644
--- a/device-types/Allied Telesis/x950-28XSQ.yaml	
+++ b/device-types/Allied Telesis/x950-28XSQ.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x950-28XSQ
-slug: x950-28xsq
+slug: allied-telesis-x950-28xsq
 part_number: AT-x950-28XSQ
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Allied Telesis/x950-28XTQm.yaml b/device-types/Allied Telesis/x950-28XTQm.yaml
index b5e21faf3b5ad3325c63ba6e4c0942c721c535f5..956f39d93f747457b11f9ea7721c227759bf5a11 100644
--- a/device-types/Allied Telesis/x950-28XTQm.yaml	
+++ b/device-types/Allied Telesis/x950-28XTQm.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x950-28XTQm
-slug: x950-28xtqm
+slug: allied-telesis-x950-28xtqm
 part_number: AT-x950-28XTQm
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Allied Telesis/x950-52XSQ.yaml b/device-types/Allied Telesis/x950-52XSQ.yaml
index 5433e5c580b2bbe22f3b1115ee51e10296c2d813..d214c63135bfe953083f7add7a9f788820bd3f8e 100644
--- a/device-types/Allied Telesis/x950-52XSQ.yaml	
+++ b/device-types/Allied Telesis/x950-52XSQ.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x950-52XSQ
-slug: x950-52xsq
+slug: allied-telesis-x950-52xsq
 part_number: AT-x950-52XSQ
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Allied Telesis/x950-52XTQm.yaml b/device-types/Allied Telesis/x950-52XTQm.yaml
index 20568f5e87313724863b699d5f44dbd4eecace01..f461e1b5f22aeae1814d0dee07849197290e3929 100644
--- a/device-types/Allied Telesis/x950-52XTQm.yaml	
+++ b/device-types/Allied Telesis/x950-52XTQm.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Allied Telesis
 model: x950-52XTQm
-slug: x950-52xtqm
+slug: allied-telesis-x950-52xtqm
 part_number: AT-x950-52XTQm
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Alpha/CXC.yaml b/device-types/Alpha/CXC.yaml
index 885d5108cbff9ea2415588c943232abcfcc4ab6a..717ddaf5dddd6a3f16e8546bf374998d1ae9acd4 100644
--- a/device-types/Alpha/CXC.yaml
+++ b/device-types/Alpha/CXC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Alpha
 model: Cordex CXC
-slug: cxc
+slug: alpha-cordex-cxc
 part_number: CXC
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Alpha/CXCM1-HP.yaml b/device-types/Alpha/CXCM1-HP.yaml
index 54b03e35347abb4a931e12d12d231a785709bc46..ea3a3e62ab18033c120eaae46300e206ddb196ed 100644
--- a/device-types/Alpha/CXCM1-HP.yaml
+++ b/device-types/Alpha/CXCM1-HP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Alpha
 model: Cordex CXCM1 HP
-slug: cxcm1-hp
+slug: alpha-cordex-cxcm1-hp
 part_number: CXCM1-HP
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Apple/AppleTV-A1427.yaml b/device-types/Apple/AppleTV-A1427.yaml
index 70006d1c18403ff51b0fb5f38a606221a5c4e3b8..54b0ea7f64a34235950527bd2e5ba03031e68a43 100644
--- a/device-types/Apple/AppleTV-A1427.yaml
+++ b/device-types/Apple/AppleTV-A1427.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Apple
 model: AppleTV3,1
-slug: appletv31
+slug: apple-appletv31
 part_number: A1427
 is_full_depth: false
 comments: "- Order Number: MD199LL/A\r\n- Model Number: A1427\r\n- EMC: 2633\r\n- Edition: 3th Gen\r\n- Processor Speed: 1 GHz\r\n- Processor Type: Apple\
diff --git a/device-types/Apple/AppleTV-A1469.yaml b/device-types/Apple/AppleTV-A1469.yaml
index 44a08250024db49d0f273582128a97d214e26657..d65c5f634747982569404fe932996c233e09f21e 100644
--- a/device-types/Apple/AppleTV-A1469.yaml
+++ b/device-types/Apple/AppleTV-A1469.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Apple
 model: AppleTV3,2
-slug: appletv32
+slug: apple-appletv32
 part_number: A1469
 is_full_depth: false
 comments: "- Order Number: MD199LL/A\r\n- Model Number: A1469\r\n- EMC: 2633\r\n- Edition: 3th Gen\r\n- Processor Speed: 1 GHz\r\n- Processor Type: Apple\
diff --git a/device-types/Apple/AppleTV-A1625.yaml b/device-types/Apple/AppleTV-A1625.yaml
index 76f6419dee6c45963812979ee0d53223501366ee..d53c61bae948a1a9511d2f447610a1ba31504bd9 100644
--- a/device-types/Apple/AppleTV-A1625.yaml
+++ b/device-types/Apple/AppleTV-A1625.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Apple
 model: AppleTV5,3
-slug: appletv53
+slug: apple-appletv53
 part_number: A1625
 is_full_depth: false
 u_height: 0
diff --git a/device-types/Apple/AppleTV-A1842.yaml b/device-types/Apple/AppleTV-A1842.yaml
index ad2e94c8019f660104a4b7c2a9aac7cae6e6ea78..a96727fda1b75cdd19d49d0b3baa8926ba408858 100644
--- a/device-types/Apple/AppleTV-A1842.yaml
+++ b/device-types/Apple/AppleTV-A1842.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Apple
 model: AppleTV6,2
-slug: appletv62
+slug: apple-appletv62
 part_number: A1842
 is_full_depth: false
 u_height: 0
diff --git a/device-types/Apple/AppleTV-A2169.yaml b/device-types/Apple/AppleTV-A2169.yaml
index 78d354345cba3a251cac63bd1702b9ed49b6977d..7a51af8de7763c990ecfa6a76c9d16b94587bdc8 100644
--- a/device-types/Apple/AppleTV-A2169.yaml
+++ b/device-types/Apple/AppleTV-A2169.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Apple
 model: AppleTV11,1
-slug: appletv111
+slug: apple-appletv111
 part_number: A2169
 is_full_depth: false
 u_height: 0
diff --git a/device-types/Arista/CCS-720XP-24Y6.yaml b/device-types/Arista/CCS-720XP-24Y6.yaml
index b11e47f3051ba29d5e0dd95cf77704e2bc9957f0..c2d23b1dcbd29fb70bd0f114639478a98251e402 100644
--- a/device-types/Arista/CCS-720XP-24Y6.yaml
+++ b/device-types/Arista/CCS-720XP-24Y6.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: CCS-720XP-24Y6
-slug: ccs-720xp-24y6
+slug: arista-ccs-720xp-24y6
 part_number: CCS-720XP-24Y6
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/CCS-720XP-24ZY4.yaml b/device-types/Arista/CCS-720XP-24ZY4.yaml
index c8cafa23b393d62fefc821ddce3f03333046e91b..6e0c95e82c16298f7c8fafaf8c9cbde12f4d971f 100644
--- a/device-types/Arista/CCS-720XP-24ZY4.yaml
+++ b/device-types/Arista/CCS-720XP-24ZY4.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: CCS-720XP-24ZY4
-slug: ccs-720xp-24zy4
+slug: arista-ccs-720xp-24zy4
 part_number: CCS-720XP-24ZY4
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/CCS-720XP-48Y6.yaml b/device-types/Arista/CCS-720XP-48Y6.yaml
index b9ee849ef1b6deae8c13130636d300e6cc15a2e7..93a361f21b6a2445df3f9985d5081b93bc1c6028 100644
--- a/device-types/Arista/CCS-720XP-48Y6.yaml
+++ b/device-types/Arista/CCS-720XP-48Y6.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: CCS-720XP-48Y6
-slug: ccs-720xp-48y6
+slug: arista-ccs-720xp-48y6
 part_number: CCS-720XP-48Y6
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/CCS-720XP-48ZC2.yaml b/device-types/Arista/CCS-720XP-48ZC2.yaml
index 3fce45affa5fe3566ebe16347ec09b29bab74ec4..a3e67019846cae16b46f274eeb80e6cbc41aa12d 100644
--- a/device-types/Arista/CCS-720XP-48ZC2.yaml
+++ b/device-types/Arista/CCS-720XP-48ZC2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: CCS-720XP-48ZC2
-slug: ccs-720xp-48zc2
+slug: arista-ccs-720xp-48zc2
 part_number: CCS-720XP-48ZC2
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/CCS-720XP-96ZC2.yaml b/device-types/Arista/CCS-720XP-96ZC2.yaml
index c57c91e43923ed90ee456c81ed8ffbb8e7edb7c2..bc33790d23987ba5c81c357c5894bf1deff7c76a 100644
--- a/device-types/Arista/CCS-720XP-96ZC2.yaml
+++ b/device-types/Arista/CCS-720XP-96ZC2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: CCS-720XP-96ZC2
-slug: ccs-720xp-96zc2
+slug: arista-ccs-720xp-96zc2
 part_number: CCS-720XP-96ZC2
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7010T-48.yaml b/device-types/Arista/DCS-7010T-48.yaml
index 38352348947260948a8cde7fc0ea7e75589ffa72..80ad535cc42a8f4a500ae9a75d996b29ce70af6a 100644
--- a/device-types/Arista/DCS-7010T-48.yaml
+++ b/device-types/Arista/DCS-7010T-48.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7010T-48
-slug: dcs-7010t-48
+slug: arista-dcs-7010t-48
 part_number: DCS-7010T-48
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7010TX-48.yaml b/device-types/Arista/DCS-7010TX-48.yaml
index 66095ec3d46c2dcfab64fc9638babfe9d6541c17..403dafa93c678304bbe312566e77cc380452138c 100644
--- a/device-types/Arista/DCS-7010TX-48.yaml
+++ b/device-types/Arista/DCS-7010TX-48.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7010TX-48
-slug: dcs-7010tx-48
+slug: arista-dcs-7010tx-48
 part_number: DCS-7010TX-48
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7020SR-24C2.yaml b/device-types/Arista/DCS-7020SR-24C2.yaml
index b0aba97cdad1d163de40c75cdb5b71a5e2783754..109e237d3523d7a84daec63775dd62ce01b4e911 100644
--- a/device-types/Arista/DCS-7020SR-24C2.yaml
+++ b/device-types/Arista/DCS-7020SR-24C2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7020SR-24C2
-slug: dcs-7020sr-24c2
+slug: arista-dcs-7020sr-24c2
 part_number: DCS-7020SR-24C2
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7020SR-32C2.yaml b/device-types/Arista/DCS-7020SR-32C2.yaml
index 73fb1f191462c917aefa26b8bcf91112e31d70d3..1b86f035a1c7c7c24cec98355eaf74dbd3a88211 100644
--- a/device-types/Arista/DCS-7020SR-32C2.yaml
+++ b/device-types/Arista/DCS-7020SR-32C2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7020SR-32C2
-slug: dcs-7020sr-32c2
+slug: arista-dcs-7020sr-32c2
 part_number: DCS-7020SR-32C2
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7020TR-48.yaml b/device-types/Arista/DCS-7020TR-48.yaml
index 9a278d933af53f147947a87ac90983bd828a03ac..0a7d6747df6a80cfebfb1973fbe5006ec7b8c42f 100644
--- a/device-types/Arista/DCS-7020TR-48.yaml
+++ b/device-types/Arista/DCS-7020TR-48.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7020TR-48
-slug: dcs-7020tr-48
+slug: arista-dcs-7020tr-48
 part_number: DCS-7020TR-48
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7048T-A.yaml b/device-types/Arista/DCS-7048T-A.yaml
index d0481d051bc4aaf43f6fb9aa6fa5f3c04d5f7e20..0416107db2f028dd11e58fdae73c07f8cba3ef0e 100644
--- a/device-types/Arista/DCS-7048T-A.yaml
+++ b/device-types/Arista/DCS-7048T-A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7048-T
-slug: dcs-7048-t
+slug: arista-dcs-7048-t
 is_full_depth: true
 u_height: 1
 interfaces:
diff --git a/device-types/Arista/DCS-7050CX3-32S.yaml b/device-types/Arista/DCS-7050CX3-32S.yaml
index 68d599a1f60d6fee4822f4e14e1cc44ca93f612a..0011354e3c82fe1e0e0fa52265b21da77a9c8995 100644
--- a/device-types/Arista/DCS-7050CX3-32S.yaml
+++ b/device-types/Arista/DCS-7050CX3-32S.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7050CX3-32S
-slug: dcs-7050cx3-32s
+slug: arista-dcs-7050cx3-32s
 part_number: DCS-7050CX3-32S
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7050QX-32S.yaml b/device-types/Arista/DCS-7050QX-32S.yaml
index 9c35305798639416e95e457c215082b8c2c0820c..2904148a7e0a774e1eed1f20ad4a7598ff42401f 100644
--- a/device-types/Arista/DCS-7050QX-32S.yaml
+++ b/device-types/Arista/DCS-7050QX-32S.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7050QX-32S
-slug: dcs-7050qx-32s
+slug: arista-dcs-7050qx-32s
 part_number: DCS-7050QX-32S
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7050S-52.yaml b/device-types/Arista/DCS-7050S-52.yaml
index 9bb4549b0c944f2485ecf8c7526129214acdf8fb..b374130282cbb656315b37f48d0762ffc1633ac0 100644
--- a/device-types/Arista/DCS-7050S-52.yaml
+++ b/device-types/Arista/DCS-7050S-52.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7050S-52
-slug: dcs-7050s-52
+slug: arista-dcs-7050s-52
 is_full_depth: true
 u_height: 1
 interfaces:
diff --git a/device-types/Arista/DCS-7050S-64.yaml b/device-types/Arista/DCS-7050S-64.yaml
index b71b1a51a76417618ac692a5b154a7ae0a63ad30..ec44d70d4869ad1840ef8d7673274d69a414ca8b 100644
--- a/device-types/Arista/DCS-7050S-64.yaml
+++ b/device-types/Arista/DCS-7050S-64.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7050S-64
-slug: dcs-7050s-64
+slug: arista-dcs-7050s-64
 is_full_depth: true
 u_height: 1
 interfaces:
diff --git a/device-types/Arista/DCS-7050SX-64.yaml b/device-types/Arista/DCS-7050SX-64.yaml
index c3cbd62b25127a7501c431a70189bc6d9de3c64f..c9d06a409f50d9d8093e1ed2fab400791b082d43 100644
--- a/device-types/Arista/DCS-7050SX-64.yaml
+++ b/device-types/Arista/DCS-7050SX-64.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7050SX-64
-slug: dcs-7050sx-64
+slug: arista-dcs-7050sx-64
 is_full_depth: true
 u_height: 1
 interfaces:
diff --git a/device-types/Arista/DCS-7050SX2-72Q.yaml b/device-types/Arista/DCS-7050SX2-72Q.yaml
index a5939154872165847ddeac0bc0ab4b2d87be43d3..80ffacd8af2f5a612bcfd05dbd48b4f8b3c6c2a7 100644
--- a/device-types/Arista/DCS-7050SX2-72Q.yaml
+++ b/device-types/Arista/DCS-7050SX2-72Q.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7050SX2-72Q
-slug: dcs-7050sx2-72q
+slug: arista-dcs-7050sx2-72q
 part_number: DCS-7050SX2-72Q
 is_full_depth: true
 u_height: 1
diff --git a/device-types/Arista/DCS-7050SX3-48YC12.yaml b/device-types/Arista/DCS-7050SX3-48YC12.yaml
index e3bb697e42f47d9cffef1ec7c0fa4cda0f4401b6..d1a12313c816d34902d64b284a5c4f4b6d677d2a 100644
--- a/device-types/Arista/DCS-7050SX3-48YC12.yaml
+++ b/device-types/Arista/DCS-7050SX3-48YC12.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7050SX3-48YC12
-slug: dcs-7050sx3-48yc12
+slug: arista-dcs-7050sx3-48yc12
 part_number: DCS-7050SX3-48YC12
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7050SX3-48YC8.yaml b/device-types/Arista/DCS-7050SX3-48YC8.yaml
index b7272527721e8b62ff84f9425ad5ba26383f8a24..744c3263f52a575ae616501c869ef562f58d1d55 100644
--- a/device-types/Arista/DCS-7050SX3-48YC8.yaml
+++ b/device-types/Arista/DCS-7050SX3-48YC8.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7050SX3-48YC8
-slug: dcs-7050sx3-48yc8
+slug: arista-dcs-7050sx3-48yc8
 part_number: DCS-7050SX3-48YC8
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7050T-52.yaml b/device-types/Arista/DCS-7050T-52.yaml
index 5cdfe39d7e3947e7568a8798d86004920a26bd4d..8cc4ebfabef15511a93c14b74ee34e45fbcc82b5 100644
--- a/device-types/Arista/DCS-7050T-52.yaml
+++ b/device-types/Arista/DCS-7050T-52.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7050T-52
-slug: dcs-7050t-52
+slug: arista-dcs-7050t-52
 is_full_depth: true
 u_height: 1
 interfaces:
diff --git a/device-types/Arista/DCS-7050T-64.yaml b/device-types/Arista/DCS-7050T-64.yaml
index 2cbea6793111c5b474ab032518092823212ef289..cccaac769e08c149a1f034681a9a1d816bf13ee1 100644
--- a/device-types/Arista/DCS-7050T-64.yaml
+++ b/device-types/Arista/DCS-7050T-64.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7050T-64
-slug: dcs-7050t-64
+slug: arista-dcs-7050t-64
 is_full_depth: true
 u_height: 1
 interfaces:
diff --git a/device-types/Arista/DCS-7050TX-48.yaml b/device-types/Arista/DCS-7050TX-48.yaml
index 4efa943fc18c2d2333d12cc08095bd5df3a072b5..723aad9945e48bb292019afac370add9c2e16eb2 100644
--- a/device-types/Arista/DCS-7050TX-48.yaml
+++ b/device-types/Arista/DCS-7050TX-48.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7050TX-48
-slug: dcs-7050tx-48
+slug: arista-dcs-7050tx-48
 part_number: DCS-7050TX-48
 is_full_depth: true
 u_height: 1
diff --git a/device-types/Arista/DCS-7050TX-72Q.yaml b/device-types/Arista/DCS-7050TX-72Q.yaml
index 59ea10af450ca71974f97f2fb07431975a2aceef..2f5731954070ab51525057aed4f904cf21e92299 100644
--- a/device-types/Arista/DCS-7050TX-72Q.yaml
+++ b/device-types/Arista/DCS-7050TX-72Q.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7050TX-72Q
-slug: dcs-7050tx-72q
+slug: arista-dcs-7050tx-72q
 is_full_depth: true
 u_height: 1
 interfaces:
diff --git a/device-types/Arista/DCS-7050TX3-48C8.yaml b/device-types/Arista/DCS-7050TX3-48C8.yaml
index 6e63418ec5df2548c156f8d213634640937941a0..e74b7e06b28790dea0e94138d6502deaf928e830 100644
--- a/device-types/Arista/DCS-7050TX3-48C8.yaml
+++ b/device-types/Arista/DCS-7050TX3-48C8.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7050TX3-48C8
-slug: dcs-7050tx3-48c8
+slug: arista-dcs-7050tx3-48c8
 part_number: DCS-7050TX3-48C8
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7060CX-32S.yaml b/device-types/Arista/DCS-7060CX-32S.yaml
index 946195b97eaa63d2dd7f04d24aa43182d22ebabb..26158e65ab3da854befb1d967e3bcf23d8f85e75 100644
--- a/device-types/Arista/DCS-7060CX-32S.yaml
+++ b/device-types/Arista/DCS-7060CX-32S.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7060CX-32S
-slug: dcs-7060cx-32s
+slug: arista-dcs-7060cx-32s
 part_number: DCS-7060CX-32S
 is_full_depth: true
 u_height: 1
diff --git a/device-types/Arista/DCS-7060CX2-32S.yaml b/device-types/Arista/DCS-7060CX2-32S.yaml
index 5eacdbab82adc53a2219af75b81a2817ec9eb426..cc8946591e68eea39bf960ea8485e0d1d367b1eb 100644
--- a/device-types/Arista/DCS-7060CX2-32S.yaml
+++ b/device-types/Arista/DCS-7060CX2-32S.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7060CX2-32S
-slug: dcs-7060cx2-32s
+slug: arista-dcs-7060cx2-32s
 is_full_depth: true
 u_height: 1
 interfaces:
diff --git a/device-types/Arista/DCS-7060DX4-32.yaml b/device-types/Arista/DCS-7060DX4-32.yaml
index ab1e21267571675ec359269da467842609548830..2738dd4c63fef97d16a8c6b3937f9ab19c6fbe80 100644
--- a/device-types/Arista/DCS-7060DX4-32.yaml
+++ b/device-types/Arista/DCS-7060DX4-32.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7060DX4-32
-slug: dcs-7060dx4-32
+slug: arista-dcs-7060dx4-32
 is_full_depth: true
 u_height: 1
 interfaces:
diff --git a/device-types/Arista/DCS-7060PX4-32.yaml b/device-types/Arista/DCS-7060PX4-32.yaml
index 72cf0606ae3311596b6a01f573f8132360483825..1679543bd940d92a9d81ebfd56d21924afd4aed8 100644
--- a/device-types/Arista/DCS-7060PX4-32.yaml
+++ b/device-types/Arista/DCS-7060PX4-32.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7060PX4-32
-slug: dcs-7060px4-32
+slug: arista-dcs-7060px4-32
 is_full_depth: true
 u_height: 1
 interfaces:
diff --git a/device-types/Arista/DCS-7060SX2-48YC6.yaml b/device-types/Arista/DCS-7060SX2-48YC6.yaml
index 5f111c7687bace5df02c58773d052776aced0792..9263629cf7280da09f3c6b0ebb32b9e5b1a19706 100644
--- a/device-types/Arista/DCS-7060SX2-48YC6.yaml
+++ b/device-types/Arista/DCS-7060SX2-48YC6.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7060SX2-48YC6
-slug: dcs-7060sx2-48yc6
+slug: arista-dcs-7060sx2-48yc6
 part_number: DCS-7060SX2-48YC6
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7124SX.yaml b/device-types/Arista/DCS-7124SX.yaml
index dc8fd0c5d21bce823a59696edfed36005c77bf98..fb7356b32927dcc07e34e65e82bd07ad87650c05 100644
--- a/device-types/Arista/DCS-7124SX.yaml
+++ b/device-types/Arista/DCS-7124SX.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7124SX
-slug: dcs-7124sx
+slug: arista-dcs-7124sx
 part_number: DCS-7124SX
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7148SX.yaml b/device-types/Arista/DCS-7148SX.yaml
index 6549222dfb02d203ee0f318fb7c0a9426529d369..e45245bc053ab394e9c7bfc27d398eb37a2af2c1 100644
--- a/device-types/Arista/DCS-7148SX.yaml
+++ b/device-types/Arista/DCS-7148SX.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7148SX
-slug: dcs-7148sx
+slug: arista-dcs-7148sx
 part_number: DCS-7148SX
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7150S-24.yaml b/device-types/Arista/DCS-7150S-24.yaml
index 9a7c8f31a0de89d1323395d5e303fbde36cc0672..972541a227179470fabb07f718b3a7dc7c74ec13 100644
--- a/device-types/Arista/DCS-7150S-24.yaml
+++ b/device-types/Arista/DCS-7150S-24.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7150S-24
-slug: dcs-7150s-24
+slug: arista-dcs-7150s-24
 part_number: DCS-7150S-24
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7150S-52.yaml b/device-types/Arista/DCS-7150S-52.yaml
index 24df92e9a5f4bc413e1d7c18f65231d0a194cc6b..653ca63d582c1e04171a377df8454c0662c06f51 100644
--- a/device-types/Arista/DCS-7150S-52.yaml
+++ b/device-types/Arista/DCS-7150S-52.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7150S-52
-slug: dcs-7150s-52
+slug: arista-dcs-7150s-52
 part_number: DCS-7150S-52
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7150S-64.yaml b/device-types/Arista/DCS-7150S-64.yaml
index 7e1db91a0936104364079313bd932f2dbd86d7fe..b8814e071d364d41be89dacc8e24fee99c7f6f9d 100644
--- a/device-types/Arista/DCS-7150S-64.yaml
+++ b/device-types/Arista/DCS-7150S-64.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7150S-64
-slug: dcs-7150s-64
+slug: arista-dcs-7150s-64
 part_number: DCS-7150S-64
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7150SC-24.yaml b/device-types/Arista/DCS-7150SC-24.yaml
index a8df4ab04b8daec96f72db07e2830b9263ef2c6d..d7aa3f2cdec4a0d73e25b0dfac148a34bd8b2438 100644
--- a/device-types/Arista/DCS-7150SC-24.yaml
+++ b/device-types/Arista/DCS-7150SC-24.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7150SC-24
-slug: dcs-7150sc-24
+slug: arista-dcs-7150sc-24
 part_number: DCS-7150SC-24
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7150SC-64.yaml b/device-types/Arista/DCS-7150SC-64.yaml
index 5cf4309a21ef7f3a5a1c67cb041e6fa5b9848a66..c3f80916f89125c156f2bed21169214339ede362 100644
--- a/device-types/Arista/DCS-7150SC-64.yaml
+++ b/device-types/Arista/DCS-7150SC-64.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7150SC-64
-slug: dcs-7150sc-64
+slug: arista-dcs-7150sc-64
 part_number: DCS-7150SC-64
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7260CX3-64-F.yaml b/device-types/Arista/DCS-7260CX3-64-F.yaml
index 4e9a5051248149617c52d33982bc4d1bd05bf9a3..128b0eccc7e34f3375b0e7a0ae39ed4b2b537855 100644
--- a/device-types/Arista/DCS-7260CX3-64-F.yaml
+++ b/device-types/Arista/DCS-7260CX3-64-F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7260CX3-64-F
-slug: dcs-7260cx3-64-f
+slug: arista-dcs-7260cx3-64-f
 part_number: DCS-7260CX3-64-F
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7280CR2-60.yaml b/device-types/Arista/DCS-7280CR2-60.yaml
index 1064b03e79bbd46f8832014d5056f7e40bdfc358..3fa04e1dc1a1d631f9e5ece0d1f9e567192d2d2e 100644
--- a/device-types/Arista/DCS-7280CR2-60.yaml
+++ b/device-types/Arista/DCS-7280CR2-60.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7280CR2-60
-slug: dcs-7280cr2-60
+slug: arista-dcs-7280cr2-60
 part_number: DCS-7280CR2-60
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Arista/DCS-7280CR2A-30.yaml b/device-types/Arista/DCS-7280CR2A-30.yaml
index dada2cff497031514fa2aa1b614b6d72739fffd3..10893b2ea3314a879e4f40050ba81fc047fa9e08 100644
--- a/device-types/Arista/DCS-7280CR2A-30.yaml
+++ b/device-types/Arista/DCS-7280CR2A-30.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7280CR2A-30
-slug: dcs-7280cr2a-30
+slug: arista-dcs-7280cr2a-30
 part_number: DCS-7280CR2A-30
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Arista/DCS-7280CR3-32D4.yaml b/device-types/Arista/DCS-7280CR3-32D4.yaml
index cd19e21042bfced5eab433cd7865f3a2aaeddf40..db794f2828539cd89388fc412bee99e0521dd476 100644
--- a/device-types/Arista/DCS-7280CR3-32D4.yaml
+++ b/device-types/Arista/DCS-7280CR3-32D4.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7280CR3-32D4
-slug: dcs-7280cr3-32d4
+slug: arista-dcs-7280cr3-32d4
 part_number: DCS-7280CR3-32D4
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Arista/DCS-7280CR3-32P4.yaml b/device-types/Arista/DCS-7280CR3-32P4.yaml
index 2cd5a24b62993fd8cbd3b1ba612e68eaada43606..1cde3304c8587a5178a33a0906a3e85b78b4b627 100644
--- a/device-types/Arista/DCS-7280CR3-32P4.yaml
+++ b/device-types/Arista/DCS-7280CR3-32P4.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7280CR3-32P4
-slug: dcs-7280cr3-32p4
+slug: arista-dcs-7280cr3-32p4
 part_number: DCS-7280CR3-32P4
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Arista/DCS-7280QR-C36.yaml b/device-types/Arista/DCS-7280QR-C36.yaml
index eff680ff5c68ecc1bdf7bbd3c350613c14295d1f..6119be3321225beecef7985a421c511ccaccb996 100644
--- a/device-types/Arista/DCS-7280QR-C36.yaml
+++ b/device-types/Arista/DCS-7280QR-C36.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7280QR-C36
-slug: dcs-7280qr-c36
+slug: arista-dcs-7280qr-c36
 part_number: DCS-7280QR-C36
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7280SR-48C6.yaml b/device-types/Arista/DCS-7280SR-48C6.yaml
index bb560bd9f01a0cea062e78fbd90d74964b78b1ea..3d152d246bd5710be51f954b388f45b7735bcf58 100644
--- a/device-types/Arista/DCS-7280SR-48C6.yaml
+++ b/device-types/Arista/DCS-7280SR-48C6.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7280SR-48C6
-slug: dcs-7280sr-48c6
+slug: arista-dcs-7280sr-48c6
 part_number: DCS-7280SR-48C6
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7280SR-48YC6.yaml b/device-types/Arista/DCS-7280SR-48YC6.yaml
index fdb0a54611017160b1311c0497f8abca67fe0178..723b9bfb40b0ec701716770171c165abb1a6282a 100644
--- a/device-types/Arista/DCS-7280SR-48YC6.yaml
+++ b/device-types/Arista/DCS-7280SR-48YC6.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7280SR-48YC6
-slug: dcs-7280sr-48yc6
+slug: arista-dcs-7280sr-48yc6
 part_number: DCS-7280SR-48YC6
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7280SR2-48YC6.yaml b/device-types/Arista/DCS-7280SR2-48YC6.yaml
index b7087974ee1210051fa5e15bc1c7adc13f2c4f3a..cafab69dae6eb8773d3221d18b08a35131a179d5 100644
--- a/device-types/Arista/DCS-7280SR2-48YC6.yaml
+++ b/device-types/Arista/DCS-7280SR2-48YC6.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7280SR2-48YC6
-slug: dcs-7280sr2-48yc6
+slug: arista-dcs-7280sr2-48yc6
 part_number: DCS-7280SR2-48YC6
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7280SR2K-48C6-M.yaml b/device-types/Arista/DCS-7280SR2K-48C6-M.yaml
index 874ece1ea24ebabce099858272f40ad077511b88..1cc0080c6ed74a2b0ba7b90b5d7ec0a52b1d6fbb 100644
--- a/device-types/Arista/DCS-7280SR2K-48C6-M.yaml
+++ b/device-types/Arista/DCS-7280SR2K-48C6-M.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7280SR2K-48C6-M
-slug: dcs-7280sr2k-48c6-m
+slug: arista-dcs-7280sr2k-48c6-m
 part_number: DCS-7280SR2K-48C6-M
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7280SR3-48YC8.yaml b/device-types/Arista/DCS-7280SR3-48YC8.yaml
index 68a5ae6ac7387b0b50daf7c8e99f5ce475e0271b..a0a64b8d4d01423644b81bce69a2d835149e91d1 100644
--- a/device-types/Arista/DCS-7280SR3-48YC8.yaml
+++ b/device-types/Arista/DCS-7280SR3-48YC8.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7280SR3-48YC8
-slug: dcs-7280sr3-48yc8
+slug: arista-dcs-7280sr3-48yc8
 part_number: DCS-7280SR3-48YC8
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7280SRA-48C6-M.yaml b/device-types/Arista/DCS-7280SRA-48C6-M.yaml
index 30245fdfcee17aa7316bf6822ade5c3b3a531ff7..a03953f76d87561fb62091e5a7cb22208626fad7 100644
--- a/device-types/Arista/DCS-7280SRA-48C6-M.yaml
+++ b/device-types/Arista/DCS-7280SRA-48C6-M.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7280SRA-48C6-M
-slug: dcs-7280sra-48c6-m
+slug: arista-dcs-7280sra-48c6-m
 part_number: DCS-7280SRA-48C6-M
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7280SRA-48C6.yaml b/device-types/Arista/DCS-7280SRA-48C6.yaml
index 0015544958695b0a965153d0e0f348cc359d5e6f..b345bcf66442efead565296244865c663d0568ba 100644
--- a/device-types/Arista/DCS-7280SRA-48C6.yaml
+++ b/device-types/Arista/DCS-7280SRA-48C6.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7280SRA-48C6
-slug: dcs-7280sra-48c6
+slug: arista-dcs-7280sra-48c6
 part_number: DCS-7280SRA-48C6
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7280TR-48C6.yaml b/device-types/Arista/DCS-7280TR-48C6.yaml
index a354e1a798dc0611145d2cde28f6ce2e94893ed7..8b86c6884c6f8dfdc6c07fc7d5b48ca3e01fabc5 100644
--- a/device-types/Arista/DCS-7280TR-48C6.yaml
+++ b/device-types/Arista/DCS-7280TR-48C6.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7280TR-48C6
-slug: dcs-7280tr-48c6
+slug: arista-dcs-7280tr-48c6
 part_number: DCS-7280TR-48C6
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7368.yaml b/device-types/Arista/DCS-7368.yaml
index a8970e2036dd4a088f7c7ef49ca695f0ddf649eb..698129f20a9383f2e4bf2f89a1d17529e144b9d8 100644
--- a/device-types/Arista/DCS-7368.yaml
+++ b/device-types/Arista/DCS-7368.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7368
-slug: dcs-7368
+slug: arista-dcs-7368
 part_number: DCS-7368
 u_height: 4
 is_full_depth: false
diff --git a/device-types/Arista/DCS-7508.yaml b/device-types/Arista/DCS-7508.yaml
index bd3c163b74238bebde166d89df6e4492c90d1d8d..3a3b0a52edafa01e69dcf29b7ee370de59a25c07 100644
--- a/device-types/Arista/DCS-7508.yaml
+++ b/device-types/Arista/DCS-7508.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7508
-slug: dcs-7508
+slug: arista-dcs-7508
 part_number: DCS-7508
 u_height: 11
 is_full_depth: false
diff --git a/device-types/Avocent/ACS16.yaml b/device-types/Avocent/ACS16.yaml
index bb24bb28aada224b2eb2207138e2b79ce68685fe..9d5b47d517c322893d214027e56cc09b2b88a080 100644
--- a/device-types/Avocent/ACS16.yaml
+++ b/device-types/Avocent/ACS16.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: ACS16
-slug: acs16
+slug: avocent-acs16
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Avocent/Cyclades-TS1000.yaml b/device-types/Avocent/Cyclades-TS1000.yaml
index eed929118f5828f5f095ea62e523315b41ff2a97..de34a96c1b452cfba9e7712dc8ded97c61ca1a32 100644
--- a/device-types/Avocent/Cyclades-TS1000.yaml
+++ b/device-types/Avocent/Cyclades-TS1000.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: Cyclades TS-1000
-slug: ts1000
+slug: avocent-cyclades-ts-1000
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Avocent/DSR2035.yaml b/device-types/Avocent/DSR2035.yaml
index ad7f601f1c54281c7a9d78d2ec7ae3dd50202b15..d7c053a5138e44ce2ee8a943e0c46a8316e68dad 100644
--- a/device-types/Avocent/DSR2035.yaml
+++ b/device-types/Avocent/DSR2035.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: DSR2035
-slug: dsr2035
+slug: avocent-dsr2035
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Avocent/DSRIQ-PS2.yaml b/device-types/Avocent/DSRIQ-PS2.yaml
index c107b7d87bac4ef601b80cfdd1d9a1cbb3d42371..2a8abd1d996fabfcf50ce4a42a03f3016f20bc75 100644
--- a/device-types/Avocent/DSRIQ-PS2.yaml
+++ b/device-types/Avocent/DSRIQ-PS2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: DSRIQ-PS2
-slug: dsriq-ps2
+slug: avocent-dsriq-ps2
 u_height: 0
 is_full_depth: false
 console-ports:
diff --git a/device-types/Avocent/DSRIQ-SRL.yaml b/device-types/Avocent/DSRIQ-SRL.yaml
index 0c1f5a17defd082fe863b58897c68229292a09b1..9fa97127abd7d3d8d78bb1045430593eba5ff389 100644
--- a/device-types/Avocent/DSRIQ-SRL.yaml
+++ b/device-types/Avocent/DSRIQ-SRL.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: DSRIQ-SRL
-slug: dsriq-srl
+slug: avocent-dsriq-srl
 u_height: 0
 is_full_depth: false
 console-ports:
diff --git a/device-types/Avocent/DSRIQ-USB.yaml b/device-types/Avocent/DSRIQ-USB.yaml
index f8f8fe0da6fea179aca3485cdd0209cfe01e9549..e25f06be22fd7a09a03d9c1177c722557c21d3ad 100644
--- a/device-types/Avocent/DSRIQ-USB.yaml
+++ b/device-types/Avocent/DSRIQ-USB.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: DSRIQ-USB
-slug: dsriq-usb
+slug: avocent-dsriq-usb
 u_height: 0
 is_full_depth: false
 console-ports:
diff --git a/device-types/Avocent/DSRIQ-VSN.yaml b/device-types/Avocent/DSRIQ-VSN.yaml
index c7893f1644bcde0c944ab37b9b0e62b7e44f843b..12e6b86fdb97975237a3eb6c223e90dded72f171 100644
--- a/device-types/Avocent/DSRIQ-VSN.yaml
+++ b/device-types/Avocent/DSRIQ-VSN.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: DSRIQ-VSN
-slug: dsriq-vsn
+slug: avocent-dsriq-vsn
 u_height: 0
 is_full_depth: false
 console-ports:
diff --git a/device-types/Avocent/PM10-15A.yaml b/device-types/Avocent/PM10-15A.yaml
index 0b6debcacc52516c2f928f80682cc03f918dc3c6..1301d0dc3bf21d7ce7c2786c399f87599c2a4e13 100644
--- a/device-types/Avocent/PM10-15A.yaml
+++ b/device-types/Avocent/PM10-15A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM10-15A
-slug: pm10_15a
+slug: avocent-pm10-15a
 u_height: 1
 is_full_depth: false
 comments: AlterPath PM10-15A
diff --git a/device-types/Avocent/PM10-20A.yaml b/device-types/Avocent/PM10-20A.yaml
index b03983285b237f626a44bf23f2dc40db75c4bc8e..b043c9fdb79b5b5a57c1b4b2defb48cf1b7ff7e8 100644
--- a/device-types/Avocent/PM10-20A.yaml
+++ b/device-types/Avocent/PM10-20A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM10-20A
-slug: pm10_20a
+slug: avocent-pm10-20a
 u_height: 1
 is_full_depth: false
 comments: AlterPath PM10-20A
diff --git a/device-types/Avocent/PM10-L20A.yaml b/device-types/Avocent/PM10-L20A.yaml
index f3b8b26b616607e3a3eed3466f80343771c05d3a..85962c111a9432aef0bc71e264a739307309bbca 100644
--- a/device-types/Avocent/PM10-L20A.yaml
+++ b/device-types/Avocent/PM10-L20A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM10-L20A
-slug: pm10_l20a
+slug: avocent-pm10-l20a
 u_height: 1
 is_full_depth: false
 comments: AlterPath PM10-L20A
diff --git a/device-types/Avocent/PM10-L30A.yaml b/device-types/Avocent/PM10-L30A.yaml
index 2e973447edf26c59a924c69465a70635272f248f..3c3a9bf8c77c825107159ddb2adcdcca1a9bce8f 100644
--- a/device-types/Avocent/PM10-L30A.yaml
+++ b/device-types/Avocent/PM10-L30A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM10-L30A
-slug: pm10_l30a
+slug: avocent-pm10-l30a
 u_height: 1
 is_full_depth: false
 comments: AlterPath PM10-L30A
diff --git a/device-types/Avocent/PM10i-10A.yaml b/device-types/Avocent/PM10i-10A.yaml
index 6a1cea44cd7972edb2a9360020537b6031c31ea6..139e57cd4874ad2a0252ca17f1a7ac0e880e33d9 100644
--- a/device-types/Avocent/PM10i-10A.yaml
+++ b/device-types/Avocent/PM10i-10A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM10i-10A
-slug: pm10i_10a
+slug: avocent-pm10i-10a
 u_height: 1
 is_full_depth: false
 comments: AlterPath PM10i-10A
diff --git a/device-types/Avocent/PM10i-15A.yaml b/device-types/Avocent/PM10i-15A.yaml
index e593104a19d590af350fdbf7c4c6e50e95966515..eb63543a29fca018d26076afabafa86237a16546 100644
--- a/device-types/Avocent/PM10i-15A.yaml
+++ b/device-types/Avocent/PM10i-15A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM10i-15A
-slug: pm10i_15a
+slug: avocent-pm10i-15a
 u_height: 1
 is_full_depth: false
 comments: AlterPath PM10i-15A
diff --git a/device-types/Avocent/PM10i-16A.yaml b/device-types/Avocent/PM10i-16A.yaml
index b7fa4ea63b855f3c47ba61211f44724c4e6556cd..af6835230dd45536ee863f7f0894bbd9d80dc80c 100644
--- a/device-types/Avocent/PM10i-16A.yaml
+++ b/device-types/Avocent/PM10i-16A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM10i-16A
-slug: pm10i_16a
+slug: avocent-pm10i-16a
 u_height: 1
 is_full_depth: false
 comments: AlterPath PM10i-16A
diff --git a/device-types/Avocent/PM10i-20A.yaml b/device-types/Avocent/PM10i-20A.yaml
index 7eba5de253946dd184c0ece11bebc29795d83a99..69d9d261dd633c3ac35f214ee6689c8a5a49582f 100644
--- a/device-types/Avocent/PM10i-20A.yaml
+++ b/device-types/Avocent/PM10i-20A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM10i-20A
-slug: pm10i_20a
+slug: avocent-pm10i-20a
 u_height: 1
 is_full_depth: false
 comments: AlterPath PM10i-20A
diff --git a/device-types/Avocent/PM10i-L30A.yaml b/device-types/Avocent/PM10i-L30A.yaml
index 6d1c6021f5d2ed5baf21eef37a706ad75156fa8a..43ce95c7ba4cf1fccaf0ed838c36b758e8c3f26b 100644
--- a/device-types/Avocent/PM10i-L30A.yaml
+++ b/device-types/Avocent/PM10i-L30A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM10i-L30A
-slug: pm10i_l30a
+slug: avocent-pm10i-l30a
 u_height: 1
 is_full_depth: false
 comments: AlterPath PM10i-L30A
diff --git a/device-types/Avocent/PM20-20A.yaml b/device-types/Avocent/PM20-20A.yaml
index 600ac2039be2cbb574112e208c3d01e045fc6afb..a636da9e2270d55025b85e70e45ad257ae3e1505 100644
--- a/device-types/Avocent/PM20-20A.yaml
+++ b/device-types/Avocent/PM20-20A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM20-20A
-slug: pm20_20a
+slug: avocent-pm20-20a
 u_height: 0
 is_full_depth: false
 comments: AlterPath PM20-20A
diff --git a/device-types/Avocent/PM20-L20A.yaml b/device-types/Avocent/PM20-L20A.yaml
index f11b7a20136226865140812d16883d970c8a0c0c..15249e1228cba13faf7b751c5e9744e51e5175bf 100644
--- a/device-types/Avocent/PM20-L20A.yaml
+++ b/device-types/Avocent/PM20-L20A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM20-L20A
-slug: pm20_l20a
+slug: avocent-pm20-l20a
 u_height: 0
 is_full_depth: false
 comments: AlterPath PM20-L20A
diff --git a/device-types/Avocent/PM20-L30A.yaml b/device-types/Avocent/PM20-L30A.yaml
index eedf7c73da5ae529625ccd18771e103ad7ff2474..efa4160baa840d83c723b086a6a2051974080850 100644
--- a/device-types/Avocent/PM20-L30A.yaml
+++ b/device-types/Avocent/PM20-L30A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM20-L30A
-slug: pm20_l30a
+slug: avocent-pm20-l30a
 u_height: 0
 is_full_depth: false
 comments: AlterPath PM20-L30A
diff --git a/device-types/Avocent/PM20i-16A.yaml b/device-types/Avocent/PM20i-16A.yaml
index 97330968717ed25fbf8b369720c7b5df2d49e14a..8485267638b16dddbb68b7e48282339506a1dd7b 100644
--- a/device-types/Avocent/PM20i-16A.yaml
+++ b/device-types/Avocent/PM20i-16A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM20i-16A
-slug: pm20i_16a
+slug: avocent-pm20i-16a
 u_height: 0
 is_full_depth: false
 comments: AlterPath PM20i-16A
diff --git a/device-types/Avocent/PM20i-20A.yaml b/device-types/Avocent/PM20i-20A.yaml
index 851bcec1a7ffd0b5f0c070948022cb66244050dd..66c1e33ce2a2d16a8b123a23570303cf371d8951 100644
--- a/device-types/Avocent/PM20i-20A.yaml
+++ b/device-types/Avocent/PM20i-20A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM20i-20A
-slug: pm20i_20a
+slug: avocent-pm20i-20a
 u_height: 0
 is_full_depth: false
 comments: AlterPath PM20i-20A
diff --git a/device-types/Avocent/PM20i-L30A.yaml b/device-types/Avocent/PM20i-L30A.yaml
index 9381e09450aa595ef93a53677b487bce254c02bd..0501a16e6f82fced5bfaa8291355fac74019763e 100644
--- a/device-types/Avocent/PM20i-L30A.yaml
+++ b/device-types/Avocent/PM20i-L30A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM20i-L30A
-slug: pm20i_l30a
+slug: avocent-pm20i-l30a
 u_height: 0
 is_full_depth: false
 comments: AlterPath PM20i-L30A
diff --git a/device-types/Avocent/PM3000.yaml b/device-types/Avocent/PM3000.yaml
index 4ff44195f163767f6b3f574a5446ea0e2a671126..71ddcfdef871a3cc2d3331db57c968c0a7b2dc5d 100755
--- a/device-types/Avocent/PM3000.yaml
+++ b/device-types/Avocent/PM3000.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM3000
-slug: pm3000
+slug: avocent-pm3000
 u_height: 0
 is_full_depth: false
 power-ports:
diff --git a/device-types/Avocent/PM3009H.yaml b/device-types/Avocent/PM3009H.yaml
index 090c81b59b5d7e2777c9c7658ee870235a3cb4cb..aa8c8b6066917b6c233c6ff6158cd06b5e858128 100644
--- a/device-types/Avocent/PM3009H.yaml
+++ b/device-types/Avocent/PM3009H.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Avocent
 model: PM3009H
-slug: pm3009h
+slug: avocent-pm3009h
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Brocade/fws624g.yaml b/device-types/Brocade/fws624g.yaml
index 0be548529855ff68100fd749e1924c16820a8a45..92aba870bbf10e5ce790b739ad4efb545186af66 100644
--- a/device-types/Brocade/fws624g.yaml
+++ b/device-types/Brocade/fws624g.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Brocade
 model: FastIron WS 624G
-slug: fws624g
+slug: brocade-fws624g
 part_number: FWS624G
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Brocade/fws648g.yaml b/device-types/Brocade/fws648g.yaml
index 088af73a325921eda789a51c8a08ddc7f5faed99..6f5a31dae3028f3b5837a4f355ee17cf3ef21495 100644
--- a/device-types/Brocade/fws648g.yaml
+++ b/device-types/Brocade/fws648g.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Brocade
 model: FastIron WS 648G
-slug: fws648g
+slug: brocade-fws648g
 part_number: FWS648G
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Brocade/icx6450-48.yaml b/device-types/Brocade/icx6450-48.yaml
index e99c3a239fca45216bf473eaa4485fe614d91fe2..070ff0e157980065aa688702d92ad9350a4e1487 100644
--- a/device-types/Brocade/icx6450-48.yaml
+++ b/device-types/Brocade/icx6450-48.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Brocade
 model: ICX 6450-48
-slug: icx6450-48
+slug: brocade-icx6450-48
 part_number: ICX6450-48
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Brocade/icx6610-24.yaml b/device-types/Brocade/icx6610-24.yaml
index e3ef8c0c540468ad9ec5c4de44a4a8b3c66205da..e6a4d6f8b3430249fdb6fcf0cc1eb7463773af1b 100644
--- a/device-types/Brocade/icx6610-24.yaml
+++ b/device-types/Brocade/icx6610-24.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Brocade
 model: ICX 6610-24
-slug: icx6610-24
+slug: brocade-icx6610-24
 part_number: ICX6610-24
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Brocade/icx6610-48.yaml b/device-types/Brocade/icx6610-48.yaml
index 5d625c01b45d3befc713c6ea3bfa08a9d185346d..768dcf6da3048f5f2c8a250b92f7f157a05eb421 100644
--- a/device-types/Brocade/icx6610-48.yaml
+++ b/device-types/Brocade/icx6610-48.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Brocade
 model: ICX 6610-48
-slug: icx6610-48
+slug: brocade-icx6610-48
 part_number: ICX6610-48
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Brocade/icx6610-48p.yaml b/device-types/Brocade/icx6610-48p.yaml
index d71b97c725e5fdcf5aad05faf9e1b15b2b8b67ca..51edf4d217a4f7fc4368efdd6f43ae7d9eddc752 100644
--- a/device-types/Brocade/icx6610-48p.yaml
+++ b/device-types/Brocade/icx6610-48p.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Brocade
 model: ICX 6610-48P
-slug: icx6610-48p
+slug: brocade-icx6610-48p
 part_number: ICX6610-48P
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Brocade/icx6650-64.yaml b/device-types/Brocade/icx6650-64.yaml
index 763698db5af574c0adafebe4e8ebcb38959ee647..4e590a8005ae17478a9aa3bc3ac8ce455ff6f96a 100644
--- a/device-types/Brocade/icx6650-64.yaml
+++ b/device-types/Brocade/icx6650-64.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Brocade
 model: ICX 6650-64
-slug: icx6650-64
+slug: brocade-icx6650-64
 part_number: ICX6650-64
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Brocade/icx7150-c12.yaml b/device-types/Brocade/icx7150-c12.yaml
index 83771c70225db923e15f945e47e033a649d8b4a8..35abc1a3f41b033fe952be0750f36fd6e4e89bc8 100644
--- a/device-types/Brocade/icx7150-c12.yaml
+++ b/device-types/Brocade/icx7150-c12.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Brocade
 model: ICX 7150-C12P
-slug: icx7150-c12p
+slug: brocade-icx7150-c12p
 part_number: ICX7150-C12P
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Brocade/icx7250-24.yaml b/device-types/Brocade/icx7250-24.yaml
index e7ba9c206f02ea003803c713e8158fc64e289060..5df498709c46f071e12dd2c3d5af8c08fe0603a3 100644
--- a/device-types/Brocade/icx7250-24.yaml
+++ b/device-types/Brocade/icx7250-24.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Brocade
 model: ICX 7250-24
-slug: icx7250-24
+slug: brocade-icx7250-24
 part_number: ICX7250-24
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Brocade/icx7250-48.yaml b/device-types/Brocade/icx7250-48.yaml
index 91be725e4c86f452e178fab7ec8398057a841e79..0de8c953134d94adb14a9cdbf6d5d87a8a895d5c 100644
--- a/device-types/Brocade/icx7250-48.yaml
+++ b/device-types/Brocade/icx7250-48.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Brocade
 model: ICX 7250-48
-slug: icx7250-48
+slug: brocade-icx7250-48
 part_number: ICX7250-48
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Brocade/icx7450-48.yaml b/device-types/Brocade/icx7450-48.yaml
index 99290b96d4d7bccc8652a8c7f1c83a2e0e18cb06..4b19a77890f955c7967d17aae1149ec2f3afe681 100644
--- a/device-types/Brocade/icx7450-48.yaml
+++ b/device-types/Brocade/icx7450-48.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Brocade
 model: ICX 7450-48
-slug: icx7450-48
+slug: brocade-icx7450-48
 part_number: ICX7450-48
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Calix/E7-2.yaml b/device-types/Calix/E7-2.yaml
index 24837aeb1cbc0438b3eef6173b04899eef448085..378d89d5c192caa9bb7a2d294a72579fda767df0 100644
--- a/device-types/Calix/E7-2.yaml
+++ b/device-types/Calix/E7-2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Calix
 model: E7-2
-slug: e7-2
+slug: calix-e7-2
 part_number: 000-00372
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Calix/E7-20.yaml b/device-types/Calix/E7-20.yaml
index b862c935667aa4a23f93cd985cdc1a88e918d21f..a80a22f350b9405ee80e16e86605944aef1203c5 100644
--- a/device-types/Calix/E7-20.yaml
+++ b/device-types/Calix/E7-20.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Calix
 model: E7-20
-slug: e7-20
+slug: calix-e7-20
 part_number: 100-02089
 u_height: 13
 is_full_depth: false
diff --git a/device-types/Canon/IR-ADV-C3520.yaml b/device-types/Canon/IR-ADV-C3520.yaml
index 80fe500ffa9d5cff89761ee833a0c8e5039bd706..240eb61f16aea3d34a8c2a1359b3b70a4317090f 100644
--- a/device-types/Canon/IR-ADV-C3520.yaml
+++ b/device-types/Canon/IR-ADV-C3520.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Canon
 model: imageRUNNER ADVANCE C3520
-slug: canon-ir-adv-c3520
+slug: canon-imagerunner-advance-c3520
 u_height: 0
 comments: '[Color Laser Multifunctional](https://oip.manual.canon/USRMA-3350-zz-CS-3500-enUV/)'
 power-ports:
diff --git a/device-types/Canon/IR-ADV-C3530-III.yaml b/device-types/Canon/IR-ADV-C3530-III.yaml
index fa0aa0c13e62e985867cd851b5035364b3e4821d..141f5b64ac97a69c52f362fd009e9e808a367373 100644
--- a/device-types/Canon/IR-ADV-C3530-III.yaml
+++ b/device-types/Canon/IR-ADV-C3530-III.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Canon
 model: imageRUNNER ADVANCE C3530 III
-slug: canon-ir-adv-c3530-iii
+slug: canon-imagerunner-advance-c3530-iii
 u_height: 0
 comments: '[Color Laser Multifunctional](https://oip.manual.canon/USRMA-3763-zz-CS-3500-enUS/)'
 power-ports:
diff --git a/device-types/Canon/IR-ADV-C3530.yaml b/device-types/Canon/IR-ADV-C3530.yaml
index 8e8056beba95c7a520a7e48a68920caaa7e5b17a..0048542877f2d0a1d4404706b078fc9872ac4c76 100644
--- a/device-types/Canon/IR-ADV-C3530.yaml
+++ b/device-types/Canon/IR-ADV-C3530.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Canon
 model: imageRUNNER ADVANCE C3530
-slug: canon-ir-adv-c3530
+slug: canon-imagerunner-advance-c3530
 u_height: 0
 comments: '[Color Laser Multifunctional](https://oip.manual.canon/USRMA-1814-zz-CS-3500-enUS/)'
 power-ports:
diff --git a/device-types/Canon/IR-ADV-C3720.yaml b/device-types/Canon/IR-ADV-C3720.yaml
index b929f8327bd120a02b4968ddd9d012b1d5344407..9e44f10708c66b7b87472cbac9432b24602c733b 100644
--- a/device-types/Canon/IR-ADV-C3720.yaml
+++ b/device-types/Canon/IR-ADV-C3720.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Canon
 model: imageRunner ADVANCE DX C3720
-slug: canon-ir-adv-c3720
+slug: canon-imagerunner-advance-dx-c3720
 u_height: 0
 comments: '[Color Laser Multifunctional](https://oip.manual.canon/USRMA-4706-zz-CS-3700-enUV)'
 power-ports:
diff --git a/device-types/Check Point/1500_3600_3800-RM-DUAL.yaml b/device-types/Check Point/1500_3600_3800-RM-DUAL.yaml
index 3ac5db1565d197a2771533cc0eea6d4a3c78869e..0de9c99d2d88bed27c4fd6ee1ee2ad40a0ebe6f6 100644
--- a/device-types/Check Point/1500_3600_3800-RM-DUAL.yaml	
+++ b/device-types/Check Point/1500_3600_3800-RM-DUAL.yaml	
@@ -1,10 +1,11 @@
 ---
 manufacturer: Check Point
-model: Rack Mount kit for the 1500, 3600 and 3800 Security Gateways
-slug: cpac-1500_3600_3800-rm-dual
+model: CPAC-1500/3600/3800-RM-DUAL
+slug: check-point-cpac-1500-3600-3800-rm-dual
 part_number: CPAC-1500/3600/3800-RM-DUAL
 u_height: 1
 is_full_depth: false
+comments: Rack Mount shelf for Single/Dual for 1500/ 3600/ 3800 desktop appliances
 subdevice_role: parent
 device-bays:
   - name: Left
diff --git a/device-types/Check Point/SG23800.yaml b/device-types/Check Point/SG23800.yaml
index 78f61e4dea189164ffce658fa4b8950e52e2c085..f4962bf8caeb0456ca077f276b303f90efc6e4f8 100644
--- a/device-types/Check Point/SG23800.yaml	
+++ b/device-types/Check Point/SG23800.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Check Point
 model: SG23800
-slug: cpap-sg23800
+slug: check-point-sg23800
 part_number: CPAP-SG23800
 u_height: 2.0
 is_full_depth: true
diff --git a/device-types/Check Point/SG3600.yaml b/device-types/Check Point/SG3600.yaml
index fa7ab6322d626622a72dad5d2d3cb62c49c2e70b..16c52a02693545c4abb673dce682c0f5f5cecd14 100644
--- a/device-types/Check Point/SG3600.yaml	
+++ b/device-types/Check Point/SG3600.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Check Point
 model: SG3600
-slug: sg3600
+slug: check-point-sg3600
 part_number: CPAP-SG3600-SNBT
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Check Point/SG6400.yaml b/device-types/Check Point/SG6400.yaml
index de1c28d4b9e61c9c52e114d7cc2ae9c51d0dbe13..850d5c4f6cf1a7e6a20740fddeb7bc3bd62b2522 100644
--- a/device-types/Check Point/SG6400.yaml	
+++ b/device-types/Check Point/SG6400.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Check Point
 model: SG6400
-slug: sg6400
+slug: check-point-sg6400
 part_number: CPAP-SG6400-SNBT
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Ciena/3926.yaml b/device-types/Ciena/3926.yaml
index 16b989ebc3cbad2e6c7b80fa11678f7afd0d3b35..bc85bcddbd7b20e43a146d2e9001082fa3e337bb 100644
--- a/device-types/Ciena/3926.yaml
+++ b/device-types/Ciena/3926.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ciena
 model: '3926'
-slug: '3926'
+slug: ciena-3926
 part_number: 170-3926-900
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ciena/3928.yaml b/device-types/Ciena/3928.yaml
index 88e5c7965745820ec6d8271c4488b9849234edc0..738f22ad81f0e4950de8ac3ae45e4a41af47ea3e 100644
--- a/device-types/Ciena/3928.yaml
+++ b/device-types/Ciena/3928.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ciena
 model: 3928AC
-slug: 3928ac
+slug: ciena-3928ac
 part_number: 170-3928-910
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ciena/3930.yaml b/device-types/Ciena/3930.yaml
index 48282c676087bbc3122a827515c98e7a110defaf..6549e5d57be85f46d6e845d2d2b29524177e0c65 100644
--- a/device-types/Ciena/3930.yaml
+++ b/device-types/Ciena/3930.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ciena
 model: '3930'
-slug: '3930'
+slug: ciena-3930
 part_number: 170-3930-900
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ciena/5142.yaml b/device-types/Ciena/5142.yaml
index 081ea4b6ce086125d2bbcbe3f86d13a21f141f8b..2373b2527c04e3813d61f8be7921dc2965ec9511 100644
--- a/device-types/Ciena/5142.yaml
+++ b/device-types/Ciena/5142.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ciena
 model: '5142'
-slug: '5142'
+slug: ciena-5142
 part_number: 170-5142-900
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ciena/5160.yaml b/device-types/Ciena/5160.yaml
index 58b5e4780d12ca8b243e3cf9b467d336d1e5cc12..d1fee300541998f5d636efd2068c1db7cdada903 100644
--- a/device-types/Ciena/5160.yaml
+++ b/device-types/Ciena/5160.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ciena
 model: '5160'
-slug: '5160'
+slug: ciena-5160
 part_number: 170-5160-900
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ciena/5170.yaml b/device-types/Ciena/5170.yaml
index 164a7416ed1940b3441fe001f9d4a2b003e3f97b..910d3be9c941ccbee70e7a1a825642fccf4a2e82 100644
--- a/device-types/Ciena/5170.yaml
+++ b/device-types/Ciena/5170.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ciena
 model: '5170'
-slug: '5170'
+slug: ciena-5170
 part_number: 170-5170-900
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Ciena/5171.yaml b/device-types/Ciena/5171.yaml
index 77355522af1134d58b7a025c0e0e424db9ad39e6..0eaddd190e27d86bf94c9caa64e0a314138b5b93 100644
--- a/device-types/Ciena/5171.yaml
+++ b/device-types/Ciena/5171.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ciena
 model: '5171'
-slug: '5171'
+slug: ciena-5171
 part_number: 170-5171-910
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Cisco/2951-K9.yaml b/device-types/Cisco/2951-K9.yaml
index 023926816b3beec95be63fc2c8e1b1697ef1b3f7..74a75b63880e0f4b1d53ce64b2f132995c3e711a 100644
--- a/device-types/Cisco/2951-K9.yaml
+++ b/device-types/Cisco/2951-K9.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: 2951 ISR
 part_number: CISCO2951/K9
-slug: cisco-2951-k9
+slug: cisco-2951-isr
 u_height: 2
 is_full_depth: true
 console-ports:
diff --git a/device-types/Cisco/C1000-48FP-4G-L.yaml b/device-types/Cisco/C1000-48FP-4G-L.yaml
index 91782395cd6d0610d3d50b386e04d8af29dc00e2..a2e0be0fe429f2a49f42c61cc1489f25e3915012 100644
--- a/device-types/Cisco/C1000-48FP-4G-L.yaml
+++ b/device-types/Cisco/C1000-48FP-4G-L.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Cisco
 model: C1000-48FP-4G-L
-slug: cisco-c1000-48f-4g-l
+slug: cisco-c1000-48fp-4g-l
 part_number: C1000-48FP-4G-L
 comments: '[Cisco Catalyst 1000 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-1000-series-switches/nb-06-cat1k-ser-switch-ds-cte-en.html)'
 u_height: 1
diff --git a/device-types/Cisco/C6807-XL.yaml b/device-types/Cisco/C6807-XL.yaml
index 222639e07406115456df839114e8509f8665f28a..b3245a133f5e7e30c0ac91a85532ad9a39a4380c 100644
--- a/device-types/Cisco/C6807-XL.yaml
+++ b/device-types/Cisco/C6807-XL.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: Catalyst 6807-XL
 part_number: C6807-XL
-slug: cisco-c6807_xl
+slug: cisco-catalyst-6807-xl
 u_height: 10
 is_full_depth: false
 console-ports:
diff --git a/device-types/Cisco/C7206VXR.yaml b/device-types/Cisco/C7206VXR.yaml
index b087502e041ceb57b103d43658cc19a186c30de5..dd57e3166b96a2f9b174e87f04e8ed04b115c335 100644
--- a/device-types/Cisco/C7206VXR.yaml
+++ b/device-types/Cisco/C7206VXR.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: 7206VXR
 part_number: CISCO7206VXR
-slug: cisco-c7206vxr
+slug: cisco-7206vxr
 u_height: 3
 is_full_depth: false
 console-ports:
diff --git a/device-types/Cisco/C9200L-48PL-4G.yaml b/device-types/Cisco/C9200L-48PL-4G.yaml
index e1a9f2a90b5b3263d6bbafecef391dd40c348f48..25122bc977bb09e06c248320cba10465255aa3e1 100644
--- a/device-types/Cisco/C9200L-48PL-4G.yaml
+++ b/device-types/Cisco/C9200L-48PL-4G.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: C9200L-48PL-4G
 part_number: C9200L-48PL-4G
-slug: cisco-c9200l-48lp-4g
+slug: cisco-c9200l-48pl-4g
 u_height: 1
 is_full_depth: false
 comments: '[Cisco Catalyst 9200 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9200-series-switches/nb-06-cat9200-ser-data-sheet-cte-en.html)'
diff --git a/device-types/Cisco/CDB-MNT-RACK5-C14.yaml b/device-types/Cisco/CDB-MNT-RACK5-C14.yaml
index fa0e4288e5d515d42582c0247c6c35e80c78c922..8ae729eca3166d0024a24ae6e3e030e9dd0a3345 100644
--- a/device-types/Cisco/CDB-MNT-RACK5-C14.yaml
+++ b/device-types/Cisco/CDB-MNT-RACK5-C14.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Cisco
 model: Catalyst Digital Building 5-slot Rack Mount
-slug: cisco-cdb-mnt-rack5-c14
+slug: cisco-catalyst-digital-building-5-slot-rack-mount
 part_number: CDB-MNT-RACK5-C14=
 u_height: 5
 is_full_depth: false
diff --git a/device-types/Cisco/CISCO3925.yaml b/device-types/Cisco/CISCO3925.yaml
index f40be92996a1173ff0f0ac5233098f0125417fee..3508f8347ba157df803bc585050a5611add3cb82 100644
--- a/device-types/Cisco/CISCO3925.yaml
+++ b/device-types/Cisco/CISCO3925.yaml
@@ -1,8 +1,8 @@
 ---
 manufacturer: Cisco
-model: CISCO3925-CHASSIS
+model: 3925-CHASSIS
 part_number: CISCO3925-CHASSIS
-slug: cisco-cisco3925
+slug: cisco-3925-chassis
 u_height: 3
 is_full_depth: true
 console-ports:
diff --git a/device-types/Cisco/CISCO7606-S.yaml b/device-types/Cisco/CISCO7606-S.yaml
index bc7845858ac8497fd4dd854c21bda4d824052b42..492de7fe1148e14539c0f814f98b144bb0d2d5fb 100644
--- a/device-types/Cisco/CISCO7606-S.yaml
+++ b/device-types/Cisco/CISCO7606-S.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Cisco
-model: CISCO7606-S
-slug: cisco-cisco7606-s
+model: 7606-S
+slug: cisco-7606-s
 part_number: CISCO7606-S
 u_height: 7
 is_full_depth: false
diff --git a/device-types/Cisco/CISCO7609-S.yaml b/device-types/Cisco/CISCO7609-S.yaml
index 5284ceaac00e3413c503fa12466445e53b7888af..f40881fb8bda6f4714548888fc08ab3847421fc8 100644
--- a/device-types/Cisco/CISCO7609-S.yaml
+++ b/device-types/Cisco/CISCO7609-S.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Cisco
-model: CISCO7609-S
-slug: cisco-cisco7609-s
+model: 7609-S
+slug: cisco-7609-s
 part_number: CISCO7609-S
 u_height: 21
 is_full_depth: false
diff --git a/device-types/Cisco/CS-500.yaml b/device-types/Cisco/CS-500.yaml
index 852b9271b4fa72a247f874d8ec4d1f75f92fc134..7fef40907dac45501782a964a7ed00f33ec220dc 100644
--- a/device-types/Cisco/CS-500.yaml
+++ b/device-types/Cisco/CS-500.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Cisco
 model: CS-500
-slug: cisco-cs500
+slug: cisco-cs-500
 u_height: 0
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8P.yaml b/device-types/Cisco/ISR1111-8P.yaml
index fec0fc7c34eb0e8bf61de40ba6d6310d0399cf30..51de53384037510ca46f598de10bdfd26693812d 100644
--- a/device-types/Cisco/ISR1111-8P.yaml
+++ b/device-types/Cisco/ISR1111-8P.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8P
 part_number: C1111-8P
-slug: cisco-isr1111
+slug: cisco-isr-1111-8p
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTEEA.yaml b/device-types/Cisco/ISR1111-8PLTEEA.yaml
index cd2c2d812c87523b26f039f5837b9b9bf941b1e6..b5c303f4d0eb64dfeac4565186a69c3b5422dffb 100644
--- a/device-types/Cisco/ISR1111-8PLTEEA.yaml
+++ b/device-types/Cisco/ISR1111-8PLTEEA.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTEEA
 part_number: C1111-8PLTEEA
-slug: cisco-isr1111-8plteae
+slug: cisco-isr-1111-8plteea
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTEEAWA.yaml b/device-types/Cisco/ISR1111-8PLTEEAWA.yaml
index 2322fc4d89484d5cfcefece0df11ce82f2829942..804ddc2951b51743b86aac92ff11a2530881112b 100644
--- a/device-types/Cisco/ISR1111-8PLTEEAWA.yaml
+++ b/device-types/Cisco/ISR1111-8PLTEEAWA.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTEEAWA
 part_number: C1111-8PLTEEAWA
-slug: cisco-isr1111-8plteeawa
+slug: cisco-isr-1111-8plteeawa
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTEEAWB.yaml b/device-types/Cisco/ISR1111-8PLTEEAWB.yaml
index 2dbe4bba77cfc6b0dd27e371326e1309ac9c01ee..477a7927974fcf6daf4d593b5a50a76598d6a73b 100644
--- a/device-types/Cisco/ISR1111-8PLTEEAWB.yaml
+++ b/device-types/Cisco/ISR1111-8PLTEEAWB.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTEEAWB
 part_number: C1111-8PLTEEAWB
-slug: cisco-isr1111-8plteeawb
+slug: cisco-isr-1111-8plteeawb
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTEEAWE.yaml b/device-types/Cisco/ISR1111-8PLTEEAWE.yaml
index eb9ca07f9702df92386565ee65faf625607db650..06cbeefb8a7b06ee6f34e7caa1fcae79118aebb7 100644
--- a/device-types/Cisco/ISR1111-8PLTEEAWE.yaml
+++ b/device-types/Cisco/ISR1111-8PLTEEAWE.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTEEAWE
 part_number: C1111-8PLTEEAWE
-slug: cisco-isr1111-8plteawe
+slug: cisco-isr-1111-8plteeawe
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTEEAWF.yaml b/device-types/Cisco/ISR1111-8PLTEEAWF.yaml
index 8d05f74c6e99cfb551533f17c4b719feffe6af3a..b5c26bf147b671f48802a3217eec2f2fce46d5b3 100644
--- a/device-types/Cisco/ISR1111-8PLTEEAWF.yaml
+++ b/device-types/Cisco/ISR1111-8PLTEEAWF.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTEEAWF
 part_number: C1111-8PLTEEAWF
-slug: cisco-isr1111-8plteeawf
+slug: cisco-isr-1111-8plteeawf
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTEEAWH.yaml b/device-types/Cisco/ISR1111-8PLTEEAWH.yaml
index 5dff41e33fce53596bddab647cbb74b52e2a6265..4a34adc54529b72838757c7f9ff5d47007897e13 100644
--- a/device-types/Cisco/ISR1111-8PLTEEAWH.yaml
+++ b/device-types/Cisco/ISR1111-8PLTEEAWH.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTEEAWH
 part_number: C1111-8PLTEEAWH
-slug: cisco-isr1111-8plteeawh
+slug: cisco-isr-1111-8plteeawh
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTEEAWN.yaml b/device-types/Cisco/ISR1111-8PLTEEAWN.yaml
index 9a9af69d3468a7d1420ea90622bbb0826be593bd..52baba7ff4aca816f6f2620f5b1fc0ee291bacc4 100644
--- a/device-types/Cisco/ISR1111-8PLTEEAWN.yaml
+++ b/device-types/Cisco/ISR1111-8PLTEEAWN.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTEEAWN
 part_number: C1111-8PLTEEAWN
-slug: cisco-isr1111-8plteeawn
+slug: cisco-isr-1111-8plteeawn
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTEEAWQ.yaml b/device-types/Cisco/ISR1111-8PLTEEAWQ.yaml
index 06b16b05c5a4cf6337ba730a4021f3f9f5ea288d..1177273d26869130c970aa2c7475280b04e3a8c0 100644
--- a/device-types/Cisco/ISR1111-8PLTEEAWQ.yaml
+++ b/device-types/Cisco/ISR1111-8PLTEEAWQ.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTEEAWQ
 part_number: C1111-8PLTEEAWQ
-slug: cisco-isr1111-8plteeawq
+slug: cisco-isr-1111-8plteeawq
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTEEAWR.yaml b/device-types/Cisco/ISR1111-8PLTEEAWR.yaml
index 4659e5c7c32684c1e21815000e0bc2cdb42f6755..a05a83cdf59c071cde545f1d091ec9e1dbf0e42c 100644
--- a/device-types/Cisco/ISR1111-8PLTEEAWR.yaml
+++ b/device-types/Cisco/ISR1111-8PLTEEAWR.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTEEAWR
 part_number: C1111-8PLTEEAWR
-slug: cisco-isr1111-8plteeawr
+slug: cisco-isr-1111-8plteeawr
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTEEAWZ.yaml b/device-types/Cisco/ISR1111-8PLTEEAWZ.yaml
index 591939bf89d17f7f32f17e1ce4b471c00e8cd510..2b7605c76ed2954650ffac1aea8044fd86b68dd8 100644
--- a/device-types/Cisco/ISR1111-8PLTEEAWZ.yaml
+++ b/device-types/Cisco/ISR1111-8PLTEEAWZ.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTEEAWZ
 part_number: C1111-8PLTEEAWZ
-slug: cisco-isr1111-8plteeawz
+slug: cisco-isr-1111-8plteeawz
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTELA.yaml b/device-types/Cisco/ISR1111-8PLTELA.yaml
index a310e3f58815b4b688de503e237a2e59db766a33..667ec295669ebe94fd022150d0812a6021133a21 100644
--- a/device-types/Cisco/ISR1111-8PLTELA.yaml
+++ b/device-types/Cisco/ISR1111-8PLTELA.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTELA
 part_number: C1111-8PLTELA
-slug: cisco-isr1111-8pltela
+slug: cisco-isr-1111-8pltela
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTELAWA.yaml b/device-types/Cisco/ISR1111-8PLTELAWA.yaml
index af058bf99c8d223f8f0eb39bfac6e4457c9fe6a7..d7e02709afab5565537d4ef019005ee2ec83350f 100644
--- a/device-types/Cisco/ISR1111-8PLTELAWA.yaml
+++ b/device-types/Cisco/ISR1111-8PLTELAWA.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTELAWA
 part_number: C1111-8PLTELAWA
-slug: cisco-isr1111-8pltelawa
+slug: cisco-isr-1111-8pltelawa
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTELAWB.yaml b/device-types/Cisco/ISR1111-8PLTELAWB.yaml
index 1ce6b4999d03cc689f2572f46d8287b1e22f4ccf..4df911d161ee9e8528ded22310c59a78c37b928e 100644
--- a/device-types/Cisco/ISR1111-8PLTELAWB.yaml
+++ b/device-types/Cisco/ISR1111-8PLTELAWB.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTELAWB
 part_number: C1111-8PLTELAWB
-slug: cisco-isr1111-8pltelawb
+slug: cisco-isr-1111-8pltelawb
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTELAWE.yaml b/device-types/Cisco/ISR1111-8PLTELAWE.yaml
index da349b6054f3423ef9eab1671fe76d01f58dd6cc..a9b62fc9dff1c9c1bd49aa5ffa95c5418c295108 100644
--- a/device-types/Cisco/ISR1111-8PLTELAWE.yaml
+++ b/device-types/Cisco/ISR1111-8PLTELAWE.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTELAWE
 part_number: C1111-8PLTELAWE
-slug: cisco-isr1111-8pltelawe
+slug: cisco-isr-1111-8pltelawe
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTELAWF.yaml b/device-types/Cisco/ISR1111-8PLTELAWF.yaml
index 69eacb81acde00209e975d33a0008fb1f63dafe0..7be46bc6f8edfd503e59a53ac6c91bb833cddfef 100644
--- a/device-types/Cisco/ISR1111-8PLTELAWF.yaml
+++ b/device-types/Cisco/ISR1111-8PLTELAWF.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTELAWF
 part_number: C1111-8PLTELAWF
-slug: cisco-isr1111-8pltelawf
+slug: cisco-isr-1111-8pltelawf
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTELAWH.yaml b/device-types/Cisco/ISR1111-8PLTELAWH.yaml
index 7b3dc6c28a575af74d0d923dd75a0ed83121b998..f1d82ec944d5ee801ea6563458e2c70b28c31ce9 100644
--- a/device-types/Cisco/ISR1111-8PLTELAWH.yaml
+++ b/device-types/Cisco/ISR1111-8PLTELAWH.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTELAWH
 part_number: C1111-8PLTELAWH
-slug: cisco-isr1111-8pltelawh
+slug: cisco-isr-1111-8pltelawh
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTELAWN.yaml b/device-types/Cisco/ISR1111-8PLTELAWN.yaml
index 52a1659b1ff114f0818d51410cfd89d5c1eeb3bc..e475d5e9edbeca540b775cc7db994d38b4f74003 100644
--- a/device-types/Cisco/ISR1111-8PLTELAWN.yaml
+++ b/device-types/Cisco/ISR1111-8PLTELAWN.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTELAWN
 part_number: C1111-8PLTELAWN
-slug: cisco-isr1111-8pltelawn
+slug: cisco-isr-1111-8pltelawn
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTELAWQ.yaml b/device-types/Cisco/ISR1111-8PLTELAWQ.yaml
index 4585bda0e5eb6c7ce8381f3da3ed779d03a0548f..c694172d1695eb6e0cbfabf34e337956b6e64a56 100644
--- a/device-types/Cisco/ISR1111-8PLTELAWQ.yaml
+++ b/device-types/Cisco/ISR1111-8PLTELAWQ.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTELAWQ
 part_number: C1111-8PLTELAWQ
-slug: cisco-isr1111-8pltelawq
+slug: cisco-isr-1111-8pltelawq
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTELAWR.yaml b/device-types/Cisco/ISR1111-8PLTELAWR.yaml
index a0069328e1784d50129cb361e785ad3a947bde50..67271ebca507a9b8eed2e6cf5210086f4bfe4bec 100644
--- a/device-types/Cisco/ISR1111-8PLTELAWR.yaml
+++ b/device-types/Cisco/ISR1111-8PLTELAWR.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTELAWR
 part_number: C1111-8PLTELAWR
-slug: cisco-isr1111-8pltelawr
+slug: cisco-isr-1111-8pltelawr
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PLTELAWZ.yaml b/device-types/Cisco/ISR1111-8PLTELAWZ.yaml
index fc4a1221358d99b2bc2c84ed02f1c9aaf688c455..1b0bd216397f5a250d2190e778384c09a84f2ea1 100644
--- a/device-types/Cisco/ISR1111-8PLTELAWZ.yaml
+++ b/device-types/Cisco/ISR1111-8PLTELAWZ.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PLTELAWZ
 part_number: C1111-8PLTELAWZ
-slug: cisco-isr1111-8pltelawz
+slug: cisco-isr-1111-8pltelawz
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PWA.yaml b/device-types/Cisco/ISR1111-8PWA.yaml
index 22f432dc1446de0ccb82f47b5df747f0a7e189d4..54aab5fa8497d195e302545900f8389d15a0c328 100644
--- a/device-types/Cisco/ISR1111-8PWA.yaml
+++ b/device-types/Cisco/ISR1111-8PWA.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PWA
 part_number: C1111-8PWA
-slug: cisco-isr1111-8pwa
+slug: cisco-isr-1111-8pwa
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PWB.yaml b/device-types/Cisco/ISR1111-8PWB.yaml
index 7aa37c55ea7f16678a23fa92843a3f7325739fd2..230138bbea7bde445f54e16ae64682c3ad0e014b 100644
--- a/device-types/Cisco/ISR1111-8PWB.yaml
+++ b/device-types/Cisco/ISR1111-8PWB.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PWB
 part_number: C1111-8PWB
-slug: cisco-isr1111-8pwb
+slug: cisco-isr-1111-8pwb
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PWE.yaml b/device-types/Cisco/ISR1111-8PWE.yaml
index 4e50c881d393038556df6b46dd2b63d8931baf8f..384a00104df054e30199bb45901a8a9e990dafc5 100644
--- a/device-types/Cisco/ISR1111-8PWE.yaml
+++ b/device-types/Cisco/ISR1111-8PWE.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PWE
 part_number: C1111-8PWE
-slug: cisco-isr1111-8pwe
+slug: cisco-isr-1111-8pwe
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PWF.yaml b/device-types/Cisco/ISR1111-8PWF.yaml
index 84498d74bd95314df8c89346170149d45603941c..26b4381fa7f603b7ace1610cbea3e20a4c40a6dd 100644
--- a/device-types/Cisco/ISR1111-8PWF.yaml
+++ b/device-types/Cisco/ISR1111-8PWF.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PWF
 part_number: C1111-8PWF
-slug: cisco-isr1111-8pwf
+slug: cisco-isr-1111-8pwf
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PWH.yaml b/device-types/Cisco/ISR1111-8PWH.yaml
index a71e0c65a796e946fc792e98a61d92cc26890844..e45c144aa0d5f2d7d1572fb70fc6c43e025bfe08 100644
--- a/device-types/Cisco/ISR1111-8PWH.yaml
+++ b/device-types/Cisco/ISR1111-8PWH.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PWH
 part_number: C1111-8PWH
-slug: cisco-isr1111-8pwh
+slug: cisco-isr-1111-8pwh
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PWN.yaml b/device-types/Cisco/ISR1111-8PWN.yaml
index 13c62519fa605e846bdc2902b4f4e4bfc5255b7b..360c36cae95dcca6410b1e245c43da78a42d6fdf 100644
--- a/device-types/Cisco/ISR1111-8PWN.yaml
+++ b/device-types/Cisco/ISR1111-8PWN.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PWN
 part_number: C1111-8PWN
-slug: cisco-isr1111-8pwn
+slug: cisco-isr-1111-8pwn
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PWQ.yaml b/device-types/Cisco/ISR1111-8PWQ.yaml
index e03d0225c809c175cf9d78a89a444a473ea78e5d..9c381a747fd7d61697840faee8c493e67f1ee3cb 100644
--- a/device-types/Cisco/ISR1111-8PWQ.yaml
+++ b/device-types/Cisco/ISR1111-8PWQ.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PWQ
 part_number: C1111-8PWQ
-slug: cisco-isr1111-8pwq
+slug: cisco-isr-1111-8pwq
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PWR.yaml b/device-types/Cisco/ISR1111-8PWR.yaml
index 73da783e76b43a018d3012c98f0de2e4c9a7cabe..438aecf36d8ad23b6e0a4168933e942fb173d436 100644
--- a/device-types/Cisco/ISR1111-8PWR.yaml
+++ b/device-types/Cisco/ISR1111-8PWR.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PWR
 part_number: C1111-8PWR
-slug: cisco-isr1111-8pwr
+slug: cisco-isr-1111-8pwr
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1111-8PWZy.yaml b/device-types/Cisco/ISR1111-8PWZy.yaml
index bdadd431974641fd6d4a526fad1f88e7a67e6328..6afd0309b15665f1e365912b5975d9a0ea46891e 100644
--- a/device-types/Cisco/ISR1111-8PWZy.yaml
+++ b/device-types/Cisco/ISR1111-8PWZy.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1111-8PWZ
 part_number: C1111-8PWZ
-slug: cisco-isr1111-8pwz
+slug: cisco-isr-1111-8pwz
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1121.yaml b/device-types/Cisco/ISR1121.yaml
index b702281d1389a218e58de9ba18bd274eb06ca7fa..8d8f679e99b0ef19d2302fccf0f8ac4d2d245d4f 100644
--- a/device-types/Cisco/ISR1121.yaml
+++ b/device-types/Cisco/ISR1121.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1121-8P
 part_number: C1121-8P
-slug: cisco-isr1121
+slug: cisco-isr-1121-8p
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/ISR1161-8P.yaml b/device-types/Cisco/ISR1161-8P.yaml
index b28f6eb18c87527c0a73ed6acff35816e8cd5b05..558ae1198a7981850b4b4a3d6961a90dfb783d51 100644
--- a/device-types/Cisco/ISR1161-8P.yaml
+++ b/device-types/Cisco/ISR1161-8P.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 model: ISR 1161-8P
 part_number: C1161-8P
-slug: cisco-isr1161-8p
+slug: cisco-isr-1161-8p
 u_height: 1
 is_full_depth: false
 interfaces:
diff --git a/device-types/Cisco/N3K-C3132Q-40GX.yaml b/device-types/Cisco/N3K-C3132Q-40GX.yaml
index a0907ef37a034de667a82d70443349b847729acd..0973cd7b7cf69cc906e300aa23277f4934d7ff3c 100644
--- a/device-types/Cisco/N3K-C3132Q-40GX.yaml
+++ b/device-types/Cisco/N3K-C3132Q-40GX.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Cisco
 model: Nexus 3132Q-40GX
-slug: cisco-n3k-c3132q-40gx
+slug: cisco-nexus-3132q-40gx
 part_number: s
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Cisco/N7K-7702.yaml b/device-types/Cisco/N7K-7702.yaml
index 54a52fa0d50b1ca195b936333083495b5477820b..548ab71598439b06e7f297c118976f17d40c315e 100644
--- a/device-types/Cisco/N7K-7702.yaml
+++ b/device-types/Cisco/N7K-7702.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Cisco
 model: N7K-7702
-slug: cisco-nexus-7702
+slug: cisco-n7k-7702
 part_number: N77-C7702
 u_height: 3
 is_full_depth: true
diff --git a/device-types/Cisco/WS-C2960+24PC-L.yaml b/device-types/Cisco/WS-C2960+24PC-L.yaml
index e601d7ba63600d546a7e2d513f14e0fed90c1891..823cb116780d1e82848fecc24c96b151ec02fd44 100644
--- a/device-types/Cisco/WS-C2960+24PC-L.yaml
+++ b/device-types/Cisco/WS-C2960+24PC-L.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Cisco
 model: Catalyst 2960+24PC-L
-slug: cisco-ws-c2960plus24pc-l
+slug: cisco-catalyst-2960-plus-24pc-l
 part_number: WS-C2960+24PC-L
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Cisco/WS-C2960+24TC-L.yaml b/device-types/Cisco/WS-C2960+24TC-L.yaml
index a1dee6cf9cba9fa5e97f661842468f114819859d..3110f4fb7ae055922729869738653114c77b480d 100644
--- a/device-types/Cisco/WS-C2960+24TC-L.yaml
+++ b/device-types/Cisco/WS-C2960+24TC-L.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Cisco
 model: Catalyst 2960+24TC-L
-slug: cisco-ws-c2960plus24tc-l
+slug: cisco-catalyst-2960-plus-24tc-l
 part_number: WS-C2960+24TC-L
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Cisco/WS-C2960+48TC-L.yaml b/device-types/Cisco/WS-C2960+48TC-L.yaml
index 80180b8869b94286580553084b31169fb689ece8..06c5f67b8127eb87cf87b82d52667f627e85d2a0 100644
--- a/device-types/Cisco/WS-C2960+48TC-L.yaml
+++ b/device-types/Cisco/WS-C2960+48TC-L.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Cisco
 model: Catalyst 2960+48TC-L
-slug: cisco-ws-c2960plus48tc-l
+slug: cisco-catalyst-2960-plus-48tc-l
 part_number: WS-C2960+48TC-L
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Cisco/WS-C3850-12X48U.yaml b/device-types/Cisco/WS-C3850-12X48U.yaml
index 7076100b83658813cffdc50445965446ebd51b5d..82562d34027f3ec924ff2ec968473e482a9b6c8c 100644
--- a/device-types/Cisco/WS-C3850-12X48U.yaml
+++ b/device-types/Cisco/WS-C3850-12X48U.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Cisco
 model: CATALYST 3850 48PT 12 MGIG+36 GIG UPOE
-slug: cisco-catalyst-3850-48pt-12-mgig36-gig-upoe
+slug: cisco-catalyst-3850-48pt-12-mgig-plus-36-gig-upoe
 part_number: WS-C3850-12X48U
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Cisco/WS-C4500X-16SFP+.yaml b/device-types/Cisco/WS-C4500X-16SFP+.yaml
index c923f8047dbf616277bd77c4f40eab57e14d9d45..600f3e9fbb2d8aa67f79270dec305186efb3b739 100644
--- a/device-types/Cisco/WS-C4500X-16SFP+.yaml
+++ b/device-types/Cisco/WS-C4500X-16SFP+.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Cisco
 model: Catalyst C4500X-16SFP+
-slug: cisco-ws-c4500x-16sfp_plus
+slug: cisco-catalyst-c4500x-16sfpp
 part_number: WS-C4500X-16SFP+
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Cisco/WS-C4500X-32SFP+.yaml b/device-types/Cisco/WS-C4500X-32SFP+.yaml
index 0be1442b1d776cf4a29fa4dcbb2b211e15bcb71b..1ae63e49be0c5742b1e7c5984b14a680d8310031 100644
--- a/device-types/Cisco/WS-C4500X-32SFP+.yaml
+++ b/device-types/Cisco/WS-C4500X-32SFP+.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Cisco
 model: Catalyst C4500X-32SFP+
-slug: cisco-ws-c4500x-32sfp_plus
+slug: cisco-catalyst-c4500x-32sfpp
 part_number: WS-C4500X-32SFP+
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Cisco/WS-C4507R+E.yaml b/device-types/Cisco/WS-C4507R+E.yaml
index de47c0018089bd68bf467d0c501c0bc5debeb6d4..04d1439fb9cd84020a9b99c94dee1d5ff08076f2 100644
--- a/device-types/Cisco/WS-C4507R+E.yaml
+++ b/device-types/Cisco/WS-C4507R+E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Cisco
 model: Catalyst C4507R+E
-slug: cisco-ws-c4507r_plus_e
+slug: cisco-catalyst-c4507r-plus-e
 part_number: WS-C4507R+E
 u_height: 11
 is_full_depth: true
diff --git a/device-types/Cisco/WS-C4510R+E.yaml b/device-types/Cisco/WS-C4510R+E.yaml
index 5604bd8cd06a9bd02a5140b60d94c11055210b61..d1b6cb97eb3004414bb89838275ef7105578519f 100644
--- a/device-types/Cisco/WS-C4510R+E.yaml
+++ b/device-types/Cisco/WS-C4510R+E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Cisco
 model: Catalyst C4510R+E
-slug: cisco-ws-c4510r_plus_e
+slug: cisco-catalyst-c4510r-plus-e
 part_number: WS-C4510R+E
 u_height: 14
 is_full_depth: true
diff --git a/device-types/Citrix/MPX-59xx.yaml b/device-types/Citrix/MPX-59xx.yaml
index 6d64bd2afedfb59bb122d390325b2f468639ff1f..1064159ccefe5e16e15ab43fa0840e20968c154c 100644
--- a/device-types/Citrix/MPX-59xx.yaml
+++ b/device-types/Citrix/MPX-59xx.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Citrix
 model: MPX-59xx
-slug: mpx-59xx
+slug: citrix-mpx-59xx
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/Citrix/SDX-14000.yaml b/device-types/Citrix/SDX-14000.yaml
index c1df6da47cfc507c1f01d60b63dc8e8612a3f4ca..5a25b0b9c2624beca502e9c160f7e3cc2bea3ef9 100644
--- a/device-types/Citrix/SDX-14000.yaml
+++ b/device-types/Citrix/SDX-14000.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Citrix
 model: SDX-14000
-slug: sdx-14000
+slug: citrix-sdx-14000
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/Colable/COL5141A.yaml b/device-types/Colable/COL5141A.yaml
index 86d197e6031027f01662879ec728d4831fc4bd8b..6a848ac7d86322dd4beb6fef0ee18e5dcab448ce 100644
--- a/device-types/Colable/COL5141A.yaml
+++ b/device-types/Colable/COL5141A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Colable
 model: COL5141S
-slug: col5141s
+slug: colable-col5141s
 u_height: 1
 is_full_depth: true
 comments: |
diff --git a/device-types/Corning/EDGE-01U-SP.yaml b/device-types/Corning/EDGE-01U-SP.yaml
index b93502be4a6e794405a6dc9c359ebd36c6a17e41..4b4aa30d7a380c0d1996db903db326754d6c74a3 100644
--- a/device-types/Corning/EDGE-01U-SP.yaml
+++ b/device-types/Corning/EDGE-01U-SP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Corning
 model: EDGE-01U-SP
-slug: edge-01u-sp
+slug: corning-edge-01u-sp
 part_number: EDGE-01U-SP
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Corning/EDGE-01U.yaml b/device-types/Corning/EDGE-01U.yaml
index f732f5597ec10b336051a1f3977a2e7df83b7ecb..9ac00a415152a75bd5d2e61bcb6e46ef6daa08c3 100644
--- a/device-types/Corning/EDGE-01U.yaml
+++ b/device-types/Corning/EDGE-01U.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Corning
 model: EDGE-01U
-slug: edge-01u
+slug: corning-edge-01u
 part_number: EDGE-01U
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Corning/EDGE-02U.yaml b/device-types/Corning/EDGE-02U.yaml
index a08632358a2c0b7115f91af65760a5bdba146d83..d1e449dfb51be89d9aa36b791d5140b795749a21 100644
--- a/device-types/Corning/EDGE-02U.yaml
+++ b/device-types/Corning/EDGE-02U.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Corning
 model: EDGE-02U
-slug: edge-02u
+slug: corning-edge-02u
 part_number: EDGE-02U
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Corning/EDGE-04U.yaml b/device-types/Corning/EDGE-04U.yaml
index c959043d797abad0347f810c396f6f1d45abf3ae..613004ccbf76352ae2ff1e1edaa933877aca9ac2 100644
--- a/device-types/Corning/EDGE-04U.yaml
+++ b/device-types/Corning/EDGE-04U.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Corning
 model: EDGE-04U
-slug: edge-04u
+slug: corning-edge-04u
 part_number: EDGE-04U
 u_height: 4
 is_full_depth: false
diff --git a/device-types/CryptoPro/NGATE-320.yaml b/device-types/CryptoPro/NGATE-320.yaml
index afc02232391366f450f2c83fd820527cbe19cef2..fea06bd865ffdfd472001c6eede5af9bc36161b7 100644
--- a/device-types/CryptoPro/NGATE-320.yaml
+++ b/device-types/CryptoPro/NGATE-320.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: CryptoPro
 model: NGATE-320
-slug: cp-ngate-320
+slug: cryptopro-ngate-320
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/CryptoPro/NGATE-600.yaml b/device-types/CryptoPro/NGATE-600.yaml
index 0d79f878d0701b1e2753ab90c9be722b2cbe418f..ac8c8025799fb08140ad43e823c6769e2ee28d1b 100644
--- a/device-types/CryptoPro/NGATE-600.yaml
+++ b/device-types/CryptoPro/NGATE-600.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: CryptoPro
 model: NGATE-600
-slug: cp-ngate-600
+slug: cryptopro-ngate-600
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/CyberPower/CPS1215RMS.yaml b/device-types/CyberPower/CPS1215RMS.yaml
index 9ca7a1088451bbfc7bdb6d16730629db378d007a..d011dab4eed2ba5eaa3817a08c68efb761aa5d12 100644
--- a/device-types/CyberPower/CPS1215RMS.yaml
+++ b/device-types/CyberPower/CPS1215RMS.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: CyberPower
 model: CPS1215RMS
-slug: cps1215rms
+slug: cyberpower-cps1215rms
 part_number: cps1215rms
 u_height: 1
 is_full_depth: false
diff --git a/device-types/CyberPower/OR1000LCDRM1U.yaml b/device-types/CyberPower/OR1000LCDRM1U.yaml
index adb9e52217aee3d64137419e225cb0df693fdae1..ccee0fd18c5aabcc951939628a4b31ef11e7f197 100644
--- a/device-types/CyberPower/OR1000LCDRM1U.yaml
+++ b/device-types/CyberPower/OR1000LCDRM1U.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: CyberPower
 model: OR1000LCDRM1U
-slug: or1000lcdrm1u
+slug: cyberpower-or1000lcdrm1u
 part_number: or1000lcdrm1u
 u_height: 1
 is_full_depth: true
diff --git a/device-types/CyberPower/OR1500LCDRTXL2U.yaml b/device-types/CyberPower/OR1500LCDRTXL2U.yaml
index 823c6f47c100dccf1b79931d6354beadc2608a1c..8569560901410477776247d3a98afb568a206d40 100644
--- a/device-types/CyberPower/OR1500LCDRTXL2U.yaml
+++ b/device-types/CyberPower/OR1500LCDRTXL2U.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: CyberPower
 model: OR1500LCDRTXL2U
-slug: or1500lcdrtxl2u
+slug: cyberpower-or1500lcdrtxl2u
 u_height: 2
 is_full_depth: true
 # comments: Smart App LCD 1500va UPS
diff --git a/device-types/CyberPower/OR2200LCDRT2U.yaml b/device-types/CyberPower/OR2200LCDRT2U.yaml
index 1d3f7144b2b6ab7147e3da438ef8f731f31265ac..f8cb802fc267becff795be66f353ec99de8edaff 100644
--- a/device-types/CyberPower/OR2200LCDRT2U.yaml
+++ b/device-types/CyberPower/OR2200LCDRT2U.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: CyberPower
 model: OR2200LCDRT2U
-slug: or2200lcdrt2u
+slug: cyberpower-or2200lcdrt2u
 u_height: 2
 is_full_depth: true
 # comments: Smart App LCD 2200va UPS
diff --git a/device-types/CyberPower/PDU15M2F12R.yaml b/device-types/CyberPower/PDU15M2F12R.yaml
index 2443071d61f9e28994215a6d834be24ccdfeb420..1590a66b707603c048816dd76d85188e5a418878 100644
--- a/device-types/CyberPower/PDU15M2F12R.yaml
+++ b/device-types/CyberPower/PDU15M2F12R.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: CyberPower
 model: PDU15M2F12R
-slug: pdu15m2f12r
+slug: cyberpower-pdu15m2f12r
 u_height: 1
 is_full_depth: false
 # comments: CyberPower PDU 1u, 14 outlet 15A 100-125V
diff --git a/device-types/CyberPower/cps1220rms.yaml b/device-types/CyberPower/cps1220rms.yaml
index 5812985433af691b222fd054401de71c5444bfd6..e8efcd5037119d127373a9c71f404adc6799fb4b 100644
--- a/device-types/CyberPower/cps1220rms.yaml
+++ b/device-types/CyberPower/cps1220rms.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: CyberPower
 model: CPS-1220RMS
-slug: cps-1220rms
+slug: cyberpower-cps-1220rms
 part_number: cps1220rms
 u_height: 1
 is_full_depth: false
diff --git a/device-types/CyberPower/cps1500pfclcd.yaml b/device-types/CyberPower/cps1500pfclcd.yaml
index 03ef82654c79d127e23ac6333c0c13219943f3f3..350f5e501182493889e98426c52b048827a5235c 100644
--- a/device-types/CyberPower/cps1500pfclcd.yaml
+++ b/device-types/CyberPower/cps1500pfclcd.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: CyberPower
 model: CP1500PFCLCD
-slug: cps1500pfclcd
+slug: cyberpower-cps1500pfclcd
 part_number: cps1500pfclcd
 #u_height: 2 # Free Standing
 is_full_depth: false
diff --git a/device-types/Datacom/DM4610-OLT-4GPON+4GX+2XS.yaml b/device-types/Datacom/DM4610-OLT-4GPON+4GX+2XS.yaml
index a96e7bfe55f062d2f145ca12d9b9bae2a9d37c2d..5a89b67be9ed5e0b5ab9199ac7122b1d28e89912 100644
--- a/device-types/Datacom/DM4610-OLT-4GPON+4GX+2XS.yaml
+++ b/device-types/Datacom/DM4610-OLT-4GPON+4GX+2XS.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Datacom
 model: DM4610 OLT 4GPON+4GX+2XS
-slug: dm4610_olt_4gpon-4gx-2xs
+slug: datacom-dm4610-olt-4gpon-plus-4gx-plus-2xs
 u_height: 1.0
 is_full_depth: true
 airflow: side-to-rear
diff --git a/device-types/Deciso/DEC2600.yaml b/device-types/Deciso/DEC2600.yaml
index fdeb9e7bba7257edf1801b395fb2e5d526307457..b0cda8ec9962344fa5ed8723c6652724ae43c716 100644
--- a/device-types/Deciso/DEC2600.yaml
+++ b/device-types/Deciso/DEC2600.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC2600
 part_number: DEC2600
-slug: dec2600
+slug: deciso-dec2600
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC2610.yaml b/device-types/Deciso/DEC2610.yaml
index 8f9903ebbdb97baf3774feb083eabcd40dbc138d..d5171846a3499d9a566b7323c41544de29589654 100644
--- a/device-types/Deciso/DEC2610.yaml
+++ b/device-types/Deciso/DEC2610.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC2610
 part_number: DEC2610
-slug: dec2610
+slug: deciso-dec2610
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC2630.yaml b/device-types/Deciso/DEC2630.yaml
index a7e482441baab5900d0979d8597c9cb8a0ef0758..540e4afec994167539e262cdaf555a5692d2d912 100644
--- a/device-types/Deciso/DEC2630.yaml
+++ b/device-types/Deciso/DEC2630.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC2630
 part_number: DEC2630
-slug: dec2630
+slug: deciso-dec2630
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC2640.yaml b/device-types/Deciso/DEC2640.yaml
index d12f58c75cf1d3bbd075839e979b8752c91ba8d8..09d14c3c9390cafbc4207c3f04548703af391a53 100644
--- a/device-types/Deciso/DEC2640.yaml
+++ b/device-types/Deciso/DEC2640.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC2640
 part_number: DEC2640
-slug: dec2640
+slug: deciso-dec2640
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC2650.yaml b/device-types/Deciso/DEC2650.yaml
index 3ce8d57ffcac943899422400eefa5bcd8c785514..755f914ac01617a2cb2ef4003fecb88ca92aed32 100644
--- a/device-types/Deciso/DEC2650.yaml
+++ b/device-types/Deciso/DEC2650.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC2650
 part_number: DEC2650
-slug: dec2650
+slug: deciso-dec2650
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC2685.yaml b/device-types/Deciso/DEC2685.yaml
index 161326a4b43349e4eda909dd0ba61ab3a9694aae..30e73c487f7a00833bc6fb73ca51f7a62a87789f 100644
--- a/device-types/Deciso/DEC2685.yaml
+++ b/device-types/Deciso/DEC2685.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC2685
 part_number: DEC2685
-slug: dec2685
+slug: deciso-dec2685
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC3840.yaml b/device-types/Deciso/DEC3840.yaml
index b994601fb91fa373504f174eaa8d0ee8088b2d3f..dceeff48a7bddc0de6a2e71ed2329c253b5bd0cc 100644
--- a/device-types/Deciso/DEC3840.yaml
+++ b/device-types/Deciso/DEC3840.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC3840
 part_number: DEC3840
-slug: dec3840
+slug: deciso-dec3840
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC3850.yaml b/device-types/Deciso/DEC3850.yaml
index 4dcddb00055a7ce4c2b3ec6aabe9c022f38d02fc..4d959dce297d418e14d76f7705591efc394277cb 100644
--- a/device-types/Deciso/DEC3850.yaml
+++ b/device-types/Deciso/DEC3850.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC3850
 part_number: DEC3850
-slug: dec3850
+slug: deciso-dec3850
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC3860.yaml b/device-types/Deciso/DEC3860.yaml
index 16d1a00e1d9f4e5d93fd670f2700370027fb0965..60f4663f4fada325360e4d242f153a3b70e8c07f 100644
--- a/device-types/Deciso/DEC3860.yaml
+++ b/device-types/Deciso/DEC3860.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC3860
 part_number: DEC3860
-slug: dec3860
+slug: deciso-dec3860
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC4020.yaml b/device-types/Deciso/DEC4020.yaml
index c38384cc66505cd78bb76d0b5250c80dedf276ee..57894f5d09584ca12b14ee4a06ff718975e64dfc 100644
--- a/device-types/Deciso/DEC4020.yaml
+++ b/device-types/Deciso/DEC4020.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC4020
 part_number: DEC4020
-slug: dec4020
+slug: deciso-dec4020
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC4040.yaml b/device-types/Deciso/DEC4040.yaml
index ccbc237316cfca19f6712defe6a18550f73e3dbb..1445e02c819abc21e66042f92921982e609a06b7 100644
--- a/device-types/Deciso/DEC4040.yaml
+++ b/device-types/Deciso/DEC4040.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC4040
 part_number: DEC4040
-slug: dec4040
+slug: deciso-dec4040
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC4610.yaml b/device-types/Deciso/DEC4610.yaml
index 3f3e75f1a0cabacd056576c7118dc4ca34e64675..383d25f152c64d3f24a4683df39e694a0c67b4ff 100644
--- a/device-types/Deciso/DEC4610.yaml
+++ b/device-types/Deciso/DEC4610.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC4610
 part_number: DEC4610
-slug: dec4610
+slug: deciso-dec4610
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC4620.yaml b/device-types/Deciso/DEC4620.yaml
index 39dda6c49e9c811074027e6dec534824f6eb6f16..449374ffd699efe1fd5408aafcf9c28ca7367f73 100644
--- a/device-types/Deciso/DEC4620.yaml
+++ b/device-types/Deciso/DEC4620.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC4620
 part_number: DEC4620
-slug: dec4620
+slug: deciso-dec4620
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC4630.yaml b/device-types/Deciso/DEC4630.yaml
index f5276486f1df47148c8baf6b54e506a2abe1acaf..c014a90be266f65231f0b694c06908351ec64d65 100644
--- a/device-types/Deciso/DEC4630.yaml
+++ b/device-types/Deciso/DEC4630.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC4630
 part_number: DEC4630
-slug: dec4630
+slug: deciso-dec4630
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC4640.yaml b/device-types/Deciso/DEC4640.yaml
index c3ce79e26e0d04d1b6d6ad2dfb2ab643d57ebe84..18732ed6062aa8cb03be9cacc76f1b05bb150af2 100644
--- a/device-types/Deciso/DEC4640.yaml
+++ b/device-types/Deciso/DEC4640.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC4640
 part_number: DEC4640
-slug: dec4640
+slug: deciso-dec4640
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC600.yaml b/device-types/Deciso/DEC600.yaml
index afd5b186cae416c9489efdf3e6569cc9bed44046..ec3b8ac07a40b0450c60b96ac26ca25ebded0b72 100644
--- a/device-types/Deciso/DEC600.yaml
+++ b/device-types/Deciso/DEC600.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC600
 part_number: DEC600
-slug: dec600
+slug: deciso-dec600
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC610.yaml b/device-types/Deciso/DEC610.yaml
index b08488331f472f43e8e637f21eb90cf860d5b000..f431c266278aeb298b36c399b6643423d276c3e3 100644
--- a/device-types/Deciso/DEC610.yaml
+++ b/device-types/Deciso/DEC610.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC610
 part_number: DEC610
-slug: dec610
+slug: deciso-dec610
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC620.yaml b/device-types/Deciso/DEC620.yaml
index a634452772d5fbf3044ca0edaa503aedb9ae30b9..cea78eb29c5866b1ae0f2be175e0ac44368dfa0c 100644
--- a/device-types/Deciso/DEC620.yaml
+++ b/device-types/Deciso/DEC620.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC620
 part_number: DEC620
-slug: dec620
+slug: deciso-dec620
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC630.yaml b/device-types/Deciso/DEC630.yaml
index 8eb8a257e8450cfaaa5df9a9cc74c74f247de039..c53af689fb689b86bc03e25f81a0a345ca0455b0 100644
--- a/device-types/Deciso/DEC630.yaml
+++ b/device-types/Deciso/DEC630.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC630
 part_number: DEC630
-slug: dec630
+slug: deciso-dec630
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC670.yaml b/device-types/Deciso/DEC670.yaml
index b9130114b7da9abc63ed05e44f5acdd9be1298b4..5f814ae0d14491a31d4437785e9889a02e2c7fad 100644
--- a/device-types/Deciso/DEC670.yaml
+++ b/device-types/Deciso/DEC670.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC670
 part_number: DEC670
-slug: dec670
+slug: deciso-dec670
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC690.yaml b/device-types/Deciso/DEC690.yaml
index c9bafe8a2fd5729d80535e576d4560d1197ddbb3..f32e29c4cefb6e40711f201d4338d016a4ac53ae 100644
--- a/device-types/Deciso/DEC690.yaml
+++ b/device-types/Deciso/DEC690.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC690
 part_number: DEC690
-slug: dec690
+slug: deciso-dec690
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC740.yaml b/device-types/Deciso/DEC740.yaml
index 5315e5434ffed6f7deb9f629e272f5df0d374af8..88d11ee1fd0d3539ea1c77a59db5c0f21b9a60ce 100644
--- a/device-types/Deciso/DEC740.yaml
+++ b/device-types/Deciso/DEC740.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC740
 part_number: DEC740
-slug: dec740
+slug: deciso-dec740
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC750.yaml b/device-types/Deciso/DEC750.yaml
index 6af6473d9251cb5936e9ce94817bbe2eb5f3b661..7bec3b95ac93bc57105745438673cc95310c4d91 100644
--- a/device-types/Deciso/DEC750.yaml
+++ b/device-types/Deciso/DEC750.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC750
 part_number: DEC750
-slug: dec750
+slug: deciso-dec750
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC840.yaml b/device-types/Deciso/DEC840.yaml
index a388c92b54ac5bf8ca97ef7de60c84f7b0aeb89d..520427db9e899cbf2ca6790e548289f188509331 100644
--- a/device-types/Deciso/DEC840.yaml
+++ b/device-types/Deciso/DEC840.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC840
 part_number: DEC840
-slug: dec840
+slug: deciso-dec840
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Deciso/DEC850.yaml b/device-types/Deciso/DEC850.yaml
index 02c9d6d625e6755aba434eac41ac14bd52a39bd1..13700c768a4ee1ae438b2019e5a68365941b7550 100644
--- a/device-types/Deciso/DEC850.yaml
+++ b/device-types/Deciso/DEC850.yaml
@@ -2,7 +2,7 @@
 manufacturer: Deciso
 model: DEC850
 part_number: DEC850
-slug: dec850
+slug: deciso-dec850
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Dell/49H29.yaml b/device-types/Dell/49H29.yaml
index 945218f81b7d4c55dae8865866c52aaa1b9912cd..61a707873f25366bbb5f96706d35c471ba3d3a99 100644
--- a/device-types/Dell/49H29.yaml
+++ b/device-types/Dell/49H29.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Dell
-model: 49H29
-slug: dell-controller-49h29
+model: 49H29 PowerVault ME SAS Controller
+slug: dell-49h29-powervault-me-sas-controller
 part_number: 49H29
 comments: SAS 4 Port Controller for use in the Dell ME4012, ME4024, and ME4084
 u_height: 0
diff --git a/device-types/Dell/DKMMLED185-207.yml b/device-types/Dell/DKMMLED185-207.yml
index ebd88e99de961a49f36e9d155bd20548de14558f..f20c8f925221d9bdee1cc9f6e765dda4348fb8f1 100644
--- a/device-types/Dell/DKMMLED185-207.yml
+++ b/device-types/Dell/DKMMLED185-207.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Dell
 model: DKMMLED185-207
-slug: dkmmled185-207
+slug: dell-dkmmled185-207
 part_number: A7485910
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Dell/DMPU2016-G01.yml b/device-types/Dell/DMPU2016-G01.yml
index b52b238dd4b5addde44c63519c20ce1c05937e30..2d72cf3ab18b55519da08bcb33648a663e3bc100 100644
--- a/device-types/Dell/DMPU2016-G01.yml
+++ b/device-types/Dell/DMPU2016-G01.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Dell
 model: DMPU2016-G01
-slug: dmpu2016-g01
+slug: dell-dmpu2016-g01
 part_number: A7485893
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Delta/PD1215-RM.yaml b/device-types/Delta/PD1215-RM.yaml
index f80308b1a9e223cbd906b151fb95c6e4f806c94d..76d983b4da789fce9b02a016d400a0a04709e29a 100644
--- a/device-types/Delta/PD1215-RM.yaml
+++ b/device-types/Delta/PD1215-RM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Delta
 model: PD1215-RM
-slug: pd1215-rm
+slug: delta-pd1215-rm
 comments: |
   Delta PD1215-RM 1U power distribution unit (PDU) with 12 NEMA 5-15P receptacles (2 front, 10 rear) from a single NEMA 5-15P plug
 
diff --git a/device-types/Digi/DigiCM_Console_Server-32p.yaml b/device-types/Digi/Digi-CM-32.yaml
similarity index 95%
rename from device-types/Digi/DigiCM_Console_Server-32p.yaml
rename to device-types/Digi/Digi-CM-32.yaml
index 5f1bc07c92edbcdb9b96e4d37e94fd0727f15241..6b7788d1326540cf2d013546d64f777c7c5a87ba 100644
--- a/device-types/Digi/DigiCM_Console_Server-32p.yaml
+++ b/device-types/Digi/Digi-CM-32.yaml
@@ -1,7 +1,8 @@
 ---
 manufacturer: Digi
-model: Digi CM Console Server 32 Port
-slug: digi_cm_32p
+model: Digi CM 32
+slug: digi-cm-32
+part_number: '70001908'
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Digi/DigiCM_Console_Server.yaml b/device-types/Digi/Digi-CM-48.yaml
similarity index 97%
rename from device-types/Digi/DigiCM_Console_Server.yaml
rename to device-types/Digi/Digi-CM-48.yaml
index 310235187a0077c73d1b2c6f2f09c8979a232a4d..b6c93ffd1db544dc4728e0ca2f75b4730f6ed5b1 100644
--- a/device-types/Digi/DigiCM_Console_Server.yaml
+++ b/device-types/Digi/Digi-CM-48.yaml
@@ -1,7 +1,8 @@
 ---
 manufacturer: Digi
-model: Digi CM Console Server
-slug: digi_cm
+model: Digi CM 48
+slug: digi-cm-48
+part_number: '70001949'
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Digital Loggers/smart_power_supply_pro.yaml b/device-types/Digital Loggers/smart_power_supply_pro.yaml
index b8f959ac6005eee049ed5831b4bfc06d7f6253cc..84ba50b6939f7d1c97b564225340065ab27c4286 100644
--- a/device-types/Digital Loggers/smart_power_supply_pro.yaml	
+++ b/device-types/Digital Loggers/smart_power_supply_pro.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Digital Loggers
 model: Smart Power Supply Pro
-slug: smart-power-supply-pro
+slug: digital-loggers-smart-power-supply-pro
 comments: '[Smart power supply Datasheet](https://www.digital-loggers.com/prospec.pdf)'
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Eaton/5PX2200IRT.yaml b/device-types/Eaton/5PX2200IRT.yaml
index 2d018b6995b6f9f4ebce4660fba628fc02e4bcc2..d27b36c0067230915e7300be9ce8f8bf15688c7d 100644
--- a/device-types/Eaton/5PX2200IRT.yaml
+++ b/device-types/Eaton/5PX2200IRT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Eaton
 model: 5PX2200IRT
-slug: 5px2200irt
+slug: eaton-5px2200irt
 part_number: 920-7374-00P
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Eaton/9PX3000iRT2U.yaml b/device-types/Eaton/9PX3000iRT2U.yaml
index 919e43353ff95786388cb66e89afaf1b77de69f6..7a4944aca782fa415ca578a4d6c58266ccbc2e0f 100644
--- a/device-types/Eaton/9PX3000iRT2U.yaml
+++ b/device-types/Eaton/9PX3000iRT2U.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Eaton
 model: 9PX 3000i RT 2U
-slug: eaton-9px3000irt2u
+slug: eaton-9px-3000i-rt-2u
 part_number: 9PX3000iRT2U
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Eaton/9PXEBM180.yaml b/device-types/Eaton/9PXEBM180.yaml
index b4a67bee77bc6fc97cc03275a02d55139ad7fabd..4fb487fb0ea087d8c6c46b439bd77acb5ab787d1 100644
--- a/device-types/Eaton/9PXEBM180.yaml
+++ b/device-types/Eaton/9PXEBM180.yaml
@@ -1,12 +1,12 @@
 ---
 manufacturer: Eaton
-model: 9PX Extended Battery Module 180
+model: 9PXEBM180
 slug: eaton-9pxebm180
 part_number: 9PXEBM180
 u_height: 3
 is_full_depth: true
 airflow: front-to-rear
-comments: 9PX 5-6kVA Series [Manual](https://www.eaton.com/content/dam/eaton/products/backup-power-ups-surge-it-power-distribution/backup-power-ups/eaton-9px-ups/eaton-9sx-9px-ups-5-6-kva-ebm-180v-installation-and-user-manual.pdf)
+comments: Eaton 9PX extended battery moduel (EBM), 180V, Rack/tower, 3U [Manual](https://www.eaton.com/content/dam/eaton/products/backup-power-ups-surge-it-power-distribution/backup-power-ups/eaton-9px-ups/eaton-9sx-9px-ups-5-6-kva-ebm-180v-installation-and-user-manual.pdf)
 interfaces:
   - name: Battery connector, top
     type: other
diff --git a/device-types/Eaton/9PXEBM72RT2U.yaml b/device-types/Eaton/9PXEBM72RT2U.yaml
index ae360b1fbe0396134b0af733388e2d497320b162..ec1225339a8eae165c86576bf0112e4c35c85df4 100644
--- a/device-types/Eaton/9PXEBM72RT2U.yaml
+++ b/device-types/Eaton/9PXEBM72RT2U.yaml
@@ -1,12 +1,12 @@
 ---
 manufacturer: Eaton
-model: 9PX Extended Battery Module, 72V
+model: 9PXEBM72RT2U
 slug: eaton-9pxebm72rt2u
 part_number: 9PXEBM72RT2U
 u_height: 2
 is_full_depth: true
 airflow: front-to-rear
-comments: 9PX 1-3kVA Series [Manual](https://www.eaton.com/content/dam/eaton/products/backup-power-ups-surge-it-power-distribution/backup-power-ups/eaton-9px-ups/eaton-9px-1-3kva-ups-manual.pdf)
+comments: Eaton 9PX EBM 2U 72V Sealed Lead Acid VRLA 9PXEBM72RT2U [Manual](https://www.eaton.com/content/dam/eaton/products/backup-power-ups-surge-it-power-distribution/backup-power-ups/eaton-9px-ups/eaton-9px-1-3kva-ups-manual.pdf)
 interfaces:
   - name: Battery connector, left
     type: other
diff --git a/device-types/Eaton/Tripp-Lite-PDUMH20HVAT.yaml b/device-types/Eaton/Tripp-Lite-PDUMH20HVAT.yaml
index d9f8153eac83a907bad712b8b07e385bc2d491cb..ab3011cebee661c3b20daee27295f4280ac58571 100644
--- a/device-types/Eaton/Tripp-Lite-PDUMH20HVAT.yaml
+++ b/device-types/Eaton/Tripp-Lite-PDUMH20HVAT.yaml
@@ -1,6 +1,6 @@
 ---
 manufacturer: Eaton
-model: PDUMH20HVAT
+model: Tripp Lite PDUMH20HVAT
 slug: eaton-tripp-lite-pdumh20hvat
 part_number: '037332156488'
 u_height: 1
diff --git a/device-types/Eaton/Tripp-Lite-SMART1500LCD.yaml b/device-types/Eaton/Tripp-Lite-SMART1500LCD.yaml
index 3366aea90f40366f5bc2149b73e9d09e34c57e1e..84851b06b44abb958e4507e3f4e55779b97fc37a 100644
--- a/device-types/Eaton/Tripp-Lite-SMART1500LCD.yaml
+++ b/device-types/Eaton/Tripp-Lite-SMART1500LCD.yaml
@@ -1,6 +1,6 @@
 ---
 manufacturer: Eaton
-model: SMART1500LCD
+model: Tripp Lite SMART1500LCD
 slug: eaton-tripp-lite-smart1500lcd
 part_number: '037332126146'
 u_height: 2
diff --git a/device-types/Edgecore/5812-54X-O-AC-B.yaml b/device-types/Edgecore/5812-54X-O-AC-B.yaml
index 447e8248e1d772e3a63bfd249cc78c5636f728ab..08f8cd038a4d2a10673e5c38b46211f634f3852b 100644
--- a/device-types/Edgecore/5812-54X-O-AC-B.yaml
+++ b/device-types/Edgecore/5812-54X-O-AC-B.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Edgecore
 model: 5812-54X-O-AC-B
-slug: 5812-54x-o-ac-b
+slug: edgecore-5812-54x-o-ac-b
 part_number: 5812-54X-O-AC-B
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Edgecore/5912-54X-O-AC-F.yaml b/device-types/Edgecore/5912-54X-O-AC-F.yaml
index 0233b971b10923af4cd70c6c3979218fbefeb6b5..c6a5f96f7b1ecf91248b50c9de881ee6fedb8248 100644
--- a/device-types/Edgecore/5912-54X-O-AC-F.yaml
+++ b/device-types/Edgecore/5912-54X-O-AC-F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Edgecore
 model: 5912-54X-O-AC-F
-slug: 5912-54x-o-ac-f
+slug: edgecore-5912-54x-o-ac-f
 part_number: 5912-54X-O-AC-F
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Edgecore/5912-54XM-O-AC-F.yaml b/device-types/Edgecore/5912-54XM-O-AC-F.yaml
index 13cbc892b89f30ae6fdf6b230374576b8ccaa219..44932819be7a17393109855815421da6e1bb2b3e 100644
--- a/device-types/Edgecore/5912-54XM-O-AC-F.yaml
+++ b/device-types/Edgecore/5912-54XM-O-AC-F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Edgecore
 model: 5912-54XM-O-AC-F
-slug: 5912-54xm-o-ac-f
+slug: edgecore-5912-54xm-o-ac-f
 part_number: 5912-54XM-O-AC-F
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Edgecore/7726-32X-O.yaml b/device-types/Edgecore/7726-32X-O.yaml
index bd571db57021de1c4ec22a098d8cce79364d476c..fe9768bae363f69b1a6b4cf1fbc19e4e511bb9cf 100755
--- a/device-types/Edgecore/7726-32X-O.yaml
+++ b/device-types/Edgecore/7726-32X-O.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Edgecore
 model: 7726-32X-O
-slug: 7726-32x-o
+slug: edgecore-7726-32x-o
 part_number: FP3ZZ7632xxxx
 u_height: 1.0
 is_full_depth: true
diff --git a/device-types/Eltex/MES3348.yml b/device-types/Eltex/MES3348.yml
index 6bdc6b6d9d86ce675308d81ea0897b5d92a90790..14284fbd49a2d1ca62eb797c924f6645f069ea11 100644
--- a/device-types/Eltex/MES3348.yml
+++ b/device-types/Eltex/MES3348.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Eltex
 model: MES3348
-slug: mes3348
+slug: eltex-mes3348
 part_number: MES3348
 is_full_depth: false
 u_height: 1
diff --git a/device-types/EnGenius/EWS5912FP.yaml b/device-types/EnGenius/EWS5912FP.yaml
index 034ea79aeb9cb366cb286f897eec3e83e22a5b98..5d1b0dbaf2b7694ff52a2551b60cdf3c0d458262 100644
--- a/device-types/EnGenius/EWS5912FP.yaml
+++ b/device-types/EnGenius/EWS5912FP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: EnGenius
 model: EWS5912FP
-slug: engenuis-ews5912fp
+slug: engenius-ews5912fp
 part_number: EWS5912FP
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ericsson/R6672.yml b/device-types/Ericsson/R6672.yml
index aa17256f90904d5d91d9c7f3382ef6035d2932c8..afcd6f9bfb82c1a01bfc7fcb6574952e30f7d618 100644
--- a/device-types/Ericsson/R6672.yml
+++ b/device-types/Ericsson/R6672.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ericsson
 model: R6672
-slug: r6672
+slug: ericsson-r6672
 part_number: R6672
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Extreme Networks/5520-24T.yaml b/device-types/Extreme Networks/5520-24T.yaml
index be5ae504bb18ca2873543f6b3f2c1f20d323168f..e660c376da06f6a10762e4bcd1ea2e9d3762b432 100644
--- a/device-types/Extreme Networks/5520-24T.yaml	
+++ b/device-types/Extreme Networks/5520-24T.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: 5520-24T
-slug: 5520-24t
+slug: extreme-networks-5520-24t
 part_number: 5520-24T
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Extreme Networks/715W_AC_PSU_FB.yaml b/device-types/Extreme Networks/715W_AC_PSU_FB.yaml
index b8f27a74337eda33c09c287d852bc237b1a099d8..d136ea894d05578750edf366dab4f96c461b094a 100644
--- a/device-types/Extreme Networks/715W_AC_PSU_FB.yaml	
+++ b/device-types/Extreme Networks/715W_AC_PSU_FB.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: 715W AC PSU FB
-slug: 715w-ac-psu-fb
+slug: extreme-networks-715w-ac-psu-fb
 part_number: '10951'
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Extreme Networks/BR-MLXE-16-MR2-M-AC.yaml b/device-types/Extreme Networks/BR-MLXE-16-MR2-M-AC.yaml
index 6e6581a0ff87d1917d6306b68a07125cb07cf483..e398fbfc33e658ab0d344e44de5a2a00481c3087 100755
--- a/device-types/Extreme Networks/BR-MLXE-16-MR2-M-AC.yaml	
+++ b/device-types/Extreme Networks/BR-MLXE-16-MR2-M-AC.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: BR-MLXE-16-MR2-AC
-slug: br-mlxe-16-mr2
+slug: extreme-networks-br-mlxe-16-mr2-ac
 part_number: BR-MLXE-16-MR2-AC
 u_height: 14
 is_full_depth: true
diff --git a/device-types/Extreme Networks/BR-MLXE-32-MR2-M-AC.yaml b/device-types/Extreme Networks/BR-MLXE-32-MR2-M-AC.yaml
index d80d9a79a3a76e01012dcd58f5ecda4c543caad9..22eae5b6469572f3cc3352a75fb1e989c0e55c34 100755
--- a/device-types/Extreme Networks/BR-MLXE-32-MR2-M-AC.yaml	
+++ b/device-types/Extreme Networks/BR-MLXE-32-MR2-M-AC.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: BR-MLXE-32-MR2-AC
-slug: br-mlxe-32-mr2
+slug: extreme-networks-br-mlxe-32-mr2-ac
 part_number: BR-MLXE-32-MR2-AC
 u_height: 33
 is_full_depth: true
diff --git a/device-types/Extreme Networks/BR-MLXE-4-MR2-M-AC.yaml b/device-types/Extreme Networks/BR-MLXE-4-MR2-M-AC.yaml
index 4a91e604570c62503464ea731b66332da92d10cd..8b39960b5c3cad1201ccc3b2634aa282768ed4bd 100755
--- a/device-types/Extreme Networks/BR-MLXE-4-MR2-M-AC.yaml	
+++ b/device-types/Extreme Networks/BR-MLXE-4-MR2-M-AC.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: BR-MLXE-4-MR2-AC
-slug: br-mlxe-4-mr2
+slug: extreme-networks-br-mlxe-4-mr2-ac
 part_number: BR-MLXE-4-MR2-AC
 u_height: 5
 is_full_depth: true
diff --git a/device-types/Extreme Networks/BR-MLXE-8-MR2-M-AC.yaml b/device-types/Extreme Networks/BR-MLXE-8-MR2-M-AC.yaml
index fc2d9a89365234109f4bf09b5ebd24d1a20d16a2..5d8e2edaf54af29184fae9d070f2d63eaf7d3c05 100755
--- a/device-types/Extreme Networks/BR-MLXE-8-MR2-M-AC.yaml	
+++ b/device-types/Extreme Networks/BR-MLXE-8-MR2-M-AC.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: BR-MLXE-8-MR2-AC
-slug: br-mlxe-8-mr2
+slug: extreme-networks-br-mlxe-8-mr2-ac
 part_number: BR-MLXE-8-MR2-AC
 u_height: 7
 is_full_depth: true
diff --git a/device-types/Extreme Networks/BR-SLX-9140-48V-AC.yaml b/device-types/Extreme Networks/BR-SLX-9140-48V-AC.yaml
index 3e698e72b6178a85c4ae0ee36fb32533b7a36795..c862632e5ac050690ef79c8390458eec7448c2e1 100755
--- a/device-types/Extreme Networks/BR-SLX-9140-48V-AC.yaml	
+++ b/device-types/Extreme Networks/BR-SLX-9140-48V-AC.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: BR-SLX-9140-48V
-slug: br-slx-9140-48v
+slug: extreme-networks-br-slx-9140-48v
 part_number: BR-SLX-9140-48V
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Extreme Networks/BR-SLX-9150-48XT-AC.yaml b/device-types/Extreme Networks/BR-SLX-9150-48XT-AC.yaml
index 69a14b97a48458d5b24e8897510045bf2b2be559..a01bb5e0fe4eb437a1c7aab9ac6e757189049d18 100755
--- a/device-types/Extreme Networks/BR-SLX-9150-48XT-AC.yaml	
+++ b/device-types/Extreme Networks/BR-SLX-9150-48XT-AC.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: BR-SLX-9150-48XT
-slug: br-slx-9150-48xt
+slug: extreme-networks-br-slx-9150-48xt
 part_number: BR-SLX-9150-48XT
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Extreme Networks/BR-SLX-9150-48Y-AC.yaml b/device-types/Extreme Networks/BR-SLX-9150-48Y-AC.yaml
index 1be074a504493efb02764825e331152e311f18d5..d2ac79f52a42a39eb7e99d8b56f8d43168b47264 100755
--- a/device-types/Extreme Networks/BR-SLX-9150-48Y-AC.yaml	
+++ b/device-types/Extreme Networks/BR-SLX-9150-48Y-AC.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: BR-SLX-9150-48Y
-slug: br-slx-9150-48y
+slug: extreme-networks-br-slx-9150-48y
 part_number: BR-SLX-9150-48Y
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Extreme Networks/BR-SLX-9240-32C-AC.yaml b/device-types/Extreme Networks/BR-SLX-9240-32C-AC.yaml
index 795851f567b3f791ca9e9a0d578f9d98bf910354..238eb8668ae0db57fc63470c6088246d4e4a5620 100755
--- a/device-types/Extreme Networks/BR-SLX-9240-32C-AC.yaml	
+++ b/device-types/Extreme Networks/BR-SLX-9240-32C-AC.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: BR-SLX-9240-32C
-slug: br-slx-9240-32c
+slug: extreme-networks-br-slx-9240-32c
 part_number: BR-SLX-9240-32C
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Extreme Networks/BR-SLX-9250-32C-AC.yaml b/device-types/Extreme Networks/BR-SLX-9250-32C-AC.yaml
index 4dc6597c4bdae925654db0a6d756323a19ddcd61..aac5eb902fecba73966b7ecf2eac36d0f1629d11 100755
--- a/device-types/Extreme Networks/BR-SLX-9250-32C-AC.yaml	
+++ b/device-types/Extreme Networks/BR-SLX-9250-32C-AC.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: BR-SLX-9250-32C
-slug: br-slx-9250-32c
+slug: extreme-networks-br-slx-9250-32c
 part_number: BR-SLX-9250-32C
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Extreme Networks/BR-SLX-9540-48S-AC.yaml b/device-types/Extreme Networks/BR-SLX-9540-48S-AC.yaml
index a4d6467fbccaaf6390b27f62a5c627792f3bc2a1..691b40a184b3c402a9b3e0fc72ecd7909f4fbed6 100755
--- a/device-types/Extreme Networks/BR-SLX-9540-48S-AC.yaml	
+++ b/device-types/Extreme Networks/BR-SLX-9540-48S-AC.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: BR-SLX-9540-48S
-slug: br-slx-9540-48s
+slug: extreme-networks-br-slx-9540-48s
 part_number: BR-SLX-9540-48S
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Extreme Networks/BR-SLX-9640-24S-12C-AC.yaml b/device-types/Extreme Networks/BR-SLX-9640-24S-12C-AC.yaml
index 3c3719f1fd304e1d56f93ae49cd718e912124b95..ae32bc15168cb5446cdc73a17f19f74a7936e790 100755
--- a/device-types/Extreme Networks/BR-SLX-9640-24S-12C-AC.yaml	
+++ b/device-types/Extreme Networks/BR-SLX-9640-24S-12C-AC.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: BR-SLX-9640-24S-12C
-slug: br-slx-9640-24s-12c
+slug: extreme-networks-br-slx-9640-24s-12c
 part_number: BR-SLX-9640-24S-12C
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Extreme Networks/BR-SLX-9740-40C-AC.yaml b/device-types/Extreme Networks/BR-SLX-9740-40C-AC.yaml
index 49d055df8c7a45807a13598d96f28da3e4f110b2..6df4e36a04272b74ee16f4b222b107299528c1e9 100755
--- a/device-types/Extreme Networks/BR-SLX-9740-40C-AC.yaml	
+++ b/device-types/Extreme Networks/BR-SLX-9740-40C-AC.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: BR-SLX-9740-40C
-slug: br-slx-9740-40c
+slug: extreme-networks-br-slx-9740-40c
 part_number: BR-SLX-9740-40C
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Extreme Networks/BR-SLX-9740-80C-AC.yaml b/device-types/Extreme Networks/BR-SLX-9740-80C-AC.yaml
index 5cb1291c2ca039a01ac63584b2ca250686c28a63..59949a640b5f30dfc75748e822e4e2b1324877ac 100755
--- a/device-types/Extreme Networks/BR-SLX-9740-80C-AC.yaml	
+++ b/device-types/Extreme Networks/BR-SLX-9740-80C-AC.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: BR-SLX-9740-80C
-slug: br-slx-9740-80c
+slug: extreme-networks-br-slx-9740-80c
 part_number: BR-SLX-9740-80C
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Extreme Networks/VSP-7400-48Y-8C.yaml b/device-types/Extreme Networks/VSP-7400-48Y-8C.yaml
index 55f943f601b196fd9c68499d57e15e394561074c..0a7c06e1d6cd66d78a18918ca9ba4424d1bd04b7 100644
--- a/device-types/Extreme Networks/VSP-7400-48Y-8C.yaml	
+++ b/device-types/Extreme Networks/VSP-7400-48Y-8C.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: VSP-7400-48Y-8C
-slug: vsp-7400-48y-8c
+slug: extreme-networks-vsp-7400-48y-8c
 part_number: VSP-7400-48Y-8C
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Extreme Networks/X440-G2-24p-10GE4.yaml b/device-types/Extreme Networks/X440-G2-24p-10GE4.yaml
index be9acd09b56f3e207b594767f1942f46b7c22cb4..33735077107891b8e5d51797cd855b85b38fe713 100644
--- a/device-types/Extreme Networks/X440-G2-24p-10GE4.yaml	
+++ b/device-types/Extreme Networks/X440-G2-24p-10GE4.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: X440-G2-24p-10GE4
-slug: x440-g2-24p-10ge4
+slug: extreme-networks-x440-g2-24p-10ge4
 part_number: '16533'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Extreme Networks/X440-G2-24t-10GE4.yaml b/device-types/Extreme Networks/X440-G2-24t-10GE4.yaml
index 0e58d18866048f24b1e67c54aae38eba551b4e9a..3f0cbb67c36432f18153a6e9863be0d646deec07 100644
--- a/device-types/Extreme Networks/X440-G2-24t-10GE4.yaml	
+++ b/device-types/Extreme Networks/X440-G2-24t-10GE4.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: X440-G2-24t-10GE4
-slug: x440-g2-24t-10ge4
+slug: extreme-networks-x440-g2-24t-10ge4
 part_number: '16532'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Extreme Networks/X440-G2-24x-10GE4.yaml b/device-types/Extreme Networks/X440-G2-24x-10GE4.yaml
index fffeac15c34d07a030c34c66078403e973ddb2c4..5e3511a2d8d2b6453c7c8400c3dbec2ce30f4185 100644
--- a/device-types/Extreme Networks/X440-G2-24x-10GE4.yaml	
+++ b/device-types/Extreme Networks/X440-G2-24x-10GE4.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: X440-G2-24x-10GE4
-slug: x440-g2-24x-10ge4
+slug: extreme-networks-x440-g2-24x-10ge4
 part_number: '16538'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Extreme Networks/X460-G2-24t-10GE4.yaml b/device-types/Extreme Networks/X460-G2-24t-10GE4.yaml
index 8e565ee0981131993214da31693599b2412d1ea1..a9322a246556a2e64801aee85773372bf01f0cd3 100644
--- a/device-types/Extreme Networks/X460-G2-24t-10GE4.yaml	
+++ b/device-types/Extreme Networks/X460-G2-24t-10GE4.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: X460-G2-24t-10GE4
-slug: x460-g2-24t-10ge4
+slug: extreme-networks-x460-g2-24t-10ge4
 part_number: '16701'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Extreme Networks/X460-G2-48p-10GE4.yaml b/device-types/Extreme Networks/X460-G2-48p-10GE4.yaml
index 534e03be6f1485424f890234e462842ac61afa45..cefa26b4a4df3a23cc4950b0a2f7554d8901fe61 100644
--- a/device-types/Extreme Networks/X460-G2-48p-10GE4.yaml	
+++ b/device-types/Extreme Networks/X460-G2-48p-10GE4.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: X460-G2-48p-10GE4
-slug: x460-g2-48p-10ge4
+slug: extreme-networks-x460-g2-48p-10ge4
 part_number: '16704'
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Extreme Networks/X460-G2_VIM-2x.yaml b/device-types/Extreme Networks/X460-G2_VIM-2x.yaml
index 0b95ad96608f0f449aa1ce9ad4b148eb5910679c..855e220c613eb7dca0b3b0dbb6addb8b25f8a99e 100644
--- a/device-types/Extreme Networks/X460-G2_VIM-2x.yaml	
+++ b/device-types/Extreme Networks/X460-G2_VIM-2x.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Extreme Networks
 model: X460-G2 VIM-2x
-slug: x460-g2-vim-2x
+slug: extreme-networks-x460-g2-vim-2x
 part_number: '16711'
 u_height: 0
 is_full_depth: false
diff --git a/device-types/F5/BIG-IP_3900.yaml b/device-types/F5/BIG-IP_3900.yaml
index 4d4c9f9b51158a584f425f5d78fb50033765c8a1..9e6ef819f082a34c149067ec55a02508fa5c8df8 100644
--- a/device-types/F5/BIG-IP_3900.yaml
+++ b/device-types/F5/BIG-IP_3900.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: F5
 model: BIG-IP 3900
-slug: big-ip-3900
+slug: f5-big-ip-3900
 part_number: '3900'
 u_height: 1
 is_full_depth: true
diff --git a/device-types/F5/BIG-IP_4200v.yaml b/device-types/F5/BIG-IP_4200v.yaml
index 37c33974e02f22518c877b6bcc1df26c5b7f8781..cd2743491ab7e8de10b4d182dc61876e996d7fb0 100644
--- a/device-types/F5/BIG-IP_4200v.yaml
+++ b/device-types/F5/BIG-IP_4200v.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: F5
 model: BIG-IP 4200v
-slug: big-ip-4200v
+slug: f5-big-ip-4200v
 part_number: 4200v
 u_height: 1
 is_full_depth: true
diff --git a/device-types/F5/BIG-IP_5200v.yaml b/device-types/F5/BIG-IP_5200v.yaml
index 4a88eea7c2b0ed98d0c895a8e92a1d186a987bf1..a7eaf45bf6c9b94657ee8800d3497f54761200e0 100644
--- a/device-types/F5/BIG-IP_5200v.yaml
+++ b/device-types/F5/BIG-IP_5200v.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: F5
 model: BIG-IP 5200v
-slug: big-ip-5200v
+slug: f5-big-ip-5200v
 part_number: 5200v
 u_height: 1
 is_full_depth: true
diff --git a/device-types/F5/BIG-IP_5250v.yaml b/device-types/F5/BIG-IP_5250v.yaml
index cb1e604e03bb5ff9e8e127698d8087d3d0d0a64c..6c790bb5b23ada62f8fa791bc7e0e3793f29a928 100644
--- a/device-types/F5/BIG-IP_5250v.yaml
+++ b/device-types/F5/BIG-IP_5250v.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: F5
 model: BIG-IP 5250v
-slug: big-ip-5250v
+slug: f5-big-ip-5250v
 part_number: 5250v
 u_height: 1
 is_full_depth: true
diff --git a/device-types/F5/BIG-IP_VPR-C2400.yaml b/device-types/F5/BIG-IP_VPR-C2400.yaml
index ce98c39f62e6b11c324c7c4bce3192aba8d59a6f..a25ce75bd04cd19f332fd7b948bd7f3dad8e614e 100644
--- a/device-types/F5/BIG-IP_VPR-C2400.yaml
+++ b/device-types/F5/BIG-IP_VPR-C2400.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: F5
 model: BIG-IP VPR-C2400
-slug: big-ip-vpr-c2400
+slug: f5-big-ip-vpr-c2400
 part_number: VPR-C2400
 u_height: 4
 is_full_depth: true
diff --git a/device-types/F5/BIG-IP_i2600.yaml b/device-types/F5/BIG-IP_i2600.yaml
index 74d78be5695bd96fec67cd8c00f2512f2f75053a..b3041e9f2cce46e4685d64d2b2928218c7f586eb 100644
--- a/device-types/F5/BIG-IP_i2600.yaml
+++ b/device-types/F5/BIG-IP_i2600.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: F5
 model: BIG-IP i2600
-slug: big-ip-i2600
+slug: f5-big-ip-i2600
 part_number: i2600
 u_height: 1
 is_full_depth: true
diff --git a/device-types/F5/BIG-IP_i2800.yaml b/device-types/F5/BIG-IP_i2800.yaml
index 6d1cb10d2617060795ff558e7c1486b323501510..3d0832213e929cffb17cc98e64853906b44cfebc 100644
--- a/device-types/F5/BIG-IP_i2800.yaml
+++ b/device-types/F5/BIG-IP_i2800.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: F5
 model: BIG-IP i2800
-slug: big-ip-i2800
+slug: f5-big-ip-i2800
 part_number: i2800
 u_height: 1
 is_full_depth: true
diff --git a/device-types/F5/BIG-IP_i4600.yaml b/device-types/F5/BIG-IP_i4600.yaml
index d8df66cd2c9620416ddc3fa06096f9138d914998..d3295c40bff4364b24ca7abaca9ad437fb2f7cfa 100644
--- a/device-types/F5/BIG-IP_i4600.yaml
+++ b/device-types/F5/BIG-IP_i4600.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: F5
 model: BIG-IP i4600
-slug: big-ip-i4600
+slug: f5-big-ip-i4600
 part_number: i4600
 u_height: 1
 is_full_depth: true
diff --git a/device-types/F5/BIG-IP_i4800.yaml b/device-types/F5/BIG-IP_i4800.yaml
index 0698b64bba7cd531afa9845ac251183af2f13e72..21a58302e8c2da1282a5209d6ecabde7f639a644 100644
--- a/device-types/F5/BIG-IP_i4800.yaml
+++ b/device-types/F5/BIG-IP_i4800.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: F5
 model: BIG-IP i4800
-slug: big-ip-i4800
+slug: f5-big-ip-i4800
 part_number: i4800
 u_height: 1
 is_full_depth: true
diff --git a/device-types/F5/BIG-IP_i5800.yaml b/device-types/F5/BIG-IP_i5800.yaml
index 5aaa1a663dcaabc3dbcb2684d2cf4b4d9c3a1d5d..9145b85ab2872788a67a57830dcd36a394909151 100644
--- a/device-types/F5/BIG-IP_i5800.yaml
+++ b/device-types/F5/BIG-IP_i5800.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: F5
 model: BIG-IP i5800
-slug: big-ip-i5800
+slug: f5-big-ip-i5800
 part_number: i5800
 u_height: 1
 is_full_depth: true
diff --git a/device-types/FS/FHD-1UFCE.yaml b/device-types/FS/FHD-1UFCE.yaml
index ba1b6c0e63486082e89e2b0d83e754e3f4a2a818..533fc036cd4816d203a1c5f8eaf7e6fdf3905467 100644
--- a/device-types/FS/FHD-1UFCE.yaml
+++ b/device-types/FS/FHD-1UFCE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: FHD-1UFCE
-slug: fhd1ufce
+slug: fs-fhd-1ufce
 comments: FHD High Density 1U Rack Mount Enclosure Unloaded, Sliding Drawer, Holds up to 4 x FHD Cassettes or Panels, 144 Fibers (LC)
 part_number: FHD-1UFCE (#70361)
 u_height: 1
diff --git a/device-types/FS/FHD-2UFCE.yaml b/device-types/FS/FHD-2UFCE.yaml
index c19d2affd832cec3406191850e95edf44e249351..3d4638f8d2810e36f0c73a0ee790e175a70ff644 100644
--- a/device-types/FS/FHD-2UFCE.yaml
+++ b/device-types/FS/FHD-2UFCE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: FHD-2UFCE
-slug: fhd2ufce
+slug: fs-fhd-2ufce
 comments: FHD High Density 2U Rack Mount Enclosure Unloaded, Sliding Drawer, Holds up to 8 x FHD Cassettes or Panels, 288 Fibers (LC)
 part_number: FHD-2UFCE (#73205)
 u_height: 2
diff --git a/device-types/FS/FHD-FPP5DRL.yml b/device-types/FS/FHD-FPP5DRL.yml
index 123cef0ff9b70710b3df3ddc7112db9409558199..bb740e1b3f8f642c48c23c7598399b1919e9d726 100644
--- a/device-types/FS/FHD-FPP5DRL.yml
+++ b/device-types/FS/FHD-FPP5DRL.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: FHD-FPP5DRL
-slug: fhdfpp5drl
+slug: fs-fhd-fpp5drl
 comments: FHD High Density 1U Rack Mount Blank Enclosure Unloaded, Detachable Cable Management Lacer Panel and Bar, Holds up to 4 x FHD Cassettes or Panels,
   144 Fibers (LC)
 part_number: FHD-FPP5DRL (#72910)
diff --git a/device-types/FS/FHU-FPP48FLCSMF.yaml b/device-types/FS/FHU-FPP48FLCSMF.yaml
index 3896a2016956231ec21e3b4cb879fbef806b22a8..bafef774da4c042828d4f82043f442e02b393537 100644
--- a/device-types/FS/FHU-FPP48FLCSMF.yaml
+++ b/device-types/FS/FHU-FPP48FLCSMF.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: FHU-FPP48FLCSMF
-slug: fhu-fpp48flcsmf
+slug: fs-fhu-fpp48flcsmf
 part_number: FHU-FPP48FLCSMF (#35530)
 u_height: 1.0
 is_full_depth: true
diff --git a/device-types/FS/FHX-1UFSP.yaml b/device-types/FS/FHX-1UFSP.yaml
index e5de6cffbe0bcc8506f3017dee4f4e4285ae2996..d7f2bad52675de1105336c1a7e956951c1bc2668 100644
--- a/device-types/FS/FHX-1UFSP.yaml
+++ b/device-types/FS/FHX-1UFSP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: FHX-1UFSP
-slug: fhx1ufsp
+slug: fs-fhx-1ufsp
 comments: 1U 144 Fibers Rack Mount FHX Ultra HD Fiber Enclosure Unloaded, Holds up to 12x FHX MTP-12 Cassettes or Panels
 part_number: FHX-1UFSP (#68911) (discontinued)
 u_height: 1
diff --git a/device-types/FS/FMU-1UFMX-N.yaml b/device-types/FS/FMU-1UFMX-N.yaml
index b6560d180494f1ba817b4025403a303c1e3c4f2d..8e107417a086edd4b91cb03cfdc2a80f72ebcdaf 100644
--- a/device-types/FS/FMU-1UFMX-N.yaml
+++ b/device-types/FS/FMU-1UFMX-N.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: FMU-1UFMX-N
-slug: fmu-1ufmx-n
+slug: fs-fmu-1ufmx-n
 comments: FMU 2-Slot 1U Rack-Chassis
 part_number: FMU-1UFMX-N
 u_height: 1
diff --git a/device-types/FS/FMU-C182761M.yaml b/device-types/FS/FMU-C182761M.yaml
index 7c23b5497f0468d7e4f99715c9792550b6340139..6992ff3e3341126fb8dc97dfd6bc74440f7df6eb 100644
--- a/device-types/FS/FMU-C182761M.yaml
+++ b/device-types/FS/FMU-C182761M.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: FMU-C182761M
-slug: fmu-c182761m
+slug: fs-fmu-c182761m
 part_number: FMU-C182761M
 u_height: 1
 is_full_depth: false
diff --git a/device-types/FS/FMU-D402160M.yaml b/device-types/FS/FMU-D402160M.yaml
index b8744f12e36b278197044741314e3139f1aa38bf..b1e02c1b034c7a9a2061a28371981681c5257beb 100644
--- a/device-types/FS/FMU-D402160M.yaml
+++ b/device-types/FS/FMU-D402160M.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: FMU-D402160M
-slug: fmu-d402160m
+slug: fs-fmu-d402160m
 part_number: FMU-D402160M
 u_height: 1
 is_full_depth: false
diff --git a/device-types/FS/FMU-MC042733.yaml b/device-types/FS/FMU-MC042733.yaml
index 17d79671697a509b33f38b7a099ea2bd5f0a5ef4..332ec18b9efb2b0fb5d05c7503772e3ea6151498 100644
--- a/device-types/FS/FMU-MC042733.yaml
+++ b/device-types/FS/FMU-MC042733.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: FMU-MC042733
-slug: fmu-mc042733
+slug: fs-fmu-mc042733
 comments: '[4 Channels 1270-1330nm, LC/UPC, Dual Fiber, Low Insertion Loss CWDM Mux Demux, FMU Plug-in Module](https://www.fs.com/products/42972.html)'
 part_number: '42972'
 u_height: 0
diff --git a/device-types/FS/FMU-MC082745.yaml b/device-types/FS/FMU-MC082745.yaml
index ace1cbcb88923dae6350b52b89e070232d40a1fb..01f44a4989e242ae43f288a40afa6f991347af66 100644
--- a/device-types/FS/FMU-MC082745.yaml
+++ b/device-types/FS/FMU-MC082745.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: FMU-MC082745
-slug: fmu-mc082745
+slug: fs-fmu-mc082745
 comments: 8Ch CWDM MUX 1270-1450 (Skip 1390,1410)
 part_number: '42937'
 u_height: 0
diff --git a/device-types/FS/FMU-MC084761EM3.yaml b/device-types/FS/FMU-MC084761EM3.yaml
index 578e4013d8fc5f4ab06eb3f2c0dae8f96c051f73..322e2b897f44be152c116db17e24cbd056564e44 100644
--- a/device-types/FS/FMU-MC084761EM3.yaml
+++ b/device-types/FS/FMU-MC084761EM3.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: FMU-MC084761EM3
-slug: fmu-mc084761em3
+slug: fs-fmu-mc084761em3
 comments: '[8ch Dual Fiber 1470-1610nm CWDM Mux Demux + Monitor, Expansion and 1310nm Port END OF SALE](https://www.fs.com/products/72428.html)'
 part_number: '72428'
 u_height: 0
diff --git a/device-types/FS/FMU-MD085360EM3.yaml b/device-types/FS/FMU-MD085360EM3.yaml
index 23d0b200eaddbf26eceb5ffee073a0f4f353093f..1bcce4e56ebb35477f410dea126f9fd81bf66a0c 100644
--- a/device-types/FS/FMU-MD085360EM3.yaml
+++ b/device-types/FS/FMU-MD085360EM3.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: FMU-MD085360EM3
-slug: fmu-md085360em3
+slug: fs-fmu-md085360em3
 part_number: FMU-MD085360EM3
 u_height: 0
 is_full_depth: false
diff --git a/device-types/FS/N5860-48SC.yaml b/device-types/FS/N5860-48SC.yaml
index ac2331a5ec7901374779b15815b4a5d6d7f7c9b0..ae16ec957cd1260948a5031a14549d50b6659258 100644
--- a/device-types/FS/N5860-48SC.yaml
+++ b/device-types/FS/N5860-48SC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: N5860-48SC
-slug: n5860-48sc
+slug: fs-n5860-48sc
 part_number: n5860-48sc
 u_height: 1
 is_full_depth: true
diff --git a/device-types/FS/PDU-2PE42I-VMO.yaml b/device-types/FS/PDU-2PE42I-VMO.yaml
index b4bc7996de84e1f845c5ed68f960edb615d5e2aa..12a4155cd7a1d06bbfbfa33d95c63946bbde1ac4 100644
--- a/device-types/FS/PDU-2PE42I-VMO.yaml
+++ b/device-types/FS/PDU-2PE42I-VMO.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: PDU-2PE42I-VMO
-slug: pdu-2pe42i-vmo
+slug: fs-pdu-2pe42i-vmo
 part_number: PDU-2PE42I-VMO (#74156)
 u_height: 0.0
 is_full_depth: false
diff --git a/device-types/FS/S3800-24F4S.yaml b/device-types/FS/S3800-24F4S.yaml
index cbafa8d9fe393a968063bbe6eecd47ab26fa20c8..b919f80288530a0d4ff26d384b89340ca28ddeab 100644
--- a/device-types/FS/S3800-24F4S.yaml
+++ b/device-types/FS/S3800-24F4S.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: S3800-24F4S
-slug: s3800-24f4s
+slug: fs-s3800-24f4s
 part_number: s3800-24f4s
 u_height: 1
 console-ports:
diff --git a/device-types/FS/S3900-24T4S-R.yaml b/device-types/FS/S3900-24T4S-R.yaml
index 7249a81890877f122c5b92fbd9289de48c61f7ad..b4541d05165d22a5c31a478504106e7ef30e407b 100644
--- a/device-types/FS/S3900-24T4S-R.yaml
+++ b/device-types/FS/S3900-24T4S-R.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: S3900-24T4S-R
-slug: s3900-24t4s-r
+slug: fs-s3900-24t4s-r
 part_number: s3900-24t4s-r
 u_height: 1
 is_full_depth: true
diff --git a/device-types/FS/S3900-24T4S.yaml b/device-types/FS/S3900-24T4S.yaml
index 6570080825cbffc3575ef7e6f24c416072c8d5f9..fd2ab78aaa8de72e0d621695f664d686988a325c 100644
--- a/device-types/FS/S3900-24T4S.yaml
+++ b/device-types/FS/S3900-24T4S.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: S3900-24T4S
-slug: s3900-24t4s
+slug: fs-s3900-24t4s
 part_number: s3900-24t4s
 u_height: 1
 console-ports:
diff --git a/device-types/FS/S3900-48T6S-R.yaml b/device-types/FS/S3900-48T6S-R.yaml
index b339988a74604af60c6edc51ed179f518a413f84..a3571f3713423b730e201b207c387d2151efed9b 100644
--- a/device-types/FS/S3900-48T6S-R.yaml
+++ b/device-types/FS/S3900-48T6S-R.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: FS
 model: S3900-48T6S-R
-slug: s3900-48t6s-r
+slug: fs-s3900-48t6s-r
 part_number: s3900-48t6s-r
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Factor-TS/DIONIS-DPS-2004-RM-4E.yaml b/device-types/Factor-TS/DIONIS-DPS-2004-RM-4E.yaml
index 9ce839f00d5bd9054532fa860eb0590971d1622e..acf3dd938cfbdd7047ec737d8075f95421ac041d 100644
--- a/device-types/Factor-TS/DIONIS-DPS-2004-RM-4E.yaml
+++ b/device-types/Factor-TS/DIONIS-DPS-2004-RM-4E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Factor-TS
-model: Dionis DPS-2004 (RM-4E)
-slug: dionis-dps-2004-rm-4e
+model: Dionis DPS-2004
+slug: factor-ts-dionis-dps-2004
 part_number: RM-4E
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Factor-TS/DIONIS-DPS-3010-RM-6E-4S.yaml b/device-types/Factor-TS/DIONIS-DPS-3010-RM-6E-4S.yaml
index 51a75bee5e455a0e6f99c96556ce4333c8b7e008..9e7d2b5af1d323e1190fe8886f1e68851557914f 100644
--- a/device-types/Factor-TS/DIONIS-DPS-3010-RM-6E-4S.yaml
+++ b/device-types/Factor-TS/DIONIS-DPS-3010-RM-6E-4S.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Factor-TS
-model: Dionis DPS-3010 (RM-6E-4S)
-slug: dionis-dps-3010-rm-6e-4s
+model: Dionis DPS-3010
+slug: factor-ts-dionis-dps-3010-rm-6e-4s
 part_number: RM-6E-4S
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Fortinet/FG-100E.yaml b/device-types/Fortinet/FG-100E.yaml
index e2625c4ea26346b34447c9d8de07fd509c8a519b..35a66c49d119030ddd0e6dcf4d3eb02e875056c7 100644
--- a/device-types/Fortinet/FG-100E.yaml
+++ b/device-types/Fortinet/FG-100E.yaml
@@ -2,7 +2,7 @@
 manufacturer: Fortinet
 model: FortiGate 100E
 part_number: FG-100E
-slug: fg-100e
+slug: fortinet-fg-100e
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Fortinet/FG-100F.yaml b/device-types/Fortinet/FG-100F.yaml
index 0ff63b814526dcc75fa492df5add2ec439dd290f..86577514c9942606293344771f7c2e24cbfe7c7a 100644
--- a/device-types/Fortinet/FG-100F.yaml
+++ b/device-types/Fortinet/FG-100F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 100F
-slug: fg-100f
+slug: fortinet-fg-100f
 part_number: FG-100F
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-101F.yaml b/device-types/Fortinet/FG-101F.yaml
index db497ccce42dc669df1cf018655ed49241d8d7df..0172c23d1e15367bee465b6d308df52b0b3b267e 100644
--- a/device-types/Fortinet/FG-101F.yaml
+++ b/device-types/Fortinet/FG-101F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 101F
-slug: fg-101f
+slug: fortinet-fg-101f
 part_number: FG-101F
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-1100E.yaml b/device-types/Fortinet/FG-1100E.yaml
index 404b69ab0dd06521dbfaec4d42e36c00ca2da4de..4bee7d5e38fb3fbe5d6824eea10dcab48afc0c35 100644
--- a/device-types/Fortinet/FG-1100E.yaml
+++ b/device-types/Fortinet/FG-1100E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 1100E
-slug: fg-1100e
+slug: fortinet-fg-1100e
 part_number: FG-1100E
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-1101E.yaml b/device-types/Fortinet/FG-1101E.yaml
index c21726d19ae62b757d1175f9441ba4987bf1f763..1190700c4bcbda494cdcb2a4f67220f9255ea2e1 100644
--- a/device-types/Fortinet/FG-1101E.yaml
+++ b/device-types/Fortinet/FG-1101E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 1101E
-slug: fg-1101e
+slug: fortinet-fg-1101e
 part_number: FG-1101E
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-140E-POE.yaml b/device-types/Fortinet/FG-140E-POE.yaml
index 9d16885402c4d651c1cc24c097fe0ab502c89044..88fbebe6a6e732fa6a0fb991fb9f1c2933ee3f8e 100644
--- a/device-types/Fortinet/FG-140E-POE.yaml
+++ b/device-types/Fortinet/FG-140E-POE.yaml
@@ -2,7 +2,7 @@
 manufacturer: Fortinet
 model: FortiGate 140E-POE
 part_number: FG-140E-POE
-slug: fg-140e-poe
+slug: fortinet-fg-140e-poe
 is_full_depth: false
 u_height: 1
 console-ports:
diff --git a/device-types/Fortinet/FG-1500D.yaml b/device-types/Fortinet/FG-1500D.yaml
index 96fd9f5083709752acd540b7b64662788d97f13e..e7f6c48b7133e1bc37feceaaf895481785242f7f 100644
--- a/device-types/Fortinet/FG-1500D.yaml
+++ b/device-types/Fortinet/FG-1500D.yaml
@@ -2,7 +2,7 @@
 manufacturer: Fortinet
 model: FortiGate 1500D
 part_number: FG-1500D
-slug: fg-1500d
+slug: fortinet-fg-1500d
 is_full_depth: false
 u_height: 2
 interfaces:
diff --git a/device-types/Fortinet/FG-1500DT.yaml b/device-types/Fortinet/FG-1500DT.yaml
index fa03da4430b015b4fa00ab2f065f8df03cdc67d6..1e5548fa0d24d3de72b8b035e2b35f775959f73a 100644
--- a/device-types/Fortinet/FG-1500DT.yaml
+++ b/device-types/Fortinet/FG-1500DT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 1500DT
-slug: fg-1500dt
+slug: fortinet-fg-1500dt
 part_number: FG-1500DT
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-1800F.yaml b/device-types/Fortinet/FG-1800F.yaml
index c9bebebf1187a4a8aff138edcc7a6ec8e182463f..541f66f1d5dcff4284cc337d51ec135980149a84 100644
--- a/device-types/Fortinet/FG-1800F.yaml
+++ b/device-types/Fortinet/FG-1800F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 1800F
-slug: fg-1800f
+slug: fortinet-fg-1800f
 part_number: FG-1800F
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Fortinet/FG-200D.yaml b/device-types/Fortinet/FG-200D.yaml
index 350ec30676bb47fab8e9b13df6e937542eb1d75a..0e287b69ab64fa7f1d6f38c51c7858c950aa7fbc 100644
--- a/device-types/Fortinet/FG-200D.yaml
+++ b/device-types/Fortinet/FG-200D.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 200D
-slug: fg-200d
+slug: fortinet-fg-200d
 part_number: FG-200D
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-200E.yaml b/device-types/Fortinet/FG-200E.yaml
index 1ea738a0e85e3c1430a7b4b220f4b5b1bc256851..54a936d257a219d75f1657598398d5a515995ad1 100644
--- a/device-types/Fortinet/FG-200E.yaml
+++ b/device-types/Fortinet/FG-200E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 200E
-slug: fg-200e
+slug: fortinet-fg-200e
 part_number: FG-200E
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-200F.yaml b/device-types/Fortinet/FG-200F.yaml
index 41b92eeec864779041c799291e6da272d06a9f81..28c683c37c949c75447c6b93f53f05a51c3e292f 100644
--- a/device-types/Fortinet/FG-200F.yaml
+++ b/device-types/Fortinet/FG-200F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 200F
-slug: fg-200f
+slug: fortinet-fg-200f
 part_number: FG-200F
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-201E.yaml b/device-types/Fortinet/FG-201E.yaml
index 89b4727d245602afaa9f8a3917c2fe896677e8da..8f572ba3f7aa885b2e30ed20b492317eaab977a9 100644
--- a/device-types/Fortinet/FG-201E.yaml
+++ b/device-types/Fortinet/FG-201E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 201E
-slug: fg-201e
+slug: fortinet-fg-201e
 part_number: FG-201E
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-3000D.yaml b/device-types/Fortinet/FG-3000D.yaml
index bd593ef0ced6e29773e1b002f14c7b3d9bb25c29..2e1828e922b399f794af866f99da4660d2bd90cc 100644
--- a/device-types/Fortinet/FG-3000D.yaml
+++ b/device-types/Fortinet/FG-3000D.yaml
@@ -2,7 +2,7 @@
 manufacturer: Fortinet
 model: FortiGate 3000D
 part_number: FG-3000D
-slug: fg-3000d
+slug: fortinet-fg-3000d
 is_full_depth: true
 u_height: 2
 interfaces:
diff --git a/device-types/Fortinet/FG-300E.yaml b/device-types/Fortinet/FG-300E.yaml
index 0a40be94adaadfc443923ee79f78907bf0139f1e..894662135f9e543e5f4b18dadca231c088748ec9 100644
--- a/device-types/Fortinet/FG-300E.yaml
+++ b/device-types/Fortinet/FG-300E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 300E
-slug: fg-300e
+slug: fortinet-fg-300e
 part_number: FG-300E
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-301E.yaml b/device-types/Fortinet/FG-301E.yaml
index 81561c06c7627136fd6d578dba80f9fe8c2576f7..a65392309ae3e8c270c3f7d494d634b6ceff64c1 100644
--- a/device-types/Fortinet/FG-301E.yaml
+++ b/device-types/Fortinet/FG-301E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 301E
-slug: fg-301e
+slug: fortinet-fg-301e
 part_number: FG-301E
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-400E.yaml b/device-types/Fortinet/FG-400E.yaml
index 34498e2c5a1adb3ca0f1f7fe7e0d01179eae5794..99b67a2f228a098b6782b4e84d3be2278cb53d3a 100644
--- a/device-types/Fortinet/FG-400E.yaml
+++ b/device-types/Fortinet/FG-400E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 400E
-slug: fg-400e
+slug: fortinet-fg-400e
 part_number: FG-400E
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-40F.yaml b/device-types/Fortinet/FG-40F.yaml
index c9bc3a9a61cf5e0ebbc6d1d763d127f0c1f7b5b6..08c429dbc0d5d74a5462cd5cafc6490d7303427d 100644
--- a/device-types/Fortinet/FG-40F.yaml
+++ b/device-types/Fortinet/FG-40F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 40F
-slug: fg-40f
+slug: fortinet-fg-40f
 part_number: FG-40F
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-500E.yaml b/device-types/Fortinet/FG-500E.yaml
index 8ce022e456550b4fb809dbe076e3a1810a70d084..23ee433e6ec125e106d0cb9e61399cfbac527b71 100644
--- a/device-types/Fortinet/FG-500E.yaml
+++ b/device-types/Fortinet/FG-500E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 500E
-slug: fg-500e
+slug: fortinet-fg-500e
 part_number: FG-500E
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-50E.yaml b/device-types/Fortinet/FG-50E.yaml
index cd1155a52203cc38d323758fae0f796f09291521..8f6d2b0bbd02f5d902aca0bf6988e333f0ee2764 100644
--- a/device-types/Fortinet/FG-50E.yaml
+++ b/device-types/Fortinet/FG-50E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 50E
-slug: fg-50e
+slug: fortinet-fg-50e
 part_number: FG-50E
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-600D.yaml b/device-types/Fortinet/FG-600D.yaml
index 956eeb21c439b4aad814de6800eda4f7daa4a6bc..c9a561582c49f5f55ca75bdb1ef0235b5bb2ace1 100644
--- a/device-types/Fortinet/FG-600D.yaml
+++ b/device-types/Fortinet/FG-600D.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate-600D
-slug: fg-600d
+slug: fortinet-fg-600d
 part_number: FG-600D
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-600E.yaml b/device-types/Fortinet/FG-600E.yaml
index 0737c1f48ab2f4fb5dcfad3a505c5eb5d63461d7..e175dbb7dc4d153492b61f150fe445386f06aa78 100644
--- a/device-types/Fortinet/FG-600E.yaml
+++ b/device-types/Fortinet/FG-600E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 600E
-slug: fg-600e
+slug: fortinet-fg-600e
 part_number: FG-600E
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-600F.yaml b/device-types/Fortinet/FG-600F.yaml
index 0372dc2f1513411fb6a488e46c3ac0709cc90ad2..2804d0735c0c0125ab35c4c22aa1ffc3eebf842a 100644
--- a/device-types/Fortinet/FG-600F.yaml
+++ b/device-types/Fortinet/FG-600F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 600F
-slug: fg-600f
+slug: fortinet-fg-600f
 part_number: FG-600F
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-601E.yaml b/device-types/Fortinet/FG-601E.yaml
index 17a9f07eea49f0f607dc7dca50320cf10b6138d4..c6f1ddc695bff68f1e71238bab1c29defaf6e4f1 100644
--- a/device-types/Fortinet/FG-601E.yaml
+++ b/device-types/Fortinet/FG-601E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 601E
-slug: fg-601e
+slug: fortinet-fg-601e
 part_number: FG-601E
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-601F.yaml b/device-types/Fortinet/FG-601F.yaml
index e790eb74ebc15b2117c92eaaf8b2bdb83dc2cd2b..f15827a2a458eea4737c9ee7ace0588e0b2c9371 100644
--- a/device-types/Fortinet/FG-601F.yaml
+++ b/device-types/Fortinet/FG-601F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 601F
-slug: fg-601f
+slug: fortinet-fg-601f
 part_number: FG-601F
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-60E.yaml b/device-types/Fortinet/FG-60E.yaml
index bbf11de2df2ee4c36d7bf975cd625d5cf2dcb719..e0654661e9a1f91a02e85d42351f924b50b2b0b0 100644
--- a/device-types/Fortinet/FG-60E.yaml
+++ b/device-types/Fortinet/FG-60E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 60E
-slug: fg-60e
+slug: fortinet-fg-60e
 part_number: FG-60E
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-60F.yaml b/device-types/Fortinet/FG-60F.yaml
index 53e356509a9a26c14a4b3c2def4e513706b61d71..18a5f0a209afc30d1ba9338c6f75e0a0977854e5 100644
--- a/device-types/Fortinet/FG-60F.yaml
+++ b/device-types/Fortinet/FG-60F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 60F
-slug: fg-60f
+slug: fortinet-fg-60f
 part_number: FG-60F
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-80E-POE.yaml b/device-types/Fortinet/FG-80E-POE.yaml
index 9d8c059928f989a930e0fa18026e8cccc28d9939..97f2f630df33eac6b6ff97e1a1fd9e7b572e1219 100644
--- a/device-types/Fortinet/FG-80E-POE.yaml
+++ b/device-types/Fortinet/FG-80E-POE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 80E-POE
-slug: fg-80e-poe
+slug: fortinet-fg-80e-poe
 part_number: FG-80E-POE
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-80E.yaml b/device-types/Fortinet/FG-80E.yaml
index e00a75fc85ef5878175c0f0153f45f7a3750edfd..c88d8211f899dddd584d74db1387b6e954a8028c 100644
--- a/device-types/Fortinet/FG-80E.yaml
+++ b/device-types/Fortinet/FG-80E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 80E
-slug: fg-80e
+slug: fortinet-fg-80e
 part_number: FG-80E
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-80F.yaml b/device-types/Fortinet/FG-80F.yaml
index dfa7ebfcb5c6747baafee79761cba0493d986f60..7ab1f5231c8b2370a21c7f8e16edd6c915c7224c 100644
--- a/device-types/Fortinet/FG-80F.yaml
+++ b/device-types/Fortinet/FG-80F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 80F
-slug: fg-80f
+slug: fortinet-fg-80f
 part_number: FG-80F
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-81E-POE.yaml b/device-types/Fortinet/FG-81E-POE.yaml
index 1ecb5132b707506b983de6a029a68f0e5a772de4..d964bd114ef0a6a4b843826d950ac22086d5d6f8 100644
--- a/device-types/Fortinet/FG-81E-POE.yaml
+++ b/device-types/Fortinet/FG-81E-POE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 81E-POE
-slug: fg-81e-poe
+slug: fortinet-fg-81e-poe
 part_number: FG-81E-POE
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-81E.yaml b/device-types/Fortinet/FG-81E.yaml
index 20b911d9db46d3f405972655508b3ef018cf3e11..96b0768a036c44c59dd0088274b8d69789cca326 100644
--- a/device-types/Fortinet/FG-81E.yaml
+++ b/device-types/Fortinet/FG-81E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 81E
-slug: fg-81e
+slug: fortinet-fg-81e
 part_number: FG-81E
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-81F.yaml b/device-types/Fortinet/FG-81F.yaml
index 9451a3c6c502ad765cb4b90d0d470fc3f02e5e86..f615054a8609a37bf26c5e585680d6bc204f14d9 100644
--- a/device-types/Fortinet/FG-81F.yaml
+++ b/device-types/Fortinet/FG-81F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 81F
-slug: fg-81f
+slug: fortinet-fg-81f
 part_number: FG-81F
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FG-90D.yml b/device-types/Fortinet/FG-90D.yml
index 2f12ba34ddfc88ffd5ac1064a617e8b34878c4d4..e7119f66741e19d397bb2b6bdf5cc4799e4abb02 100644
--- a/device-types/Fortinet/FG-90D.yml
+++ b/device-types/Fortinet/FG-90D.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fortinet
 model: FortiGate 90D
-slug: fg-90d
+slug: fortinet-fg-90d
 part_number: FG-90D
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Fortinet/FWB-2000E.yaml b/device-types/Fortinet/FWB-2000E.yaml
index a78a3aae2c9fb04c7606db6b5f91dbd7b83914b4..04f8de3e1a87908b49cc2f9c316ce7a379ecfa24 100644
--- a/device-types/Fortinet/FWB-2000E.yaml
+++ b/device-types/Fortinet/FWB-2000E.yaml
@@ -2,7 +2,7 @@
 manufacturer: Fortinet
 model: FortiWeb 2000E
 part_number: FWB-2000E
-slug: fwb-2000e
+slug: fortinet-fwb-2000e
 is_full_depth: true
 u_height: 2
 interfaces:
diff --git a/device-types/Fujitsu/primergy_bx2560_m1.yaml b/device-types/Fujitsu/primergy_bx2560_m1.yaml
index 655d5db0740a24cb8425ae889836add0c8576703..ebb09bab9a26b999c11838639f89a384d90ff44f 100644
--- a/device-types/Fujitsu/primergy_bx2560_m1.yaml
+++ b/device-types/Fujitsu/primergy_bx2560_m1.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fujitsu
 model: Primergy BX2560 M1
-slug: primergy_bx2560_m1
+slug: fujitsu-primergy-bx2560-m1
 u_height: 0
 is_full_depth: true
 console-ports:
diff --git a/device-types/Fujitsu/primergy_bx2560_m2.yaml b/device-types/Fujitsu/primergy_bx2560_m2.yaml
index 8e4c4b6c2dfa15d2805f9407f7ee3fa6aadb4302..9746a83a2100e82fd753ee8be79b32a9d0ace7ea 100644
--- a/device-types/Fujitsu/primergy_bx2560_m2.yaml
+++ b/device-types/Fujitsu/primergy_bx2560_m2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fujitsu
 model: Primergy BX2560 M2
-slug: primergy_bx2560_m2
+slug: fujitsu-primergy-bx2560-m2
 u_height: 0
 is_full_depth: true
 console-ports:
diff --git a/device-types/Fujitsu/primergy_bx924_s4.yaml b/device-types/Fujitsu/primergy_bx924_s4.yaml
index dc7e310d85930a99659e1efd0dc2dbeb8cd16afd..2d28be51768df8ebda6eb13b068534afade8f720 100644
--- a/device-types/Fujitsu/primergy_bx924_s4.yaml
+++ b/device-types/Fujitsu/primergy_bx924_s4.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fujitsu
 model: Primergy BX924 S4
-slug: primergy_bx924_s4
+slug: fujitsu-primergy-bx924-s4
 u_height: 0
 is_full_depth: true
 console-ports:
diff --git a/device-types/Fujitsu/primergy_tx100_s1.yml b/device-types/Fujitsu/primergy_tx100_s1.yml
index 758ce47ce07813ea0f6373de6bbee45b3e607c52..be0031f40ebdfc59c4ce6eb899db1bcffae77929 100644
--- a/device-types/Fujitsu/primergy_tx100_s1.yml
+++ b/device-types/Fujitsu/primergy_tx100_s1.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fujitsu
 model: PRIMERGY TX100 S1
-slug: fujitsu_primergy_tx100_s1
+slug: fujitsu-primergy-tx100-s1
 u_height: 5
 is_full_depth: true
 console-ports:
diff --git a/device-types/Fujitsu/primergy_tx1310_m1.yml b/device-types/Fujitsu/primergy_tx1310_m1.yml
index ead5e83495d9d81dc1551fe2d560ed8398f8d2d4..bfc560ae22948caa5ddb8c2e70da32f7ad221d54 100644
--- a/device-types/Fujitsu/primergy_tx1310_m1.yml
+++ b/device-types/Fujitsu/primergy_tx1310_m1.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fujitsu
 model: PRIMERGY TX1310 M1
-slug: fujitsu_primergy_tx1310_m1
+slug: fujitsu-primergy-tx1310-m1
 u_height: 5
 is_full_depth: true
 console-ports:
diff --git a/device-types/Fujitsu/primergy_tx1310_m3.yml b/device-types/Fujitsu/primergy_tx1310_m3.yml
index 48d6295c20faf9563ca6f69f7a303f4a47913164..4f77e8ff1523283b6916d0395727389cd8656827 100644
--- a/device-types/Fujitsu/primergy_tx1310_m3.yml
+++ b/device-types/Fujitsu/primergy_tx1310_m3.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fujitsu
 model: PRIMERGY TX1310 M3
-slug: fujitsu_primergy_tx1310_m3
+slug: fujitsu-primergy-tx1310-m3
 u_height: 5
 is_full_depth: true
 console-ports:
diff --git a/device-types/Fujitsu/primergy_tx1330_m4.yml b/device-types/Fujitsu/primergy_tx1330_m4.yml
index ad3a8f2f625b960a06a9230678e135f969c949c7..1da44be02f6e32287b3fbee185d1af0138859195 100644
--- a/device-types/Fujitsu/primergy_tx1330_m4.yml
+++ b/device-types/Fujitsu/primergy_tx1330_m4.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Fujitsu
 model: PRIMERGY TX1330 M4
-slug: fujitsu_primergy_tx1330_m4
+slug: fujitsu-primergy-tx1330-m4
 u_height: 5
 is_full_depth: true
 console-ports:
diff --git a/device-types/Generic/24-port_copper_patch_panel.yaml b/device-types/Generic/24-port_copper_patch_panel.yaml
index 773e34245b0f454d312e5aed4b82332a975d184f..201c4e8185e20e4bf69365273c24d9a3c0f71743 100644
--- a/device-types/Generic/24-port_copper_patch_panel.yaml
+++ b/device-types/Generic/24-port_copper_patch_panel.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
 model: 24-port UTP Patch Panel
-slug: 24-port-utp-patch-panel
+slug: generic-24-port-utp-patch-panel
 u_height: 1
 airflow: passive
 front-ports:
diff --git a/device-types/Generic/24-port_copper_patch_panel_half.yaml b/device-types/Generic/24-port_copper_patch_panel_half.yaml
index 298e0b259b22add30b14a1cbf5aa4c19f45f046f..601a976c43935d0550f3c04c5a35f8a5e3848ebb 100644
--- a/device-types/Generic/24-port_copper_patch_panel_half.yaml
+++ b/device-types/Generic/24-port_copper_patch_panel_half.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
-model: 24-port UTP Patch Panel (half depth)
-slug: 24-port-utp-patch-panel-half-depth
+model: 24-port UTP Patch Panel Half Depth
+slug: generic-24-port-utp-patch-panel-half-depth
 u_height: 1
 is_full_depth: false
 airflow: passive
diff --git a/device-types/Generic/48-port_copper_patch_panel.yaml b/device-types/Generic/48-port_copper_patch_panel.yaml
index aa04554706c8c0e2a87102c81265de338a018fcc..08b40357a64b25687a828815cc26b6c5dc9cee24 100644
--- a/device-types/Generic/48-port_copper_patch_panel.yaml
+++ b/device-types/Generic/48-port_copper_patch_panel.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
 model: 48-port UTP Patch Panel
-slug: 48-port-utp-patch-panel
+slug: generic-48-port-utp-patch-panel
 u_height: 2
 airflow: passive
 front-ports:
diff --git a/device-types/Generic/48-port_copper_patch_panel_half.yaml b/device-types/Generic/48-port_copper_patch_panel_half.yaml
index 68ee7c75198cd1f0607b1d96567787f3256df995..301b0e5ce2a4a7346eefdf6b930f25688bdf2423 100644
--- a/device-types/Generic/48-port_copper_patch_panel_half.yaml
+++ b/device-types/Generic/48-port_copper_patch_panel_half.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
-model: 48-port UTP Patch Panel (half depth)
-slug: 48-port-utp-patch-panel-half-depth
+model: 48-port UTP Patch Panel Half Depth
+slug: generic-48-port-utp-patch-panel-half-depth
 u_height: 2
 is_full_depth: false
 airflow: passive
diff --git a/device-types/Generic/LC-12-port_fiber_patch_panel.yaml b/device-types/Generic/LC-12-port_fiber_patch_panel.yaml
index eeaec2bd6c6194b030d636c1942e8e18491f675c..26eecf7b259ed2c468b783ac183c35e260b103e9 100644
--- a/device-types/Generic/LC-12-port_fiber_patch_panel.yaml
+++ b/device-types/Generic/LC-12-port_fiber_patch_panel.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
 model: LC-12-port Fiber Patch Panel
-slug: lc-12-port-fiber-patch-panel
+slug: generic-lc-12-port-fiber-patch-panel
 u_height: 1
 airflow: passive
 front-ports:
diff --git a/device-types/Generic/LC-12-port_fiber_patch_panel_half.yaml b/device-types/Generic/LC-12-port_fiber_patch_panel_half.yaml
index fa59cc2ed45b7c1c15b6b88bf0c7dc3b81ff34f5..7b5096b5e175d09d1815354faa3539ec6f06b56a 100644
--- a/device-types/Generic/LC-12-port_fiber_patch_panel_half.yaml
+++ b/device-types/Generic/LC-12-port_fiber_patch_panel_half.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
-model: LC-12-port Fiber Patch Panel (half depth)
-slug: lc-12-port-fiber-patch-panel-half-depth
+model: LC-12-port Fiber Patch Panel Half Depth
+slug: generic-lc-12-port-fiber-patch-panel-half-depth
 u_height: 1
 is_full_depth: false
 airflow: passive
diff --git a/device-types/Generic/LC-24-port_fiber_patch_panel.yaml b/device-types/Generic/LC-24-port_fiber_patch_panel.yaml
index 0e714e1cc01dfe1355d3ebdce95091795471014e..8608c9cb3ee24611790a760ef5d9ef25aab04ea8 100644
--- a/device-types/Generic/LC-24-port_fiber_patch_panel.yaml
+++ b/device-types/Generic/LC-24-port_fiber_patch_panel.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
 model: LC-24-port Fiber Patch Panel
-slug: lc-24-port-fiber-patch-panel
+slug: generic-lc-24-port-fiber-patch-panel
 u_height: 1
 airflow: passive
 front-ports:
diff --git a/device-types/Generic/LC-24-port_fiber_patch_panel_half.yaml b/device-types/Generic/LC-24-port_fiber_patch_panel_half.yaml
index 9205f23b71afb4738083cf14f2781765e9b94809..60e10fcf01c5736805a950a34cc8d1062e5572df 100644
--- a/device-types/Generic/LC-24-port_fiber_patch_panel_half.yaml
+++ b/device-types/Generic/LC-24-port_fiber_patch_panel_half.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
-model: LC-24-port Fiber Patch Panel (half depth)
-slug: lc-24-port-fiber-patch-panel-half-depth
+model: LC-24-port Fiber Patch Panel Half Depth
+slug: generic-lc-24-port-fiber-patch-panel-half-depth
 u_height: 1
 is_full_depth: false
 airflow: passive
diff --git a/device-types/Generic/LC-48-port_fiber_patch_panel.yaml b/device-types/Generic/LC-48-port_fiber_patch_panel.yaml
index 0735e9f940f20e54a276b0b22ae7e5b3c3e45896..d2b13258c93555abe80bc604acf2183e917f2b3e 100644
--- a/device-types/Generic/LC-48-port_fiber_patch_panel.yaml
+++ b/device-types/Generic/LC-48-port_fiber_patch_panel.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
 model: LC-48-port Fiber Patch Panel
-slug: lc-48-port-fiber-patch-panel
+slug: generic-lc-48-port-fiber-patch-panel
 u_height: 2
 airflow: passive
 front-ports:
diff --git a/device-types/Generic/LC-48-port_fiber_patch_panel_half.yaml b/device-types/Generic/LC-48-port_fiber_patch_panel_half.yaml
index e7dd180e156194417243406035d36ff2908b58db..d0f6fc7ccb1e2d337a7cd85948dd1536916230a9 100644
--- a/device-types/Generic/LC-48-port_fiber_patch_panel_half.yaml
+++ b/device-types/Generic/LC-48-port_fiber_patch_panel_half.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
-model: LC-48-port Fiber Patch Panel (half depth)
-slug: lc-48-port-fiber-patch-panel-half-depth
+model: LC-48-port Fiber Patch Panel Half Depth
+slug: generic-lc-48-port-fiber-patch-panel-half-depth
 u_height: 2
 is_full_depth: false
 airflow: passive
diff --git a/device-types/Generic/SC-24-double-port_fiber_patch_panel.yaml b/device-types/Generic/SC-24-double-port_fiber_patch_panel.yaml
index 31d073bd50bbf91b1ca22fce419e66f9bd20707d..1b8aa5a0b43cfbc49fb7fa9801afb118c3923864 100644
--- a/device-types/Generic/SC-24-double-port_fiber_patch_panel.yaml
+++ b/device-types/Generic/SC-24-double-port_fiber_patch_panel.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
 model: SC-24-double-port Fiber Patch Panel
-slug: sc-24-double-port-fiber-patch-panel
+slug: generic-sc-24-double-port-fiber-patch-panel
 u_height: 1
 is_full_depth: true
 airflow: passive
diff --git a/device-types/Generic/SC-24-double-port_fiber_patch_panel_half.yaml b/device-types/Generic/SC-24-double-port_fiber_patch_panel_half.yaml
index 1304ec778bba54bcb96125b15c4cffe0399c9724..907ef01b25c027c4c3a8c273e2983ca46fedb4c6 100644
--- a/device-types/Generic/SC-24-double-port_fiber_patch_panel_half.yaml
+++ b/device-types/Generic/SC-24-double-port_fiber_patch_panel_half.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
-model: SC-24-double-port Fiber Patch Panel (half depth)
-slug: sc-24-double-port-fiber-patch-panel-half-depth
+model: SC-24-double-port Fiber Patch Panel Half Depth
+slug: generic-sc-24-double-port-fiber-patch-panel-half-depth
 u_height: 1
 is_full_depth: false
 airflow: passive
diff --git a/device-types/Generic/SC-24-port_fiber_patch_panel.yaml b/device-types/Generic/SC-24-port_fiber_patch_panel.yaml
index b81dc8536509e5200223528e2c728e9f085e1d81..4f84dbb321169d630f3fd795aae89ca7155b68ba 100644
--- a/device-types/Generic/SC-24-port_fiber_patch_panel.yaml
+++ b/device-types/Generic/SC-24-port_fiber_patch_panel.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
 model: SC-24-port Fiber Patch Panel
-slug: sc-24-port-fiber-patch-panel
+slug: generic-sc-24-port-fiber-patch-panel
 u_height: 1
 is_full_depth: true
 airflow: passive
diff --git a/device-types/Generic/SC-24-port_fiber_patch_panel_half.yaml b/device-types/Generic/SC-24-port_fiber_patch_panel_half.yaml
index fbba81d608014113014732b8ff6d694574eaf14f..a4b870b85b2127cbd8c6296cf7427ca2951fa2d0 100644
--- a/device-types/Generic/SC-24-port_fiber_patch_panel_half.yaml
+++ b/device-types/Generic/SC-24-port_fiber_patch_panel_half.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
-model: SC-24-port Fiber Patch Panel (half depth)
-slug: sc-24-port-fiber-patch-panel-half-depth
+model: SC-24-port Fiber Patch Panel Half Depth
+slug: generic-sc-24-port-fiber-patch-panel-half-depth
 u_height: 1
 is_full_depth: false
 airflow: passive
diff --git a/device-types/Generic/cable-management-panel-1ru.yaml b/device-types/Generic/cable-management-panel-1ru.yaml
index 507f642d1b978df19d317826c2d6c7deaf47bc14..f9d45bec0905860aa8e70702655cee6b8bde0fec 100644
--- a/device-types/Generic/cable-management-panel-1ru.yaml
+++ b/device-types/Generic/cable-management-panel-1ru.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
 model: cable-management-panel-1ru
-slug: cable-management-panel-1ru
+slug: generic-cable-management-panel-1ru
 u_height: 1
 is_full_depth: false
 airflow: passive
diff --git a/device-types/Generic/cable-management-panel-2ru.yaml b/device-types/Generic/cable-management-panel-2ru.yaml
index 03567921541955f36c60e86a2486b48978d5bdf1..7d0ad4c99e08a29032d1a6b45e4a866b6897a0b4 100644
--- a/device-types/Generic/cable-management-panel-2ru.yaml
+++ b/device-types/Generic/cable-management-panel-2ru.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
 model: cable-management-panel-2ru
-slug: cable-management-panel-2ru
+slug: generic-cable-management-panel-2ru
 u_height: 2
 is_full_depth: false
 airflow: passive
diff --git a/device-types/Generic/shelf-1he.yaml b/device-types/Generic/shelf-1he.yaml
index df797906aa56d2901f4b053af467ac82d01b8daf..ee0976918a376d2c870f4c175aa3da4b1577c2fe 100644
--- a/device-types/Generic/shelf-1he.yaml
+++ b/device-types/Generic/shelf-1he.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
 model: shelf-1he
-slug: shelf-1he
+slug: generic-shelf-1he
 u_height: 1
 is_full_depth: false
 airflow: passive
diff --git a/device-types/Generic/shelf-2he.yaml b/device-types/Generic/shelf-2he.yaml
index 0d05f7ccb47d4eb391f741028cf117a026a447fd..23f3058dc1a2f99a4493bfe7ae6c8a955819646a 100644
--- a/device-types/Generic/shelf-2he.yaml
+++ b/device-types/Generic/shelf-2he.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
 model: shelf-2he
-slug: shelf-2he
+slug: generic-shelf-2he
 u_height: 2
 is_full_depth: false
 airflow: passive
diff --git a/device-types/Generic/wall-box-2-utp.yaml b/device-types/Generic/wall-box-2-utp.yaml
index 7db81c167568f8807d0d68288dcfc6a9f3523e28..94882583d65cdb5cc1d83bd6e98a9b306e9906d2 100644
--- a/device-types/Generic/wall-box-2-utp.yaml
+++ b/device-types/Generic/wall-box-2-utp.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
 model: Wall box, 2 UTP plugs
-slug: wall-box-2-utp-plugs
+slug: generic-wall-box-2-utp-plugs
 u_height: 0.0
 is_full_depth: false
 front-ports:
diff --git a/device-types/Generic/wall-box-3-utp.yaml b/device-types/Generic/wall-box-3-utp.yaml
index c64e39d2586e12400e2d366f7ae894f3ce802940..84142f69f6a0ddf5ee276af02196486f62a8cab6 100644
--- a/device-types/Generic/wall-box-3-utp.yaml
+++ b/device-types/Generic/wall-box-3-utp.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
 model: Wall box, 3 UTP plugs
-slug: wall-box-3-utp-plugs
+slug: generic-wall-box-3-utp-plugs
 u_height: 0.0
 is_full_depth: false
 front-ports:
diff --git a/device-types/Generic/wall-box-4-utp.yaml b/device-types/Generic/wall-box-4-utp.yaml
index fa443e0fab5f5bf79f5e54f970855384a801ab8e..abcc3a90f61961f76a3da63fa231461465f4d9c2 100644
--- a/device-types/Generic/wall-box-4-utp.yaml
+++ b/device-types/Generic/wall-box-4-utp.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
 model: Wall box, 4 UTP plugs
-slug: wall-box-4-utp-plugs
+slug: generic-wall-box-4-utp-plugs
 u_height: 0.0
 is_full_depth: false
 front-ports:
diff --git a/device-types/Generic/wall-box-6-utp.yaml b/device-types/Generic/wall-box-6-utp.yaml
index 12be89b28a6cd8b9fc5d8c2855f95d3f6c06edf8..2c2e2c0d6fccd17c655365595e38c30981bc2784 100644
--- a/device-types/Generic/wall-box-6-utp.yaml
+++ b/device-types/Generic/wall-box-6-utp.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
 model: Wall box, 6 UTP plugs
-slug: wall-box-6-utp-plugs
+slug: generic-wall-box-6-utp-plugs
 u_height: 0.0
 is_full_depth: false
 front-ports:
diff --git a/device-types/HPE/Aruba-10000-48Y6C-R8P13A.yaml b/device-types/HPE/Aruba-10000-48Y6C-R8P13A.yaml
index 613e4be443ee0c64004c61c43c954c29c0115b2a..9500e13a54622afdda6a923be0fbc9fdd635e1b0 100644
--- a/device-types/HPE/Aruba-10000-48Y6C-R8P13A.yaml
+++ b/device-types/HPE/Aruba-10000-48Y6C-R8P13A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 10000-48Y6C Front-to-Back
-slug: hpe-aruba-10000-48y6c-r8p13a
+slug: hpe-aruba-10000-48y6c-front-to-back
 part_number: R8P13A
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-10000-48Y6C-R8P14A.yaml b/device-types/HPE/Aruba-10000-48Y6C-R8P14A.yaml
index 57c5a98c7e39a918e51c0085d2506c1bb42eed35..73af828361cdac39d679d62182f92eab6c268b10 100644
--- a/device-types/HPE/Aruba-10000-48Y6C-R8P14A.yaml
+++ b/device-types/HPE/Aruba-10000-48Y6C-R8P14A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 10000-48Y6C Back-to-Front
-slug: hpe-aruba-10000-48y6c-r8p14a
+slug: hpe-aruba-10000-48y6c-back-to-front
 part_number: R8P14A
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-2530-48-PoEP.yml b/device-types/HPE/Aruba-2530-48-PoEP.yml
index cdb3ea64ba00df839a93931a0423a1733620e4cb..47d40e018e857bfe2c9f4c727a2fdbe03cd80a21 100644
--- a/device-types/HPE/Aruba-2530-48-PoEP.yml
+++ b/device-types/HPE/Aruba-2530-48-PoEP.yml
@@ -1,6 +1,6 @@
 ---
 manufacturer: HPE
-model: Aruba 2530-48-PoE+ Switch
+model: Aruba 2530-48-PoE+
 slug: hpe-aruba-2530-48-poep
 part_number: J9778A
 u_height: 1
diff --git a/device-types/HPE/Aruba-3810M-24G-1-slot.yaml b/device-types/HPE/Aruba-3810M-24G-1-slot.yaml
index 2676f4e00c9e8ff2cec7b94093a9fd54b91a5113..74bd4928b431f3c7dae7e5291015560a9f1c181c 100644
--- a/device-types/HPE/Aruba-3810M-24G-1-slot.yaml
+++ b/device-types/HPE/Aruba-3810M-24G-1-slot.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 3810M 24G 1-slot Switch
-slug: hpe-aruba-3810m24g1-slotswitch
+slug: hpe-aruba-3810m-24g-1-slot-switch
 part_number: JL071A
 u_height: 1
 airflow: front-to-rear
diff --git a/device-types/HPE/Aruba-5406R-zl2.yaml b/device-types/HPE/Aruba-5406R-zl2.yaml
index cb3bd1dd0974c99098f6c1683f1b4723ccb95ddf..d2e5a538e737174eefe5ebdfdec3182e16c4e773 100644
--- a/device-types/HPE/Aruba-5406R-zl2.yaml
+++ b/device-types/HPE/Aruba-5406R-zl2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
-model: 5406R-zl2
-slug: hpe-aruba-hpe-5406r-zl2
+model: Aruba 5406R-zl2
+slug: hpe-aruba-5406r-zl2
 part_number: J9850A
 u_height: 4
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-8325-32C-JL626A.yaml b/device-types/HPE/Aruba-8325-32C-JL626A.yaml
index 8f93f301ae4db1fa158222014161bd12dec2db2a..602ae8bb19272cde29c802fecffc35ff81739556 100644
--- a/device-types/HPE/Aruba-8325-32C-JL626A.yaml
+++ b/device-types/HPE/Aruba-8325-32C-JL626A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 8325-32C Front-to-Back
-slug: hpe-aruba-8325-32c-ja626a
+slug: hpe-aruba-8325-32c-front-to-back
 part_number: JL626A
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-8325-32C-JL627A.yaml b/device-types/HPE/Aruba-8325-32C-JL627A.yaml
index 9c54289c2c3c3afd2293f28601e7a29970739025..5f8fd4ec68aad37413a77b0273986543b91f133f 100644
--- a/device-types/HPE/Aruba-8325-32C-JL627A.yaml
+++ b/device-types/HPE/Aruba-8325-32C-JL627A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 8325-32C Back-to-Front
-slug: hpe-aruba-8325-32c-jl627a
+slug: hpe-aruba-8325-32c-back-to-front
 part_number: JL627A
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-8325-48Y8C-JL624A.yaml b/device-types/HPE/Aruba-8325-48Y8C-JL624A.yaml
index 694c294bb9a9f065c6aa8b20cb4df474935fe027..ba8e394826c2619f706b5c7c5f3dc881d663506d 100644
--- a/device-types/HPE/Aruba-8325-48Y8C-JL624A.yaml
+++ b/device-types/HPE/Aruba-8325-48Y8C-JL624A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 8325-48Y8C Front-to-Back
-slug: hpe-aruba-8325-48y8c-jl624a
+slug: hpe-aruba-8325-48y8c-front-to-back
 part_number: JL624A
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-8325-48Y8C-JL625A.yaml b/device-types/HPE/Aruba-8325-48Y8C-JL625A.yaml
index 2dc5e7c95cbc2a214c4e0f58b5c36ad142da27cf..7f614ef1898fc94a54edbf2b67e00cf4fcd6eecf 100644
--- a/device-types/HPE/Aruba-8325-48Y8C-JL625A.yaml
+++ b/device-types/HPE/Aruba-8325-48Y8C-JL625A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 8325-48Y8C Back-to-Front
-slug: hpe-aruba-8325-48y8c-jl625a
+slug: hpe-aruba-8325-48y8c-back-to-front
 part_number: JL625A
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-8360-12C-JL708C.yaml b/device-types/HPE/Aruba-8360-12C-JL708C.yaml
index 051c7913f81c208163892c0160baff7b2b481377..5aea06904be9000587f69e322f1b13b7a413f606 100644
--- a/device-types/HPE/Aruba-8360-12C-JL708C.yaml
+++ b/device-types/HPE/Aruba-8360-12C-JL708C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 8360-12C Front-to-Back
-slug: hpe-aruba-8360-12c-jl708c
+slug: hpe-aruba-8360-12c-front-to-back
 part_number: JL708C
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-8360-12C-JL709C.yaml b/device-types/HPE/Aruba-8360-12C-JL709C.yaml
index 7d89de528721b8b35e5606f419bfff77eca5181b..c0405527ae4b13f126c681d3aa6be598f6708349 100644
--- a/device-types/HPE/Aruba-8360-12C-JL709C.yaml
+++ b/device-types/HPE/Aruba-8360-12C-JL709C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 8360-12C Back-to-Front
-slug: hpe-aruba-8360-12c-jl709c
+slug: hpe-aruba-8360-12c-back-to-front
 part_number: JL709C
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-8360-16Y2C-JL702C.yaml b/device-types/HPE/Aruba-8360-16Y2C-JL702C.yaml
index d7e3661ca772c1b5c7aa1584748fba44162c47f9..3c40eadea425bac6ccb5cccaaed87a41990b180f 100644
--- a/device-types/HPE/Aruba-8360-16Y2C-JL702C.yaml
+++ b/device-types/HPE/Aruba-8360-16Y2C-JL702C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 8360-16Y2C Front-to-Back
-slug: hpe-aruba-8360-16y2c-jl702c
+slug: hpe-aruba-8360-16y2c-front-to-back
 part_number: JL702C
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-8360-16Y2C-JL703C.yaml b/device-types/HPE/Aruba-8360-16Y2C-JL703C.yaml
index 1e596bbd4c3cf8a57d8ac4616971ff7f0923fd82..d10f596a4150a242f99a0520ba9f45f167ecd0ee 100644
--- a/device-types/HPE/Aruba-8360-16Y2C-JL703C.yaml
+++ b/device-types/HPE/Aruba-8360-16Y2C-JL703C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 8360-16Y2C Back-to-Front
-slug: hpe-aruba-8360-16y2c-jl703c
+slug: hpe-aruba-8360-16y2c-back-to-front
 part_number: JL703C
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-8360-24XF2C-JL710C.yaml b/device-types/HPE/Aruba-8360-24XF2C-JL710C.yaml
index e865653b33fd37fa536f84284da72fe143258df8..93beea97525e76b3ec6de110d321322874fb6abb 100644
--- a/device-types/HPE/Aruba-8360-24XF2C-JL710C.yaml
+++ b/device-types/HPE/Aruba-8360-24XF2C-JL710C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
-model: Aruba 8320-24XF2C Front-to-Back
-slug: hpe-aruba-8320-24xf2c-jl710c
+model: Aruba 8360-24XF2C
+slug: hpe-aruba-8360-24xf2c
 part_number: JL710C
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-8360-24XF2C-JL711C.yaml b/device-types/HPE/Aruba-8360-24XF2C-JL711C.yaml
index 86380daaa6b2ab1b69906256b5835e4cd1c0fea0..46fa4c3b8eae125e6c9f9b09a6a50b2988201a9f 100644
--- a/device-types/HPE/Aruba-8360-24XF2C-JL711C.yaml
+++ b/device-types/HPE/Aruba-8360-24XF2C-JL711C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 8320-24XF2C Back-to-Front
-slug: hpe-aruba-8320-24xf2c-jl711c
+slug: hpe-aruba-8320-24xf2c-back-to-front
 part_number: JL711C
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-8360-32Y4C-JL700C.yaml b/device-types/HPE/Aruba-8360-32Y4C-JL700C.yaml
index 3cac282445e7cc2d436e073fb259abb787bdb429..37d6200e399249b1598f7a4bf08149efb108ae51 100644
--- a/device-types/HPE/Aruba-8360-32Y4C-JL700C.yaml
+++ b/device-types/HPE/Aruba-8360-32Y4C-JL700C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 8360-32Y4C Front-to-Back
-slug: hpe-aruba-8360-32y4c-jl700c
+slug: hpe-aruba-8360-32y4c-front-to-back
 part_number: JL700C
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-8360-32Y4C-JL701C.yaml b/device-types/HPE/Aruba-8360-32Y4C-JL701C.yaml
index 999e12efff398dc715b738d7e656843a5105eff1..1e1527cbddfa7e67425b227284b5c3f72c550609 100644
--- a/device-types/HPE/Aruba-8360-32Y4C-JL701C.yaml
+++ b/device-types/HPE/Aruba-8360-32Y4C-JL701C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 8360-32Y4C Back-to-Front
-slug: hpe-aruba-8360-32y4c-jl701c
+slug: hpe-aruba-8360-32y4c-back-to-front
 part_number: JL701C
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-8360-48XT4C-JL706C.yaml b/device-types/HPE/Aruba-8360-48XT4C-JL706C.yaml
index c65e58193544d17f0dd6e9c0aac389f3982737a2..fbfefbbd197ab99f42d9e44ee6728a6de0375e53 100644
--- a/device-types/HPE/Aruba-8360-48XT4C-JL706C.yaml
+++ b/device-types/HPE/Aruba-8360-48XT4C-JL706C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 8360-48XT4C Front-to-Back
-slug: hpe-aruba-8360-48xt4c-jl706c
+slug: hpe-aruba-8360-48xt4c-front-to-back
 part_number: JL706C
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-8360-48XT4C-JL707C.yaml b/device-types/HPE/Aruba-8360-48XT4C-JL707C.yaml
index 63a937701fba4c09d7609a3adcbc1fbc03398a31..24f8b8e89b8698df1b09c51a566d7b6e017134a3 100644
--- a/device-types/HPE/Aruba-8360-48XT4C-JL707C.yaml
+++ b/device-types/HPE/Aruba-8360-48XT4C-JL707C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 8360-48XT4C Back-to-Front
-slug: hpe-aruba-8360-48xt4c-jl707c
+slug: hpe-aruba-8360-48xt4c-back-to-front
 part_number: JL707C
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-8360-48Y6C-JL704C.yaml b/device-types/HPE/Aruba-8360-48Y6C-JL704C.yaml
index 30af2373c797c241acb0edff53f847c7ee4261e1..a43f26fe114651d430ce96f44e17dffc1ac13bb8 100644
--- a/device-types/HPE/Aruba-8360-48Y6C-JL704C.yaml
+++ b/device-types/HPE/Aruba-8360-48Y6C-JL704C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 8360-48Y6C Front-to-Back
-slug: hpe-aruba-8360-48y6c-jl704c
+slug: hpe-aruba-8360-48y6c-front-to-back
 part_number: JL704C
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/Aruba-8360-48Y6C-JL705C.yaml b/device-types/HPE/Aruba-8360-48Y6C-JL705C.yaml
index c635563e8abea20f32fe34e595b600575caabdb8..35006b699a1c520664e28241e4c8d2603ef4ac1f 100644
--- a/device-types/HPE/Aruba-8360-48Y6C-JL705C.yaml
+++ b/device-types/HPE/Aruba-8360-48Y6C-JL705C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Aruba 8360-48Y6C Back-to-Front
-slug: hpe-aruba-8360-48y6c-jl705c
+slug: hpe-aruba-8360-48y6c-back-to-front
 part_number: JL705C
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/FlexFabric-5800-48G.yml b/device-types/HPE/FlexFabric-5800-48G.yml
index 3d90efe3a7d1df742bb4d788bdd12433bddcb2de..bb7ed8195e4d3b37615b020bbdd6cee9649ca775 100644
--- a/device-types/HPE/FlexFabric-5800-48G.yml
+++ b/device-types/HPE/FlexFabric-5800-48G.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: FlexFabric 5800-48G
-slug: hpe-flexfabic-5800-48g
+slug: hpe-flexfabric-5800-48g
 part_number: JC105B
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/FlexFabric-5945-2-slot.yaml b/device-types/HPE/FlexFabric-5945-2-slot.yaml
index bccf3d67bac536df3e4f58f6c0f0ee36a17b2092..47a93b75bc3edff0a54953b62991673596d599bd 100644
--- a/device-types/HPE/FlexFabric-5945-2-slot.yaml
+++ b/device-types/HPE/FlexFabric-5945-2-slot.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: FlexFabric 5945 2-slot
-slug: flexfabric-5945-2-slot
+slug: hpe-flexfabric-5945-2-slot
 part_number: JQ075A
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/FlexNetwork-5130-48G-4SFPP-HI.yml b/device-types/HPE/FlexNetwork-5130-48G-4SFPP-HI.yml
index 98569b86f4c2c2df88630b2e2921759a81c0a0e9..5866466db29a12a472d434c0d4ce2703e6286fbb 100644
--- a/device-types/HPE/FlexNetwork-5130-48G-4SFPP-HI.yml
+++ b/device-types/HPE/FlexNetwork-5130-48G-4SFPP-HI.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: FlexNetwork 5130-48G-4SFP+-1-slot HI
-slug: hpe-flexnetwork-5130-48g-4sfpp-hi
+slug: hpe-flexnetwork-5130-48g-4sfpp-1-slot-hi
 part_number: JH324A
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/FlexNetwork-5130-48G-PoEP-4SFPP-HI.yml b/device-types/HPE/FlexNetwork-5130-48G-PoEP-4SFPP-HI.yml
index 247df5514c7b1b12f3be398294d420f028fdbb99..6b5866962ce963376381a5b6684a0b8228fe0c4d 100644
--- a/device-types/HPE/FlexNetwork-5130-48G-PoEP-4SFPP-HI.yml
+++ b/device-types/HPE/FlexNetwork-5130-48G-PoEP-4SFPP-HI.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: FlexNetwork 5130-48G-POE+-4SFP+-1-slot HI
-slug: hpe-flexnetwork-5130-48g-poep-4sfpp-hi
+slug: hpe-flexnetwork-5130-48g-poep-4sfpp-1-slot-hi
 part_number: JH326A
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/HP-5120-48G-EI-with-2-Interface-Slots.yaml b/device-types/HPE/HP-5120-48G-EI-with-2-Interface-Slots.yaml
index b4555ac88ceab8251eb26cee26eb50384ad5a6ae..c8a776626e59773d4157689749355f53514225c2 100644
--- a/device-types/HPE/HP-5120-48G-EI-with-2-Interface-Slots.yaml
+++ b/device-types/HPE/HP-5120-48G-EI-with-2-Interface-Slots.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
-model: 5120-48G EI Switch with 2 Interface Slots
-slug: hpe-5120-48g-ei-2-interface-slots
+model: 5120-48G EI
+slug: hpe-5120-48g-ei
 part_number: JE069A
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/OfficeConnect-1810-24G.yml b/device-types/HPE/OfficeConnect-1810-24G.yml
index 8b5d2e805892bdfd5a40e101d2d7528d1a1ea1c6..c3c9bbb0f03c97f8febfc70d61463652c4ccfc0c 100644
--- a/device-types/HPE/OfficeConnect-1810-24G.yml
+++ b/device-types/HPE/OfficeConnect-1810-24G.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: OfficeConnect 1810-24G
-slug: hpe-1810-24g
+slug: hpe-officeconnect-1810-24g
 part_number: J9803A
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/OfficeConnect-1820-48G.yml b/device-types/HPE/OfficeConnect-1820-48G.yml
index c35be0b3a26288fbeb62c2d603f3217f2a280b3d..228f3b74449a78e5dcc85ac3e8b22345a1ed6c81 100644
--- a/device-types/HPE/OfficeConnect-1820-48G.yml
+++ b/device-types/HPE/OfficeConnect-1820-48G.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: OfficeConnect 1820-48G
-slug: hpe-1820-48g
+slug: hpe-officeconnect-1820-48g
 part_number: J9981A
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/OfficeConnect-1920S-48-PoE+-4SFP.yml b/device-types/HPE/OfficeConnect-1920S-48-PoE+-4SFP.yml
index e68655b7f9f72b76be95a8c06b3fde582c395995..e095c941c961ae24cf35a8e444ec37f4244e6add 100644
--- a/device-types/HPE/OfficeConnect-1920S-48-PoE+-4SFP.yml
+++ b/device-types/HPE/OfficeConnect-1920S-48-PoE+-4SFP.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: OfficeConnect 1920S-48G-4SFP-PPoE+
-slug: hpe-1920s-48g-poep
+slug: hpe-officeconnect-1920s-48g-4sfp-ppoep
 part_number: JL386A
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/ProCurve-2524.yaml b/device-types/HPE/ProCurve-2524.yaml
index df4beb1b98a8b831ab5843027b445b8750e68064..46685137fc13bc918ad7ccbbc8e868a5384ffd16 100644
--- a/device-types/HPE/ProCurve-2524.yaml
+++ b/device-types/HPE/ProCurve-2524.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: ProCurve 2524
-slug: hpe-procurve-2524-24
+slug: hpe-procurve-2524
 part_number: J4813A
 u_height: 1
 is_full_depth: false
diff --git a/device-types/HPE/ProCurve-2626.yaml b/device-types/HPE/ProCurve-2626.yaml
index 792339051cbb60f79c55c4ab3b82d70a24ea4ff7..3394313ef84184cc900c4f70c40ed27b974a8ed1 100644
--- a/device-types/HPE/ProCurve-2626.yaml
+++ b/device-types/HPE/ProCurve-2626.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: ProCurve 2626
-slug: hpe-procurve-2626-24fe
+slug: hpe-procurve-2626
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/HPE/ProLiant-DL180-Gen6.yaml b/device-types/HPE/ProLiant-DL180-Gen6.yaml
index d95d7c13eabbab55d3b9c9cbd0528aabce2b9915..782c2f98c538587e2f2e9606827204b9668d6f4d 100644
--- a/device-types/HPE/ProLiant-DL180-Gen6.yaml
+++ b/device-types/HPE/ProLiant-DL180-Gen6.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: ProLiant DL180 Gen6
-slug: hp_dl180_g6
+slug: hpe-proliant-dl180-gen6
 u_height: 2.0
 is_full_depth: true
 part_number: 590638-371
diff --git a/device-types/HPE/ProLiant-DL320e-Gen8.yml b/device-types/HPE/ProLiant-DL320e-Gen8.yml
index 2119bff75cf45808c03b0f5bb717262b900c98f1..64516e8a949bcff444232c48b74282ab29a9f202 100644
--- a/device-types/HPE/ProLiant-DL320e-Gen8.yml
+++ b/device-types/HPE/ProLiant-DL320e-Gen8.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: ProLiant DL320e Gen8
-slug: hpe-proliant-dl320e-g8
+slug: hpe-proliant-dl320e-gen8
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/HPE/ProLiant-DL360-Gen7.yaml b/device-types/HPE/ProLiant-DL360-Gen7.yaml
index b75cbd5b8478c0721903664d989343316900a229..def56e4328fc8fe374ac701c3420f37d96ba4cf0 100644
--- a/device-types/HPE/ProLiant-DL360-Gen7.yaml
+++ b/device-types/HPE/ProLiant-DL360-Gen7.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: ProLiant DL360 Gen7
-slug: hpe-proliant-dl360-g7
+slug: hpe-proliant-dl360-gen7
 u_height: 1
 is_full_depth: true
 part_number: 579237-B21
diff --git a/device-types/HPE/ProLiant-DL360-Gen9.yaml b/device-types/HPE/ProLiant-DL360-Gen9.yaml
index 6267f8dfafbfaf36f5946b81730fed007d954511..558f0b17f6474184838265ddd903229f030e04a8 100644
--- a/device-types/HPE/ProLiant-DL360-Gen9.yaml
+++ b/device-types/HPE/ProLiant-DL360-Gen9.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: ProLiant DL360 Gen9
-slug: hpe-proliant-dl360-g9
+slug: hpe-proliant-dl360-gen9
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/HPE/ProLiant-DL360e-Gen8.yaml b/device-types/HPE/ProLiant-DL360e-Gen8.yaml
index f3eb235f010b088ad937d83b1b6c783c5184b812..c49a207de722b8302e3cd527c856a1091a81c79c 100644
--- a/device-types/HPE/ProLiant-DL360e-Gen8.yaml
+++ b/device-types/HPE/ProLiant-DL360e-Gen8.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: ProLiant DL360e Gen8
-slug: hp_dl360e_g8
+slug: hpe-proliant-dl360e-gen8
 u_height: 1.0
 is_full_depth: true
 part_number: 661189-B21
diff --git a/device-types/HPE/ProLiant-DL380-Gen5.yml b/device-types/HPE/ProLiant-DL380-Gen5.yml
index 807da7e07bc0845d1c60bd00e6c17f5d52b6c6f7..c1327550cbb7b6fc17ea138f3095f4e10bf95132 100644
--- a/device-types/HPE/ProLiant-DL380-Gen5.yml
+++ b/device-types/HPE/ProLiant-DL380-Gen5.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: ProLiant DL380 Gen5
-slug: hpe-proliant-dl380-g5
+slug: hpe-proliant-dl380-gen5
 u_height: 2
 is_full_depth: true
 console-ports:
diff --git a/device-types/HPE/ProLiant-DL380-Gen6.yml b/device-types/HPE/ProLiant-DL380-Gen6.yml
index b9c32a55cec322c49dd81ae606749fc40509661f..d6a2bd8fd860ca07434b5cd89639c3785a4c1d21 100644
--- a/device-types/HPE/ProLiant-DL380-Gen6.yml
+++ b/device-types/HPE/ProLiant-DL380-Gen6.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: ProLiant DL380 Gen6
-slug: hpe-proliant-dl380-g6
+slug: hpe-proliant-dl380-gen6
 u_height: 2
 is_full_depth: true
 console-ports:
diff --git a/device-types/HPE/ProLiant-DL380-Gen7.yml b/device-types/HPE/ProLiant-DL380-Gen7.yml
index d975f812c1c994e73a7da67601b0d2d52bf4807c..8e8429295baaf173a8237c1efaa10e86f543da25 100644
--- a/device-types/HPE/ProLiant-DL380-Gen7.yml
+++ b/device-types/HPE/ProLiant-DL380-Gen7.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: ProLiant DL380 Gen7
-slug: hpe-proliant-dl380-g7
+slug: hpe-proliant-dl380-gen7
 u_height: 2
 is_full_depth: true
 console-ports:
diff --git a/device-types/HPE/ProLiant-DL380-Gen9.yaml b/device-types/HPE/ProLiant-DL380-Gen9.yaml
index f2351ef9c52570a2caa544e9c55e1a1d2788887c..c915d052f3e536866e1ad07d500c2af67c7838e6 100644
--- a/device-types/HPE/ProLiant-DL380-Gen9.yaml
+++ b/device-types/HPE/ProLiant-DL380-Gen9.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: ProLiant DL380 Gen9
-slug: hpe-proliant-dl380-g9
+slug: hpe-proliant-dl380-gen9
 u_height: 2
 is_full_depth: true
 console-ports:
diff --git a/device-types/HPE/ProLiant-DL380p-Gen8.yaml b/device-types/HPE/ProLiant-DL380p-Gen8.yaml
index 12335cc83b645151abca52cb53e8b0d4cd1e6f5a..b506a7b63a09495d2291750fc8e3011efc6d33eb 100644
--- a/device-types/HPE/ProLiant-DL380p-Gen8.yaml
+++ b/device-types/HPE/ProLiant-DL380p-Gen8.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: ProLiant DL380p Gen8
-slug: hpe-proliant-dl380p-g8
+slug: hpe-proliant-dl380p-gen8
 part_number: 670524-001
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Huawei/AR6121E.yaml b/device-types/Huawei/AR6121E.yaml
index 4dc70cc9d26d748795add91706bd98e9ef001de2..24508829da6b76332f5f85bce4a1000d3a7e4d40 100644
--- a/device-types/Huawei/AR6121E.yaml
+++ b/device-types/Huawei/AR6121E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: AR6121E
-slug: ar6121e
+slug: huawei-ar6121e
 part_number: 02353TBH
 u_height: 1.0
 is_full_depth: false
diff --git a/device-types/Huawei/ATN910I-D.yaml b/device-types/Huawei/ATN910I-D.yaml
index 113862d6d0fc8d37baad91e92e22541b40835f90..72ad5d3871e261f5aac66505e191ccabfc054a2f 100644
--- a/device-types/Huawei/ATN910I-D.yaml
+++ b/device-types/Huawei/ATN910I-D.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: ATN910I-D
-slug: atn910i-d
+slug: huawei-atn910i-d
 u_height: 1
 is_full_depth: false
 power-ports:
diff --git a/device-types/Huawei/CE6851-48S6Q-HI.yaml b/device-types/Huawei/CE6851-48S6Q-HI.yaml
index e84e532840b10396c295779ab5176b2ed5953ae2..5c851aaac776c1d868b80455471aa99c24e2f1d7 100644
--- a/device-types/Huawei/CE6851-48S6Q-HI.yaml
+++ b/device-types/Huawei/CE6851-48S6Q-HI.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: CE6851-48S6Q-HI
-slug: ce6851-48s6q-hi
+slug: huawei-ce6851-48s6q-hi
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/Huawei/Huawei_2288H_V5.yaml b/device-types/Huawei/Huawei_2288H_V5.yaml
index e125056371e83ef31b0ccc11dbad5154c80a4df3..f3112045f325347b50f86b248d0f44065bca9665 100644
--- a/device-types/Huawei/Huawei_2288H_V5.yaml
+++ b/device-types/Huawei/Huawei_2288H_V5.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: Huawei 2288H V5
-slug: huawei_2288h_v5
+slug: huawei-2288h-v5
 part_number: H22-05-S8AFF
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Huawei/Huawei_CE6820H-48S6CQ.yaml b/device-types/Huawei/Huawei_CE6820H-48S6CQ.yaml
index eebb8a053c9b956c07867d647ca0030971608b77..7031d9976ef860b1e4a2c7afc21f43dd726a903c 100644
--- a/device-types/Huawei/Huawei_CE6820H-48S6CQ.yaml
+++ b/device-types/Huawei/Huawei_CE6820H-48S6CQ.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: Huawei_CE6820H-48S6CQ
-slug: ce6820h-48s6cq
+slug: huawei-ce6820h-48s6cq
 part_number: CE6820H-48S6CQ
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Huawei/Huawei_Dorado_3000_v6.yaml b/device-types/Huawei/Huawei_Dorado_3000_v6.yaml
index 6fa1208a19f7dc994493ced3a945fd7e837ef0eb..ce7cc95eefdb53fc2f3d22485fd09ae0f5c82490 100644
--- a/device-types/Huawei/Huawei_Dorado_3000_v6.yaml
+++ b/device-types/Huawei/Huawei_Dorado_3000_v6.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: Huawei Dorado 3000 V6
-slug: huawei_dorado_3000_v6
+slug: huawei-dorado-3000-v6
 part_number: D3V6-192G-SAS
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Huawei/Huawei_S5732-H24UM2CC.yaml b/device-types/Huawei/Huawei_S5732-H24UM2CC.yaml
index 123e44874d579fa6b359901254cae7c736d15b22..3ae98f28587e546d837cc966f520eebe412f62ab 100644
--- a/device-types/Huawei/Huawei_S5732-H24UM2CC.yaml
+++ b/device-types/Huawei/Huawei_S5732-H24UM2CC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: Huawei_S5732-H24UM2CC
-slug: s5732-h24um2cc
+slug: huawei-s5732-h24um2cc
 part_number: S5732-H24UM2CC
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Huawei/NE40E-M2K-B.yaml b/device-types/Huawei/NE40E-M2K-B.yaml
index 5a9f7e69ae90fe92ab2d10954802bb420b4843c8..5171163da0f850013396e3328ff56cc82847bda7 100644
--- a/device-types/Huawei/NE40E-M2K-B.yaml
+++ b/device-types/Huawei/NE40E-M2K-B.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: NE40E-M2K-B
-slug: ne40e-m2k-b
+slug: huawei-ne40e-m2k-b
 is_full_depth: false
 u_height: 2
 comments: '[NE40E-M2K-B Documentation](https://support.huawei.com/hedex/hdx.do?docid=EDOC1100168834)'
diff --git a/device-types/Huawei/S1720-28GWR-PWR-4TP-E.yaml b/device-types/Huawei/S1720-28GWR-PWR-4TP-E.yaml
index 78976e2a4a208dcd57117dc55ff4cdbddd836dad..8e761a86566509a1deed5285e4de27c76f2d6cfd 100644
--- a/device-types/Huawei/S1720-28GWR-PWR-4TP-E.yaml
+++ b/device-types/Huawei/S1720-28GWR-PWR-4TP-E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: S1720-28GWR-PWR-4TP-E
-slug: s1720-28gwr-pwr-4tp-e
+slug: huawei-s1720-28gwr-pwr-4tp-e
 part_number: '98010752'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Huawei/S5720-28X-LI-24S-DC.yaml b/device-types/Huawei/S5720-28X-LI-24S-DC.yaml
index b6f94fccaf6773ef2f408b57641dbb6e44a7ad5b..8ea25df555ac05670154ee743a574c2d0c47c145 100644
--- a/device-types/Huawei/S5720-28X-LI-24S-DC.yaml
+++ b/device-types/Huawei/S5720-28X-LI-24S-DC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: S5720-28X-LI-24S-DC
-slug: s5720-28x-li-24s-dc
+slug: huawei-s5720-28x-li-24s-dc
 u_height: 1.0
 is_full_depth: true
 console-ports:
diff --git a/device-types/Huawei/S5731-S24T4X.yaml b/device-types/Huawei/S5731-S24T4X.yaml
index d67d2649f398872e63de08b8be67b9039dc2c93c..d63966dabba22744c854eb1d1e7dcd6fd0a6200d 100644
--- a/device-types/Huawei/S5731-S24T4X.yaml
+++ b/device-types/Huawei/S5731-S24T4X.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: S5731-S24T4X
-slug: s5731-s24t4x
+slug: huawei-s5731-s24t4x
 part_number: 02353AHU-001
 u_height: 1.0
 is_full_depth: false
diff --git a/device-types/Huawei/S5732-H48XUM2CC.yaml b/device-types/Huawei/S5732-H48XUM2CC.yaml
index c8f9fae5d98aeb15543aac9821d491ae35b72b62..613d60da6cab5be2b2f3e89540bb6bd8d1da193a 100644
--- a/device-types/Huawei/S5732-H48XUM2CC.yaml
+++ b/device-types/Huawei/S5732-H48XUM2CC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: CloudEngine S5732-H48XUM2CC
-slug: cloudengine-s5732-h48xum2cc
+slug: huawei-cloudengine-s5732-h48xum2cc
 part_number: 02353MLH
 u_height: 1.0
 is_full_depth: false
diff --git a/device-types/Huawei/S5735-L24P4X-A1.yaml b/device-types/Huawei/S5735-L24P4X-A1.yaml
index 7d23c9e1899d3ba9808c0eebcadc9b48120e8678..d1c4d862c0258411a451a165242cef8cec654998 100644
--- a/device-types/Huawei/S5735-L24P4X-A1.yaml
+++ b/device-types/Huawei/S5735-L24P4X-A1.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: S5735-L24P4X-A1
-slug: s5735-l24p4x-a1
+slug: huawei-s5735-l24p4x-a1
 part_number: '98011318'
 u_height: 1.0
 is_full_depth: false
diff --git a/device-types/Huawei/S5735-L24T4X-A.yaml b/device-types/Huawei/S5735-L24T4X-A.yaml
index 51b86c8e6a681a2d88413ee69b6b286f5db1a4c8..48e570c4e71f44b42be78be9eecc4d7b91b65df4 100644
--- a/device-types/Huawei/S5735-L24T4X-A.yaml
+++ b/device-types/Huawei/S5735-L24T4X-A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: S5735-L24T4X-A
-slug: s5735-l24t4x-a
+slug: huawei-s5735-l24t4x-a
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/Huawei/S6720-30C-EI-24S-AC.yaml b/device-types/Huawei/S6720-30C-EI-24S-AC.yaml
index 793e93df25b96b23445b6d508d465287b7ad18df..5b817f93e48da71f58b8f104848ce17d7e51e1e2 100644
--- a/device-types/Huawei/S6720-30C-EI-24S-AC.yaml
+++ b/device-types/Huawei/S6720-30C-EI-24S-AC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: S6720-30C-EI-24S-AC
-slug: s6720-30c-ei-24s-ac
+slug: huawei-s6720-30c-ei-24s-ac
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/Huawei/S6720-30C-EI-24S-DC.yaml b/device-types/Huawei/S6720-30C-EI-24S-DC.yaml
index 30fadde97f2e0ca16ca92e0391802d499e32a8c9..b9a12838d6382d5d28f28e9bd4bc70112b09fc9b 100644
--- a/device-types/Huawei/S6720-30C-EI-24S-DC.yaml
+++ b/device-types/Huawei/S6720-30C-EI-24S-DC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: S6720-30C-EI-24S-DC
-slug: s6720-30c-ei-24s-dc
+slug: huawei-s6720-30c-ei-24s-dc
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/Huawei/S6720S-26Q-EI-24S-AC.yaml b/device-types/Huawei/S6720S-26Q-EI-24S-AC.yaml
index baec696827108392f5da2021ba0b295aacd38f2a..a24512dda37722030bd1e83559b52dc1e953027d 100644
--- a/device-types/Huawei/S6720S-26Q-EI-24S-AC.yaml
+++ b/device-types/Huawei/S6720S-26Q-EI-24S-AC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: S6720S-26Q-EI-24S-AC
-slug: s6720s-26q-ei-24s-ac
+slug: huawei-s6720s-26q-ei-24s-ac
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/Huawei/S6730-H24X6C.yaml b/device-types/Huawei/S6730-H24X6C.yaml
index 3a7557031711398fe342bf3de3f443ef83d7698a..039bb89141c70df0ad8a45b1cd97864d1219a2b8 100644
--- a/device-types/Huawei/S6730-H24X6C.yaml
+++ b/device-types/Huawei/S6730-H24X6C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: S6730-H24X6C
-slug: s6730-h24x6c
+slug: huawei-s6730-h24x6c
 part_number: S6730-H24X6C
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Huawei/S6730-H48X6C.yaml b/device-types/Huawei/S6730-H48X6C.yaml
index e04b771edc4df6a7efca0c1193561ab91d759ed9..7230c521923dbde6c467f4eb07a5bfd50c4fb00d 100644
--- a/device-types/Huawei/S6730-H48X6C.yaml
+++ b/device-types/Huawei/S6730-H48X6C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: S6730-H48X6C
-slug: s6730-h48x6c
+slug: huawei-s6730-h48x6c
 part_number: S6730-H48X6C
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Huawei/huawei-s5720-56c-ei-48s-ac.yaml b/device-types/Huawei/huawei-s5720-56c-ei-48s-ac.yaml
index 7564f38364d6a4b4db1f942389969917c4d065ea..91ae0200684d94da6f18cc483409b4af7598d7f6 100644
--- a/device-types/Huawei/huawei-s5720-56c-ei-48s-ac.yaml
+++ b/device-types/Huawei/huawei-s5720-56c-ei-48s-ac.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Huawei
 model: S5720-56C-EI-48S-AC
-slug: s5720-56c-ei-48s-ac
+slug: huawei-s5720-56c-ei-48s-ac
 is_full_depth: false
 u_height: 1
 comments: '[S5720-56C-EI-48S-AC](https://support.huawei.com/enterprise/en/doc/EDOC1000013597/4dfb988f/s5720-56c-ei-48s-ac)'
diff --git a/device-types/IBM/BladeCenter-GS22.yaml b/device-types/IBM/BladeCenter-GS22.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e0800631ed33087dca87f0663b4605c04af5ea6c
--- /dev/null
+++ b/device-types/IBM/BladeCenter-GS22.yaml
@@ -0,0 +1,6 @@
+---
+manufacturer: IBM
+model: BladeCenter HS22
+slug: ibm-bladecenter-hs22
+u_height: 0
+subdevice_role: child
diff --git a/device-types/IBM/bladecenter_h.yaml b/device-types/IBM/BladeCenter-H.yaml
similarity index 97%
rename from device-types/IBM/bladecenter_h.yaml
rename to device-types/IBM/BladeCenter-H.yaml
index e0bc6f69b37a62843ecd01fe9f6af29a12623fef..3c269e3a5954618db84cb8a5cef8096700e61b45 100644
--- a/device-types/IBM/bladecenter_h.yaml
+++ b/device-types/IBM/BladeCenter-H.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: IBM
 model: BladeCenter H
-slug: bladecenter_h
+slug: ibm-bladecenter-h
 u_height: 9
 is_full_depth: true
 subdevice_role: parent
diff --git a/device-types/IBM/system_x3550_type_7978.yaml b/device-types/IBM/System-x3550.yaml
similarity index 89%
rename from device-types/IBM/system_x3550_type_7978.yaml
rename to device-types/IBM/System-x3550.yaml
index 5c757e92c79c4ae60cfb5aa97c74fe800dd268b8..903f9cbb3d7e05148dc50cad47c5b23f20b8453a 100644
--- a/device-types/IBM/system_x3550_type_7978.yaml
+++ b/device-types/IBM/System-x3550.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: IBM
-model: System x3550 (Type 7978)
-slug: system_x3550_type_7978
+model: System x3550
+slug: ibm-system-x3550
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/IBM/eServer_x226_86482DG.yml b/device-types/IBM/eServer-x226.yml
similarity index 83%
rename from device-types/IBM/eServer_x226_86482DG.yml
rename to device-types/IBM/eServer-x226.yml
index cac60333f0bd4d0b2bafcfe75eabbca0766933e9..d559a334484341fd5f9e28893aa0970b5c958f36 100644
--- a/device-types/IBM/eServer_x226_86482DG.yml
+++ b/device-types/IBM/eServer-x226.yml
@@ -1,7 +1,8 @@
 ---
 manufacturer: IBM
-model: eServer x226-[86482DG]-
-slug: ibm_eserver_x226_86482dg
+model: eServer x226
+slug: ibm-eserver-x226
+part_number: 86482DG
 u_height: 5
 is_full_depth: true
 console-ports:
diff --git a/device-types/IBM/hs22_type_7870.yaml b/device-types/IBM/hs22_type_7870.yaml
deleted file mode 100644
index 1aad1aee9c0126e8f52ccbdff6c9d7ee6d5d34dc..0000000000000000000000000000000000000000
--- a/device-types/IBM/hs22_type_7870.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-manufacturer: IBM
-model: BladeCenter HS22 (Type 7870)
-slug: ibm_bladecenter_hs22_type_7870
-u_height: 0
-subdevice_role: child
diff --git a/device-types/Infinera/CloudXpress2.yml b/device-types/Infinera/CloudXpress2.yml
index 7d0ada695fca683d6d4fc6da03ac4354a06c782f..ea73dbefa27bcd33d970a0ade24459fdff5d08ce 100644
--- a/device-types/Infinera/CloudXpress2.yml
+++ b/device-types/Infinera/CloudXpress2.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Infinera
 model: Cloud Xpress 2
-slug: cloud-xpress-2
+slug: infinera-cloud-xpress-2
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/Infoblox/IB-1410.yaml b/device-types/Infoblox/IB-1410.yaml
index 8f4f29d2d9a82bace1d1e7a02136bf7dd3eef03f..a785f08b7327dc7b458d13a73e010d8a02aee31e 100644
--- a/device-types/Infoblox/IB-1410.yaml
+++ b/device-types/Infoblox/IB-1410.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Infoblox
 model: IB-1410
-slug: ib-1410
+slug: infoblox-ib-1410
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Infoblox/IB-1420.yaml b/device-types/Infoblox/IB-1420.yaml
index f9edc9cb9cee583d06de03feaec4db6962ecc1bc..33a5b16f34ccbe0626a4a78f4ace483999639a76 100644
--- a/device-types/Infoblox/IB-1420.yaml
+++ b/device-types/Infoblox/IB-1420.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Infoblox
 model: IB-1420
-slug: ib-1420
+slug: infoblox-ib-1420
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Infoblox/TE-1415-NS1GD-AC.yaml b/device-types/Infoblox/TE-1415-NS1GD-AC.yaml
index 6c4369cf4c5708e5b13edf9660d7cfc4f9f594e8..582645f764b6a52332daa373da292d0de8357133 100644
--- a/device-types/Infoblox/TE-1415-NS1GD-AC.yaml
+++ b/device-types/Infoblox/TE-1415-NS1GD-AC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Infoblox
 model: TE-1415-NS1GD-AC
-slug: te-1415-ns1gd-ac
+slug: infoblox-te-1415-ns1gd-ac
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Infoblox/TE-805-HW-AC-B.yaml b/device-types/Infoblox/TE-805-HW-AC-B.yaml
index 68c6137dbd95d9221e94bc1e34cf5e1488a3de48..65c141109a0defdb19928e24c727c801464454b9 100644
--- a/device-types/Infoblox/TE-805-HW-AC-B.yaml
+++ b/device-types/Infoblox/TE-805-HW-AC-B.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Infoblox
 model: Trinzic TE-805
-slug: te-805-hw-ac-b
+slug: infoblox-te-805-hw-ac-b
 part_number: TE-805-HW-AC-B
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Infoblox/TE-815-NS1GD-AC.yaml b/device-types/Infoblox/TE-815-NS1GD-AC.yaml
index c03c93beed3b1a255c3f3895cf2fa7cff30d029b..6240ef2c1a5419d6500ac63b0be6b1e3b07cb9b4 100644
--- a/device-types/Infoblox/TE-815-NS1GD-AC.yaml
+++ b/device-types/Infoblox/TE-815-NS1GD-AC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Infoblox
 model: TE-815-NS1GD-AC
-slug: te-815-ns1gd-ac
+slug: infoblox-te-815-ns1gd-ac
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/Infotecs/VIPNET-COORDINATOR-HW1000C.yaml b/device-types/Infotecs/VIPNET-COORDINATOR-HW1000C.yaml
index 7fc5fef17bc1e1a3ecf053159ac8cce29eb06d63..d8d026293c44353928a60badf86adc500de9d720 100644
--- a/device-types/Infotecs/VIPNET-COORDINATOR-HW1000C.yaml
+++ b/device-types/Infotecs/VIPNET-COORDINATOR-HW1000C.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Infotecs
 model: ViPNet Coordinator HW1000C
-slug: vipnet-coordinator-hw1000c
+slug: infotecs-vipnet-coordinator-hw1000c
 u_height: 1
 is_full_depth: true
 power-ports:
diff --git a/device-types/Inspur/NF5180M6.yaml b/device-types/Inspur/NF5180M6.yaml
index c5ad9790e81ed575c4de135cb3bd0927660a59f0..86a370b9973c2327b58df536da6eaf916643c034 100644
--- a/device-types/Inspur/NF5180M6.yaml
+++ b/device-types/Inspur/NF5180M6.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Inspur
 model: NF5180M6
-slug: inspur_nf5180m6
+slug: inspur-nf5180m6
 part_number: NF5180M6
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Inspur/NF8260M6.yaml b/device-types/Inspur/NF8260M6.yaml
index 6efb30002c4ab6c85883dcf3f591fe7ca65727ad..33949160fffbc4f315e4b6ecbbc3f48073177fef 100644
--- a/device-types/Inspur/NF8260M6.yaml
+++ b/device-types/Inspur/NF8260M6.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Inspur
 model: NF8260M6
-slug: inspur_nf8260m6
+slug: inspur-nf8260m6
 part_number: NF8260M6
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Juniper/SRX210HE2.yaml b/device-types/Juniper/SRX210HE2.yaml
index 722107b994494a3d572c2451bf95b89c9d92f644..d361173cb66adae83fbcc0861d711ad517e8f2b3 100644
--- a/device-types/Juniper/SRX210HE2.yaml
+++ b/device-types/Juniper/SRX210HE2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Juniper
 model: SRX21HE2
-slug: juniper-srx210he2
+slug: juniper-srx21he2
 is_full_depth: false
 interfaces:
   - name: ge-0/0/0
diff --git a/device-types/Juniper/SRX380-P.yaml b/device-types/Juniper/SRX380-P.yaml
index 9618e76fac8f7808abc9813a03081204a7b1220f..401c5c12a7cc1c9ec09f72eaa7367df9dc5a497c 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: juniper-srx380
+slug: juniper-jnp-srx380-p
 part_number: SRX380-P
 u_height: 1
 is_full_depth: true
diff --git a/device-types/LANCOM/GS-1108.yaml b/device-types/LANCOM/GS-1108.yaml
index 7e8c34cd979e176607ad4178c57443543eb6d1e4..18fe7dc3b28a80457ac347a4829a58cc71c2d56f 100644
--- a/device-types/LANCOM/GS-1108.yaml
+++ b/device-types/LANCOM/GS-1108.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-1108
-slug: gs-1108
+slug: lancom-gs-1108
 part_number: '61457'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-1108P.yaml b/device-types/LANCOM/GS-1108P.yaml
index 040c7dcc335fd7e6f2c4ca178d0ac351250368a5..a148894480fb078f7c44c9a6dd212002e5adfae5 100644
--- a/device-types/LANCOM/GS-1108P.yaml
+++ b/device-types/LANCOM/GS-1108P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-1108P
-slug: gs-1108p
+slug: lancom-gs-1108p
 part_number: '61430'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-1326.yaml b/device-types/LANCOM/GS-1326.yaml
index 6b5ca566f1829c344aee4d475e7abcc020f1acc2..4b899f359aca8f77d9736a1454191d037dbc42ea 100644
--- a/device-types/LANCOM/GS-1326.yaml
+++ b/device-types/LANCOM/GS-1326.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-1326
-slug: gs-1326
+slug: lancom-gs-1326
 part_number: '61438'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-2310.yaml b/device-types/LANCOM/GS-2310.yaml
index 78fa5b063cca79a41a7c5fbf7da65f587f1b8929..bf74fa50bd2c53fcd74bb3071e2125b8416337c0 100644
--- a/device-types/LANCOM/GS-2310.yaml
+++ b/device-types/LANCOM/GS-2310.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-2310
-slug: gs-2310
+slug: lancom-gs-2310
 part_number: '61492'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-2310P-plus.yaml b/device-types/LANCOM/GS-2310P-plus.yaml
index 063776e101af9d33f5c93ea9d5681ceac0b1ca1e..169366b68887c224d6993de44bd88b4ce559f20c 100644
--- a/device-types/LANCOM/GS-2310P-plus.yaml
+++ b/device-types/LANCOM/GS-2310P-plus.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-2310P+
-slug: gs-2310p-plus
+slug: lancom-gs-2310p-plus
 part_number: '61440'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-2310P.yaml b/device-types/LANCOM/GS-2310P.yaml
index c417099a6f9096c537cca3112106174c1f923ff3..a6b801731bcbd07ee9c106ddec721e1ebe8915d0 100644
--- a/device-types/LANCOM/GS-2310P.yaml
+++ b/device-types/LANCOM/GS-2310P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-2310P
-slug: gs-2310p
+slug: lancom-gs-2310p
 part_number: '61433'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-2326-plus.yaml b/device-types/LANCOM/GS-2326-plus.yaml
index 571b63928c696f19894c9496fd621ffc055f6c06..44ee67c0999e08e53675b1cb6f1b0f47c6fca18d 100644
--- a/device-types/LANCOM/GS-2326-plus.yaml
+++ b/device-types/LANCOM/GS-2326-plus.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-2326+
-slug: gs-2326-plus
+slug: lancom-gs-2326-plus
 part_number: '61483'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-2326.yaml b/device-types/LANCOM/GS-2326.yaml
index e1ff813635d7733057ca7651c0824203ae4b0b55..9471b13dff6bdcb29bc80027422859bd394fd89a 100644
--- a/device-types/LANCOM/GS-2326.yaml
+++ b/device-types/LANCOM/GS-2326.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-2326
-slug: gs-2326
+slug: lancom-gs-2326
 part_number: '61470'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-2326P-plus.yaml b/device-types/LANCOM/GS-2326P-plus.yaml
index 42122b14d4a1616c4c2566ad833174ff8c7e6c85..f8d50618b4d9605c706122f50f5b2425dc6144f8 100644
--- a/device-types/LANCOM/GS-2326P-plus.yaml
+++ b/device-types/LANCOM/GS-2326P-plus.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-2326P+
-slug: gs-2326p-plus
+slug: lancom-gs-2326p-plus
 part_number: '61481'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-2328.yaml b/device-types/LANCOM/GS-2328.yaml
index 2a87b210d09560ada70b30dc08f158dd06c30c62..4b9066e618aefc98e8a48f86e6ac81bef3e695fb 100644
--- a/device-types/LANCOM/GS-2328.yaml
+++ b/device-types/LANCOM/GS-2328.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-2328
-slug: gs-2328
+slug: lancom-gs-2328
 part_number: '61444'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-2328F.yaml b/device-types/LANCOM/GS-2328F.yaml
index 09bb0a930453097904b3f4d496f0f4b39288955e..503c7af8e7a461a0fd4954e44dd426075300d19a 100644
--- a/device-types/LANCOM/GS-2328F.yaml
+++ b/device-types/LANCOM/GS-2328F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-2328F
-slug: gs-2328f
+slug: lancom-gs-2328f
 part_number: '61446'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-2328P.yaml b/device-types/LANCOM/GS-2328P.yaml
index 2a7b2a76cfb96d4b70ea77e144a1301f0b07fd76..9c43fee001fc3145daf8e604b07e12374feab922 100644
--- a/device-types/LANCOM/GS-2328P.yaml
+++ b/device-types/LANCOM/GS-2328P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-2328P
-slug: gs-2328p
+slug: lancom-gs-2328p
 part_number: '61442'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-2352.yaml b/device-types/LANCOM/GS-2352.yaml
index a8e2a8a2e7bfb408493731ee1bca624cb430944a..65713146f23c56e7db398aecca60cde49c391ee8 100644
--- a/device-types/LANCOM/GS-2352.yaml
+++ b/device-types/LANCOM/GS-2352.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-2352
-slug: gs-2352
+slug: lancom-gs-2352
 part_number: '61472'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-2352P.yaml b/device-types/LANCOM/GS-2352P.yaml
index 506e532be69c2460432e70b742ea9fcd6c275b41..d75af5fc13fcbb0e5c02393a442f345b6a41cbad 100644
--- a/device-types/LANCOM/GS-2352P.yaml
+++ b/device-types/LANCOM/GS-2352P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-2352P
-slug: gs-2352p
+slug: lancom-gs-2352p
 part_number: '61436'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-3126X.yaml b/device-types/LANCOM/GS-3126X.yaml
index 7d142b3ccfb0cfae0f395ff45f0640fd42e3e3be..c21261a33bbdc9d2cc3f053461eeba1165f0f0c3 100644
--- a/device-types/LANCOM/GS-3126X.yaml
+++ b/device-types/LANCOM/GS-3126X.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-3126X
-slug: gs-3126x
+slug: lancom-gs-3126x
 part_number: '61847'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-3126XP.yaml b/device-types/LANCOM/GS-3126XP.yaml
index ea93c4e516dbd4406850d4bb9534d5f0583bfea2..3ba72b2c0626a50a4caa2c1b7c45bc6d5b842475 100644
--- a/device-types/LANCOM/GS-3126XP.yaml
+++ b/device-types/LANCOM/GS-3126XP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-3126XP
-slug: gs-3126xp
+slug: lancom-gs-3126xp
 part_number: '61848'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-3152X.yaml b/device-types/LANCOM/GS-3152X.yaml
index 59f9d2aeccfd71fab1a21895ce78ad1351a7e6cd..cc31fcce62ed9dfab71194afcb02e2881a81f6c0 100644
--- a/device-types/LANCOM/GS-3152X.yaml
+++ b/device-types/LANCOM/GS-3152X.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-3152X
-slug: gs-3152x
+slug: lancom-gs-3152x
 part_number: '61488'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-3152XP.yaml b/device-types/LANCOM/GS-3152XP.yaml
index acb0cd0428d3f0fef11a60139c71f592170773bd..33e6cfcb0fece7dae81ca38aab87c8812ea2b3d0 100644
--- a/device-types/LANCOM/GS-3152XP.yaml
+++ b/device-types/LANCOM/GS-3152XP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-3152XP
-slug: gs-3152xp
+slug: lancom-gs-3152xp
 part_number: '61487'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-3152XSP.yaml b/device-types/LANCOM/GS-3152XSP.yaml
index 3bce340433a71b071615f690dc6136168c2038f4..87e5dcf49a51e1ebda2d973861dbb88527fdcaf4 100644
--- a/device-types/LANCOM/GS-3152XSP.yaml
+++ b/device-types/LANCOM/GS-3152XSP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-3152XSP
-slug: gs-3152xsp
+slug: lancom-gs-3152xsp
 part_number: '61486'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-3510XP.yaml b/device-types/LANCOM/GS-3510XP.yaml
index 0771c2956c50c60af58fac58ad5bec15f365e92d..441cc6dd5a2681af975becdc6d81d6218da0ac5b 100644
--- a/device-types/LANCOM/GS-3510XP.yaml
+++ b/device-types/LANCOM/GS-3510XP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-3510XP
-slug: gs-3510xp
+slug: lancom-gs-3510xp
 part_number: '61849'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-3528X.yaml b/device-types/LANCOM/GS-3528X.yaml
index 25107d9cc121ca03410027b441829ebda0dbcd73..c85c2a391be5c6bebfbdd5de13a6286375d2b9cb 100644
--- a/device-types/LANCOM/GS-3528X.yaml
+++ b/device-types/LANCOM/GS-3528X.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-3528X
-slug: gs-3528x
+slug: lancom-gs-3528x
 part_number: '61496'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/GS-3528XP.yaml b/device-types/LANCOM/GS-3528XP.yaml
index e31fc89dffb2e418fb8d6f50e2abcbf719f8b398..424523d9277c164aeb2282918ce2441b995526fe 100644
--- a/device-types/LANCOM/GS-3528XP.yaml
+++ b/device-types/LANCOM/GS-3528XP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: GS-3528XP
-slug: gs-3528xp
+slug: lancom-gs-3528xp
 part_number: '61850'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/ISG-1000.yaml b/device-types/LANCOM/ISG-1000.yaml
index 462b973eec4ce1ec866c18c4f97cbdb81475b3cc..73d3ede33d0ffb91fbd19049b8cb1d812195d418 100644
--- a/device-types/LANCOM/ISG-1000.yaml
+++ b/device-types/LANCOM/ISG-1000.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: ISG-1000
-slug: isg-1000
+slug: lancom-isg-1000
 part_number: '61073'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/ISG-4000.yaml b/device-types/LANCOM/ISG-4000.yaml
index 52ddf66e959041768ce620ef8676ecd81f633c7c..341f070a9e447289f4716add63d8012912c6a908 100644
--- a/device-types/LANCOM/ISG-4000.yaml
+++ b/device-types/LANCOM/ISG-4000.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: ISG-4000
-slug: isg-4000
+slug: lancom-isg-4000
 part_number: '61075'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/ISG-8000.yaml b/device-types/LANCOM/ISG-8000.yaml
index c00772381c857ab1b02f8fd5477ba86ec66e2486..183202f341259ed6abd50ae817c924015d437d56 100644
--- a/device-types/LANCOM/ISG-8000.yaml
+++ b/device-types/LANCOM/ISG-8000.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: ISG-8000
-slug: isg-8000
+slug: lancom-isg-8000
 part_number: '61077'
 u_height: 1
 is_full_depth: true
diff --git a/device-types/LANCOM/LN-1700.yaml b/device-types/LANCOM/LN-1700.yaml
index c69998e35cda24364c2bcebbd38c351fc68ad87f..3a61c08f177fbea3046dd04c794d4a32829ad774 100644
--- a/device-types/LANCOM/LN-1700.yaml
+++ b/device-types/LANCOM/LN-1700.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: LN-1700
-slug: ln-1700
+slug: lancom-ln-1700
 part_number: '61767'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/LN-1700B.yaml b/device-types/LANCOM/LN-1700B.yaml
index d762aa9d56fbe21ee13fc8082da81d9155d488cf..c530fa22ddb49ca6ed083169edec2cb3cbcd3c41 100644
--- a/device-types/LANCOM/LN-1700B.yaml
+++ b/device-types/LANCOM/LN-1700B.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: LN-1700B
-slug: ln-1700b
+slug: lancom-ln-1700b
 part_number: '61792'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/LN-1700UE.yaml b/device-types/LANCOM/LN-1700UE.yaml
index 22ae8a54afa4a9ad86d3787ff68d13f7394faaa5..82c294e2b66732c140be3e2126a54ca261e79ead 100644
--- a/device-types/LANCOM/LN-1700UE.yaml
+++ b/device-types/LANCOM/LN-1700UE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: LN-1700UE
-slug: ln-1700ue
+slug: lancom-ln-1700ue
 part_number: '61801'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/LN-1702.yaml b/device-types/LANCOM/LN-1702.yaml
index 0cddcb0445df1d7f1a5484d1692320beb8418ac5..b799db8292928b565f60ce9abba4869a28494d45 100644
--- a/device-types/LANCOM/LN-1702.yaml
+++ b/device-types/LANCOM/LN-1702.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: LN-1702
-slug: ln-1702
+slug: lancom-ln-1702
 part_number: '61764'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/LN-1702B.yaml b/device-types/LANCOM/LN-1702B.yaml
index 57bf56a60689b496c02f851fc780b9277eb3bee1..279e4927bbe1c52ad6cda047f67790f654c581b8 100644
--- a/device-types/LANCOM/LN-1702B.yaml
+++ b/device-types/LANCOM/LN-1702B.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: LN-1702B
-slug: ln-1702b
+slug: lancom-ln-1702b
 part_number: '61794'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/WLC-1000.yaml b/device-types/LANCOM/WLC-1000.yaml
index d50e8d485cad8febc287ff0267342f8848ab6b7a..e16fc77c9b946e26fbd4d60ca6511d506bad1980 100644
--- a/device-types/LANCOM/WLC-1000.yaml
+++ b/device-types/LANCOM/WLC-1000.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: WLC-1000
-slug: wlc-1000
+slug: lancom-wlc-1000
 part_number: '61783'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/WLC-30.yaml b/device-types/LANCOM/WLC-30.yaml
index 0a391de92e7f071d13f43e2767218a29b20bea0f..3d0a949af6c4cf20f34a431f6255ef3cc8de85cd 100644
--- a/device-types/LANCOM/WLC-30.yaml
+++ b/device-types/LANCOM/WLC-30.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: WLC-30
-slug: wlc-30
+slug: lancom-wlc-30
 part_number: '61789'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/WLC-4006-plus.yaml b/device-types/LANCOM/WLC-4006-plus.yaml
index c61ac247a6cce5b5121e5a7499a3dfa598e02c7e..11aac29f8def0a57f56ea9b04993741658b366bd 100644
--- a/device-types/LANCOM/WLC-4006-plus.yaml
+++ b/device-types/LANCOM/WLC-4006-plus.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: WLC-4006+
-slug: wlc-4006-plus
+slug: lancom-wlc-4006-plus
 part_number: '62035'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/WLC-4025-plus.yaml b/device-types/LANCOM/WLC-4025-plus.yaml
index 2ba179a8a1c9b1327f129522e64807e310f2670f..f052915e3b24eac19589d30e74b6d98d8b409d08 100644
--- a/device-types/LANCOM/WLC-4025-plus.yaml
+++ b/device-types/LANCOM/WLC-4025-plus.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: WLC-4025+
-slug: wlc-4025-plus
+slug: lancom-wlc-4025-plus
 part_number: wlc-4025-plus
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/WLC-4025.yaml b/device-types/LANCOM/WLC-4025.yaml
index 87653b32a658c1612f21f826b201245d4e425a9c..16247f013c7d08f6a10d37715d4b701b3d87be7c 100644
--- a/device-types/LANCOM/WLC-4025.yaml
+++ b/device-types/LANCOM/WLC-4025.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: WLC-4025
-slug: wlc-4025
+slug: lancom-wlc-4025
 part_number: wlc-4025
 u_height: 1
 is_full_depth: false
diff --git a/device-types/LANCOM/WLC-4100.yaml b/device-types/LANCOM/WLC-4100.yaml
index e31d4172a44d09592cfbd5e955b41953da633fcb..53d27621369acdbab2d225ab644a89c87b042965 100644
--- a/device-types/LANCOM/WLC-4100.yaml
+++ b/device-types/LANCOM/WLC-4100.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: LANCOM
 model: WLC-4100
-slug: wlc-4100
+slug: lancom-wlc-4100
 part_number: '61369'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Lenovo/FLEX-SYSTEM.yaml b/device-types/Lenovo/FLEX-SYSTEM.yaml
index 6789ca29d6095f5a0413dc81bc1cb684587bc190..036db2739634606fe445ca78c7c0f345dd09e6ef 100644
--- a/device-types/Lenovo/FLEX-SYSTEM.yaml
+++ b/device-types/Lenovo/FLEX-SYSTEM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Lenovo
-model: Flex system
-slug: flex-system
+model: Flex System
+slug: lenovo-flex-system
 part_number: 8721W3X
 u_height: 10
 subdevice_role: parent
diff --git a/device-types/Lenovo/SR530.yaml b/device-types/Lenovo/SR530.yaml
index e76ff7672979d23f0bf50cc74ef4d8cf608a6fe2..d78d2b9ce73c7c8799ecba33009b25599c846cc6 100644
--- a/device-types/Lenovo/SR530.yaml
+++ b/device-types/Lenovo/SR530.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Lenovo
 model: ThinkSystem SR530
-slug: sr530
+slug: lenovo-thinksystem-sr530
 part_number: 7X07
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Lenovo/SR550.yaml b/device-types/Lenovo/SR550.yaml
index c7cbe0264c02987d897a8bb2021bb0e215694728..d7d5e55bd430f6005aafaaff615574b91491ac12 100644
--- a/device-types/Lenovo/SR550.yaml
+++ b/device-types/Lenovo/SR550.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Lenovo
 model: ThinkSystem SR550
-slug: sr550
+slug: lenovo-thinksystem-sr550
 part_number: 7X04
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Lenovo/SR630.yaml b/device-types/Lenovo/SR630.yaml
index b50b904b8e2109eae94726d7a2f356dd44f44045..347657bc929e606d069408228d5f642ba042bc16 100644
--- a/device-types/Lenovo/SR630.yaml
+++ b/device-types/Lenovo/SR630.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Lenovo
-model: SR630
-slug: sr630
+model: ThinkSystem SR630
+slug: lenovo-thinksystem-sr630
 part_number: 7X02
 is_full_depth: true
 subdevice_role: parent
diff --git a/device-types/Lenovo/SR650.yaml b/device-types/Lenovo/SR650.yaml
index 09061c827f5c637a1a29ddbd6b8ac6bae4d96685..d468fa399f62483e96a404a5396fdbd2e472b838 100644
--- a/device-types/Lenovo/SR650.yaml
+++ b/device-types/Lenovo/SR650.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Lenovo
 model: ThinkSystem SR650
-slug: sr650
+slug: lenovo-thinksystem-sr650
 part_number: 7X06
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Lenovo/ThinkSystem_AUKJ.yaml b/device-types/Lenovo/ThinkSystem_AUKJ.yaml
index 096e9675e43549e7a3ea64db5cf12e2563c11e2f..1a3bd385d86e453ef76f76857d5fe6ebe81a037e 100644
--- a/device-types/Lenovo/ThinkSystem_AUKJ.yaml
+++ b/device-types/Lenovo/ThinkSystem_AUKJ.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Lenovo
 model: ThinkSystem 10Gb 2-port SFP+ LOM
-slug: thinksystem-10gb-2sfpp
+slug: lenovo-thinksystem-10gb-2-port-sfpp-lom
 part_number: 7ZT7A00546
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Lenovo/ThinkSystem_AUKK.yaml b/device-types/Lenovo/ThinkSystem_AUKK.yaml
index f19ad236ca9670304495923261990883a661da75..fe13cfd2bb6d9c2fff7345193a37d15d1074a100 100644
--- a/device-types/Lenovo/ThinkSystem_AUKK.yaml
+++ b/device-types/Lenovo/ThinkSystem_AUKK.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Lenovo
 model: ThinkSystem 10Gb 4-port SFP+ LOM
-slug: thinksystem-10gb-4sfpp
+slug: lenovo-thinksystem-10gb-4-port-sfpp-lom
 part_number: 7ZT7A00547
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Lenovo/system_x3250_M6.yaml b/device-types/Lenovo/system_x3250_M6.yaml
index 2537628e8d1c25c1ac4a2cd9ab8b94f18a2ea82b..c1769af3cb5fccf13ee94e3c628785faa85295ac 100644
--- a/device-types/Lenovo/system_x3250_M6.yaml
+++ b/device-types/Lenovo/system_x3250_M6.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Lenovo
 model: System x3250 M6
-slug: system_x3250_m6
+slug: lenovo-system-x3250-m6
 part_number: '3633'
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Lenovo/system_x3550_M5.yaml b/device-types/Lenovo/system_x3550_M5.yaml
index 8d65acfed022aa79b551f0b35ba2c002ee2a05fe..99736474f9ae4ee11bca888cef209dcb8e1ebe7b 100644
--- a/device-types/Lenovo/system_x3550_M5.yaml
+++ b/device-types/Lenovo/system_x3550_M5.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Lenovo
 model: System x3550 M5
-slug: system_x3550_m5
+slug: lenovo-system-x3550-m5
 part_number: 5463AC1
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Lenovo/system_x3750_M4.yaml b/device-types/Lenovo/system_x3750_M4.yaml
index 8e2e56aa845abe5021d063a570b5271b096b8451..eb1c74eb5e62156586c3f40ebee0714b9d7e23bb 100644
--- a/device-types/Lenovo/system_x3750_M4.yaml
+++ b/device-types/Lenovo/system_x3750_M4.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Lenovo
 model: System x3750 M4
-slug: system_x3750_m4
+slug: lenovo-system-x3750-m4
 part_number: 8722C1U
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Leviton/49255-H24.yaml b/device-types/Leviton/49255-H24.yaml
index 9d6610d36c1df1f960c2c4cae0a19888dca062f4..e09d1b6a7bf903b56f97cc555b23af5c046c5ab4 100644
--- a/device-types/Leviton/49255-H24.yaml
+++ b/device-types/Leviton/49255-H24.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Leviton
 model: 24 Port Keystone Patch Panel
-slug: 24-port-keystone-patch-panel
+slug: leviton-24-port-keystone-patch-panel
 part_number: 49255-H24
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Leviton/49255-Q48.yaml b/device-types/Leviton/49255-Q48.yaml
index b9374d1ee79ed584096d91ad776f3831fbbbfd2f..de72e6d19b200785c0e9f65ce7fae01a519f5d06 100644
--- a/device-types/Leviton/49255-Q48.yaml
+++ b/device-types/Leviton/49255-Q48.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Leviton
 model: 48 Port Keystone Patch Panel
-slug: 48-port-keystone-patch-panel
+slug: leviton-48-port-keystone-patch-panel
 part_number: 49255-Q48
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Leviton/5R1UM-F03.yml b/device-types/Leviton/5R1UM-F03.yml
index 0be6da082b0b42d61e1f53f07829f03f57e67349..210bcde30fa669e9cf89f7b22a7ccf231dbe0afa 100644
--- a/device-types/Leviton/5R1UM-F03.yml
+++ b/device-types/Leviton/5R1UM-F03.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Leviton
 model: 5R1UM-F03
-slug: 5r1umf03
+slug: leviton-5r1um-f03
 comments: Opt-X 1000i SDX 1RU Distribution and Splice Enclosure, empty, (no sliding tray); Accepts up to (3) SDX adapter plates or (3) SDX MTP cassettes
   and accepts up to (3) splice trays.
 u_height: 1
diff --git a/device-types/Leviton/5R2UM-F06.yml b/device-types/Leviton/5R2UM-F06.yml
index 86d5f2b28dcac5f482c2b4606abbd8262d6a37ee..9ad7e1fa23d92db20c8be9d4877910153b254819 100644
--- a/device-types/Leviton/5R2UM-F06.yml
+++ b/device-types/Leviton/5R2UM-F06.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Leviton
 model: 5R2UM-F06
-slug: 5r2umf06
+slug: leviton-5r2um-f06
 comments: Opt-X 1000i SDX 2RU Distribution and Splice Enclosure, empty (no sliding tray); Accepts up to (6) SDX adapter plates or (6) SDX MTP cassettes
   and accepts up to (6) splice trays.
 u_height: 2
diff --git a/device-types/Leviton/5R3UM-F09.yml b/device-types/Leviton/5R3UM-F09.yml
index a2cc2e315f95f5f51ee64e791ddd08ab1a3ca0f1..ce3a1d86c9f436e39f31fd3606b78e25d5b157ae 100644
--- a/device-types/Leviton/5R3UM-F09.yml
+++ b/device-types/Leviton/5R3UM-F09.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Leviton
 model: 5R3UM-F09
-slug: 5r3umf09
+slug: leviton-5r3um-f09
 comments: Opt-X 1000i SDX 3RU Distribution and Splice Enclosure, empty; Accepts up to (9) SDX adapter plates or (9) SDX MTP cassettes and accepts up to
   (9) splice trays.
 u_height: 3
diff --git a/device-types/Leviton/5R3UM-F12.yml b/device-types/Leviton/5R3UM-F12.yml
index 21d1724eb3bbb618414695df3cd82e01c3bdb0f2..e51443dc9e88a4711d17e0baaeccb5e5e3e1913f 100644
--- a/device-types/Leviton/5R3UM-F12.yml
+++ b/device-types/Leviton/5R3UM-F12.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Leviton
 model: 5R3UM-F12
-slug: 5r3umf12
+slug: leviton-5r3um-f12
 comments: Opt-X 1000i SDX 3RU Distribution and Splice Enclosure, empty; Accepts up to (12) SDX adapter plates or (12) SDX MTP cassettes and accepts up to
   (12) splice trays. (Vertical adapter plate/cassette orientation).
 u_height: 3
diff --git a/device-types/Mellanox/SB7800.yml b/device-types/Mellanox/SB7800.yml
index 502ee83ea69aa0b6aac394ef26a59e7343c0a965..edf66803b1f28e0022d58ffecc1b962df0d618c1 100644
--- a/device-types/Mellanox/SB7800.yml
+++ b/device-types/Mellanox/SB7800.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mellanox
 model: SB7800
-slug: sb7800
+slug: mellanox-sb7800
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Mellanox/SN2010.yml b/device-types/Mellanox/SN2010.yml
index c6c0e696a4f46a5bb2e3b73ce6f3ad38de35de69..f4b04d6ff74bfaee9dce81f72de998b65af55fad 100644
--- a/device-types/Mellanox/SN2010.yml
+++ b/device-types/Mellanox/SN2010.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mellanox
 model: SN2010
-slug: sn2010
+slug: mellanox-sn2010
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/Mellanox/SN2700.yml b/device-types/Mellanox/SN2700.yml
index 1d0bd77250def123e83c3f061cab90b346b1db97..ba0d1ecabf7f3791881d47bed195daa9936e3f6b 100644
--- a/device-types/Mellanox/SN2700.yml
+++ b/device-types/Mellanox/SN2700.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mellanox
 model: SN2700
-slug: sn2700
+slug: mellanox-sn2700
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/Mellanox/SN3700.yml b/device-types/Mellanox/SN3700.yml
index 609110baca79c44b6980db10f587c9472721f6ae..b8d89a2369000a14f9f02b75feadc7f09a87b247 100644
--- a/device-types/Mellanox/SN3700.yml
+++ b/device-types/Mellanox/SN3700.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mellanox
 model: SN3700
-slug: sn3700
+slug: mellanox-sn3700
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/Mellanox/SN3700C.yml b/device-types/Mellanox/SN3700C.yml
index 06faa25bebd0d936adef3df000bea61a4c7e3dce..ad079b7fcc1072e83bb7bfb7fbbbf943c4a25e0e 100644
--- a/device-types/Mellanox/SN3700C.yml
+++ b/device-types/Mellanox/SN3700C.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mellanox
 model: SN3700C
-slug: sn3700c
+slug: mellanox-sn3700c
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/Mellanox/SN4600.yml b/device-types/Mellanox/SN4600.yml
index 9570a414f8ced6ad88c5563f044ee297ea6c53b1..5e9be84a04ed07a0bc052cba9f67f1f98382ac8a 100644
--- a/device-types/Mellanox/SN4600.yml
+++ b/device-types/Mellanox/SN4600.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mellanox
 model: SN4600
-slug: sn4600
+slug: mellanox-sn4600
 u_height: 1
 is_full_depth: true
 comments: |
diff --git a/device-types/Mellanox/SN4600C.yml b/device-types/Mellanox/SN4600C.yml
index 784acc848655b97af724d3c4286f22412a57e7cd..b702a1ce8fedc603177b6fa5a1001847e24d18ba 100644
--- a/device-types/Mellanox/SN4600C.yml
+++ b/device-types/Mellanox/SN4600C.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mellanox
 model: SN4600C
-slug: sn4600c
+slug: mellanox-sn4600c
 u_height: 1
 is_full_depth: true
 comments: |
diff --git a/device-types/Mellanox/SN4700.yml b/device-types/Mellanox/SN4700.yml
index 952c616e21b7a34e5f0f82bf2b0bd062c2c63860..bbde7da8a5e75f5ccc53416e9a173e69a34ae442 100644
--- a/device-types/Mellanox/SN4700.yml
+++ b/device-types/Mellanox/SN4700.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mellanox
 model: SN4700
-slug: sn4700
+slug: mellanox-sn4700
 u_height: 1
 is_full_depth: true
 comments: |
diff --git a/device-types/Mellanox/SX6036.yml b/device-types/Mellanox/SX6036.yml
index 5ea237183531bed7aea8764cd0579df901a5a30e..a65cced70f2e5ea2f86cbb8495effd1bbc0ae779 100644
--- a/device-types/Mellanox/SX6036.yml
+++ b/device-types/Mellanox/SX6036.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mellanox
 model: SX6036
-slug: sx6036
+slug: mellanox-sx6036
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/MikroTik/C52iG-5HaxD2HaxD-TC.yaml b/device-types/MikroTik/C52iG-5HaxD2HaxD-TC.yaml
index f5a0838d6645780bdce642db7fcfb1005102ade0..b27f36d0a2851ae74c3d971baccd27968f7546c1 100644
--- a/device-types/MikroTik/C52iG-5HaxD2HaxD-TC.yaml
+++ b/device-types/MikroTik/C52iG-5HaxD2HaxD-TC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: C52iG-5HaxD2HaxD-TC
-slug: c52ig-5haxd2haxd-tc
+slug: mikrotik-c52ig-5haxd2haxd-tc
 u_height: 1
 is_full_depth: false
 power-ports:
diff --git a/device-types/MikroTik/C53UiG-5HPaxD2HPaxD.yaml b/device-types/MikroTik/C53UiG-5HPaxD2HPaxD.yaml
index c04865174e529f8d9a24d990e9d93381bdd8b8ff..505f9dd21174e64bf63352b81f47bd7109334299 100644
--- a/device-types/MikroTik/C53UiG-5HPaxD2HPaxD.yaml
+++ b/device-types/MikroTik/C53UiG-5HPaxD2HPaxD.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: C53UiG+5HPaxD2HPaxD
-slug: c53uig-5hpaxd2hpaxd
+slug: mikrotik-c53uig-plus-5hpaxd2hpaxd
 u_height: 1
 is_full_depth: false
 power-ports:
diff --git a/device-types/MikroTik/CCR1009-7G-1C-1S+.yaml b/device-types/MikroTik/CCR1009-7G-1C-1S+.yaml
index 9589c819523123c0c424e4781d339f0937beebcd..84bb285286775ee26cdeabb5881425b1e4211cce 100644
--- a/device-types/MikroTik/CCR1009-7G-1C-1S+.yaml
+++ b/device-types/MikroTik/CCR1009-7G-1C-1S+.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CCR1009-7G-1C-1S+
-slug: ccr1009-7g-1c-1splus
+slug: mikrotik-ccr1009-7g-1c-1s-plus
 is_full_depth: false
 u_height: 1
 airflow: front-to-rear
diff --git a/device-types/MikroTik/CCR1009-7G-1C-1S+PC.yaml b/device-types/MikroTik/CCR1009-7G-1C-1S+PC.yaml
index 1cc5731481958539f8a1ea512098c400ed73f0f3..5bbc545d9a32f0d0e760af02b563b588bfe57623 100644
--- a/device-types/MikroTik/CCR1009-7G-1C-1S+PC.yaml
+++ b/device-types/MikroTik/CCR1009-7G-1C-1S+PC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CCR1009-7G-1C-1S+PC
-slug: ccr1009-7g-1c-1spluspc
+slug: mikrotik-ccr1009-7g-1c-1s-plus-pc
 is_full_depth: false
 u_height: 1
 airflow: front-to-rear
diff --git a/device-types/MikroTik/CCR1009-7G-1C-PC.yaml b/device-types/MikroTik/CCR1009-7G-1C-PC.yaml
index d565bc3f77082fc3f2487fe3b21773c77d1285ba..40007b4f1fdae079a138452ebbe6e8b5bcf137e1 100644
--- a/device-types/MikroTik/CCR1009-7G-1C-PC.yaml
+++ b/device-types/MikroTik/CCR1009-7G-1C-PC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CCR1009-7G-1C-PC
-slug: ccr1009-7g-1c-pc
+slug: mikrotik-ccr1009-7g-1c-pc
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CCR1009-8G-1S-1S+.yaml b/device-types/MikroTik/CCR1009-8G-1S-1S+.yaml
index 3ac82906e77748bd60462c4344ca95c47aa0c91f..48b7a080c51a6f303c1c2471e5db9829fc78b832 100644
--- a/device-types/MikroTik/CCR1009-8G-1S-1S+.yaml
+++ b/device-types/MikroTik/CCR1009-8G-1S-1S+.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CCR1009-8G-1S-1S+
-slug: ccr1009-8g-1s-1splus
+slug: mikrotik-ccr1009-8g-1s-1s-plus
 is_full_depth: false
 comments: |
   [Product Data](https://mikrotik.com/product/CCR1009-8G-1S-1Splus)
diff --git a/device-types/MikroTik/CCR1016-12G.yaml b/device-types/MikroTik/CCR1016-12G.yaml
index 4e01223040e71a57cca6643e87921c0fa5c09047..077b5f6328387a0ce8152d38cf1f3ba008e9d1bf 100644
--- a/device-types/MikroTik/CCR1016-12G.yaml
+++ b/device-types/MikroTik/CCR1016-12G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CCR1016-12G
-slug: ccr1016-12g
+slug: mikrotik-ccr1016-12g
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CCR1016-12S-1S+.yaml b/device-types/MikroTik/CCR1016-12S-1S+.yaml
index ee910364585572f6114c2bb17bb3cff868d2140e..c39ad9995e7b43f740d9f89d68d469d83f17ef1a 100644
--- a/device-types/MikroTik/CCR1016-12S-1S+.yaml
+++ b/device-types/MikroTik/CCR1016-12S-1S+.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CCR1016-12S-1S+
-slug: ccr1016-12s-1splus
+slug: mikrotik-ccr1016-12s-1s-plus
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CCR1036-12G-4S-EM.yaml b/device-types/MikroTik/CCR1036-12G-4S-EM.yaml
index 4034aafa9a2caa621b82fc49d0f58ee1d6ef6ab6..72375ad20de90c5f661312af7a989d4349a5ad61 100644
--- a/device-types/MikroTik/CCR1036-12G-4S-EM.yaml
+++ b/device-types/MikroTik/CCR1036-12G-4S-EM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CCR1036-12G-4S-EM
-slug: ccr1036-12g-4s-em
+slug: mikrotik-ccr1036-12g-4s-em
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CCR1036-12G-4S.yaml b/device-types/MikroTik/CCR1036-12G-4S.yaml
index 5d761275992bf1e97ac8ca24de6bdb8fc4ebf37d..40665bd9c91e27cf0676a24ecf79a6701adc72d6 100644
--- a/device-types/MikroTik/CCR1036-12G-4S.yaml
+++ b/device-types/MikroTik/CCR1036-12G-4S.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CCR1036-12G-4S
-slug: ccr1036-12g-4s
+slug: mikrotik-ccr1036-12g-4s
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CCR1036-8G-2S+.yaml b/device-types/MikroTik/CCR1036-8G-2S+.yaml
index d6a416af982c4fde40aedb974410d4e6e6726c59..6468f0aa705950b8142415a432223537465e3ad9 100644
--- a/device-types/MikroTik/CCR1036-8G-2S+.yaml
+++ b/device-types/MikroTik/CCR1036-8G-2S+.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CCR1036-8G-2S+
-slug: ccr1036-8g-2splus
+slug: mikrotik-ccr1036-8g-2s-plus
 is_full_depth: false
 u_height: 1
 airflow: front-to-rear
diff --git a/device-types/MikroTik/CCR1036-8G-2S+EM.yaml b/device-types/MikroTik/CCR1036-8G-2S+EM.yaml
index fbda5576e0431252bc97d101eef13c09b65da2fc..8b52998f4297a607bd44f6203288d944e05f3a95 100644
--- a/device-types/MikroTik/CCR1036-8G-2S+EM.yaml
+++ b/device-types/MikroTik/CCR1036-8G-2S+EM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CCR1036-8G-2S+EM
-slug: ccr1036-8g-2splus-em
+slug: mikrotik-ccr1036-8g-2s-plus-em
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CCR1072-1G-8S+.yaml b/device-types/MikroTik/CCR1072-1G-8S+.yaml
index c10b607d3b6f493c668f75da23f8e1ce38f3ee1b..4c96757170d34a51e71b750fbf49a3a3fd378739 100644
--- a/device-types/MikroTik/CCR1072-1G-8S+.yaml
+++ b/device-types/MikroTik/CCR1072-1G-8S+.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CCR1072-1G-8S+
-slug: ccr1072-1g-8splus
+slug: mikrotik-ccr1072-1g-8s-plus
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CCR2004-16G-2S+.yaml b/device-types/MikroTik/CCR2004-16G-2S+.yaml
index 9f95aad12201dbdff5de6839730996449932e487..2171c266e28710c20813811b686515ff3144d4c9 100644
--- a/device-types/MikroTik/CCR2004-16G-2S+.yaml
+++ b/device-types/MikroTik/CCR2004-16G-2S+.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CCR2004-16G-2S+
-slug: ccr2004-16g-2splus
+slug: mikrotik-ccr2004-16g-2s-plus
 part_number: CCR2004-16G-2S+
 is_full_depth: false
 u_height: 1
diff --git a/device-types/MikroTik/CCR2004-1G-12S+2XS.yaml b/device-types/MikroTik/CCR2004-1G-12S+2XS.yaml
index 2bc6f3048321f29a3683658202ea57832fc02018..5b9e3d5029dc58225dabb50c55a17c10169cfb22 100644
--- a/device-types/MikroTik/CCR2004-1G-12S+2XS.yaml
+++ b/device-types/MikroTik/CCR2004-1G-12S+2XS.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CCR2004-1G-12S+2XS
-slug: ccr2004-1g-12s-plus2sx
+slug: mikrotik-ccr2004-1g-12s-plus-2xs
 part_number: CCR2004-1G-12S+2XS
 is_full_depth: false
 u_height: 1
diff --git a/device-types/MikroTik/CCR2116-12G-4SX.yaml b/device-types/MikroTik/CCR2116-12G-4SX.yaml
index e7b96a66b73639a89fc31203f2981cba3518cd76..235bb14855539e9508e61fd4071cd778afbd013b 100644
--- a/device-types/MikroTik/CCR2116-12G-4SX.yaml
+++ b/device-types/MikroTik/CCR2116-12G-4SX.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CCR2116-12G-4S+
-slug: ccr2116-12g-4splus
+slug: mikrotik-ccr2116-12g-4s-plus
 part_number: CCR2116-12G-4S+
 is_full_depth: false
 u_height: 1
diff --git a/device-types/MikroTik/CCR2216-1G-12XS-2XQ.yaml b/device-types/MikroTik/CCR2216-1G-12XS-2XQ.yaml
index 2746f80aeaafd23b3ed2f44c1ab4510a5172cc53..c7333d4097a871245e79942c4156aa2603ec79dd 100644
--- a/device-types/MikroTik/CCR2216-1G-12XS-2XQ.yaml
+++ b/device-types/MikroTik/CCR2216-1G-12XS-2XQ.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CCR2216-1G-12XS-2XQ
-slug: ccr2216-1g-12xs-2xq
+slug: mikrotik-ccr2216-1g-12xs-2xq
 part_number: CCR2216-1G-12XS-2XQ
 comments: '[Mikrotik CCR2216-1G-12XS-2XQ ](https://mikrotik.com/product/ccr2216_1g_12xs_2xq)'
 is_full_depth: false
diff --git a/device-types/MikroTik/CRS106-1C-5S.yaml b/device-types/MikroTik/CRS106-1C-5S.yaml
index 50a65c3b1392d568ac7f1cebed98b777cac48fec..433baf0834e5d6771ddc9fc6d946bae3a7c55be5 100644
--- a/device-types/MikroTik/CRS106-1C-5S.yaml
+++ b/device-types/MikroTik/CRS106-1C-5S.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS106-1C-5S
-slug: crs106-1c-5s
+slug: mikrotik-crs106-1c-5s
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CRS112-8G-4S-IN.yaml b/device-types/MikroTik/CRS112-8G-4S-IN.yaml
index d2e96f0a1a40cc92683987d1cb2a71a3952f8fd0..3f4905da41b75537c249fc5c93995c23c1551a68 100644
--- a/device-types/MikroTik/CRS112-8G-4S-IN.yaml
+++ b/device-types/MikroTik/CRS112-8G-4S-IN.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS112-8G-4S-IN
-slug: crs112-8g-4s-in
+slug: mikrotik-crs112-8g-4s-in
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CRS112-8P-4S-IN.yaml b/device-types/MikroTik/CRS112-8P-4S-IN.yaml
index 20c43a357a9c07133fb455de7686f6bd26952006..4296a5eb5863d7b8c003e64ad20fc9babdaaceb1 100644
--- a/device-types/MikroTik/CRS112-8P-4S-IN.yaml
+++ b/device-types/MikroTik/CRS112-8P-4S-IN.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS112-8P-4S-IN
-slug: crs112-8p-4s-in
+slug: mikrotik-crs112-8p-4s-in
 part_number: CRS112-8P-4S
 is_full_depth: false
 u_height: 1
diff --git a/device-types/MikroTik/CRS125-24G-1S-2HnD-IN.yaml b/device-types/MikroTik/CRS125-24G-1S-2HnD-IN.yaml
index b7c53b88e142e3893647387ed887e3be3ccb781f..91cd7155f03607c0c16bf61eddc2902c53e4d5ad 100644
--- a/device-types/MikroTik/CRS125-24G-1S-2HnD-IN.yaml
+++ b/device-types/MikroTik/CRS125-24G-1S-2HnD-IN.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS125-24G-1S-2HnD-IN
-slug: crs125-24g-1s-2hnd-in
+slug: mikrotik-crs125-24g-1s-2hnd-in
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CRS125-24G-1S-IN.yaml b/device-types/MikroTik/CRS125-24G-1S-IN.yaml
index e6773a234a6ae8eead969dce36f4cd747f0bfa52..b651f12bba95c83e12f79b271f26023778df856c 100644
--- a/device-types/MikroTik/CRS125-24G-1S-IN.yaml
+++ b/device-types/MikroTik/CRS125-24G-1S-IN.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS125-24G-1S-IN
-slug: crs125-24g-1s-in
+slug: mikrotik-crs125-24g-1s-in
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CRS125-24G-1S-RM.yaml b/device-types/MikroTik/CRS125-24G-1S-RM.yaml
index 21751a04407f58deb223dbd25f4304df332e8f44..da85731a25bc90d1e3ac84ed5f4814568a1f6d93 100644
--- a/device-types/MikroTik/CRS125-24G-1S-RM.yaml
+++ b/device-types/MikroTik/CRS125-24G-1S-RM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS125-24G-1S-RM
-slug: crs125-24g-1s-rm
+slug: mikrotik-crs125-24g-1s-rm
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CRS212-1G-10S-1S+IN.yaml b/device-types/MikroTik/CRS212-1G-10S-1S+IN.yaml
index 781028a6fa6bea539b429a17792a3c2158af3485..eb1b0d963abaa93d297a2e844f190349df022288 100644
--- a/device-types/MikroTik/CRS212-1G-10S-1S+IN.yaml
+++ b/device-types/MikroTik/CRS212-1G-10S-1S+IN.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS212-1G-10S-1S+IN
-slug: crs212-1g-10s-1splus-in
+slug: mikrotik-crs212-1g-10s-1s-plus-in
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CRS226-24G-2S+RM.yaml b/device-types/MikroTik/CRS226-24G-2S+RM.yaml
index 7c50880b2360e38641fac4a54e67e49054fc6478..31024ce69c18ce48ed8cc6ab3b0df0b621ae307a 100644
--- a/device-types/MikroTik/CRS226-24G-2S+RM.yaml
+++ b/device-types/MikroTik/CRS226-24G-2S+RM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS226-24G-2S+RM
-slug: crs226-24g-2splusrm
+slug: mikrotik-crs226-24g-2s-plus-rm
 comments: '[CRS226-24G-2S+RM Datasheet](https://mikrotik.com/product/CRS226-24G-2SplusRM)'
 is_full_depth: false
 u_height: 1
diff --git a/device-types/MikroTik/CRS305-1G-4S+IN.yaml b/device-types/MikroTik/CRS305-1G-4S+IN.yaml
index 484989beed946f162cf88e53b523938fcac6c2d0..fe2c3fb8e717667ab489437690a2661c32ecf4d6 100644
--- a/device-types/MikroTik/CRS305-1G-4S+IN.yaml
+++ b/device-types/MikroTik/CRS305-1G-4S+IN.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS305-1G-4S+IN
-slug: crs305-1g-4splus-in
+slug: mikrotik-crs305-1g-4s-plus-in
 part_number: CRS305-1G-4S+
 is_full_depth: false
 u_height: 1
diff --git a/device-types/MikroTik/CRS309-1G-8S+IN.yaml b/device-types/MikroTik/CRS309-1G-8S+IN.yaml
index 5d3f00a521054e63599a2db53c61fe16db0984d5..0726ac0b9a4fe7199b719ea0b6ec29e5a6072dbe 100644
--- a/device-types/MikroTik/CRS309-1G-8S+IN.yaml
+++ b/device-types/MikroTik/CRS309-1G-8S+IN.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS309-1G-8S+IN
-slug: crs309-1g-8splus-in
+slug: mikrotik-crs309-1g-8s-plus-in
 part_number: CRS309-1G-8S+
 is_full_depth: false
 u_height: 1
diff --git a/device-types/MikroTik/CRS310-1G-5S-4S+IN.yaml b/device-types/MikroTik/CRS310-1G-5S-4S+IN.yaml
index 86b02ba904f26b5058b46d50e35be7ae988600a9..8060c69fa17f763e2f4220b156d89ab988f198bc 100644
--- a/device-types/MikroTik/CRS310-1G-5S-4S+IN.yaml
+++ b/device-types/MikroTik/CRS310-1G-5S-4S+IN.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS310-1G-5S-4S+IN
-slug: crs310-1g-5s-4splus-in
+slug: mikrotik-crs310-1g-5s-4s-plus-in
 part_number: CRS310-1G-5S-4S+
 comments: 10 Gigabit fibre connectivity way over a 100 meters – for small offices or ISPs. Hardware offloaded VLAN-filtering and even some L3 routing
 is_full_depth: false
diff --git a/device-types/MikroTik/CRS312-4C+8XG-RM.yaml b/device-types/MikroTik/CRS312-4C+8XG-RM.yaml
index e0f6cd0b9e3d543d8d34d6428b3518861b6ccd84..00fb998f52a38c68a1e6cee348e660240de2b82b 100644
--- a/device-types/MikroTik/CRS312-4C+8XG-RM.yaml
+++ b/device-types/MikroTik/CRS312-4C+8XG-RM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS312-4C+8XG-RM
-slug: crs312-4cplus-8xg-rm
+slug: mikrotik-crs312-4c-plus-8xg-rm
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CRS317-1G-16S+RM.yaml b/device-types/MikroTik/CRS317-1G-16S+RM.yaml
index 1a5a919fa309b97dc48a1eefee1826f481182cf8..0ca0f030bcc87c9116d4539061bc8a31dbc38591 100644
--- a/device-types/MikroTik/CRS317-1G-16S+RM.yaml
+++ b/device-types/MikroTik/CRS317-1G-16S+RM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS317-1G-16S+RM
-slug: crs317-1g-16splus-rm
+slug: mikrotik-crs317-1g-16s-plus-rm
 part_number: CRS317-1G-16S+
 is_full_depth: false
 u_height: 1
diff --git a/device-types/MikroTik/CRS326-24G-2S+RM.yaml b/device-types/MikroTik/CRS326-24G-2S+RM.yaml
index cfeb44cfdf78cbe4458d0bc9f8afb2e0ef217f50..27b3c91549afcb90df79540752c7e8d514cbb05d 100644
--- a/device-types/MikroTik/CRS326-24G-2S+RM.yaml
+++ b/device-types/MikroTik/CRS326-24G-2S+RM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS326-24G-2S+RM
-slug: crs326-24g-2splus-rm
+slug: mikrotik-crs326-24g-2s-plus-rm
 part_number: CRS326-24G-2S
 is_full_depth: false
 u_height: 1
diff --git a/device-types/MikroTik/CRS326-24S+2Q+RM.yaml b/device-types/MikroTik/CRS326-24S+2Q+RM.yaml
index 7c83d238b41b7f3895e16e415dc42c5b2fb9afc7..114bcd51a6c2cff6006a169bb7b6aa832db4ade2 100644
--- a/device-types/MikroTik/CRS326-24S+2Q+RM.yaml
+++ b/device-types/MikroTik/CRS326-24S+2Q+RM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS326-24S+2Q+RM
-slug: crs326-24splus-2qplus-rm
+slug: mikrotik-crs326-24s-plus-2q-plus-rm
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CRS328-24P-4S+RM.yaml b/device-types/MikroTik/CRS328-24P-4S+RM.yaml
index 7af1a14a98da4a5a1f90e6f8a3a3fc24dbf6cf08..317fd2c121b12ce4b86dc1968c2577331bc6cdd5 100644
--- a/device-types/MikroTik/CRS328-24P-4S+RM.yaml
+++ b/device-types/MikroTik/CRS328-24P-4S+RM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS328-24P-4S+RM
-slug: crs328-24p-4splus-rm
+slug: mikrotik-crs328-24p-4s-plus-rm
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CRS328-4C-20S-4S+RM.yaml b/device-types/MikroTik/CRS328-4C-20S-4S+RM.yaml
index a1bb2ef9063192e19c4002fd0e263bf51aa86938..dd2d2c95c2e09d9368669d34f4de7b16b46d18b7 100644
--- a/device-types/MikroTik/CRS328-4C-20S-4S+RM.yaml
+++ b/device-types/MikroTik/CRS328-4C-20S-4S+RM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS328-4C-20S-4S+RM
-slug: crs328-4c-20s-4splus-rm
+slug: mikrotik-crs328-4c-20s-4s-plus-rm
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CRS354-48G-4S+2Q+RM.yaml b/device-types/MikroTik/CRS354-48G-4S+2Q+RM.yaml
index 6bd0e63b0d2f558a9100db88fd2ba177e7f4f3d1..cc48488b8e2c39623fae3f3460aa00602189f834 100644
--- a/device-types/MikroTik/CRS354-48G-4S+2Q+RM.yaml
+++ b/device-types/MikroTik/CRS354-48G-4S+2Q+RM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS354-48G-4S+2Q+RM
-slug: crs354-48g-4splus-2qplus-rm
+slug: mikrotik-crs354-48g-4s-plus-2q-plus-rm
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CRS354-48P-4S+2Q+RM.yaml b/device-types/MikroTik/CRS354-48P-4S+2Q+RM.yaml
index f6aea7cbf9c44cea0dd572f90880c296cb583f75..391e0f1e02b92366578ee25924775e6175830abe 100644
--- a/device-types/MikroTik/CRS354-48P-4S+2Q+RM.yaml
+++ b/device-types/MikroTik/CRS354-48P-4S+2Q+RM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS354-48P-4S+2Q+RM
-slug: crs354-48p-4splus-2qplus-rm
+slug: mikrotik-crs354-48p-4s-plus-2q-plus-rm
 part_number: CRS354-48P-4S+2Q+RM
 is_full_depth: false
 u_height: 1
diff --git a/device-types/MikroTik/CRS504-4XQ-IN.yaml b/device-types/MikroTik/CRS504-4XQ-IN.yaml
index c28898ce7b19127f8da49324299dc477f5045cb9..65d7b510690ad5184ad3b34070073f073c7f8cde 100644
--- a/device-types/MikroTik/CRS504-4XQ-IN.yaml
+++ b/device-types/MikroTik/CRS504-4XQ-IN.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS504-4XQ-IN
-slug: crs504-4xq-in
+slug: mikrotik-crs504-4xq-in
 part_number: CRS504-4XQ-IN
 is_full_depth: false
 airflow: front-to-rear
diff --git a/device-types/MikroTik/CRS518-16XS-2XQ.yaml b/device-types/MikroTik/CRS518-16XS-2XQ.yaml
index 5866add9acfa3de436f6a1dc87b925f1dba3c0cc..63d23765345e3cb52fd1fa56d43486f446493268 100644
--- a/device-types/MikroTik/CRS518-16XS-2XQ.yaml
+++ b/device-types/MikroTik/CRS518-16XS-2XQ.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CRS518-16XS-2XQ
-slug: crs518-16xs-2xq
+slug: mikrotik-crs518-16xs-2xq
 part_number: CRS518-16XS-2XQ
 is_full_depth: false
 airflow: front-to-rear
diff --git a/device-types/MikroTik/CSS326-24G-2S+RM.yaml b/device-types/MikroTik/CSS326-24G-2S+RM.yaml
index bc21323fcbb6dc7dc094042dcd4d9c92bfc79b0d..cc15ac9954a8815150bcf391a22ffeb9a2d0d7fb 100644
--- a/device-types/MikroTik/CSS326-24G-2S+RM.yaml
+++ b/device-types/MikroTik/CSS326-24G-2S+RM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: CSS326-24G-2S+RM
-slug: css326-24g-2s-rm
+slug: mikrotik-css326-24g-2s-plus-rm
 is_full_depth: false
 airflow: passive
 u_height: 1
diff --git a/device-types/MikroTik/RB1100AHx2.yaml b/device-types/MikroTik/RB1100AHx2.yaml
index 67a61cae67b3fd25615017fa58e1b56eaf33f663..79263f7d3e1160fe2f9d0fb9e41167a5861982b0 100644
--- a/device-types/MikroTik/RB1100AHx2.yaml
+++ b/device-types/MikroTik/RB1100AHx2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB1100AHx2
-slug: rb1100ahx2
+slug: mikrotik-rb1100ahx2
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/RB1100AHx4-Dude-Edition.yaml b/device-types/MikroTik/RB1100AHx4-Dude-Edition.yaml
index 7c68dcbf1d782e02aa5a1b9ef199c6064c5f33d0..7076a586125661e4bd5082b8f66114948518ac39 100644
--- a/device-types/MikroTik/RB1100AHx4-Dude-Edition.yaml
+++ b/device-types/MikroTik/RB1100AHx4-Dude-Edition.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB1100AHx4 Dude Edition
-slug: rb1100dx4
+slug: mikrotik-rb1100ahx4-dude-edition
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/RB1100AHx4.yaml b/device-types/MikroTik/RB1100AHx4.yaml
index 808072dd05e368b023ea25ce4f5567b5470e1862..2dbb43e8fe47994e015ddb7ff07c5c1eccc1e22a 100644
--- a/device-types/MikroTik/RB1100AHx4.yaml
+++ b/device-types/MikroTik/RB1100AHx4.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB1100AHx4
-slug: rb1100ahx4
+slug: mikrotik-rb1100ahx4
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/RB2011UiAS-IN.yaml b/device-types/MikroTik/RB2011UiAS-IN.yaml
index abed250ea6fc6e885914d3c0608a81db3b4e3896..b6d1e98e2093a6fedc56c4e96009071fd73b5e2e 100644
--- a/device-types/MikroTik/RB2011UiAS-IN.yaml
+++ b/device-types/MikroTik/RB2011UiAS-IN.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB2011UiAS-IN
-slug: rb2011uias-in
+slug: mikrotik-rb2011uias-in
 interfaces:
   - name: ether1
     type: 1000base-t
diff --git a/device-types/MikroTik/RB2011UiAS-RM.yaml b/device-types/MikroTik/RB2011UiAS-RM.yaml
index a98a09585b3fba67bf169a1c934c8b0d5c9342b1..4606b0efd4bb7b7650f2fd9bbbefa76e96f961d9 100644
--- a/device-types/MikroTik/RB2011UiAS-RM.yaml
+++ b/device-types/MikroTik/RB2011UiAS-RM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB2011UiAS-RM
-slug: rb2011uias-rm
+slug: mikrotik-rb2011uias-rm
 is_full_depth: false
 u_height: 1
 airflow: passive
diff --git a/device-types/MikroTik/RB2011iL-RM.yaml b/device-types/MikroTik/RB2011iL-RM.yaml
index 283eb6d321da1f37f19963ff140bec867aac66e4..dfeaac5d6005d1ba5a94c4ae7dd4a33d5187ac16 100644
--- a/device-types/MikroTik/RB2011iL-RM.yaml
+++ b/device-types/MikroTik/RB2011iL-RM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB2011iL-RM
-slug: rb2011il-rm
+slug: mikrotik-rb2011il-rm
 is_full_depth: false
 u_height: 1
 airflow: passive
diff --git a/device-types/MikroTik/RB2011iLS-IN.yaml b/device-types/MikroTik/RB2011iLS-IN.yaml
index 3148c542a3364610c4da6ecb5a606e9a2cb56253..af7b61e3827bd88fc32df1faac68845287ab0f42 100644
--- a/device-types/MikroTik/RB2011iLS-IN.yaml
+++ b/device-types/MikroTik/RB2011iLS-IN.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB2011iLS-IN
-slug: rb2011ils-in
+slug: mikrotik-rb2011ils-in
 interfaces:
   - name: ether1
     type: 1000base-t
diff --git a/device-types/MikroTik/RB260GS.yaml b/device-types/MikroTik/RB260GS.yaml
index d9d2de07e8a805f66620418f0b3c4a96f17de509..e445feb4ce0cab94c1f2badd6be55c16ba10604f 100644
--- a/device-types/MikroTik/RB260GS.yaml
+++ b/device-types/MikroTik/RB260GS.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB260GS
-slug: rb260gs
+slug: mikrotik-rb260gs
 interfaces:
   - name: ether1
     type: 1000base-t
diff --git a/device-types/MikroTik/RB260GSP.yaml b/device-types/MikroTik/RB260GSP.yaml
index e7ec2df374ef3b0d679c61faefc12f9d0c6f9483..57f40398a92c6c6e527e32c5d70ce8baa2b5dd72 100644
--- a/device-types/MikroTik/RB260GSP.yaml
+++ b/device-types/MikroTik/RB260GSP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB260GSP
-slug: rb260gsp
+slug: mikrotik-rb260gsp
 interfaces:
   - name: ether1
     type: 1000base-t
diff --git a/device-types/MikroTik/RB3011UiAS-RM.yaml b/device-types/MikroTik/RB3011UiAS-RM.yaml
index 28a8956bcfadbb151230ef61fbee599aa61fd0e9..f5e5265589ba0de930b9d2b7037d51f19ca8d4ec 100644
--- a/device-types/MikroTik/RB3011UiAS-RM.yaml
+++ b/device-types/MikroTik/RB3011UiAS-RM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB3011UiAS-RM
-slug: rb3011uias-rm
+slug: mikrotik-rb3011uias-rm
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/RB5009UG+S+IN.yaml b/device-types/MikroTik/RB5009UG+S+IN.yaml
index 3a7037f6dbc3a5c9ef614dcbd261ad92358c1d5a..231c20c25dfc0b8c373273d7422224795d24cd22 100644
--- a/device-types/MikroTik/RB5009UG+S+IN.yaml
+++ b/device-types/MikroTik/RB5009UG+S+IN.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB5009UG+S+IN
-slug: rb5009ug_s_in
+slug: mikrotik-rb5009ug-plus-s-plus-in
 comments: '[MikroTik RB5009UG+S+IN Datasheet](https://mikrotik.com/product/rb5009ug_s_in)'
 is_full_depth: false
 u_height: 0
diff --git a/device-types/MikroTik/RB5009UPr+S+IN.yaml b/device-types/MikroTik/RB5009UPr+S+IN.yaml
index 06d4af6d320084977902d93a0a92c984284579af..c4b0ecc0e3b1e68ae88cc9aa01f3ab79d316bce1 100644
--- a/device-types/MikroTik/RB5009UPr+S+IN.yaml
+++ b/device-types/MikroTik/RB5009UPr+S+IN.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB5009UPr+S+IN
-slug: rb5009upr_s_in
+slug: mikrotik-rb5009upr-plus-s-plus-in
 comments: '[MikroTik RB5009UPr+S+IN Datasheet](https://mikrotik.com/product/rb5009upr_s_in)'
 is_full_depth: false
 u_height: 0
diff --git a/device-types/MikroTik/RB750Gr3.yaml b/device-types/MikroTik/RB750Gr3.yaml
index eb6eaef4fe356eacf9c21d52464f8f82475bf1c8..8d5d0dceb8aa418a79e2cfe6bae3cc1a80fbff69 100644
--- a/device-types/MikroTik/RB750Gr3.yaml
+++ b/device-types/MikroTik/RB750Gr3.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB750Gr3
-slug: rb750gr3
+slug: mikrotik-rb750gr3
 comments: '[MikroTik RB750Gr3 Datasheet](https://mikrotik.com/product/RB750Gr3)'
 interfaces:
   - name: ether1
diff --git a/device-types/MikroTik/RB750r2.yaml b/device-types/MikroTik/RB750r2.yaml
index 54a673808552a3ceebedc5197dc96c05f92bbd0e..333ccc512b76c21001801b576bf5704a96046408 100644
--- a/device-types/MikroTik/RB750r2.yaml
+++ b/device-types/MikroTik/RB750r2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB750r2
-slug: rb750r2
+slug: mikrotik-rb750r2
 interfaces:
   - name: ether1
     type: 100base-tx
diff --git a/device-types/MikroTik/RB750r3.yaml b/device-types/MikroTik/RB750r3.yaml
index 93cdc3bf52729f8081a3c71162e782b24d7585e3..49ed161d41b043a5959bbfc0df59ca159d8a3f8d 100644
--- a/device-types/MikroTik/RB750r3.yaml
+++ b/device-types/MikroTik/RB750r3.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB750r3
-slug: rb750r3
+slug: mikrotik-rb750r3
 interfaces:
   - name: ether1
     type: 1000base-t
diff --git a/device-types/MikroTik/RB760iGS.yaml b/device-types/MikroTik/RB760iGS.yaml
index 549b1fcff459062f4146cc3432327d158cec5748..b3fd6d30bb4f352e0548b7aacc8a01bbd51dcd56 100644
--- a/device-types/MikroTik/RB760iGS.yaml
+++ b/device-types/MikroTik/RB760iGS.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB760iGS
-slug: rb760igs
+slug: mikrotik-rb760igs
 part_number: RB760iGS
 u_height: 0
 is_full_depth: false
diff --git a/device-types/MikroTik/RB941-2nD.yaml b/device-types/MikroTik/RB941-2nD.yaml
index 2df025dbd0a4243682229ddaf68114a01fd8f6d7..b757e38c8c0bd1377895403cb703695a7a48cfa9 100644
--- a/device-types/MikroTik/RB941-2nD.yaml
+++ b/device-types/MikroTik/RB941-2nD.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: hAP lite
-slug: rb941-2nd
+slug: mikrotik-hap-lite
 part_number: RB941-2nD
 is_full_depth: false
 u_height: 0
diff --git a/device-types/MikroTik/RB951G-2HnD.yaml b/device-types/MikroTik/RB951G-2HnD.yaml
index 97a2af2fc99144d738c8169c49f6af28d05a732f..f97e4e367698f47d482a0fc3bb3b271b90e3c1fd 100644
--- a/device-types/MikroTik/RB951G-2HnD.yaml
+++ b/device-types/MikroTik/RB951G-2HnD.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB951G-2HnD
-slug: rb951g-2hnd
+slug: mikrotik-rb951g-2hnd
 u_height: 0
 power-ports:
   - name: power8-30V
diff --git a/device-types/MikroTik/RB960PGS.yaml b/device-types/MikroTik/RB960PGS.yaml
index de7e247eb7d6dda779c13bc85192f7f101334a98..61e2b36697d6ffabc39b663655918e4db1e77380 100644
--- a/device-types/MikroTik/RB960PGS.yaml
+++ b/device-types/MikroTik/RB960PGS.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RB960PGS
-slug: rb960pgs
+slug: mikrotik-rb960pgs
 comments: '[MikroTik RB960PGS Datasheet](https://mikrotik.com/product/RB960PGS)'
 is_full_depth: false
 u_height: 0
diff --git a/device-types/MikroTik/RBLHGR&R11e-LTE-US.yaml b/device-types/MikroTik/RBLHGR&R11e-LTE-US.yaml
index 846c616c716eba0d4355137e19734d7564581774..3a385f3ea71f2342bcb80a78c3175388362e1b7f 100644
--- a/device-types/MikroTik/RBLHGR&R11e-LTE-US.yaml
+++ b/device-types/MikroTik/RBLHGR&R11e-LTE-US.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RBLHGR&R11e-LTE-US
-slug: rblhg-r11e-lte-us
+slug: mikrotik-rblhgr-and-r11e-lte-us
 part_number: RBLHGR&R11e-LTE-US
 u_height: 0
 is_full_depth: false
diff --git a/device-types/MikroTik/RBLHGR&R11e-LTE6.yaml b/device-types/MikroTik/RBLHGR&R11e-LTE6.yaml
index e13c070c14465c070bb75d4b542ae3c2ff9bcc27..4fcb46e27513ecb8573edd4e83e5a0110cefdd3b 100644
--- a/device-types/MikroTik/RBLHGR&R11e-LTE6.yaml
+++ b/device-types/MikroTik/RBLHGR&R11e-LTE6.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RBLHGR&R11e-LTE6
-slug: rblhg-r11d-lte6
+slug: mikrotik-rblhgr-and-r11e-lte6
 part_number: RBLHGR&R11e-LTE6
 u_height: 0
 is_full_depth: false
diff --git a/device-types/MikroTik/RBLtAP-2HnD.yaml b/device-types/MikroTik/RBLtAP-2HnD.yaml
index 7df1fb6f36866d036522edff9bc9332b30521e23..417bdc71cfdb71f42b4640fadba6e32e4a66a65b 100644
--- a/device-types/MikroTik/RBLtAP-2HnD.yaml
+++ b/device-types/MikroTik/RBLtAP-2HnD.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RBLtAP-2HnD
-slug: rbltap-2hnd
+slug: mikrotik-rbltap-2hnd
 part_number: RBLtAP-2HnD
 u_height: 0
 is_full_depth: false
diff --git a/device-types/MikroTik/RBSXTR&R11e-LTE6.yaml b/device-types/MikroTik/RBSXTR&R11e-LTE6.yaml
index 4fb041f6fe844c0dafea8319b6d58cd7688e8900..77111dc14b321e738e516958bf60ee96933a02b7 100644
--- a/device-types/MikroTik/RBSXTR&R11e-LTE6.yaml
+++ b/device-types/MikroTik/RBSXTR&R11e-LTE6.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: MikroTik
 model: RBSXTR&R11e-LTE6
-slug: rbsxtr-r11e-lte6
+slug: mikrotik-rbsxtr-and-r11e-lte6
 part_number: RBSXTR&R11e-LTE6
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Mimosa Networks/a5.yaml b/device-types/Mimosa Networks/a5.yaml
index d31cfbab66e6b0f45cea8a53a10e941ae4ecbac0..c40eb0be25a5ee962dec60efe4aa0d9cf12eb282 100644
--- a/device-types/Mimosa Networks/a5.yaml	
+++ b/device-types/Mimosa Networks/a5.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mimosa Networks
 model: A5
-slug: a5
+slug: mimosa-networks-a5
 part_number: a5
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Mimosa Networks/a5c.yaml b/device-types/Mimosa Networks/a5c.yaml
index d855886d0dd1783182a8a45d845933d0d1462ad3..3045123120fcd3670ce8c1d8c615c9b26142f7e7 100644
--- a/device-types/Mimosa Networks/a5c.yaml	
+++ b/device-types/Mimosa Networks/a5c.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mimosa Networks
 model: A5c
-slug: a5c
+slug: mimosa-networks-a5c
 part_number: a5c
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Mimosa Networks/a5x.yaml b/device-types/Mimosa Networks/a5x.yaml
index f9fe96abb54c0210458648cf5085d60d0619e330..00c9a95db8964ca5de41253dc0d2161c5d4a76f7 100644
--- a/device-types/Mimosa Networks/a5x.yaml	
+++ b/device-types/Mimosa Networks/a5x.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mimosa Networks
 model: A5x
-slug: a5x
+slug: mimosa-networks-a5x
 part_number: a5x
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Mimosa Networks/b5c.yaml b/device-types/Mimosa Networks/b5c.yaml
index 944af684607a0ceb0bb11bbb35bbfcf6d60031af..3d1022b649f6c8e5507ece34f45146d88468b227 100644
--- a/device-types/Mimosa Networks/b5c.yaml	
+++ b/device-types/Mimosa Networks/b5c.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mimosa Networks
 model: B5c
-slug: b5c
+slug: mimosa-networks-b5c
 part_number: b5c
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Mimosa Networks/b5x.yaml b/device-types/Mimosa Networks/b5x.yaml
index c8c884bc4cc4da925c2b1ee8bcfb2805e632c346..9a2e9c6811d37f7eeaaf33efa2ceba88504b7e02 100644
--- a/device-types/Mimosa Networks/b5x.yaml	
+++ b/device-types/Mimosa Networks/b5x.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mimosa Networks
 model: B5X
-slug: b5x
+slug: mimosa-networks-b5x
 part_number: b5x
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Mimosa Networks/c5c.yaml b/device-types/Mimosa Networks/c5c.yaml
index 44ff12f14e654ca263b274602048f2d917a6684a..fddbfa73047aabf2fff09cd9e0494246325c45ac 100644
--- a/device-types/Mimosa Networks/c5c.yaml	
+++ b/device-types/Mimosa Networks/c5c.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mimosa Networks
 model: C5c
-slug: c5c
+slug: mimosa-networks-c5c
 part_number: C5c
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Mimosa Networks/c5x.yaml b/device-types/Mimosa Networks/c5x.yaml
index 137247bfc6e7ba36b69296a6e36acec378f18f7e..6535034cb7f5c4c6b79e0ce1765a6b522d90f9c6 100644
--- a/device-types/Mimosa Networks/c5x.yaml	
+++ b/device-types/Mimosa Networks/c5x.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mimosa Networks
 model: C5x
-slug: c5x
+slug: mimosa-networks-c5x
 part_number: C5x
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Mimosa Networks/c6x.yaml b/device-types/Mimosa Networks/c6x.yaml
index c85a4212cc677f87f1e83928ab23c465e49bae9e..3e5ba5e31f6c14c8b433ef7c799e5becc5348fde 100644
--- a/device-types/Mimosa Networks/c6x.yaml	
+++ b/device-types/Mimosa Networks/c6x.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Mimosa Networks
 model: C6x
-slug: c6x
+slug: mimosa-networks-c6x
 part_number: C6x
 u_height: 0
 is_full_depth: false
diff --git a/device-types/NEC/UNIVERGE-IX2015.yaml b/device-types/NEC/UNIVERGE-IX2015.yaml
index 0040af7f78aa541a903ce79afc0cba6f971d0220..cb3aece8ec595bac5e43f1bde90d3d1c17609c18 100644
--- a/device-types/NEC/UNIVERGE-IX2015.yaml
+++ b/device-types/NEC/UNIVERGE-IX2015.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: NEC
 model: UNIVERGE IX2015
-slug: univerge-ix2015
+slug: nec-univerge-ix2015
 comments: |
   NEC UNIVERGE IX2015, 12W
   (1) RJ-45 Console Port, (2) Ethernet 1000BASE-T, (4) Ethernet 1000BASE-T in Switching Hub, (1) ISDN S/T interface
diff --git a/device-types/NEC/UNIVERGE-IX2025.yaml b/device-types/NEC/UNIVERGE-IX2025.yaml
index 755490644c2c30e70541123075489b13778bb3d8..ac8799e3b2063df34d3b5f28e4f97eae58526a28 100644
--- a/device-types/NEC/UNIVERGE-IX2025.yaml
+++ b/device-types/NEC/UNIVERGE-IX2025.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: NEC
 model: UNIVERGE IX2025
-slug: univerge-ix2025
+slug: nec-univerge-ix2025
 comments: |
   NEC UNIVERGE IX2025, 9W
   (1) RJ-45 Console Port, (2) Ethernet 100BASE-TX, (4) Ethernet 100BASE-TX in Switching Hub, (1) ISDN LINE interface, (1) ISDN S/T interface
diff --git a/device-types/NEC/UNIVERGE-IX2106.yaml b/device-types/NEC/UNIVERGE-IX2106.yaml
index ec47aabe397d1bd4f9219dfa7bc72d2e3e1f7f8d..5e624bab37f6b7b5754cb35a7fd3bd7ec6a2af8d 100644
--- a/device-types/NEC/UNIVERGE-IX2106.yaml
+++ b/device-types/NEC/UNIVERGE-IX2106.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: NEC
 model: UNIVERGE IX2106
-slug: univerge-ix2106
+slug: nec-univerge-ix2106
 part_number: BI000087
 comments: |
   NEC UNIVERGE IX2106, VPN-Compatible High speed Access Router, 7W
diff --git a/device-types/NEC/UNIVERGE-IX2107.yaml b/device-types/NEC/UNIVERGE-IX2107.yaml
index cb27bcd5d8f051942197e5ae42aed619c52f71e3..46e7cf9eca3dfd38c8a7a4e0eb60fb67e4095fd8 100644
--- a/device-types/NEC/UNIVERGE-IX2107.yaml
+++ b/device-types/NEC/UNIVERGE-IX2107.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: NEC
 model: UNIVERGE IX2107
-slug: univerge-ix2107
+slug: nec-univerge-ix2107
 part_number: BI000118
 comments: |
   NEC UNIVERGE IX2107, VPN-Compatible High speed Access Router, 7W
diff --git a/device-types/NEC/UNIVERGE-IX2215.yaml b/device-types/NEC/UNIVERGE-IX2215.yaml
index d685c8f66140c431b1497e2a07ada007a6a44ab1..fb9c9f9862f6a6e22aa5136cd91cd9e574901aec 100644
--- a/device-types/NEC/UNIVERGE-IX2215.yaml
+++ b/device-types/NEC/UNIVERGE-IX2215.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: NEC
 model: UNIVERGE IX2215
-slug: univerge-ix2215
+slug: nec-univerge-ix2215
 part_number: BI000054
 comments: |
   NEC UNIVERGE IX2215, VPN-Compatible High speed Access Router, 18W
diff --git a/device-types/NEC/UNIVERGE-IX2235.yaml b/device-types/NEC/UNIVERGE-IX2235.yaml
index 3f292c83ab49df2be9cc70a2d04c830323aa3f38..9d4d29ecab3a4a7a99081cf2fc05552fcfc7fa63 100644
--- a/device-types/NEC/UNIVERGE-IX2235.yaml
+++ b/device-types/NEC/UNIVERGE-IX2235.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: NEC
 model: UNIVERGE IX2235
-slug: univerge-ix2235
+slug: nec-univerge-ix2235
 part_number: BI000106
 comments: |
   NEC UNIVERGE IX2235, VPN-Compatible High speed Access Router, 19W
diff --git a/device-types/NEC/UNIVERGE-IX2310.yaml b/device-types/NEC/UNIVERGE-IX2310.yaml
index b3bb4d52b2cc83b6ab407d535f14c67000192a01..46bbd518612d21816399f1c4b9ac3430ca70022d 100644
--- a/device-types/NEC/UNIVERGE-IX2310.yaml
+++ b/device-types/NEC/UNIVERGE-IX2310.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: NEC
 model: UNIVERGE IX2310
-slug: univerge-ix2310
+slug: nec-univerge-ix2310
 part_number: BI000111
 comments: |
   NEC UNIVERGE IX2310, VPN-Compatible High speed Access Router, 50W
diff --git a/device-types/NetApp/FAS2750.yaml b/device-types/NetApp/FAS2750.yaml
index 6ca04e91e531c67b56ca5b7e681f758a4a117bbc..ffb9f8f5517198b3ee903ad8721c3d62b99a1eed 100644
--- a/device-types/NetApp/FAS2750.yaml
+++ b/device-types/NetApp/FAS2750.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: NetApp
 model: FAS2750
-slug: fas2750
+slug: netapp-fas2750
 part_number: FAS2750
 u_height: 2
 is_full_depth: true
diff --git a/device-types/NetApp/FAS8200.yaml b/device-types/NetApp/FAS8200.yaml
index cfcfa065a25a2f6ee88c99b74a6222ec9359213f..4ee0411d88bfa1550c2bcfb5a838682cf404c73e 100644
--- a/device-types/NetApp/FAS8200.yaml
+++ b/device-types/NetApp/FAS8200.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: NetApp
 model: FAS8200
-slug: fas8200
+slug: netapp-fas8200
 part_number: FAS8200A
 u_height: 3
 is_full_depth: true
diff --git a/device-types/NetApp/X3172A.yaml b/device-types/NetApp/X3172A.yaml
index 5323335c3b3fc054aacdc726613706c34cba964a..e5b2871501f6aed6121cc5efcdd7adcf8edbb85a 100644
--- a/device-types/NetApp/X3172A.yaml
+++ b/device-types/NetApp/X3172A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: NetApp
 model: FAS8200 Controller
-slug: fas8200-controller
+slug: netapp-fas8200-controller
 part_number: X3172A
 u_height: 0
 is_full_depth: true
diff --git a/device-types/NetApp/X3218A.yaml b/device-types/NetApp/X3218A.yaml
index a8f41e7a1fd427e90f0ba7dd4ff712e7e9534d17..bf1e37344107639beab89e8cefb668d084cd3d98 100644
--- a/device-types/NetApp/X3218A.yaml
+++ b/device-types/NetApp/X3218A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: NetApp
 model: FAS2700 Controller CNA
-slug: fas2700-controller-cna
+slug: netapp-fas2700-controller-cna
 part_number: X3218A
 u_height: 0
 is_full_depth: true
diff --git a/device-types/NetApp/X3219A.yaml b/device-types/NetApp/X3219A.yaml
index 9abdc449bd74eca56228a3cdc5016607b2ae5fc9..30326937d1c7a5d8b3e10579cbf49d9369ef2aa9 100644
--- a/device-types/NetApp/X3219A.yaml
+++ b/device-types/NetApp/X3219A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: NetApp
 model: FAS2700 Controller 10GBASE-T
-slug: fas2700-controller-10gbase-t
+slug: netapp-fas2700-controller-10gbase-t
 part_number: X3219A
 u_height: 0
 is_full_depth: true
diff --git a/device-types/Netgate/7100.yaml b/device-types/Netgate/7100.yaml
index a20d080ca4572f592581cf9e351f849233554c5e..081c3553f9653a9df3b6c8ec33bb6b0899080b5d 100644
--- a/device-types/Netgate/7100.yaml
+++ b/device-types/Netgate/7100.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Netgate
 model: 7100 Security Gateway
-slug: 7100-sg
+slug: netgate-7100-security-gateway
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Netgear/GS105.yaml b/device-types/Netgear/GS105.yaml
index a7698feb8c4bd958e07dbdabf025b3993ef2f4a8..434bee317c9e5cb0e6e0cf1796ccd81911166718 100644
--- a/device-types/Netgear/GS105.yaml
+++ b/device-types/Netgear/GS105.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Netgear
 model: GS105
-slug: gs105
+slug: netgear-gs105
 u_height: 1
 comments: '[Gigabit Unmanaged Switch Series GS105](https://www.netgear.com/business/wired/switches/unmanaged/gs105/)'
 is_full_depth: false
diff --git a/device-types/Netgear/GS105E.yaml b/device-types/Netgear/GS105E.yaml
index af35f7f4308e0a532f204d2410c4961aeb6562bd..411b50f1c1e7922b0551a543d84d17651b99aff1 100644
--- a/device-types/Netgear/GS105E.yaml
+++ b/device-types/Netgear/GS105E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Netgear
 model: GS105E
-slug: gs105e
+slug: netgear-gs105e
 u_height: 1
 comments: '[Gigabit Plus Switch Series GS105E](https://www.netgear.com/business/wired/switches/plus/gs105ev2/)'
 is_full_depth: false
diff --git a/device-types/Netgear/GS108.yaml b/device-types/Netgear/GS108.yaml
index a0c189fb943f5591e75cb57c30310b04905a5abd..50af9ff5ccc1a1eba4fdaddb0d7f98e2df537c02 100644
--- a/device-types/Netgear/GS108.yaml
+++ b/device-types/Netgear/GS108.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Netgear
 model: GS108
-slug: gs108
+slug: netgear-gs108
 u_height: 1
 comments: '[Gigabit Unmanaged Switch Series GS108](https://www.netgear.com/business/wired/switches/unmanaged/gs108/)'
 is_full_depth: false
diff --git a/device-types/Netgear/GS108E.yaml b/device-types/Netgear/GS108E.yaml
index 5905894b24042baa7fe6819d0e77196d5a9d8b5b..439974b112431563dda9860fcdba888b6d136630 100644
--- a/device-types/Netgear/GS108E.yaml
+++ b/device-types/Netgear/GS108E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Netgear
 model: GS108E
-slug: gs108e
+slug: netgear-gs108e
 u_height: 1
 comments: '[Gigabit Plus Switch Series GS108E](https://www.netgear.com/business/wired/switches/plus/gs108e/)'
 is_full_depth: false
diff --git a/device-types/Netgear/GS116.yaml b/device-types/Netgear/GS116.yaml
index a2f20c38ac46dbdfe574ffbedec0ab1b1480c420..b524295d87098d991ad69aaa155bd9f5f99458e7 100644
--- a/device-types/Netgear/GS116.yaml
+++ b/device-types/Netgear/GS116.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Netgear
 model: GS116
-slug: gs116
+slug: netgear-gs116
 u_height: 1
 comments: '[Gigabit Unmanaged Switch Series GS116](https://www.netgear.com/business/wired/switches/unmanaged/gs116/)'
 is_full_depth: false
diff --git a/device-types/Netgear/GS116E.yaml b/device-types/Netgear/GS116E.yaml
index 47955a325caa70727694575f432d91597ccd5d70..c81a531a12f73ab3374747b4c3a3cc7ec5afb1bf 100644
--- a/device-types/Netgear/GS116E.yaml
+++ b/device-types/Netgear/GS116E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Netgear
 model: GS116Ev2
-slug: gs116ev2
+slug: netgear-gs116ev2
 u_height: 1
 comments: '[Gigabit Unmanaged Switch Series GS116Ev2](https://www.netgear.com/support/product/GS116Ev2.aspx)'
 is_full_depth: false
diff --git a/device-types/Netgear/GSM7252PS.yaml b/device-types/Netgear/GSM7252PS.yaml
index eea162513cd55ff90462ee8320408bc227049008..132e526b20cf393de75f2191da8d88e8592967c7 100644
--- a/device-types/Netgear/GSM7252PS.yaml
+++ b/device-types/Netgear/GSM7252PS.yaml
@@ -1,8 +1,8 @@
 ---
 manufacturer: Netgear
-model: ProSAFE GS752TP V1H1
-slug: gs752tpv1h1
-part_number: GS752TP V1H1
+model: ProSafe GS752TP
+slug: netgear-prosafe-gs752tp
+part_number: GS752TP
 comments: '[52-Port Gigabit Ethernet Smart Switch with 4 SFP Ports (40 PoE, 8 PoE+)](https://www.netgear.com/support/product/GS752TP.aspx)'
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Netgear/JGS524.yaml b/device-types/Netgear/JGS524.yaml
index b5a0c575c070bccd73352d04a8f64a89f2235473..39d12c63a6c8dabd2fcefdf84b97bd4589334db5 100644
--- a/device-types/Netgear/JGS524.yaml
+++ b/device-types/Netgear/JGS524.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Netgear
 model: JGS524
-slug: jgs524
+slug: netgear-jgs524
 u_height: 1
 comments: '[Gigabit Unmanaged Switch Series JGS524](https://www.netgear.com/business/wired/switches/unmanaged/jgs524/)'
 is_full_depth: false
diff --git a/device-types/Netgear/M4300-12X12F.yaml b/device-types/Netgear/M4300-12X12F.yaml
index 1f1ee9caa3bed86bd36ddccc7f1cf05b7e43554a..a8648766581500ed1975012239e91b8fce88371b 100644
--- a/device-types/Netgear/M4300-12X12F.yaml
+++ b/device-types/Netgear/M4300-12X12F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Netgear
 model: M4300-12X12F
-slug: m4300-12x12f
+slug: netgear-m4300-12x12f
 u_height: 1
 airflow: front-to-rear
 comments: 'Documentation: [https://www.netgear.it/support/product/m4300-12x12f.aspx](https://www.netgear.it/support/product/m4300-12x12f.aspx)'
diff --git a/device-types/Netonix/WS-12-120-AC.yaml b/device-types/Netonix/WS-12-120-AC.yaml
index 4aed15b97ba8eb684f007482729d490ea833d6dd..c5bddbba2701a5958154eb9500fe99dfe109beeb 100644
--- a/device-types/Netonix/WS-12-120-AC.yaml
+++ b/device-types/Netonix/WS-12-120-AC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Netonix
 model: WS-12-250-AC
-slug: ws12-250-ac
+slug: netonix-ws-12-250-ac
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Netonix/WS-24-400A.yaml b/device-types/Netonix/WS-24-400A.yaml
index 0f157f911c23471816c942c8946ab34bc7e87252..8a92e4c4fc12fd2093fc051256b036446ef322a3 100644
--- a/device-types/Netonix/WS-24-400A.yaml
+++ b/device-types/Netonix/WS-24-400A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Netonix
 model: WS-24-400A
-slug: ws-24-400a
+slug: netonix-ws-24-400a
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Nokia/7210-SAS-Sx.yaml b/device-types/Nokia/7210-SAS-Sx.yaml
index ee9026fff0a8d1218c6526ac0f1c1d7232f39e0d..7affc1c840589334687bbb505bdbdf61e8d5316b 100644
--- a/device-types/Nokia/7210-SAS-Sx.yaml
+++ b/device-types/Nokia/7210-SAS-Sx.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Nokia
 model: 7210 SAS-Sx 10/100GE
-slug: 7210-sas-sx-10-100ge
+slug: nokia-7210-sas-sx-10-100ge
 part_number: 3HE11597AARB01
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Nokia/7220-IXR-D1.yaml b/device-types/Nokia/7220-IXR-D1.yaml
index f9e380349f75d598f8812a978133eab8f9d5c24f..b7f67015301168bfe8828b55ec94380b23afbe3d 100644
--- a/device-types/Nokia/7220-IXR-D1.yaml
+++ b/device-types/Nokia/7220-IXR-D1.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Nokia
 model: 7220 IXR-D1 88G 48baseT 4SFP+
-slug: nokia-7220-ixr-d1
+slug: nokia-7220-ixr-d1-88g-48baset-4sfpp
 part_number: 3HE15621AA
 u_height: 1
 is_full_depth: true  # 15.75"
diff --git a/device-types/Nokia/7220-IXR-D2.yaml b/device-types/Nokia/7220-IXR-D2.yaml
index 462d069d06aae60109cef8912459dd094ada3221..db7d73fd6616a9094de41c7117c18e25240e536e 100644
--- a/device-types/Nokia/7220-IXR-D2.yaml
+++ b/device-types/Nokia/7220-IXR-D2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Nokia
 model: 7220 IXR-D2 25/100GE
-slug: nokia-7220-ixr-d2
+slug: nokia-7220-ixr-d2-25-100ge
 part_number: 3HE15622AA
 u_height: 1
 is_full_depth: true  # 18.11"
diff --git a/device-types/Nokia/7220-IXR-D2L.yaml b/device-types/Nokia/7220-IXR-D2L.yaml
index 65f0effc47a68dff0d029dfafe02af51b21bd04e..c432d2d9791e0d5f8b73e3ff4e52cc658c56b3e2 100644
--- a/device-types/Nokia/7220-IXR-D2L.yaml
+++ b/device-types/Nokia/7220-IXR-D2L.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Nokia
 model: 7220 IXR-D2L 25/100GE
-slug: nokia-7220-ixr-d2l
+slug: nokia-7220-ixr-d2l-25-100ge
 part_number: 3HE17645AA
 u_height: 1
 is_full_depth: true  # 21.10"
diff --git a/device-types/Nokia/7220-IXR-D3.yaml b/device-types/Nokia/7220-IXR-D3.yaml
index 838f3a61bab1fd34d6baae52ba4725ed02d2ad50..77d2cf3d447f9be22cc540be55c46967c606ee73 100644
--- a/device-types/Nokia/7220-IXR-D3.yaml
+++ b/device-types/Nokia/7220-IXR-D3.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Nokia
 model: 7220 IXR-D3 32*100GE
-slug: nokia-7220-ixr-d3
+slug: nokia-7220-ixr-d3-32-100ge
 part_number: 3HE15623AA
 u_height: 1
 is_full_depth: true  # 18.11"
diff --git a/device-types/Nokia/7220-IXR-D3L.yaml b/device-types/Nokia/7220-IXR-D3L.yaml
index 465def282ea50f187a449a870c73d1263182b294..40acdccb7316d763aa10772e505f47f8414a1e11 100644
--- a/device-types/Nokia/7220-IXR-D3L.yaml
+++ b/device-types/Nokia/7220-IXR-D3L.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Nokia
 model: 7220 IXR-D3L 32*100GE
-slug: nokia-7220-ixr-d3l
+slug: nokia-7220-ixr-d3l-32-100ge
 part_number: 3HE17646AA
 u_height: 1
 is_full_depth: true  # 21.28"
diff --git a/device-types/Nokia/7220-IXR-H3.yaml b/device-types/Nokia/7220-IXR-H3.yaml
index 274bfebbd3ddf189f27601761c4c0a469ea26a04..4a810473637a23509428cd14d4a8b4a6843e3f87 100644
--- a/device-types/Nokia/7220-IXR-H3.yaml
+++ b/device-types/Nokia/7220-IXR-H3.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Nokia
 model: 7220 IXR-H3 32QSFPDD 2SFP+
-slug: nokia-7220-ixr-h3
+slug: nokia-7220-ixr-h3-32qsfpdd-2sfpp
 part_number: 3HE16425AA
 u_height: 1
 is_full_depth: true  # 21.65"
diff --git a/device-types/Nvidia/jetson-xavier-nx-developer-kit.yaml b/device-types/Nvidia/jetson-xavier-nx-developer-kit.yaml
index 1c0e40320ccd62fbd471a3c8c0fb80fa57067e02..b761289b06c61bb99cdcf9296decfaf107050b31 100644
--- a/device-types/Nvidia/jetson-xavier-nx-developer-kit.yaml
+++ b/device-types/Nvidia/jetson-xavier-nx-developer-kit.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Nvidia
 model: Jetson Xavier NX Developer Kit
-slug: jetson-xavier-nx-developer-kit
+slug: nvidia-jetson-xavier-nx-developer-kit
 comments: '[Jetson Xavier NX Developer Kit website](https://www.nvidia.com/en-us/autonomous-machines/embedded-systems/jetson-xavier-nx/)'
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Opengear/ACM7008-2-M.yaml b/device-types/Opengear/ACM7008-2-M.yaml
index 4d565041bea426cfce3d4d2e5bef3bdcf3d118d0..3c850aaff5c1f106a2dfebcb8f9ca132502a26ae 100644
--- a/device-types/Opengear/ACM7008-2-M.yaml
+++ b/device-types/Opengear/ACM7008-2-M.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: ACM7008-2-M
-slug: acm7008-2-m
+slug: opengear-acm7008-2-m
 part_number: ACM7008-2-M
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/CM7116-2-DAC-US.yaml b/device-types/Opengear/CM7116-2-DAC-US.yaml
index 30f99362dadda29fb18196f07df59d3b07c2da5a..9335e2f2000adba03e871a6101c5ab00deda01b4 100644
--- a/device-types/Opengear/CM7116-2-DAC-US.yaml
+++ b/device-types/Opengear/CM7116-2-DAC-US.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: CM7116-2-DAC-US
-slug: cm7116-2-dac-us
+slug: opengear-cm7116-2-dac-us
 part_number: CM7116-2-DAC-US
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/CM7116-2-SAC-US.yaml b/device-types/Opengear/CM7116-2-SAC-US.yaml
index ec990c8ac5ce654f1c71417f0e28582d72ddd80b..d44d99bc4c0f6e446e0ebd83b8fc789326622576 100644
--- a/device-types/Opengear/CM7116-2-SAC-US.yaml
+++ b/device-types/Opengear/CM7116-2-SAC-US.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: CM7116-2-SAC-US
-slug: cm7116-2-sac-us
+slug: opengear-cm7116-2-sac-us
 part_number: CM7116-2-SAC-US
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/CM7132-2-DAC-US.yaml b/device-types/Opengear/CM7132-2-DAC-US.yaml
index 91f4a5d00f10add2975c5839886878c929b08720..bcbf24215137f3e801ea6042fde9b07ca50834c5 100644
--- a/device-types/Opengear/CM7132-2-DAC-US.yaml
+++ b/device-types/Opengear/CM7132-2-DAC-US.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: CM7132-2-DAC-US
-slug: cm7132-2-dac-us
+slug: opengear-cm7132-2-dac-us
 part_number: CM7132-2-DAC-US
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/CM7148-2-DAC-US.yaml b/device-types/Opengear/CM7148-2-DAC-US.yaml
index ca5ca6520daed1ec50c815471170d6651a687e77..a24120e411892047babd24475ff6b215ff5f0868 100644
--- a/device-types/Opengear/CM7148-2-DAC-US.yaml
+++ b/device-types/Opengear/CM7148-2-DAC-US.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: CM7148-2-DAC-US
-slug: cm7148-2-dac-us
+slug: opengear-cm7148-2-dac-us
 part_number: CM7148-2-DAC-US
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/CM7148-2-SAC-US.yaml b/device-types/Opengear/CM7148-2-SAC-US.yaml
index aaf634d047325ef4576e17cde1bff331b541649c..dd8a6b8168d1f6dcd3cca2a7683ebbdb76561232 100644
--- a/device-types/Opengear/CM7148-2-SAC-US.yaml
+++ b/device-types/Opengear/CM7148-2-SAC-US.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: CM7148-2-SAC-US
-slug: cm7148-2-sac-us
+slug: opengear-cm7148-2-sac-us
 part_number: CM7148-2-SAC-US
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/CM7196-2-DAC-US.yaml b/device-types/Opengear/CM7196-2-DAC-US.yaml
index 88c46e7ecc25854e589eab253319a15e958636e9..b3a1a7b0d64700963565b9dc9d683922e41be01a 100644
--- a/device-types/Opengear/CM7196-2-DAC-US.yaml
+++ b/device-types/Opengear/CM7196-2-DAC-US.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: CM7196-2-DAC-US
-slug: cm7196-2-dac-us
+slug: opengear-cm7196-2-dac-us
 part_number: CM7196-2-DAC-US
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/IM4216-2.yaml b/device-types/Opengear/IM4216-2.yaml
index 5b450cbf6a46b58ea9e5142a4611d6d0af1e64b0..ac1bd2beaa00a8bb7f8e1b850de5bc67bccb11a0 100644
--- a/device-types/Opengear/IM4216-2.yaml
+++ b/device-types/Opengear/IM4216-2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: IM4216-2
-slug: im4216-2
+slug: opengear-im4216-2
 part_number: IM4248-2
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/IM4232-2.yaml b/device-types/Opengear/IM4232-2.yaml
index 109945385e8c635c5148bb99c8d05ef900395eb7..1e4b42657cd4c9d8f0666b78fcab27e2aec23807 100644
--- a/device-types/Opengear/IM4232-2.yaml
+++ b/device-types/Opengear/IM4232-2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: IM4232-2
-slug: im4232-2
+slug: opengear-im4232-2
 part_number: IM4232-2
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/IM4248-2.yaml b/device-types/Opengear/IM4248-2.yaml
index 3fbbb31b04999a5b5f6895e008276f16e7d016bf..fabac88c99608346d791d5513df3ab8b7c047a2b 100644
--- a/device-types/Opengear/IM4248-2.yaml
+++ b/device-types/Opengear/IM4248-2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: IM4248-2
-slug: im4248-2
+slug: opengear-im4248-2
 part_number: IM4248-2
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/IM7216-2-DAC-US.yaml b/device-types/Opengear/IM7216-2-DAC-US.yaml
index acab54eda622bb5c9001b76edc621ff1515281ef..cd38b56ff8aea3e398281a61d5c02c55b24c5ea1 100644
--- a/device-types/Opengear/IM7216-2-DAC-US.yaml
+++ b/device-types/Opengear/IM7216-2-DAC-US.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: IM7216-2-DAC-US
-slug: im7216-2-dac-us
+slug: opengear-im7216-2-dac-us
 part_number: IM7216-2-DAC-US
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/IM7232-2-DAC-US.yaml b/device-types/Opengear/IM7232-2-DAC-US.yaml
index 10ebe01a2ac9dd5a0af4a4075bcae4ec5de136fb..eca091de5aa804cc0a636575c12f6d06fdf58eb5 100644
--- a/device-types/Opengear/IM7232-2-DAC-US.yaml
+++ b/device-types/Opengear/IM7232-2-DAC-US.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: IM7232-2-DAC-US
-slug: im7232-2-dac-us
+slug: opengear-im7232-2-dac-us
 part_number: IM7232-2-DAC-US
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/IM7248-2-DAC-LMA.yaml b/device-types/Opengear/IM7248-2-DAC-LMA.yaml
index 21825a4d457cd123bbb19e749931eb2607402240..a0d2dd14db46f480c7a74251651622b3d913f511 100644
--- a/device-types/Opengear/IM7248-2-DAC-LMA.yaml
+++ b/device-types/Opengear/IM7248-2-DAC-LMA.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: IM7248-2-DAC-LMA
-slug: im7248-2-dac-lma
+slug: opengear-im7248-2-dac-lma
 part_number: IM7248-2-DAC-LMA
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/IM7248-2-DAC-LMP.yaml b/device-types/Opengear/IM7248-2-DAC-LMP.yaml
index 0aa90b967afed7c0645a0bbf11567dbfff48d486..6d08e8dc04ecb6cf12b07951c163bfeb3cdee2c8 100644
--- a/device-types/Opengear/IM7248-2-DAC-LMP.yaml
+++ b/device-types/Opengear/IM7248-2-DAC-LMP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: IM7248-2-DAC-LMP
-slug: im7248-2-dac-lmp
+slug: opengear-im7248-2-dac-lmp
 part_number: IM7248-2-DAC-LMP
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/IM7248-2-DAC-LMV.yaml b/device-types/Opengear/IM7248-2-DAC-LMV.yaml
index d53ae47ef507306049f6672da2b37a5a02893596..7ce7b7785f3b899195882036036556df130c0d66 100644
--- a/device-types/Opengear/IM7248-2-DAC-LMV.yaml
+++ b/device-types/Opengear/IM7248-2-DAC-LMV.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: IM7248-2-DAC-LMV
-slug: im7248-2-dac-lmv
+slug: opengear-im7248-2-dac-lmv
 part_number: IM7248-2-DAC-LMV
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/IM7248-2-DAC-LR.yaml b/device-types/Opengear/IM7248-2-DAC-LR.yaml
index 7f39304d961157805a55ed31640d7510664dd7db..bc3e79b00690e8ec0924983f60d548077a1a284e 100644
--- a/device-types/Opengear/IM7248-2-DAC-LR.yaml
+++ b/device-types/Opengear/IM7248-2-DAC-LR.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: IM7248-2-DAC-LR
-slug: im7248-2-dac-lr
+slug: opengear-im7248-2-dac-lr
 part_number: IM7248-2-DAC-LR
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/IM7248-2-DAC-US.yaml b/device-types/Opengear/IM7248-2-DAC-US.yaml
index b5365740d85aff0b0f77bebfea32e72c44012b1b..5a0c1f084c3a76d19964cf86ff0dc56fc4bdc664 100644
--- a/device-types/Opengear/IM7248-2-DAC-US.yaml
+++ b/device-types/Opengear/IM7248-2-DAC-US.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: IM7248-2-DAC-US
-slug: im7248-2-dac-us
+slug: opengear-im7248-2-dac-us
 part_number: IM7248-2-DAC-US
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/IM7248-2-DAC.yaml b/device-types/Opengear/IM7248-2-DAC.yaml
index b0335ea78b86cecf10725722e114e6137d784265..2c6673cf34890b53a4c62cbddcb731955a42c858 100644
--- a/device-types/Opengear/IM7248-2-DAC.yaml
+++ b/device-types/Opengear/IM7248-2-DAC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: IM7248-2-DAC
-slug: im7248-2-dac
+slug: opengear-im7248-2-dac
 part_number: IM7248-2-DAC
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/OM2248-L-EU.yaml b/device-types/Opengear/OM2248-L-EU.yaml
index 1339d244eaa86c201da1c6cffbdddc3a7886eefe..999fc202ef6a4a0091c76bd3b9b94258e3bccd04 100644
--- a/device-types/Opengear/OM2248-L-EU.yaml
+++ b/device-types/Opengear/OM2248-L-EU.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: OM2248-L-EU
-slug: om2248-l-eu
+slug: opengear-om2248-l-eu
 part_number: OM2248-L-EU
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Opengear/OM2248-L.yaml b/device-types/Opengear/OM2248-L.yaml
index b67da9105c6e2382dae8e583b104c94df4776cdc..5a6db2b406aeeff3b24858e356b1f4a39bffc7d7 100644
--- a/device-types/Opengear/OM2248-L.yaml
+++ b/device-types/Opengear/OM2248-L.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Opengear
 model: OM2248-L
-slug: om2248-l
+slug: opengear-om2248-l
 part_number: OM2248-L-EU
 u_height: 1
 is_full_depth: false
diff --git a/device-types/PC Engines/APU.yaml b/device-types/PC Engines/APU.yaml
index eac25896300c00c5cc205c26b97fd2120b9f318e..24595c98f44b7de7d1b07b6939023c7ca4ab6a9c 100644
--- a/device-types/PC Engines/APU.yaml	
+++ b/device-types/PC Engines/APU.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: PC Engines
 model: APU
-slug: apu1
+slug: pc-engines-apu1
 part_number: apu1
 comments: |
   Dimensions: 168 x 157 x 30 mm (6.61 x 6.18 x 1.18")
diff --git a/device-types/PC Engines/APU2.yaml b/device-types/PC Engines/APU2.yaml
index 076724d29c7b201a46e3c58676ca7441e510a25f..df15fa07d95b273e5199dbbd5343ca2e627c512c 100644
--- a/device-types/PC Engines/APU2.yaml	
+++ b/device-types/PC Engines/APU2.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: PC Engines
 model: APU2
-slug: apu2
+slug: pc-engines-apu2
 part_number: apu2
 comments: |
   Dimensions: 168 x 157 x 30 mm (6.61 x 6.18 x 1.18")
diff --git a/device-types/PC Engines/APU4.yaml b/device-types/PC Engines/APU4.yaml
index ca9a79fa239d3f4332131725317d0854b80ff54c..12bae13d9e8ff6e0a1fd552aebe2a7d34950b9d7 100644
--- a/device-types/PC Engines/APU4.yaml	
+++ b/device-types/PC Engines/APU4.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: PC Engines
 model: APU4
-slug: apu4
+slug: pc-engines-apu4
 part_number: apu4
 comments: |
   Dimensions: 168 x 157 x 30 mm (6.61 x 6.18 x 1.18")
diff --git a/device-types/Palo Alto/M-100.yaml b/device-types/Palo Alto/M-100.yaml
index 27b394c40ed701c7fcff8466ce6b3018752a4ba8..5c584e1fd64ad8575803e0e9d704f14bf3bfaa14 100644
--- a/device-types/Palo Alto/M-100.yaml	
+++ b/device-types/Palo Alto/M-100.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: M-100
-slug: m-100
+slug: palo-alto-m-100
 part_number: M-100
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Palo Alto/M-500.yaml b/device-types/Palo Alto/M-500.yaml
index b2a3d099051c760ff96506e565fe0c85fdc883a3..690040fe445478714008c64873cee9b707145318 100644
--- a/device-types/Palo Alto/M-500.yaml	
+++ b/device-types/Palo Alto/M-500.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: M-500
-slug: m-500
+slug: palo-alto-m-500
 part_number: M-500
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Palo Alto/PA-200.yaml b/device-types/Palo Alto/PA-200.yaml
index abfe99b159cf5fd79a7afb5fb30bd69110bf3d1a..240acf17f7cd15d892d3d2d6a0215df22ab412e5 100644
--- a/device-types/Palo Alto/PA-200.yaml	
+++ b/device-types/Palo Alto/PA-200.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-200
-slug: pa-200
+slug: palo-alto-pa-200
 part_number: PA-200
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Palo Alto/PA-220.yaml b/device-types/Palo Alto/PA-220.yaml
index 3b3197a4a6388d45b2fc4afa9175755ba276c818..154a3e4453c7af9ca27a98d645d4d19d9360259b 100644
--- a/device-types/Palo Alto/PA-220.yaml	
+++ b/device-types/Palo Alto/PA-220.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-220
-slug: pa-220
+slug: palo-alto-pa-220
 part_number: PA-220
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Palo Alto/PA-3020.yaml b/device-types/Palo Alto/PA-3020.yaml
index f37d77c8237ec8bb6c7e0fda729879fce86c7bce..044ce692b91168b1f0b0da4eba76eb9bd53836df 100644
--- a/device-types/Palo Alto/PA-3020.yaml	
+++ b/device-types/Palo Alto/PA-3020.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-3020
-slug: pa-3020
+slug: palo-alto-pa-3020
 part_number: PA-3020
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Palo Alto/PA-3050.yaml b/device-types/Palo Alto/PA-3050.yaml
index 17bb71947b9750267d1d7ac428795c583202c6ed..8914486e1262624b043215c326232950c62dc844 100644
--- a/device-types/Palo Alto/PA-3050.yaml	
+++ b/device-types/Palo Alto/PA-3050.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-3050
-slug: pa-3050
+slug: palo-alto-pa-3050
 part_number: PA-3050
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Palo Alto/PA-3060.yaml b/device-types/Palo Alto/PA-3060.yaml
index 567dfb25e87400776d23897ecdd4fda4374fce5b..5ab6ad14f2da5ee6ab294a5d7abd41fe70ba4337 100644
--- a/device-types/Palo Alto/PA-3060.yaml	
+++ b/device-types/Palo Alto/PA-3060.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-3060
-slug: pa-3060
+slug: palo-alto-pa-3060
 part_number: PA-3060
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Palo Alto/PA-3220.yaml b/device-types/Palo Alto/PA-3220.yaml
index 3adb3762b1a0eec5a7f3955522089964b78de622..b46019eb8ac5330b9712198edcb8eb4e0465e30e 100644
--- a/device-types/Palo Alto/PA-3220.yaml	
+++ b/device-types/Palo Alto/PA-3220.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-3220
-slug: pa-3220
+slug: palo-alto-pa-3220
 part_number: PA-3220
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Palo Alto/PA-3250.yaml b/device-types/Palo Alto/PA-3250.yaml
index 3ebe19040423a9f210a0ad507fd2228de61857a1..7e83bd2b9c20d0433683d75976c522fc2b6c5843 100644
--- a/device-types/Palo Alto/PA-3250.yaml	
+++ b/device-types/Palo Alto/PA-3250.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-3250
-slug: pa-3250
+slug: palo-alto-pa-3250
 part_number: PA-3250
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Palo Alto/PA-3260.yaml b/device-types/Palo Alto/PA-3260.yaml
index ed08497d7d7f28a7cef4fff5e4279ef740fcb3b8..28ee796d34f5feb0326fb034b435ebfb8d78d108 100644
--- a/device-types/Palo Alto/PA-3260.yaml	
+++ b/device-types/Palo Alto/PA-3260.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-3260
-slug: pa-3260
+slug: palo-alto-pa-3260
 part_number: PA-3260
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Palo Alto/PA-500.yaml b/device-types/Palo Alto/PA-500.yaml
index 93c4710fe169a41ff24fb407f28829316add6103..82883ec66f39e4739cfcf6d99f4867e13346d74c 100644
--- a/device-types/Palo Alto/PA-500.yaml	
+++ b/device-types/Palo Alto/PA-500.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-500
-slug: pa-500
+slug: palo-alto-pa-500
 part_number: PA-500
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Palo Alto/PA-5050.yaml b/device-types/Palo Alto/PA-5050.yaml
index c7c851b604a92ff3c8bcdbedb5f13fa680eb4681..51dd41086854047cfd42eab26cf75c9ab524f905 100644
--- a/device-types/Palo Alto/PA-5050.yaml	
+++ b/device-types/Palo Alto/PA-5050.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-5050
-slug: pa-5050
+slug: palo-alto-pa-5050
 part_number: PA-5050
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Palo Alto/PA-5060.yaml b/device-types/Palo Alto/PA-5060.yaml
index 9e42026158ec83a19a4583310b688e92e9b4aafa..b6146a0ccec8dad7de8f302957cf02433695ff2d 100644
--- a/device-types/Palo Alto/PA-5060.yaml	
+++ b/device-types/Palo Alto/PA-5060.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-5060
-slug: pa-5060
+slug: palo-alto-pa-5060
 part_number: PA-5060
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Palo Alto/PA-5220.yaml b/device-types/Palo Alto/PA-5220.yaml
index 68c33d21c3945bf40981d13a4d9785e96f6f8c93..e1f994d39103f3278044da0fd9ceb07a60b2d2a2 100644
--- a/device-types/Palo Alto/PA-5220.yaml	
+++ b/device-types/Palo Alto/PA-5220.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-5220
-slug: pa-5220
+slug: palo-alto-pa-5220
 part_number: PA-5220
 u_height: 3
 is_full_depth: true
diff --git a/device-types/Palo Alto/PA-5250.yaml b/device-types/Palo Alto/PA-5250.yaml
index f34182dd153c422a3a3d7f5aba1e43f553cdd857..9f208e499b15ab2c2ab709b83816d217fdeee581 100644
--- a/device-types/Palo Alto/PA-5250.yaml	
+++ b/device-types/Palo Alto/PA-5250.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-5250
-slug: pa-5250
+slug: palo-alto-pa-5250
 part_number: PA-5250
 u_height: 3
 is_full_depth: true
diff --git a/device-types/Palo Alto/PA-5260.yaml b/device-types/Palo Alto/PA-5260.yaml
index f910e9b7d2c52bcfa7ed97c9608e722b6e6db159..153b146a4a89cad44e722ff9c0bc9a8fbd527ab8 100644
--- a/device-types/Palo Alto/PA-5260.yaml	
+++ b/device-types/Palo Alto/PA-5260.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-5260
-slug: pa-5260
+slug: palo-alto-pa-5260
 part_number: PA-5260
 u_height: 3
 is_full_depth: true
diff --git a/device-types/Palo Alto/PA-5280.yaml b/device-types/Palo Alto/PA-5280.yaml
index 5a06d0d1ecac374f4b34e3dbaa048d6952aab2f8..b5495abb7dbba67aa36b94dba88e3a298e2d2789 100644
--- a/device-types/Palo Alto/PA-5280.yaml	
+++ b/device-types/Palo Alto/PA-5280.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-5280
-slug: pa-5280
+slug: palo-alto-pa-5280
 part_number: PA-5280
 u_height: 3
 is_full_depth: true
diff --git a/device-types/Palo Alto/PA-7080.yaml b/device-types/Palo Alto/PA-7080.yaml
index bf6c44cc2c4ad73224a4eaf93efbe637a3baf741..8b202f616c3096723534fe62d44e014dc396ea7e 100644
--- a/device-types/Palo Alto/PA-7080.yaml	
+++ b/device-types/Palo Alto/PA-7080.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-7080
-slug: pa-7080
+slug: palo-alto-pa-7080
 part_number: PA-7080
 u_height: 19
 is_full_depth: true
diff --git a/device-types/Palo Alto/PA-820.yaml b/device-types/Palo Alto/PA-820.yaml
index 948b37aea5c0af4799d97183eaaaf0b15635e447..d626dbd59d36ecf82c36ea3bd066d81a470b9e6d 100644
--- a/device-types/Palo Alto/PA-820.yaml	
+++ b/device-types/Palo Alto/PA-820.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-820
-slug: pa-820
+slug: palo-alto-pa-820
 part_number: PA-820
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Palo Alto/PA-850.yaml b/device-types/Palo Alto/PA-850.yaml
index b279527bfb91f844f4ebb011e2fd34f081ca3310..bdd0cb39240bfa22156f01fadc710d26f7c75088 100644
--- a/device-types/Palo Alto/PA-850.yaml	
+++ b/device-types/Palo Alto/PA-850.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Palo Alto
 model: PA-850
-slug: pa-850
+slug: palo-alto-pa-850
 part_number: PA-850
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Panduit/CDPP8RG-S.yaml b/device-types/Panduit/CDPP8RG-S.yaml
index a38404e4348cfe7aa39a6bd222c6c986cb8eb913..df38e9823bfb9ffe01f957e0e8afc0e87a0f3631 100644
--- a/device-types/Panduit/CDPP8RG-S.yaml
+++ b/device-types/Panduit/CDPP8RG-S.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com Shielded DIN Rail Patch Panel (8 Port)
-slug: cdpp8rg-s
+slug: panduit-cdpp8rg-s
 part_number: CDPP8RG-S
 u_height: 3
 is_full_depth: false
diff --git a/device-types/Panduit/CDPP8RG.yaml b/device-types/Panduit/CDPP8RG.yaml
index 09cb5727e5aaced78b5e461dac9ffeba967ac518..8b01590401420697a78e0b52ddbab3739dae84a9 100644
--- a/device-types/Panduit/CDPP8RG.yaml
+++ b/device-types/Panduit/CDPP8RG.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com DIN Rail Patch Panel (8 Port)
-slug: cdpp8rg
+slug: panduit-cdpp8rg
 part_number: CDPP8RG
 u_height: 3
 is_full_depth: false
diff --git a/device-types/Panduit/CP24BLY.yaml b/device-types/Panduit/CP24BLY.yaml
index 8b15d3b61dfc551a0006273e30ff3ac8b9c947ed..59145f0189d6ae32ee4b4f67e6043bfd88bef6fe 100644
--- a/device-types/Panduit/CP24BLY.yaml
+++ b/device-types/Panduit/CP24BLY.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com Shielded Patch Panel (24 Port, 1RU)
-slug: cp24bly
+slug: panduit-cp24bly
 part_number: CP24BLY
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Panduit/CP48BLY.yaml b/device-types/Panduit/CP48BLY.yaml
index 46a9d4ab58d8cb31570ffaf700d513f829b07ffc..6dd50d0a397f6d92ad9f203dd79cc1a3a14b6809 100644
--- a/device-types/Panduit/CP48BLY.yaml
+++ b/device-types/Panduit/CP48BLY.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com Shielded Patch Panel (48 Port, 2RU)
-slug: cp48bly
+slug: panduit-cp48bly
 part_number: CP48BLY
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Panduit/CP48HDBL.yaml b/device-types/Panduit/CP48HDBL.yaml
index 7ea9328e47395d6f6fad339b09350abab4cc28dd..83b15a98eef1762443d9dc9131853accb1d40365 100644
--- a/device-types/Panduit/CP48HDBL.yaml
+++ b/device-types/Panduit/CP48HDBL.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com Shielded High Density Patch Panel (48 Port, 1RU)
-slug: cp48hdbl
+slug: panduit-cp48hdbl
 part_number: CP48HDBL
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Panduit/CPA24BLY.yaml b/device-types/Panduit/CPA24BLY.yaml
index 0b39b22b40757f340fa8bdbf2b09596c9db60a89..44ccbe5b7a8c7a235e7fb18b5268781ffc624d12 100644
--- a/device-types/Panduit/CPA24BLY.yaml
+++ b/device-types/Panduit/CPA24BLY.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com Shielded Angled Patch Panel (24 Port, 1RU)
-slug: cpa24bly
+slug: panduit-cpa24bly
 part_number: CPA24BLY
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Panduit/CPA48BLY.yaml b/device-types/Panduit/CPA48BLY.yaml
index 422693f74d5bd900ce91c49c4e7b739978d1892e..29fcf2ae0eef3438baaaaf4afd253296cba93462 100644
--- a/device-types/Panduit/CPA48BLY.yaml
+++ b/device-types/Panduit/CPA48BLY.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com Shielded Angled Patch Panel (48 Port, 2RU)
-slug: cpa48bly
+slug: panduit-cpa48bly
 part_number: CPA48BLY
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Panduit/CPA48HDBL.yaml b/device-types/Panduit/CPA48HDBL.yaml
index dd29e47ddfd280e3dcb68cc2c7513f842f292588..9187a8242844ef024f19ffd09387fa0f71a3eece 100644
--- a/device-types/Panduit/CPA48HDBL.yaml
+++ b/device-types/Panduit/CPA48HDBL.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com Shielded High Density Angled Patch Panel (48 Port, 1RU)
-slug: cpa48hdbl
+slug: panduit-cpa48hdbl
 part_number: CPA48HDBL
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Panduit/CPP24FMWBLY.yaml b/device-types/Panduit/CPP24FMWBLY.yaml
index c53c348bbd3665761269297a38f9d8a8064c75eb..28ff989332961c77559705fad3cbff0829a88d25 100644
--- a/device-types/Panduit/CPP24FMWBLY.yaml
+++ b/device-types/Panduit/CPP24FMWBLY.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com Flush Mount Patch Panel (24 Port, 1RU)
-slug: cpp24fmwbly
+slug: panduit-cpp24fmwbly
 part_number: CPP24FMWBLY
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Panduit/CPP24WBLY.yaml b/device-types/Panduit/CPP24WBLY.yaml
index 8636f0272ba4877f8057b0b2b7b43b9c7bd6a5c6..3d9cb57057e06d664165e96f9777930508ffd350 100644
--- a/device-types/Panduit/CPP24WBLY.yaml
+++ b/device-types/Panduit/CPP24WBLY.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com Front Access Patch Panel (24 Port, 1RU)
-slug: cpp24wbly
+slug: panduit-cpp24wbly
 part_number: CPP24WBLY
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Panduit/CPP48FMWBLY.yaml b/device-types/Panduit/CPP48FMWBLY.yaml
index 41c21da6b7a80168051dc91739168656e74d721e..799d7cd7f18b46c3ed219100d0643350d92b7e95 100644
--- a/device-types/Panduit/CPP48FMWBLY.yaml
+++ b/device-types/Panduit/CPP48FMWBLY.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com Flush Mount Patch Panel (48 Port, 2RU)
-slug: cpp48fmwbly
+slug: panduit-cpp48fmwbly
 part_number: CPP48FMWBLY
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Panduit/CPP48HDEWBL.yaml b/device-types/Panduit/CPP48HDEWBL.yaml
index ec413dea7f0db437bd9b5256142e649b0356ec66..971712df1e592938c25e94390d0a831165a5bf01 100644
--- a/device-types/Panduit/CPP48HDEWBL.yaml
+++ b/device-types/Panduit/CPP48HDEWBL.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com High Density Patch Panel (48 Port, 1RU)
-slug: cpp48hdewbl
+slug: panduit-cpp48hdewbl
 part_number: CPP48HDEWBL
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Panduit/CPP48WBLY.yaml b/device-types/Panduit/CPP48WBLY.yaml
index a1e1674ed8a6c5c76d04e8404e061cd7eac25a1a..cd7cefdb3634c5debf2b8beb9a328c83e8de7423 100644
--- a/device-types/Panduit/CPP48WBLY.yaml
+++ b/device-types/Panduit/CPP48WBLY.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com Front Access Patch Panel (48 Port, 2RU)
-slug: cpp48wbly
+slug: panduit-cpp48wbly
 part_number: CPP48WBLY
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Panduit/CPP72FMWBLY.yaml b/device-types/Panduit/CPP72FMWBLY.yaml
index 695da1c4882420a7273e5ea4e18b6975c371827d..fc48e39c3dbb11a443c01d243e1f7fccbae51a00 100644
--- a/device-types/Panduit/CPP72FMWBLY.yaml
+++ b/device-types/Panduit/CPP72FMWBLY.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com Flush Mount Patch Panel (72 Port, 2RU)
-slug: cpp72fmwbly
+slug: panduit-cpp72fmwbly
 part_number: CPP72FMWBLY
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Panduit/CPPA24FMWBLY.yaml b/device-types/Panduit/CPPA24FMWBLY.yaml
index ba8a657385ae6a52d6116e5a71d2cc76c12c0838..ad175f7ea0ae43597ee59da7ed694fa217075c35 100644
--- a/device-types/Panduit/CPPA24FMWBLY.yaml
+++ b/device-types/Panduit/CPPA24FMWBLY.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com Flush Mount Angled Patch Panel (24 Port, 1RU)
-slug: cppa24fmwbly
+slug: panduit-cppa24fmwbly
 part_number: CPPA24FMWBLY
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Panduit/CPPA48FMWBLY.yaml b/device-types/Panduit/CPPA48FMWBLY.yaml
index 6d8287e1a386c6651e88e3ebde0c4e3fd5ed1709..6b50fbc0cb422ca55b31dfd9b25dc6656e61fcba 100644
--- a/device-types/Panduit/CPPA48FMWBLY.yaml
+++ b/device-types/Panduit/CPPA48FMWBLY.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com Flush Mount Angled Patch Panel (48 Port, 2RU)
-slug: cppa48fmwbly
+slug: panduit-cppa48fmwbly
 part_number: CPPA48FMWBLY
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Panduit/CPPA48HDWBLY.yaml b/device-types/Panduit/CPPA48HDWBLY.yaml
index 0e17e5eeaefd9ee0898d5197047d6d43a586d14d..f3a07a5aeb8f74cba99369f1da6cb503eec15947 100644
--- a/device-types/Panduit/CPPA48HDWBLY.yaml
+++ b/device-types/Panduit/CPPA48HDWBLY.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com High Density Angled Patch Panel (48 Port, 1RU)
-slug: cppa48hdwbly
+slug: panduit-cppa48hdwbly
 part_number: CPPA48HDWBLY
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Panduit/CPPA72FMWBLY.yaml b/device-types/Panduit/CPPA72FMWBLY.yaml
index c706839c52c4fe97fe2355ce537b4f4d9ba45579..a1ac0a73af28f1abcd3f022a060f03405285ff71 100644
--- a/device-types/Panduit/CPPA72FMWBLY.yaml
+++ b/device-types/Panduit/CPPA72FMWBLY.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Mini-Com Flush Mount Angled Patch Panel (72 Port, 2RU)
-slug: cppa72fmwbly
+slug: panduit-cppa72fmwbly
 part_number: CPPA72FMWBLY
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Panduit/FCE1.yaml b/device-types/Panduit/FCE1.yaml
index 2ee2b7351999bccd77f3f1e5c1d3639ae3153be7..ad9a0f7c96f0488f5063d787bd97383bc3e13507 100644
--- a/device-types/Panduit/FCE1.yaml
+++ b/device-types/Panduit/FCE1.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Quicknet Rack Mount Fiber Enclosure, 1 RU
-slug: fce1
+slug: panduit-fce1
 part_number: FCE1
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Panduit/FCE1U.yaml b/device-types/Panduit/FCE1U.yaml
index 90f421d4459d6da8382f1295210fd696f7866c1e..b04fe6737da47a834451f521631ab1cb26101f8b 100644
--- a/device-types/Panduit/FCE1U.yaml
+++ b/device-types/Panduit/FCE1U.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Rack Mount Fiber Enclosure, 1 RU, 4 Ports
-slug: fce1u
+slug: panduit-fce1u
 part_number: FCE1U
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Panduit/FCE2.yaml b/device-types/Panduit/FCE2.yaml
index 14ec5c58143f69186839019ad2a187686c098b37..50fb9cfd16ff57449f890564d7fb72ede54422f3 100644
--- a/device-types/Panduit/FCE2.yaml
+++ b/device-types/Panduit/FCE2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Quicknet Rack Mount Fiber Enclosure, 2 RU
-slug: fce2
+slug: panduit-fce2
 part_number: FCE2
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Panduit/FCE2U.yaml b/device-types/Panduit/FCE2U.yaml
index bbcd9773101fdbc9f70002c2c59d7b26bde47050..a9c46c3e6f6dcd88153c28529dde861bd0cdddf2 100644
--- a/device-types/Panduit/FCE2U.yaml
+++ b/device-types/Panduit/FCE2U.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Rack Mount Fiber Enclosure, 2 RU, 8 Ports
-slug: fce2u
+slug: panduit-fce2u
 part_number: FCE2U
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Panduit/FMD1.yaml b/device-types/Panduit/FMD1.yaml
index f9403d9c6f5aff02ab8f356957c287eeaf13835b..9301024aaa05ca75da87e40a88ec7426b7eeb178 100644
--- a/device-types/Panduit/FMD1.yaml
+++ b/device-types/Panduit/FMD1.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Fiber Drawer (4 Adapters, 1RU)
-slug: fmd1
+slug: panduit-fmd1
 part_number: FMD1
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Panduit/FMD2.yaml b/device-types/Panduit/FMD2.yaml
index 3eeb05c1ccee681c6c595c9868f2560df6103521..d0fa2fafd5949fa99ec40cb13abebc158ce0e196 100644
--- a/device-types/Panduit/FMD2.yaml
+++ b/device-types/Panduit/FMD2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Fiber Drawer (8 Adapters, 2RU)
-slug: fmd2
+slug: panduit-fmd2
 part_number: FMD2
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Panduit/FRME1.yaml b/device-types/Panduit/FRME1.yaml
index c44c250b80c25217206f0e55b21bc1b7c08b3309..e32e48148613d040d5f093dea8569e20742b667f 100644
--- a/device-types/Panduit/FRME1.yaml
+++ b/device-types/Panduit/FRME1.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Rack Mount Fiber Enclosure, 1 RU
-slug: frme1
+slug: panduit-frme1
 part_number: FRME1
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Panduit/FRME2.yaml b/device-types/Panduit/FRME2.yaml
index 9ea67cff586db66a2989d7e81e0bc35c5a369944..e024b1bd7b65d3bd3b9d30d188ca4e45925f81d5 100644
--- a/device-types/Panduit/FRME2.yaml
+++ b/device-types/Panduit/FRME2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Rack Mount Fiber Enclosure, 2 RU
-slug: frme2
+slug: panduit-frme2
 part_number: FRME2
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Panduit/FRME4.yaml b/device-types/Panduit/FRME4.yaml
index 5281eb0535d38ed6f98f3a0d83aedac60163ddfb..8e37bcc3163a3bcdb7793d646619afc239b3f155 100644
--- a/device-types/Panduit/FRME4.yaml
+++ b/device-types/Panduit/FRME4.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Rack Mount Fiber Enclosure, 4 RU
-slug: frme4
+slug: panduit-frme4
 part_number: FRME4
 u_height: 4
 is_full_depth: false
diff --git a/device-types/Panduit/FWME2.yaml b/device-types/Panduit/FWME2.yaml
index 605cb8eb1bb238eba87fc1768eb0a22367152385..c29d0bfdeb2259d37d71227975635f0b1a77e15e 100644
--- a/device-types/Panduit/FWME2.yaml
+++ b/device-types/Panduit/FWME2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Wallmount Fiber Enclosure (2 Adapters)
-slug: fwme2
+slug: panduit-fwme2
 part_number: FWME2
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Panduit/FWME4.yaml b/device-types/Panduit/FWME4.yaml
index 963185c43fa3975e0590981977da53ea688378a8..809453ab12749f432059343f368ea783e5e23392 100644
--- a/device-types/Panduit/FWME4.yaml
+++ b/device-types/Panduit/FWME4.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Wallmount Fiber Enclosure (4 Adapters)
-slug: fwme4
+slug: panduit-fwme4
 part_number: FWME4
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Panduit/FWME8.yaml b/device-types/Panduit/FWME8.yaml
index 555d1f94ca00c7ba6900a13fcc02c8cf1f25b766..83c663ae725df2eefaf261eec4fba07773f1b9f5 100644
--- a/device-types/Panduit/FWME8.yaml
+++ b/device-types/Panduit/FWME8.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Wallmount Fiber Enclosure (8 Adapters)
-slug: fwme8
+slug: panduit-fwme8
 part_number: FWME8
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Panduit/P36G18M.yaml b/device-types/Panduit/P36G18M.yaml
index 0727f2b87eaabf300e92bc55c057a2976a125b51..f83b8f56b6c501e709825f339ee036646779d4de 100644
--- a/device-types/Panduit/P36G18M.yaml
+++ b/device-types/Panduit/P36G18M.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Panduit
 model: P36G18M
-slug: p36g18m
+slug: panduit-p36g18m
 part_number: P36G18M
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Parks/Fiberlink_30028.yaml b/device-types/Parks/Fiberlink_30028.yaml
index 5cd96e383cb26a45e328a5cdd36a09d861e6969b..a8b1a0239bc068d54b1a7968fca40f4b96ec1dd2 100644
--- a/device-types/Parks/Fiberlink_30028.yaml
+++ b/device-types/Parks/Fiberlink_30028.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Parks
 model: Fiberlink 30028
-slug: fiberlink-30028
+slug: parks-fiberlink-30028
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Peplink/Balance-1350.yaml b/device-types/Peplink/Balance-1350.yaml
index 1ad1eb12af90f88507e015b39788f40bcb6dcf76..49f03b5eaf9593c78e64b98372178b63799830b3 100644
--- a/device-types/Peplink/Balance-1350.yaml
+++ b/device-types/Peplink/Balance-1350.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Peplink
 model: Balance 1350
-slug: balance-1350
+slug: peplink-balance-1350
 part_number: BPL-135
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Peplink/Balance-305.yaml b/device-types/Peplink/Balance-305.yaml
index 34c815a341c85fdf75ede7fd670a8ecf05c5bb3b..bb670f6f7a3f6ee3854f23b611e0b896a406b9d0 100644
--- a/device-types/Peplink/Balance-305.yaml
+++ b/device-types/Peplink/Balance-305.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Peplink
 model: Balance 305
-slug: balance-305
+slug: peplink-balance-305
 part_number: BPL-305
 u_height: 1
 is_full_depth: false
diff --git a/device-types/QCT/D51B-2U_DUAL_1G_LOM.yml b/device-types/QCT/D51B-2U_DUAL_1G_LOM.yml
index 6ffacbbd0bc9e04a363f6f5d3b78787fcbcc03b1..3fb8b5df117897be58dea3b41c5abb5afc3a1a19 100644
--- a/device-types/QCT/D51B-2U_DUAL_1G_LOM.yml
+++ b/device-types/QCT/D51B-2U_DUAL_1G_LOM.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: QCT
-model: D51B-2U (dual 1G LoM)
-slug: qct_d51b_2u_dual_1g_lom
+model: QuantaGrid D51B-2U
+slug: qct-quantagrid-d51b-2u
 u_height: 2
 is_full_depth: true
 console-ports:
diff --git a/device-types/QNAP/Qnap_TS-1683XU-RP.yaml b/device-types/QNAP/Qnap_TS-1683XU-RP.yaml
index ae44b3c311ef3da0adb26e9739c2819b2b612c7a..6c890d83e54a20be78ef1d84aae96ebc1f4251a0 100644
--- a/device-types/QNAP/Qnap_TS-1683XU-RP.yaml
+++ b/device-types/QNAP/Qnap_TS-1683XU-RP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: QNAP
 model: TS-1683XU-RP
-slug: ts-1683xu-rp
+slug: qnap-ts-1683xu-rp
 part_number: TS-1683XU-RP
 u_height: 3
 is_full_depth: true
diff --git a/device-types/QNAP/Qnap_TS-h1886XU-RP.yaml b/device-types/QNAP/Qnap_TS-h1886XU-RP.yaml
index ec22c29a32a313b6c10f7d049096ddb56630a3cb..1070283d44b6011c88c703c5149b825bdf01383e 100644
--- a/device-types/QNAP/Qnap_TS-h1886XU-RP.yaml
+++ b/device-types/QNAP/Qnap_TS-h1886XU-RP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: QNAP
 model: TS-h1886XU-RP
-slug: ts-h1886xu-rp
+slug: qnap-ts-h1886xu-rp
 part_number: TS-h1886XU-RP
 u_height: 2
 is_full_depth: true
diff --git a/device-types/QNAP/TS-1263U-RP.yaml b/device-types/QNAP/TS-1263U-RP.yaml
index adf4aa0a4daa1e5995d8a2f08d5320c101fa9c9b..cc618ab85f6c83a2bb8d09f9c571a53146f150b6 100644
--- a/device-types/QNAP/TS-1263U-RP.yaml
+++ b/device-types/QNAP/TS-1263U-RP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: QNAP
 model: TS-1263U-RP
-slug: ts-1263u-rp
+slug: qnap-ts-1263u-rp
 part_number: TS-1263U-RP-4G
 u_height: 2
 is_full_depth: true
diff --git a/device-types/QNAP/TS-212.yml b/device-types/QNAP/TS-212.yml
index 775d68906c621a98a3f5fd1e075cbe42cbcc9ed5..234e2ef54de14882a3eff9979e2f3c4929886bf8 100644
--- a/device-types/QNAP/TS-212.yml
+++ b/device-types/QNAP/TS-212.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: QNAP
 model: TS-212
-slug: ts-212
+slug: qnap-ts-212
 part_number: TS-212
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/QNAP/TS-412.yml b/device-types/QNAP/TS-412.yml
index f4f4591ffecfe41f200ae73c7f85e5381052cc9a..8127b4405d7d2e6519c1153994b6de51554a3f25 100644
--- a/device-types/QNAP/TS-412.yml
+++ b/device-types/QNAP/TS-412.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: QNAP
 model: TS-412
-slug: ts-412
+slug: qnap-ts-412
 part_number: TS-412
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/QNAP/TS-453U-RP.yml b/device-types/QNAP/TS-453U-RP.yml
index acd892faf2eeaeec872dd8815bb18e47871d57b6..b74f1103a43b773eb30b0dd9bd07025bdf67f373 100644
--- a/device-types/QNAP/TS-453U-RP.yml
+++ b/device-types/QNAP/TS-453U-RP.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: QNAP
 model: TS-453U-RP
-slug: ts-453u-rp
+slug: qnap-ts-453u-rp
 part_number: TS-453U-RP
 u_height: 1
 airflow: front-to-rear
diff --git a/device-types/QNAP/TS-453mini.yml b/device-types/QNAP/TS-453mini.yml
index b8262e6f59faa980bc0038ca789e3cda74552192..b8b26bbcb442cd75ab12d2db9280f73b29451d26 100644
--- a/device-types/QNAP/TS-453mini.yml
+++ b/device-types/QNAP/TS-453mini.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: QNAP
 model: TS-453mini
-slug: ts-453mini
+slug: qnap-ts-453mini
 part_number: TS-453mini
 airflow: side-to-rear
 is_full_depth: false
diff --git a/device-types/QNAP/TS-469L.yml b/device-types/QNAP/TS-469L.yml
index 09a13dd0463977a92df9d0469331f75c2511ff3f..bf7bba0799e0a0045317b34cf184ab23fb06c822 100644
--- a/device-types/QNAP/TS-469L.yml
+++ b/device-types/QNAP/TS-469L.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: QNAP
 model: TS-469L
-slug: ts-469l
+slug: qnap-ts-469l
 part_number: TS-469L
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/QNAP/TS-469U-RP.yml b/device-types/QNAP/TS-469U-RP.yml
index 14b0897f2f4c80658c2cbaf876652865ef8b49ed..553582e32a4b9a008b03cb6a138af69f3bf549e7 100644
--- a/device-types/QNAP/TS-469U-RP.yml
+++ b/device-types/QNAP/TS-469U-RP.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: QNAP
 model: TS-469U-RP
-slug: ts-469u-rp
+slug: qnap-ts-469u-rp
 part_number: TS-469U-RP
 u_height: 1
 airflow: front-to-rear
diff --git a/device-types/QNAP/TS-873.yml b/device-types/QNAP/TS-873.yml
index c8db8379cb3b84541dda9ac9850495efdf628d1e..32d99e7be502e8ee55e7d3ffaf23a4b0bada6a12 100644
--- a/device-types/QNAP/TS-873.yml
+++ b/device-types/QNAP/TS-873.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: QNAP
 model: TS-873
-slug: ts-873
+slug: qnap-ts-873
 part_number: TS-873
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/QNAP/ts-1283xu-rp.yml b/device-types/QNAP/ts-1283xu-rp.yml
index f26f61ae8145e2672f483182937e0f17e0485fae..19b977a3aa409ed2dca0c904173a4218ce0129bb 100644
--- a/device-types/QNAP/ts-1283xu-rp.yml
+++ b/device-types/QNAP/ts-1283xu-rp.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: QNAP
 model: TS-1283XU-RP
-slug: ts-1283xu-rp
+slug: qnap-ts-1283xu-rp
 part_number: TS-1283XU-RP
 u_height: 2
 is_full_depth: true
diff --git a/device-types/QNAP/ts-431xeu.yml b/device-types/QNAP/ts-431xeu.yml
index 4fb853c3b2096e4430fe507e54e953c850e75b6d..8d26063de9c57f01c42f3f32749536d2627a4756 100644
--- a/device-types/QNAP/ts-431xeu.yml
+++ b/device-types/QNAP/ts-431xeu.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: QNAP
 model: TS-431XeU
-slug: ts-431xeu
+slug: qnap-ts-431xeu
 part_number: TS-431XeU
 u_height: 1
 is_full_depth: false
diff --git a/device-types/QNAP/ts-459pro+.yml b/device-types/QNAP/ts-459pro+.yml
index 1877cbcb23366217a10daf913a57e3a353f57888..f6514d691d6754511b8b6af234f7a940cffacc6c 100644
--- a/device-types/QNAP/ts-459pro+.yml
+++ b/device-types/QNAP/ts-459pro+.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: QNAP
 model: TS-459pro+
-slug: ts-459proplus
+slug: qnap-ts-459pro-plus
 part_number: TS-459pro+
 u_height: 0
 is_full_depth: false
diff --git a/device-types/QTECH/QSW-6900-32H.yaml b/device-types/QTECH/QSW-6900-32H.yaml
index 40d9e3deb34a5612d6ddb9a7e5e742fac1bb827d..f0e3f4a227828d455ae1fe46fe55266813d9d49f 100644
--- a/device-types/QTECH/QSW-6900-32H.yaml
+++ b/device-types/QTECH/QSW-6900-32H.yaml
@@ -2,7 +2,7 @@
 manufacturer: QTECH
 model: QSW-6900-32H
 part_number: QSW-6900-32H
-slug: qsw-6900-32h
+slug: qtech-qsw-6900-32h
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/Qotom/Q330G4.yaml b/device-types/Qotom/Q330G4.yaml
index 6a2fa1e5fcf2da246b93a7e8fca09d571f6f6df3..e06f98390d9808f43977dd26b042ae063f1b7125 100644
--- a/device-types/Qotom/Q330G4.yaml
+++ b/device-types/Qotom/Q330G4.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Qotom
 model: Q330G4
-slug: q330g4
+slug: qotom-q330g4
 u_height: 0
 is_full_depth: false
 power-ports:
diff --git a/device-types/RAD/ETX-2i-10G.yaml b/device-types/RAD/ETX-2i-10G.yaml
index 0468b944c004b9ca56038b3e3cb3d46e9c5701d0..e60f27da1266e5249d55c83c9d94bf5d5f9c0ed5 100644
--- a/device-types/RAD/ETX-2i-10G.yaml
+++ b/device-types/RAD/ETX-2i-10G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: RAD
 model: ETX-2i-10G
-slug: etx-2i-10g
+slug: rad-etx-2i-10g
 comments: '[RAD ETX-2i-10G Datasheet](https://www.rad.com/resources/etx-2i-10g-devices-data-sheet)'
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Raritan/PX2-2493.yaml b/device-types/Raritan/PX2-2493.yaml
index 866cfa6a6c9d2f6be68ae042ea3db53d895e7a23..7c5c08fa849d9a30bd7eb50abe0652dd93953cec 100644
--- a/device-types/Raritan/PX2-2493.yaml
+++ b/device-types/Raritan/PX2-2493.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Raritan
 model: PX2-2493
-slug: px2-2493
+slug: raritan-px2-2493
 part_number: PX2-2493
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Raritan/PX3-5469R.yaml b/device-types/Raritan/PX3-5469R.yaml
index 52533b50a5192ebefcb579f7069e2101cb5e05f7..36c9c3349c547af5666d8230e6e4de225b6321fa 100644
--- a/device-types/Raritan/PX3-5469R.yaml
+++ b/device-types/Raritan/PX3-5469R.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Raritan
 model: PX3-5469R
-slug: px3-5469r
+slug: raritan-px3-5469r
 part_number: PX3-5469R
 u_height: 2
 is_full_depth: false
diff --git a/device-types/Raritan/PX3-5497V.yaml b/device-types/Raritan/PX3-5497V.yaml
index 2f99607a466aed8ecbfd999a36a7426981a34fe8..b0ddebd8342744f0a3ccfd533da00ffb0fda754e 100755
--- a/device-types/Raritan/PX3-5497V.yaml
+++ b/device-types/Raritan/PX3-5497V.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Raritan
 model: PX3-5497V
-slug: px3-5497v
+slug: raritan-px3-5497v
 part_number: PX3-5497V
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Raritan/PX3-5664U.yaml b/device-types/Raritan/PX3-5664U.yaml
index 8fb95016bf53c18e9a9311ed6db870a456e936d6..9114672be9719ecadd53aa81bab57b0cbb4f90ef 100644
--- a/device-types/Raritan/PX3-5664U.yaml
+++ b/device-types/Raritan/PX3-5664U.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Raritan
 model: PX3-5664U
-slug: px3-5664u
+slug: raritan-px3-5664u
 part_number: PX3-5664U
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Raritan/PX3-5724V.yaml b/device-types/Raritan/PX3-5724V.yaml
index a7d4e874f85850d85f425aea318f1e826cca31d2..51299a4cb1e65b918472b3a3b5ac8ccbbc4eb9a6 100644
--- a/device-types/Raritan/PX3-5724V.yaml
+++ b/device-types/Raritan/PX3-5724V.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Raritan
 model: PX3-5724V
-slug: px3-5724v
+slug: raritan-px3-5724v
 part_number: PX3-5724V
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Raritan/PX3-5870V.yaml b/device-types/Raritan/PX3-5870V.yaml
index ad3a58f296cf63de8e553261b2a8b75d3cb5b917..27447fe8dd5380b14df19e54d07714275142939a 100644
--- a/device-types/Raritan/PX3-5870V.yaml
+++ b/device-types/Raritan/PX3-5870V.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Raritan
 model: PX3-5870V
-slug: px3-5870v
+slug: raritan-px3-5870v
 part_number: PX3-5870V
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Raritan/PX3TS-5184CR.yaml b/device-types/Raritan/PX3TS-5184CR.yaml
index 1f78eba48efc8e5eefaac7e4d5369b884bf38144..d0ed7fb39b747e538dfc89105eb74bf859888939 100644
--- a/device-types/Raritan/PX3TS-5184CR.yaml
+++ b/device-types/Raritan/PX3TS-5184CR.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Raritan
 model: PX3TS-5184CR
-slug: px3ts-5184cr
+slug: raritan-px3ts-5184cr
 part_number: PX3TS-5184CR
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Raspberry Pi/RPI3-MODB-1GB.yaml b/device-types/Raspberry Pi/RPI3-MODB-1GB.yaml
index 1bab047eb814a9f42b863392b25a9c0be4522526..455c1fac4665145ce6dc55d34c03bf7170c4369f 100644
--- a/device-types/Raspberry Pi/RPI3-MODB-1GB.yaml	
+++ b/device-types/Raspberry Pi/RPI3-MODB-1GB.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Raspberry Pi
 model: Raspberry Pi 3 Model B 1GB
-slug: rpi3-modb-1gb
+slug: raspberry-pi-rpi3-modb-1gb
 part_number: RPI3-MODB-1GB
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Raspberry Pi/RPI3-MODBP-1GB.yaml b/device-types/Raspberry Pi/RPI3-MODBP-1GB.yaml
index ce9606d55c8a54beaeeb68f459d23c749633d7ef..38447cb53c06d093308813e78fd68034ad0b6e3b 100644
--- a/device-types/Raspberry Pi/RPI3-MODBP-1GB.yaml	
+++ b/device-types/Raspberry Pi/RPI3-MODBP-1GB.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Raspberry Pi
 model: Raspberry Pi 3 Model B+ 1GB
-slug: rpi3-modbp-1gb
+slug: raspberry-pi-rpi3-modbp-1gb
 part_number: RPI3-MODBP-1GB
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Raspberry Pi/RPI4-MODB-1GB.yaml b/device-types/Raspberry Pi/RPI4-MODB-1GB.yaml
index 6e2ecd3d4c53bba2f92e59023a02f5699a7f60a2..ee7789a6efca1fbe021739cbcd7af85387e7463e 100644
--- a/device-types/Raspberry Pi/RPI4-MODB-1GB.yaml	
+++ b/device-types/Raspberry Pi/RPI4-MODB-1GB.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Raspberry Pi
 model: Raspberry Pi 4 Model B 1GB
-slug: rpi4-modb-1gb
+slug: raspberry-pi-rpi4-modb-1gb
 part_number: RPI4-MODB-1GB
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Raspberry Pi/RPI4-MODB-2GB.yaml b/device-types/Raspberry Pi/RPI4-MODB-2GB.yaml
index 5bac49d45fdad803bc2f4101c662bbe0a95f0948..a2ee51287d9965866fd06d1b2a282ecd709b1c05 100644
--- a/device-types/Raspberry Pi/RPI4-MODB-2GB.yaml	
+++ b/device-types/Raspberry Pi/RPI4-MODB-2GB.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Raspberry Pi
 model: Raspberry Pi 4 Model B 2GB
-slug: rpi4-modb-2gb
+slug: raspberry-pi-rpi4-modb-2gb
 part_number: RPI4-MODB-2GB
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Raspberry Pi/RPI4-MODB-4GB.yaml b/device-types/Raspberry Pi/RPI4-MODB-4GB.yaml
index d33bb09ac053e511c7c785cb75a837adf05ad3d4..88a012036afcb2dc1dc1dc8799762ec9694a865c 100644
--- a/device-types/Raspberry Pi/RPI4-MODB-4GB.yaml	
+++ b/device-types/Raspberry Pi/RPI4-MODB-4GB.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Raspberry Pi
 model: Raspberry Pi 4 Model B 4GB
-slug: rpi4-modb-4gb
+slug: raspberry-pi-rpi4-modb-4gb
 part_number: RPI4-MODB-4GB
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Raspberry Pi/RPI4-MODB-8GB.yaml b/device-types/Raspberry Pi/RPI4-MODB-8GB.yaml
index f4b7d9a18536ce148142b9ad0ea23a908ea2d118..b38f506f331745622a66bd7681b28334ec0721e2 100644
--- a/device-types/Raspberry Pi/RPI4-MODB-8GB.yaml	
+++ b/device-types/Raspberry Pi/RPI4-MODB-8GB.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Raspberry Pi
 model: Raspberry Pi 4 Model B 8GB
-slug: rpi4-modb-8gb
+slug: raspberry-pi-rpi4-modb-8gb
 part_number: RPI4-MODB-8GB
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Riverbed/CX1555.yaml b/device-types/Riverbed/CX1555.yaml
index 1364db57c7ea680b2ccd1d303e6ef611a94f0eac..cc6aca53b7cb5d75179878b64f1b889a2c8d2436 100644
--- a/device-types/Riverbed/CX1555.yaml
+++ b/device-types/Riverbed/CX1555.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Riverbed
 model: CX1555
-slug: cx1555
+slug: riverbed-cx1555
 part_number: CX1555
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Riverbed/CX3070.yaml b/device-types/Riverbed/CX3070.yaml
index bab89f988257518d5c8eb28d919ae86125b81b9c..eac2770543b090e8a60e89ba43a8f65a5ecebdd0 100644
--- a/device-types/Riverbed/CX3070.yaml
+++ b/device-types/Riverbed/CX3070.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Riverbed
 model: CX3070
-slug: cx3070
+slug: riverbed-cx3070
 part_number: CX3070
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Riverbed/CX5055.yaml b/device-types/Riverbed/CX5055.yaml
index 2fe4e37e104504746f93ddb626c90fb393203a63..9bddc6e3fc055d4fabeb55091df4f80d77e87a6d 100644
--- a/device-types/Riverbed/CX5055.yaml
+++ b/device-types/Riverbed/CX5055.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Riverbed
 model: CX5055
-slug: cx5055
+slug: riverbed-cx5055
 part_number: CX5055
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Riverbed/CX555.yaml b/device-types/Riverbed/CX555.yaml
index da0487bb3ed446fdf06303b6f8064998efb897d4..b095b0e097f59f625f169cb759c7df86a2aa9512 100644
--- a/device-types/Riverbed/CX555.yaml
+++ b/device-types/Riverbed/CX555.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Riverbed
 model: CX555
-slug: cx555
+slug: riverbed-cx555
 part_number: CX555
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Riverbed/CX570.yaml b/device-types/Riverbed/CX570.yaml
index b0676c2de0bfec16254660198d7a9d2af4d26cf6..ff7b05fbbdb81a093ca5dbdb14b99dd6a29fce20 100644
--- a/device-types/Riverbed/CX570.yaml
+++ b/device-types/Riverbed/CX570.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Riverbed
 model: CX570
-slug: cx570
+slug: riverbed-cx570
 part_number: CX570
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Riverbed/CX7055.yaml b/device-types/Riverbed/CX7055.yaml
index 064a3c1227e757615f4a32f8cb160d41484ef058..604a59eb02227ca0bbd055a193544e2ec28e594a 100644
--- a/device-types/Riverbed/CX7055.yaml
+++ b/device-types/Riverbed/CX7055.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Riverbed
 model: CX7055
-slug: cx7055
+slug: riverbed-cx7055
 part_number: CX7055
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Riverbed/CX7070.yaml b/device-types/Riverbed/CX7070.yaml
index 4fefc307fbec4866b00bf4c58b8e4447982e5783..bd347c842bae5526a409fb53d841585bc7eaceba 100644
--- a/device-types/Riverbed/CX7070.yaml
+++ b/device-types/Riverbed/CX7070.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Riverbed
 model: CX7070
-slug: cx7070
+slug: riverbed-cx7070
 part_number: CX7070
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Riverbed/CX755.yaml b/device-types/Riverbed/CX755.yaml
index db5a51fc4cbe61ad5c80af0721eb09136fe2629e..e24500ae4da2fe9d693af8a5881cd5d89d1be915 100644
--- a/device-types/Riverbed/CX755.yaml
+++ b/device-types/Riverbed/CX755.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Riverbed
 model: CX755
-slug: cx755
+slug: riverbed-cx755
 part_number: CX755
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Riverbed/CX770.yaml b/device-types/Riverbed/CX770.yaml
index 16ba8ae0948a90af068d1fba110d0b6c2e92e4dd..a97dd7a91bc8e8615a4f12b1984090f00ddc297c 100644
--- a/device-types/Riverbed/CX770.yaml
+++ b/device-types/Riverbed/CX770.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Riverbed
 model: CX770
-slug: cx770
+slug: riverbed-cx770
 part_number: CX770
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Rockwell Automation/1756-A10.yaml b/device-types/Rockwell Automation/1756-A10.yaml
index 3174c80dd2ee71738f7e74b4f064c89cd1560a99..d61282eeb8532391378a9514dd8a4dc2bffd3afe 100644
--- a/device-types/Rockwell Automation/1756-A10.yaml	
+++ b/device-types/Rockwell Automation/1756-A10.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Rack - 10 Slot
 part_number: 1756-A10
-slug: 1756-a10
+slug: rockwell-automation-1756-a10
 u_height: 3
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/Rockwell Automation/1756-A10K.yaml b/device-types/Rockwell Automation/1756-A10K.yaml
index e5e6f056dc5d13dc7bcc46a44a925eeb15312a6c..4a69d701b6e9df45c3c5f9b3bac2633aa088d7c5 100644
--- a/device-types/Rockwell Automation/1756-A10K.yaml	
+++ b/device-types/Rockwell Automation/1756-A10K.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Rack K - 10 Slot
 part_number: 1756-A10K
-slug: 1756-a10k
+slug: rockwell-automation-1756-a10k
 u_height: 3
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/Rockwell Automation/1756-A10XT.yaml b/device-types/Rockwell Automation/1756-A10XT.yaml
index 8e0360f6431900ce50aba99e335406494baa81aa..874d2a1fa1909f5c7fc159662a344aca250507c8 100644
--- a/device-types/Rockwell Automation/1756-A10XT.yaml	
+++ b/device-types/Rockwell Automation/1756-A10XT.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Rack XT - 10 Slot
 part_number: 1756-A10XT
-slug: 1756-a10xt
+slug: rockwell-automation-1756-a10xt
 u_height: 3
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/Rockwell Automation/1756-A13.yaml b/device-types/Rockwell Automation/1756-A13.yaml
index 070ad226fc23b5e2943020095481a7a1fabfc60a..7188f3883a605ec3f729b42593b220635310bb93 100644
--- a/device-types/Rockwell Automation/1756-A13.yaml	
+++ b/device-types/Rockwell Automation/1756-A13.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Rack - 13 Slot
 part_number: 1756-A13
-slug: 1756-a13
+slug: rockwell-automation-1756-a13
 u_height: 3
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/Rockwell Automation/1756-A13K.yaml b/device-types/Rockwell Automation/1756-A13K.yaml
index 933263847a7704819ca92ba8189d27988b29bb23..a4267e78472f5e250cf938b706ed8e0e17eb1940 100644
--- a/device-types/Rockwell Automation/1756-A13K.yaml	
+++ b/device-types/Rockwell Automation/1756-A13K.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Rack K - 13 Slot
 part_number: 1756-A13K
-slug: 1756-a13k
+slug: rockwell-automation-1756-a13k
 u_height: 3
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/Rockwell Automation/1756-A17.yaml b/device-types/Rockwell Automation/1756-A17.yaml
index 7bd798e2b41f16664bba40dd38e486c58560ab33..0bcd6f1a53f3102e7496bcc488f5f44b214860ce 100644
--- a/device-types/Rockwell Automation/1756-A17.yaml	
+++ b/device-types/Rockwell Automation/1756-A17.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Rack - 17 Slot
 part_number: 1756-A17
-slug: 1756-a17
+slug: rockwell-automation-1756-a17
 u_height: 3
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/Rockwell Automation/1756-A17K.yaml b/device-types/Rockwell Automation/1756-A17K.yaml
index 7253ee62dfcabcec262089e7b98834bb9cada468..d99b2463d834855e3f2febef2b22301104c24d93 100644
--- a/device-types/Rockwell Automation/1756-A17K.yaml	
+++ b/device-types/Rockwell Automation/1756-A17K.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Rack K - 17 Slot
 part_number: 1756-A17K
-slug: 1756-a17k
+slug: rockwell-automation-1756-a17k
 u_height: 3
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/Rockwell Automation/1756-A4.yaml b/device-types/Rockwell Automation/1756-A4.yaml
index 7521badb48e62f17f81e8ef5f63de0c29051b0a6..7c25fedeb6ea862511fd81d772b77f5cfec390ed 100644
--- a/device-types/Rockwell Automation/1756-A4.yaml	
+++ b/device-types/Rockwell Automation/1756-A4.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Rack - 4 Slot
 part_number: 1756-a4
-slug: 1756-a4
+slug: rockwell-automation-1756-a4
 u_height: 3
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/Rockwell Automation/1756-A4K.yaml b/device-types/Rockwell Automation/1756-A4K.yaml
index 19a0cd3cf5b9a3d2355c92e76829a90a4b7a1f53..0cd635269f946e6890796f996e5a962565c6868a 100644
--- a/device-types/Rockwell Automation/1756-A4K.yaml	
+++ b/device-types/Rockwell Automation/1756-A4K.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Rack K - 4 Slot
 part_number: 1756-A4K
-slug: 1756-a4k
+slug: rockwell-automation-1756-a4k
 u_height: 3
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/Rockwell Automation/1756-A7.yaml b/device-types/Rockwell Automation/1756-A7.yaml
index 24d6cf44e3b9e937940c82ecda9180c8104facac..8dbdce2c29acf0e97d5a30d560ccc3a31e6b8b8e 100644
--- a/device-types/Rockwell Automation/1756-A7.yaml	
+++ b/device-types/Rockwell Automation/1756-A7.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Rack - 7 Slot
 part_number: 1756-A7
-slug: 1756-a7
+slug: rockwell-automation-1756-a7
 u_height: 3
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/Rockwell Automation/1756-A7K.yaml b/device-types/Rockwell Automation/1756-A7K.yaml
index 9f18a19026d5154f48ebf1e3a620cb3558ea5242..fd0d210554e9d049a3b3409bd3b87438d70f87f8 100644
--- a/device-types/Rockwell Automation/1756-A7K.yaml	
+++ b/device-types/Rockwell Automation/1756-A7K.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Rack K - 7 Slot
 part_number: 1756-a7k
-slug: 1756-a7k
+slug: rockwell-automation-1756-a7k
 u_height: 3
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/Rockwell Automation/1756-A7XT.yaml b/device-types/Rockwell Automation/1756-A7XT.yaml
index 8bab39e66dfa9c68ba1ac8e1681fb131c020a003..c41c957193186de7bc36a17b22839f783ff6719f 100644
--- a/device-types/Rockwell Automation/1756-A7XT.yaml	
+++ b/device-types/Rockwell Automation/1756-A7XT.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Rack XT - 7 Slot
 part_number: 1756-A7XT
-slug: 1756-a7xt
+slug: rockwell-automation-1756-a7xt
 u_height: 3
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/Rockwell Automation/1756-CMS1B1.yaml b/device-types/Rockwell Automation/1756-CMS1B1.yaml
index e02ed1f2876bb598e9ea7cc75bcbeefccbfb213c..3366544323f8a4ecdaf6edc2e5089c17db5add4b 100644
--- a/device-types/Rockwell Automation/1756-CMS1B1.yaml	
+++ b/device-types/Rockwell Automation/1756-CMS1B1.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Compute - Windows
 part_number: 1756-CMS1B1
-slug: 1756-cms1b1
+slug: rockwell-automation-1756-cms1b1
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-CMS1C1.yaml b/device-types/Rockwell Automation/1756-CMS1C1.yaml
index 9fd76028fd76f4db920e7b96716cd7cb6957113a..fbbe0fb53fda2bc4861b236570ada80261ff00e6 100644
--- a/device-types/Rockwell Automation/1756-CMS1C1.yaml	
+++ b/device-types/Rockwell Automation/1756-CMS1C1.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Compute - Linux
 part_number: 1756-CMS1C1
-slug: 1756-cms1c1
+slug: rockwell-automation-1756-cms1c1
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-EN2F.yaml b/device-types/Rockwell Automation/1756-EN2F.yaml
index 9b9c4d7b957eff5efcb0dde38d86a726f0698ce5..17989168d20bf8d0a767769842c919a5511ef5c6 100644
--- a/device-types/Rockwell Automation/1756-EN2F.yaml	
+++ b/device-types/Rockwell Automation/1756-EN2F.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Fiber Ethernet Adapter (EN2F)
 part_number: 1756-EN2F
-slug: 1756-en2f
+slug: rockwell-automation-1756-en2f
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-EN2FK.yaml b/device-types/Rockwell Automation/1756-EN2FK.yaml
index 457d69e7a602b3172ea4323c4d7a627b05136b43..0294c44cf08524bafcd7c4f394e52924f5fdc3c6 100644
--- a/device-types/Rockwell Automation/1756-EN2FK.yaml	
+++ b/device-types/Rockwell Automation/1756-EN2FK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Fiber Ethernet Adapter K (EN2FK)
 part_number: 1756-EN2FK
-slug: 1756-en2fk
+slug: rockwell-automation-1756-en2fk
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-EN2T.yaml b/device-types/Rockwell Automation/1756-EN2T.yaml
index c3cc62344392fda24ce3ae8c28b0528a31560ec0..6d3a0f2bbcf8b19207fa2945cfd02d7f0a053176 100644
--- a/device-types/Rockwell Automation/1756-EN2T.yaml	
+++ b/device-types/Rockwell Automation/1756-EN2T.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Ethernet Adapter (EN2T)
 part_number: 1756-EN2T
-slug: 1756-en2t
+slug: rockwell-automation-1756-en2t
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-EN2TK.yaml b/device-types/Rockwell Automation/1756-EN2TK.yaml
index e04f6fc429115d7a9fd2033112ccf84ec4a65e6c..cb798cd9cf04a10a601c863632c49f80c00ff65b 100644
--- a/device-types/Rockwell Automation/1756-EN2TK.yaml	
+++ b/device-types/Rockwell Automation/1756-EN2TK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Ethernet Adapter K (EN2TK)
 part_number: 1756-EN2TK
-slug: 1756-en2tk
+slug: rockwell-automation-1756-en2tk
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-EN2TP.yaml b/device-types/Rockwell Automation/1756-EN2TP.yaml
index bf826dd59dc3028d6e837301b70f6e7305453290..582c67e4fbc22b277c5ee4c4fac5e1653008b4f0 100644
--- a/device-types/Rockwell Automation/1756-EN2TP.yaml	
+++ b/device-types/Rockwell Automation/1756-EN2TP.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Ethernet PRP Adapter (EN2TP)
 part_number: 1756-EN2TP
-slug: 1756-en2tp
+slug: rockwell-automation-1756-en2tp
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-EN2TPK.yaml b/device-types/Rockwell Automation/1756-EN2TPK.yaml
index 9b7bf0f0d4eaff41caefbe09c526674cb704fac6..302e785a7a46e6acc84e8f832ed56067ceb4bd1b 100644
--- a/device-types/Rockwell Automation/1756-EN2TPK.yaml	
+++ b/device-types/Rockwell Automation/1756-EN2TPK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Ethernet PRP Adapter K (EN2TP)
 part_number: 1756-EN2TPK
-slug: 1756-en2tpk
+slug: rockwell-automation-1756-en2tpk
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-EN2TR.yaml b/device-types/Rockwell Automation/1756-EN2TR.yaml
index 027c496f19ea70944ea2894a6bc447931a524c2d..f2b77ac4b4b6d66c3a3f8e4ad4cb681df876a797 100644
--- a/device-types/Rockwell Automation/1756-EN2TR.yaml	
+++ b/device-types/Rockwell Automation/1756-EN2TR.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Ethernet Adapter (EN2TR)
 part_number: 1756-EN2TR
-slug: 1756-en2tr
+slug: rockwell-automation-1756-en2tr
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-EN2TRK.yaml b/device-types/Rockwell Automation/1756-EN2TRK.yaml
index bbd9d6d734afee81691ca42a72ed11829a01d0e7..20103213528dbbdf89be9f5963272e59de14d3b5 100644
--- a/device-types/Rockwell Automation/1756-EN2TRK.yaml	
+++ b/device-types/Rockwell Automation/1756-EN2TRK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Ethernet Adapter K (EN2TR)
 part_number: 1756-EN2TRK
-slug: 1756-en2trk
+slug: rockwell-automation-1756-en2trk
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-EN3TR.yaml b/device-types/Rockwell Automation/1756-EN3TR.yaml
index 0515fa4b491b0b402cac45aee2aa0a2193b21f0e..e75c96ea188273b1b4faf575803035142bba4ac1 100644
--- a/device-types/Rockwell Automation/1756-EN3TR.yaml	
+++ b/device-types/Rockwell Automation/1756-EN3TR.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Ethernet Adapter (EN3TR)
 part_number: 1756-EN3TR
-slug: 1756-en3tr
+slug: rockwell-automation-1756-en3tr
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-EN3TRK.yaml b/device-types/Rockwell Automation/1756-EN3TRK.yaml
index be664f1a74c8860882474fa6b1f793c961023edd..373abc6ebaa4d6add0fbbef1874bfe9951b12ce6 100644
--- a/device-types/Rockwell Automation/1756-EN3TRK.yaml	
+++ b/device-types/Rockwell Automation/1756-EN3TRK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Ethernet Adapter K (EN3TR)
 part_number: 1756-EN3TRK
-slug: 1756-en3trk
+slug: rockwell-automation-1756-en3trk
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-EN4TR.yaml b/device-types/Rockwell Automation/1756-EN4TR.yaml
index 5725d0b80e69a030a111d46a49839ab70f5709fa..03979f8b5367ab47cdfeb61080fe4b018994379a 100644
--- a/device-types/Rockwell Automation/1756-EN4TR.yaml	
+++ b/device-types/Rockwell Automation/1756-EN4TR.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Ethernet Adapter (EN4TR)
 part_number: 1756-EN4TR
-slug: 1756-en4tr
+slug: rockwell-automation-1756-en4tr
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-EN4TRK.yaml b/device-types/Rockwell Automation/1756-EN4TRK.yaml
index b879ab3f0465878ac3c9704467d9277fad32e32d..47918d8f9fd759af601b3f5ab60c174bcdb71797 100644
--- a/device-types/Rockwell Automation/1756-EN4TRK.yaml	
+++ b/device-types/Rockwell Automation/1756-EN4TRK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Ethernet Adapter K (EN4TR)
 part_number: 1756-EN4TRK
-slug: 1756-en4trk
+slug: rockwell-automation-1756-en4trk
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-ENBT.yaml b/device-types/Rockwell Automation/1756-ENBT.yaml
index f08a6b64aeb10700b4a8d943b8bc7911cb6f6769..0166a54b2f6713259b64837be3d956aaff4a3970 100644
--- a/device-types/Rockwell Automation/1756-ENBT.yaml	
+++ b/device-types/Rockwell Automation/1756-ENBT.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Ethernet Adapter (ENBT)
 part_number: 1756-ENBT
-slug: 1756-enbt
+slug: rockwell-automation-1756-enbt
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-ENBTK.yaml b/device-types/Rockwell Automation/1756-ENBTK.yaml
index 8adef9b7e296b9d2104e25265a434522ddef27aa..73e6c943d359edc2620a4510536499ecc9409ac5 100644
--- a/device-types/Rockwell Automation/1756-ENBTK.yaml	
+++ b/device-types/Rockwell Automation/1756-ENBTK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix Ethernet Adapter K (ENBT)
 part_number: 1756-ENBTK
-slug: 1756-enbtk
+slug: rockwell-automation-1756-enbtk
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-EWEB.yaml b/device-types/Rockwell Automation/1756-EWEB.yaml
index aad49f30a78e73b8e21d630a6d21d4a2a159227a..1a765ea30c9871bfda8e7509c34ca6a3f7b2c4b5 100644
--- a/device-types/Rockwell Automation/1756-EWEB.yaml	
+++ b/device-types/Rockwell Automation/1756-EWEB.yaml	
@@ -1,8 +1,8 @@
 ---
 manufacturer: Rockwell Automation
-model: ControlLogix Web Module (EWEB)
+model: ControlLogix Web Module
 part_number: 1756-EWEB
-slug: 1756-enweb
+slug: rockwell-automation-controllogix-web-module
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L81E-NSE.yaml b/device-types/Rockwell Automation/1756-L81E-NSE.yaml
index a9b88bdbe079187419c26f25921e19ce861ceefe..a31170e365547d86e5ce07788a0bb4c1553ae349 100644
--- a/device-types/Rockwell Automation/1756-L81E-NSE.yaml	
+++ b/device-types/Rockwell Automation/1756-L81E-NSE.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L81E-NSE
 part_number: 1756-L81E-NSE
-slug: 1756-l81e-nse
+slug: rockwell-automation-1756-l81e-nse
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L81E.yaml b/device-types/Rockwell Automation/1756-L81E.yaml
index 158e93236c8343e3d1d4ecb8c75efb1e3f59cea6..e25ac36f4bdfe802759e7055fdf642b2eefefba9 100644
--- a/device-types/Rockwell Automation/1756-L81E.yaml	
+++ b/device-types/Rockwell Automation/1756-L81E.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L81E
 part_number: 1756-L81E
-slug: 1756-l81e
+slug: rockwell-automation-1756-l81e
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L81EK.yaml b/device-types/Rockwell Automation/1756-L81EK.yaml
index 51f5615570aa74380e77a69a93fbfa29aaae0f4e..eeb3dc88d2bce121176247fb1535cda21dda53e3 100644
--- a/device-types/Rockwell Automation/1756-L81EK.yaml	
+++ b/device-types/Rockwell Automation/1756-L81EK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L81EK
 part_number: 1756-L81EK
-slug: 1756-l81ek
+slug: rockwell-automation-1756-l81ek
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L81EP.yaml b/device-types/Rockwell Automation/1756-L81EP.yaml
index dbf6ce2461f223e7018e420962841d658b7e23cd..bbf3fc4ff225610701ff12340e40d614001a76fe 100644
--- a/device-types/Rockwell Automation/1756-L81EP.yaml	
+++ b/device-types/Rockwell Automation/1756-L81EP.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L81EP
 part_number: 1756-L81EP
-slug: 1756-l81ep
+slug: rockwell-automation-1756-l81ep
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L81ES.yaml b/device-types/Rockwell Automation/1756-L81ES.yaml
index 518630051142d53add5b86f621aed44c72027045..361d54d25697e6c7bd0a398f6aebdc348f762137 100644
--- a/device-types/Rockwell Automation/1756-L81ES.yaml	
+++ b/device-types/Rockwell Automation/1756-L81ES.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: GuardLogix 5580 L81ES
 part_number: 1756-L81ES
-slug: 1756-l81es
+slug: rockwell-automation-1756-l81es
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L81ESK.yaml b/device-types/Rockwell Automation/1756-L81ESK.yaml
index 55e5131801a5d496e89aa7d02dd4d2d2c89f107e..2f8fdcb7c802953cf5e6ef33c381a010b781ddd3 100644
--- a/device-types/Rockwell Automation/1756-L81ESK.yaml	
+++ b/device-types/Rockwell Automation/1756-L81ESK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: GuardLogix 5580 L81ESK
 part_number: 1756-L81ESK
-slug: 1756-l81esk
+slug: rockwell-automation-1756-l81esk
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L82E-NSE.yaml b/device-types/Rockwell Automation/1756-L82E-NSE.yaml
index 67856302ec50fcacfa9f79b41269dec7335dd730..680b2de4fa9b3dd4b5cf55d06e6fced9dd18339c 100644
--- a/device-types/Rockwell Automation/1756-L82E-NSE.yaml	
+++ b/device-types/Rockwell Automation/1756-L82E-NSE.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L82E-NSE
 part_number: 1756-L82E-NSE
-slug: 1756-l82e-nse
+slug: rockwell-automation-1756-l82e-nse
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L82E.yaml b/device-types/Rockwell Automation/1756-L82E.yaml
index 4dd04ead4c7d53a9b7e4d3298c1481f9f641b7d7..3e8becdba74d04ddc4b0366ee3421be2dec22dea 100644
--- a/device-types/Rockwell Automation/1756-L82E.yaml	
+++ b/device-types/Rockwell Automation/1756-L82E.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L82E
 part_number: 1756-L82E
-slug: 1756-l82e
+slug: rockwell-automation-1756-l82e
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L82EK.yaml b/device-types/Rockwell Automation/1756-L82EK.yaml
index a2c44040a130083d53ea4882116dd1b15c6e910b..27a88d65806e743c2fe796791f90749ecf31811e 100644
--- a/device-types/Rockwell Automation/1756-L82EK.yaml	
+++ b/device-types/Rockwell Automation/1756-L82EK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L82EK
 part_number: 1756-L82EK
-slug: 1756-l82ek
+slug: rockwell-automation-1756-l82ek
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L82ES.yaml b/device-types/Rockwell Automation/1756-L82ES.yaml
index d5fa7b2d9021fef5dc3949459216a8b1a28cc5c0..40a2030ead43639699d3e6b8250dce2db86040fd 100644
--- a/device-types/Rockwell Automation/1756-L82ES.yaml	
+++ b/device-types/Rockwell Automation/1756-L82ES.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: GuardLogix 5580 L82ES
 part_number: 1756-L82ES
-slug: 1756-l82es
+slug: rockwell-automation-1756-l82es
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L82ESK.yaml b/device-types/Rockwell Automation/1756-L82ESK.yaml
index 6aae50a5e4c3311b058ea496aa27132845eb8a41..f37ef941e081205da2e6babcc45da06dc0ac04fc 100644
--- a/device-types/Rockwell Automation/1756-L82ESK.yaml	
+++ b/device-types/Rockwell Automation/1756-L82ESK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: GuardLogix 5580 L82ESK
 part_number: 1756-L82ESK
-slug: 1756-l82esk
+slug: rockwell-automation-1756-l82esk
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L83E-NSE.yaml b/device-types/Rockwell Automation/1756-L83E-NSE.yaml
index 015513c8e1719e107f5c66adf72446ed7093003b..391fc5a4758dcd7b1e023aa5bdb00eaf45b8dafa 100644
--- a/device-types/Rockwell Automation/1756-L83E-NSE.yaml	
+++ b/device-types/Rockwell Automation/1756-L83E-NSE.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L83E-NSE
 part_number: 1756-L83E-NSE
-slug: 1756-l83e-nse
+slug: rockwell-automation-1756-l83e-nse
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L83E.yaml b/device-types/Rockwell Automation/1756-L83E.yaml
index 0221b09166ece3ce2a80cab77c80d80bf7120b3c..8346510018d0b4993ea94e1f0134cc6ba984f831 100644
--- a/device-types/Rockwell Automation/1756-L83E.yaml	
+++ b/device-types/Rockwell Automation/1756-L83E.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L83E
 part_number: 1756-L83E
-slug: 1756-l83e
+slug: rockwell-automation-1756-l83e
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L83EK.yaml b/device-types/Rockwell Automation/1756-L83EK.yaml
index d25dfaac0e726e9d286e4f4665b726b2acfa1941..23574a03ac1eb6b75090beec94a8b0e1274fe4f4 100644
--- a/device-types/Rockwell Automation/1756-L83EK.yaml	
+++ b/device-types/Rockwell Automation/1756-L83EK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L83EK
 part_number: 1756-L83EK
-slug: 1756-l83ek
+slug: rockwell-automation-1756-l83ek
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L83EP.yaml b/device-types/Rockwell Automation/1756-L83EP.yaml
index 9f452e47125e9b2fdae4239ee620c8109814d5e7..2a8657a7fc7f10c94fc32d04698aa5221f89510d 100644
--- a/device-types/Rockwell Automation/1756-L83EP.yaml	
+++ b/device-types/Rockwell Automation/1756-L83EP.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L83EP
 part_number: 1756-L83EP
-slug: 1756-l83ep
+slug: rockwell-automation-1756-l83ep
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L83ES.yaml b/device-types/Rockwell Automation/1756-L83ES.yaml
index 5c2a5e38bb3252708dfe8368f8c1a43c8336a388..01117e7cec4ab34eee95ec745ca5043c8ffdd955 100644
--- a/device-types/Rockwell Automation/1756-L83ES.yaml	
+++ b/device-types/Rockwell Automation/1756-L83ES.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: GuardLogix 5580 L83ES
 part_number: 1756-L83ES
-slug: 1756-l83es
+slug: rockwell-automation-1756-l83es
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L83ESK.yaml b/device-types/Rockwell Automation/1756-L83ESK.yaml
index d01e396974b57c51243d458cd3adfcd96dd1339b..3debfae08fab9ba28df8e9578bfd8e6caebc42ea 100644
--- a/device-types/Rockwell Automation/1756-L83ESK.yaml	
+++ b/device-types/Rockwell Automation/1756-L83ESK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: GuardLogix 5580 L83ESK
 part_number: 1756-L83ESK
-slug: 1756-l83esk
+slug: rockwell-automation-1756-l83esk
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L84E-NSE.yaml b/device-types/Rockwell Automation/1756-L84E-NSE.yaml
index a1ecaad6a8775cd68d23fde9ea8e1c093a80e384..896c3d6b104235699ec8b6ad445f535828a22ca1 100644
--- a/device-types/Rockwell Automation/1756-L84E-NSE.yaml	
+++ b/device-types/Rockwell Automation/1756-L84E-NSE.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L84E-NSE
 part_number: 1756-L84E-NSE
-slug: 1756-l84e-nse
+slug: rockwell-automation-1756-l84e-nse
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L84E.yaml b/device-types/Rockwell Automation/1756-L84E.yaml
index c03e6a8b3bf3993aee6534615b28efea63c8f5f1..e734e2b1db8b12a890137e9190999245eda80519 100644
--- a/device-types/Rockwell Automation/1756-L84E.yaml	
+++ b/device-types/Rockwell Automation/1756-L84E.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L84E
 part_number: 1756-L84E
-slug: 1756-l84e
+slug: rockwell-automation-1756-l84e
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L84EK.yaml b/device-types/Rockwell Automation/1756-L84EK.yaml
index 896374cf9d1fffba5d34edb118ca3eb93829afeb..9bbb3ddca0c0a14eb491b2b0f38702e7c2d47957 100644
--- a/device-types/Rockwell Automation/1756-L84EK.yaml	
+++ b/device-types/Rockwell Automation/1756-L84EK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L84EK
 part_number: 1756-L84EK
-slug: 1756-l84ek
+slug: rockwell-automation-1756-l84ek
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L84ES.yaml b/device-types/Rockwell Automation/1756-L84ES.yaml
index 9811e28121561b6b7d9e263bae6ae372d6afa233..dd40702f319f6791383a3d833ddd38b91123aa49 100644
--- a/device-types/Rockwell Automation/1756-L84ES.yaml	
+++ b/device-types/Rockwell Automation/1756-L84ES.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: GuardLogix 5580 L84ES
 part_number: 1756-L84ES
-slug: 1756-l84es
+slug: rockwell-automation-1756-l84es
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L84ESK.yaml b/device-types/Rockwell Automation/1756-L84ESK.yaml
index b8a81af335d2d0974a19d7ee8428855778c503d7..cd3b1603a14d7615ee1d5b44fa926f3c987b75b0 100644
--- a/device-types/Rockwell Automation/1756-L84ESK.yaml	
+++ b/device-types/Rockwell Automation/1756-L84ESK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: GuardLogix 5580 L84ESK
 part_number: 1756-L84ESK
-slug: 1756-l84esk
+slug: rockwell-automation-1756-l84esk
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L85E-NSE.yaml b/device-types/Rockwell Automation/1756-L85E-NSE.yaml
index 8ce02546435f894a9f02c981280aad79c88b90e4..25d4bdf13a0fe7f7dbac83550e018933656d58ff 100644
--- a/device-types/Rockwell Automation/1756-L85E-NSE.yaml	
+++ b/device-types/Rockwell Automation/1756-L85E-NSE.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L85E-NSE
 part_number: 1756-L85E-NSE
-slug: 1756-l85e-nse
+slug: rockwell-automation-1756-l85e-nse
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L85E.yaml b/device-types/Rockwell Automation/1756-L85E.yaml
index ee825712444042e5ad19b955da5efaaf739216c9..24807e4e4311d883404e7445622933563a5b723a 100644
--- a/device-types/Rockwell Automation/1756-L85E.yaml	
+++ b/device-types/Rockwell Automation/1756-L85E.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L85E
 part_number: 1756-L85E
-slug: 1756-l85e
+slug: rockwell-automation-1756-l85e
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L85EK.yaml b/device-types/Rockwell Automation/1756-L85EK.yaml
index fbceade2096c6c15f6170fb59a7518a2eeba7a5c..ebdae1d980b74001f7a211e4cac3b656217a079c 100644
--- a/device-types/Rockwell Automation/1756-L85EK.yaml	
+++ b/device-types/Rockwell Automation/1756-L85EK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L85EK
 part_number: 1756-L85EK
-slug: 1756-l85ek
+slug: rockwell-automation-1756-l85ek
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1756-L85EP.yaml b/device-types/Rockwell Automation/1756-L85EP.yaml
index 8948d57a3b6626f5aca349234fd7fd33c2b81da6..7b1ee18fa15c511938eca479e674a22937e3a497 100644
--- a/device-types/Rockwell Automation/1756-L85EP.yaml	
+++ b/device-types/Rockwell Automation/1756-L85EP.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: ControlLogix 5580 L85EP
 part_number: 1756-L85EP
-slug: 1756-l85ep
+slug: rockwell-automation-1756-l85ep
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/Rockwell Automation/1783-BMS06SA.yaml b/device-types/Rockwell Automation/1783-BMS06SA.yaml
index 6efd9d2f62c52a8006a950c0b2f6bf186196287c..082a2692f3367f221e0bb0467b0729aab2c765d5 100644
--- a/device-types/Rockwell Automation/1783-BMS06SA.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS06SA.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS06SA
 part_number: 1783-BMS06SA
-slug: 1783-bms06sa
+slug: rockwell-automation-1783-bms06sa
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS06SGA.yaml b/device-types/Rockwell Automation/1783-BMS06SGA.yaml
index 918291d5a02b30b348ac4b4321980766526b9358..93ca2b7f67b32bca7b4cbfc9e87fe5f1d21ea647 100644
--- a/device-types/Rockwell Automation/1783-BMS06SGA.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS06SGA.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS06SGA
 part_number: 1783-BMS06SGA
-slug: 1783-bms06sga
+slug: rockwell-automation-1783-bms06sga
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS06SGL.yaml b/device-types/Rockwell Automation/1783-BMS06SGL.yaml
index 77445362acd0d4c64866c71ad9589503118d6b9a..415de5e05ef7783f1742eff06ecae57ddc358fad 100644
--- a/device-types/Rockwell Automation/1783-BMS06SGL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS06SGL.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS06SGL
 part_number: 1783-BMS06SGL
-slug: 1783-bms06sgl
+slug: rockwell-automation-1783-bms06sgl
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS06SL.yaml b/device-types/Rockwell Automation/1783-BMS06SL.yaml
index cb18ff8679e8e5d49dcae81fe674cb2c6892dd73..3b4ed1257408615136c11e88922202b96f11e3a7 100644
--- a/device-types/Rockwell Automation/1783-BMS06SL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS06SL.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS06SL
 part_number: 1783-BMS06SL
-slug: 1783-bms06sl
+slug: rockwell-automation-1783-bms06sl
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS06TA.yaml b/device-types/Rockwell Automation/1783-BMS06TA.yaml
index f6bccd50a1f468a4b192464ada302689d5061ee9..65e953db879605e5bd7fb5f4078cc629dbab8e54 100644
--- a/device-types/Rockwell Automation/1783-BMS06TA.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS06TA.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS06TA
 part_number: 1783-BMS06TA
-slug: 1783-bms06ta
+slug: rockwell-automation-1783-bms06ta
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS06TGA.yaml b/device-types/Rockwell Automation/1783-BMS06TGA.yaml
index f9e708ff892dce12f7791e45ca5071e820fedcb4..627f1b73c48209a4c889f008e0f56d0b6a709ff0 100644
--- a/device-types/Rockwell Automation/1783-BMS06TGA.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS06TGA.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS06TGA
 part_number: 1783-BMS06TGA
-slug: 1783-bms06tga
+slug: rockwell-automation-1783-bms06tga
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS06TGL.yaml b/device-types/Rockwell Automation/1783-BMS06TGL.yaml
index 331ee693d9c8f81496ba5d94b8017ecdfdce8317..72bb79a6360c17d763e10be87a63fd11626faf28 100644
--- a/device-types/Rockwell Automation/1783-BMS06TGL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS06TGL.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS06TGL
 part_number: 1783-BMS06TGL
-slug: 1783-bms06tgl
+slug: rockwell-automation-1783-bms06tgl
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS06TL.yaml b/device-types/Rockwell Automation/1783-BMS06TL.yaml
index 0809d031a2dc76ad997f9b85f483165d74d16201..884e8956b9a5023e5da526bb06dd2633cd694d77 100644
--- a/device-types/Rockwell Automation/1783-BMS06TL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS06TL.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS06TL
 part_number: 1783-BMS06TL
-slug: 1783-bms06tl
+slug: rockwell-automation-1783-bms06tl
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS10CA.yaml b/device-types/Rockwell Automation/1783-BMS10CA.yaml
index 9d564b9aa37ee5be10ed4a937b9b85a000f64c16..8dc6a6fd43ae37fd1d83fabbc1d8903c83691cfa 100644
--- a/device-types/Rockwell Automation/1783-BMS10CA.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS10CA.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS10CA
 part_number: 1783-BMS10CA
-slug: 1783-bms10ca
+slug: rockwell-automation-1783-bms10ca
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS10CGA.yaml b/device-types/Rockwell Automation/1783-BMS10CGA.yaml
index 1b3c6e97b2d6c52a4513465254b2e22e9e667c90..ffa91b53ba37623f3d0c4bef5bb4301a25e79ecc 100644
--- a/device-types/Rockwell Automation/1783-BMS10CGA.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS10CGA.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS10CGA
 part_number: 1783-BMS10CGA
-slug: 1783-bms10cga
+slug: rockwell-automation-1783-bms10cga
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS10CGL.yaml b/device-types/Rockwell Automation/1783-BMS10CGL.yaml
index b0d8223e315011f5d25bd26a4d0a08cc90db51fb..96a5e16035e6dd798dd6e3f7f7b4afd28f7354b1 100644
--- a/device-types/Rockwell Automation/1783-BMS10CGL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS10CGL.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS10CGL
 part_number: 1783-BMS10CGL
-slug: 1783-bms10cgl
+slug: rockwell-automation-1783-bms10cgl
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS10CGN.yaml b/device-types/Rockwell Automation/1783-BMS10CGN.yaml
index 5eefcb43abc022a8feeb08576a8a95621ebe8bf1..d7f5a8da3aa6be1aa8ccf664a15dd766c78518e4 100644
--- a/device-types/Rockwell Automation/1783-BMS10CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS10CGN.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS10CGN
 part_number: 1783-BMS10CGN
-slug: 1783-bms10cgn
+slug: rockwell-automation-1783-bms10cgn
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS10CGP.yaml b/device-types/Rockwell Automation/1783-BMS10CGP.yaml
index 878c65c02dd28095fb57517974f01b451ed4fc82..e4559834a0986e025d6499c0343cd21a7c1b4344 100644
--- a/device-types/Rockwell Automation/1783-BMS10CGP.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS10CGP.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS10CGP
 part_number: 1783-BMS10CGP
-slug: 1783-bms10cgp
+slug: rockwell-automation-1783-bms10cgp
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS10CL.yaml b/device-types/Rockwell Automation/1783-BMS10CL.yaml
index a7b96b37e0566571e0e518145046e0a47ea82f52..a9c5642c6ac6025d8a90418122d8e430b2036181 100644
--- a/device-types/Rockwell Automation/1783-BMS10CL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS10CL.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS10CL
 part_number: 1783-BMS10CL
-slug: 1783-bms10cl
+slug: rockwell-automation-1783-bms10cl
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS20CA.yaml b/device-types/Rockwell Automation/1783-BMS20CA.yaml
index ef2e93758b4bfbc5ba2f62b945f6b494f3a52e82..d584bee7693be4e2cbfa56e71077991622782a2c 100644
--- a/device-types/Rockwell Automation/1783-BMS20CA.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS20CA.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS20CA
 part_number: 1783-BMS20CA
-slug: 1783-bms20ca
+slug: rockwell-automation-1783-bms20ca
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS20CGL.yaml b/device-types/Rockwell Automation/1783-BMS20CGL.yaml
index 9348036d6e8df4fe5b38949e19a3c3308844287f..13b5ba91e45a4dbaba6096c3f14482d918148666 100644
--- a/device-types/Rockwell Automation/1783-BMS20CGL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS20CGL.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS20CGL
 part_number: 1783-BMS20CGL
-slug: 1783-bms20cgl
+slug: rockwell-automation-1783-bms20cgl
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS20CGN.yaml b/device-types/Rockwell Automation/1783-BMS20CGN.yaml
index 9e5c8b319c390b8233006c22c8d8f0705b487d74..6ccf2488b3c3d2ce95fe600ee51eddd5ac6e297c 100644
--- a/device-types/Rockwell Automation/1783-BMS20CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS20CGN.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS20CGN
 part_number: 1783-BMS20CGN
-slug: 1783-bms20cgn
+slug: rockwell-automation-1783-bms20cgn
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS20CGP.yaml b/device-types/Rockwell Automation/1783-BMS20CGP.yaml
index 2c9927314a2f7c8c7dcd7a9202ce277d9a83eb42..5f7dce6366c8d3b04dbfeb15da5396b4986a9f04 100644
--- a/device-types/Rockwell Automation/1783-BMS20CGP.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS20CGP.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS20CGP
 part_number: 1783-BMS20CGP
-slug: 1783-bms20cgp
+slug: rockwell-automation-1783-bms20cgp
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS20CGPK.yaml b/device-types/Rockwell Automation/1783-BMS20CGPK.yaml
index f0366afef823fc26916023da14e970f89b33d166..9c839d8c8b80e95dee502b21f104653674dc0c0d 100644
--- a/device-types/Rockwell Automation/1783-BMS20CGPK.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS20CGPK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS20CGPK
 part_number: 1783-BMS20CGPK
-slug: 1783-bms20cgpk
+slug: rockwell-automation-1783-bms20cgpk
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS20CL.yaml b/device-types/Rockwell Automation/1783-BMS20CL.yaml
index 9adee701ee1164516982dad49dad15772418d3cd..b5695caf62439deee3f44bcec079445f4cdba371 100644
--- a/device-types/Rockwell Automation/1783-BMS20CL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS20CL.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS20CL
 part_number: 1783-BMS20CL
-slug: 1783-bms20cl
+slug: rockwell-automation-1783-bms20cl
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS4S2SGA.yaml b/device-types/Rockwell Automation/1783-BMS4S2SGA.yaml
index 241847a5874ef7b97dfc41b2bf1a892fb3a0cc8e..16cc26987fd5dba694c1c329dee6fb1961fe3de8 100644
--- a/device-types/Rockwell Automation/1783-BMS4S2SGA.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS4S2SGA.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS4S2SGA
 part_number: 1783-BMS4S2SGA
-slug: 1783-bms4s2sga
+slug: rockwell-automation-1783-bms4s2sga
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-BMS4S2SGL.yaml b/device-types/Rockwell Automation/1783-BMS4S2SGL.yaml
index 48b537ba413aa1f2f28e841f96ea2b640019307f..e126525780f2400ad473f3a220ecee2615f90896 100644
--- a/device-types/Rockwell Automation/1783-BMS4S2SGL.yaml	
+++ b/device-types/Rockwell Automation/1783-BMS4S2SGL.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-BMS4S2SGL
 part_number: 1783-BMS4S2SGL
-slug: 1783-bms4s2sgl
+slug: rockwell-automation-1783-bms4s2sgl
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS16T4CGN.yaml b/device-types/Rockwell Automation/1783-HMS16T4CGN.yaml
index 2f6c5f9cc593336c05b424508b113c27f25fa826..eef2565a8be6f514c563e6a4f82b8ab1ef7b547d 100644
--- a/device-types/Rockwell Automation/1783-HMS16T4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS16T4CGN.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS16T4CGN
 part_number: 1783-HMS16T4CGN
-slug: 1783-hms16t4cgn
+slug: rockwell-automation-1783-hms16t4cgn
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS16TG4CGN.yaml b/device-types/Rockwell Automation/1783-HMS16TG4CGN.yaml
index 328e15c75e10a239cef1fe48f8d63c5806eaf024..57c879fd3765aba49d1652987c3e81910799ff6e 100644
--- a/device-types/Rockwell Automation/1783-HMS16TG4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS16TG4CGN.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS16TG4CGN
 part_number: 1783-HMS16TG4CGN
-slug: 1783-hms16tg4cgn
+slug: rockwell-automation-1783-hms16tg4cgn
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS16TG4CGR.yaml b/device-types/Rockwell Automation/1783-HMS16TG4CGR.yaml
index 09ea548ca7501304aec8c3f2fbdccee84e4642c5..33bd74848b1a698da6ef7c14175afd2258f104a0 100644
--- a/device-types/Rockwell Automation/1783-HMS16TG4CGR.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS16TG4CGR.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS16TG4CGR
 part_number: 1783-HMS16TG4CGR
-slug: 1783-hms16tg4cgr
+slug: rockwell-automation-1783-hms16tg4cgr
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS4C4CGN.yaml b/device-types/Rockwell Automation/1783-HMS4C4CGN.yaml
index d63f7ef38f6d99997340994ad46b75323c55d824..ca0cf092bf7c2ebe4f591db162930454c198e0a3 100644
--- a/device-types/Rockwell Automation/1783-HMS4C4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS4C4CGN.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS4C4CGN
 part_number: 1783-HMS4C4CGN
-slug: 1783-hms4c4cgn
+slug: rockwell-automation-1783-hms4c4cgn
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS4EG8CGN.yaml b/device-types/Rockwell Automation/1783-HMS4EG8CGN.yaml
index 8d2d39807c579ca4db7a84ffaea411d3990d2d7e..de83c666f78d16e2846eac2211e1b86173ea1b3e 100644
--- a/device-types/Rockwell Automation/1783-HMS4EG8CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS4EG8CGN.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS4EG8CGN
 part_number: 1783-HMS4EG8CGN
-slug: 1783-hms4eg8cgn
+slug: rockwell-automation-1783-hms4eg8cgn
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS4EG8CGR.yaml b/device-types/Rockwell Automation/1783-HMS4EG8CGR.yaml
index 416367b97a05e30de201540aa97905822b42fe67..d76ef8458f0735a3f79d091eed05bcadb394ec2e 100644
--- a/device-types/Rockwell Automation/1783-HMS4EG8CGR.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS4EG8CGR.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS4EG8CGR
 part_number: 1783-HMS4EG8CGR
-slug: 1783-hms4eg8cgr
+slug: rockwell-automation-1783-hms4eg8cgr
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS4S8E4CGN.yaml b/device-types/Rockwell Automation/1783-HMS4S8E4CGN.yaml
index 8ee885a049da6afd7058453cc7835bfca429b36a..5de2e68f0049fd81f4e0c1db8451f8f46540c438 100644
--- a/device-types/Rockwell Automation/1783-HMS4S8E4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS4S8E4CGN.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS4S8E4CGN
 part_number: 1783-HMS4S8E4CGN
-slug: 1783-hms4s8e4cgn
+slug: rockwell-automation-1783-hms4s8e4cgn
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS4SG8EG4CGN.yaml b/device-types/Rockwell Automation/1783-HMS4SG8EG4CGN.yaml
index f63b59eacc1d01d24511cc711d4637ff0d738625..8626e6ab81c7231a05f5afb2b218bad29306e6da 100644
--- a/device-types/Rockwell Automation/1783-HMS4SG8EG4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS4SG8EG4CGN.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS4SG8EG4CGN
 part_number: 1783-HMS4SG8EG4CGN
-slug: 1783-hms4sg8ge4cgn
+slug: rockwell-automation-1783-hms4sg8eg4cgn
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS4SG8EG4CGR.yaml b/device-types/Rockwell Automation/1783-HMS4SG8EG4CGR.yaml
index b27ba230e91558b776ce90155c3e55fba4e8b333..e761e5bb719fbc7332b9686f47e41c77bb5af79b 100644
--- a/device-types/Rockwell Automation/1783-HMS4SG8EG4CGR.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS4SG8EG4CGR.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS4SG8EG4CGR
 part_number: 1783-HMS4SG8EG4CGR
-slug: 1783-hms4sg8ge4cgr
+slug: rockwell-automation-1783-hms4sg8eg4cgr
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS4T4E4CGN.yaml b/device-types/Rockwell Automation/1783-HMS4T4E4CGN.yaml
index a8b6a487bcd42c864773c2c679a3f416db9c6ce4..296fdd2c4b42a6f4688cc879217fb707a4909a7d 100644
--- a/device-types/Rockwell Automation/1783-HMS4T4E4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS4T4E4CGN.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS4T4E4CGN
 part_number: 1783-HMS4T4E4CGN
-slug: 1783-hms4t4e4cgn
+slug: rockwell-automation-1783-hms4t4e4cgn
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS8S4CGN.yaml b/device-types/Rockwell Automation/1783-HMS8S4CGN.yaml
index 2d87592c6141541b36d07af11b71bfc58f0e397d..cbd537654997a5b9ccbcbff0aa67cca4871c0a84 100644
--- a/device-types/Rockwell Automation/1783-HMS8S4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS8S4CGN.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS8S4CGN
 part_number: 1783-HMS8S4CGN
-slug: 1783-hms8s4cgn
+slug: rockwell-automation-1783-hms8s4cgn
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS8SG4CGN.yaml b/device-types/Rockwell Automation/1783-HMS8SG4CGN.yaml
index 15ff6b98e52383a9a1a5341342a10c80e220ae5e..00f803a2c1b84662c7697f691bd475c4d535f5bd 100644
--- a/device-types/Rockwell Automation/1783-HMS8SG4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS8SG4CGN.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS8SG4CGN
 part_number: 1783-HMS8SG4CGN
-slug: 1783-hms8sg4cgn
+slug: rockwell-automation-1783-hms8sg4cgn
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS8SG4CGR.yaml b/device-types/Rockwell Automation/1783-HMS8SG4CGR.yaml
index 9c5fb7f36db20b6bc7b7a75f77450532d0d070fc..21a91d5970d93d94f312fc17f3cefceab2b690ff 100644
--- a/device-types/Rockwell Automation/1783-HMS8SG4CGR.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS8SG4CGR.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS8SG4CGR
 part_number: 1783-HMS8SG4CGR
-slug: 1783-hms8sg4cgr
+slug: rockwell-automation-1783-hms8sg4cgr
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS8T4CGN.yaml b/device-types/Rockwell Automation/1783-HMS8T4CGN.yaml
index acabfa5f8eec83cc8db7fc97bcd9e33817ae3792..f364eaef8df92c67dba57c1b6c1700ab39274e9a 100644
--- a/device-types/Rockwell Automation/1783-HMS8T4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS8T4CGN.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS8T4CGN
 part_number: 1783-HMS8T4CGN
-slug: 1783-hms8t4cgn
+slug: rockwell-automation-1783-hms8t4cgn
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS8TG4CGN.yaml b/device-types/Rockwell Automation/1783-HMS8TG4CGN.yaml
index 586f338b9f618313f16af1a5f694bdf2a566cd12..ce2c0d66ebb8237f410b736ea1041261b12c0367 100644
--- a/device-types/Rockwell Automation/1783-HMS8TG4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS8TG4CGN.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS8TG4CGN
 part_number: 1783-HMS8TG4CGN
-slug: 1783-hms8tg4cgn
+slug: rockwell-automation-1783-hms8tg4cgn
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS8TG4CGR.yaml b/device-types/Rockwell Automation/1783-HMS8TG4CGR.yaml
index 3f2eea422d81370a76122759811fe5e667e04ac8..92b201ddccce7c416fa17246d9f47a608224eb51 100644
--- a/device-types/Rockwell Automation/1783-HMS8TG4CGR.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS8TG4CGR.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS8TG4CGR
 part_number: 1783-HMS8TG4CGR
-slug: 1783-hms8tg4cgr
+slug: rockwell-automation-1783-hms8tg4cgr
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS8TG8EG4CGN.yaml b/device-types/Rockwell Automation/1783-HMS8TG8EG4CGN.yaml
index 49e703f07a61cb51cf8bc8ab46464124c11295a8..a3e16905c85001823a43ce001c412101509e8a23 100644
--- a/device-types/Rockwell Automation/1783-HMS8TG8EG4CGN.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS8TG8EG4CGN.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS8TG8EG4CGN
 part_number: 1783-HMS8TG8EG4CGN
-slug: 1783-hms8tg8ge4cgn
+slug: rockwell-automation-1783-hms8tg8eg4cgn
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/1783-HMS8TG8EG4CGR.yaml b/device-types/Rockwell Automation/1783-HMS8TG8EG4CGR.yaml
index 4d12dbbaed98b634e94bb6a04849d92f188fae8f..ea2e4988491c22f46e8585158e45d990c033fd68 100644
--- a/device-types/Rockwell Automation/1783-HMS8TG8EG4CGR.yaml	
+++ b/device-types/Rockwell Automation/1783-HMS8TG8EG4CGR.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: 1783-HMS8TG8EG4CGR
 part_number: 1783-HMS8TG8EG4CGR
-slug: 1783-hms8tg8ge4cgr
+slug: rockwell-automation-1783-hms8tg8eg4cgr
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-AEN2TR.yaml b/device-types/Rockwell Automation/5069-AEN2TR.yaml
index 3ea2368339e3f4f04e760db98a65951af34c278c..5f5176a97af5e5c116dd9191fdd39b264cf828bf 100644
--- a/device-types/Rockwell Automation/5069-AEN2TR.yaml	
+++ b/device-types/Rockwell Automation/5069-AEN2TR.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: Compact 5000 I/O Ethernet Adapter (AEN2TR)
 part_number: 5069-AEN2TR
-slug: 5069-aen2tr
+slug: rockwell-automation-5069-aen2tr
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-AENTR.yaml b/device-types/Rockwell Automation/5069-AENTR.yaml
index 166b2cbb8cb9161c1b8bc14483f83efe0b1bf916..4a82808f4d62ec6932e90bff29f05793ba7c4177 100644
--- a/device-types/Rockwell Automation/5069-AENTR.yaml	
+++ b/device-types/Rockwell Automation/5069-AENTR.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: Compact 5000 I/O Ethernet Adapter (AENTR)
 part_number: 5069-AENTR
-slug: 5069-aentr
+slug: rockwell-automation-5069-aentr
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-AENTRK.yaml b/device-types/Rockwell Automation/5069-AENTRK.yaml
index cf1c9549ca1104296664df287077a46ddb33dadf..5ad2319e4d23d60352b0eb56937630757e7aa691 100644
--- a/device-types/Rockwell Automation/5069-AENTRK.yaml	
+++ b/device-types/Rockwell Automation/5069-AENTRK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: Compact 5000 I/O Ethernet Adapter (AENTRK)
 part_number: 5069-AENTRK
-slug: 5069-aentrk
+slug: rockwell-automation-5069-aentrk
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L306ER.yaml b/device-types/Rockwell Automation/5069-L306ER.yaml
index 5a2bf5c32adac79c4d6fec2aa6e25c07d95cf7f1..163d07cc3d9c6bbe967a08133c1dcca0bb92307c 100644
--- a/device-types/Rockwell Automation/5069-L306ER.yaml	
+++ b/device-types/Rockwell Automation/5069-L306ER.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L306ER
 part_number: 5069-L306ER
-slug: 5069-l306er
+slug: rockwell-automation-5069-l306er
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L306ERM.yaml b/device-types/Rockwell Automation/5069-L306ERM.yaml
index 3fd01eff8e947d265dee9d86e0bacc0b152c0b1d..ba0a114393b11c1f26f11a53de38dcae945de0ea 100644
--- a/device-types/Rockwell Automation/5069-L306ERM.yaml	
+++ b/device-types/Rockwell Automation/5069-L306ERM.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L306ERM
 part_number: 5069-L306ERM
-slug: 5069-l306erm
+slug: rockwell-automation-5069-l306erm
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L306ERMS2.yaml b/device-types/Rockwell Automation/5069-L306ERMS2.yaml
index f7da9b228790e81458d74f944577bab841def7d6..cbdd27ed3a5b640c66949158872ed2e033a458f0 100644
--- a/device-types/Rockwell Automation/5069-L306ERMS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L306ERMS2.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L306ERMS2
 part_number: 5069-L306ERMS2
-slug: 5069-l306erms2
+slug: rockwell-automation-5069-l306erms2
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L306ERMS3.yaml b/device-types/Rockwell Automation/5069-L306ERMS3.yaml
index 9b2c72af7385e47ffeddc1e65b0b73e7eb94761a..2c82595246aaee9cc348b8977f63f47b2e0c8484 100644
--- a/device-types/Rockwell Automation/5069-L306ERMS3.yaml	
+++ b/device-types/Rockwell Automation/5069-L306ERMS3.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L306ERMS3
 part_number: 5069-L306ERMS3
-slug: 5069-l306erms3
+slug: rockwell-automation-5069-l306erms3
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L306ERS2.yaml b/device-types/Rockwell Automation/5069-L306ERS2.yaml
index 85fac04498f4988137b7fff2e62b79e2afcb5151..a44c2b4587fdd55db24c3007dc9bdf963943553b 100644
--- a/device-types/Rockwell Automation/5069-L306ERS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L306ERS2.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L306ERS2
 part_number: 5069-L306ERS2
-slug: 5069-l306ers2
+slug: rockwell-automation-5069-l306ers2
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L3100ERM.yaml b/device-types/Rockwell Automation/5069-L3100ERM.yaml
index b78555cc6d72233963dbe0b586681e080cd90989..2a80a78f1089d863d124eca9fe203087d16b41d0 100644
--- a/device-types/Rockwell Automation/5069-L3100ERM.yaml	
+++ b/device-types/Rockwell Automation/5069-L3100ERM.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L3100ERM
 part_number: 5069-L3100ERM
-slug: 5069-l3100erm
+slug: rockwell-automation-5069-l3100erm
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L3100ERMS2.yaml b/device-types/Rockwell Automation/5069-L3100ERMS2.yaml
index 4d5c8e08f41667de7efc793aea1efc59b95864e6..cca7504dde1af710cec4ba72f3595c701606bf3d 100644
--- a/device-types/Rockwell Automation/5069-L3100ERMS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L3100ERMS2.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L3100ERMS2
 part_number: 5069-L3100ERMS2
-slug: 5069-l3100erms2
+slug: rockwell-automation-5069-l3100erms2
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L3100ERMS3.yaml b/device-types/Rockwell Automation/5069-L3100ERMS3.yaml
index 1c93bcf81896c8f8743ab827cb12c8b586c4277a..3b01bdb93c839370a442b4301cbe534e3f7bf80c 100644
--- a/device-types/Rockwell Automation/5069-L3100ERMS3.yaml	
+++ b/device-types/Rockwell Automation/5069-L3100ERMS3.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L3100ERMS3
 part_number: 5069-L3100ERMS3
-slug: 5069-l3100erms3
+slug: rockwell-automation-5069-l3100erms3
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L3100ERS2.yaml b/device-types/Rockwell Automation/5069-L3100ERS2.yaml
index 55b1faa7c9a27178b8a437e7610c39e4f494eebe..37a74c31bc1ce9599a6808b2d0dd0b6ba7f2fae3 100644
--- a/device-types/Rockwell Automation/5069-L3100ERS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L3100ERS2.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L3100ERS2
 part_number: 5069-L3100ERS2
-slug: 5069-l3100ers2
+slug: rockwell-automation-5069-l3100ers2
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L310ER-NSE.yaml b/device-types/Rockwell Automation/5069-L310ER-NSE.yaml
index 9a6e9fadfda290abd2d0f1bd5c2a5a200ae09982..9ce8bd68d73068b05090e40e2c7ad2ac27fb3d22 100644
--- a/device-types/Rockwell Automation/5069-L310ER-NSE.yaml	
+++ b/device-types/Rockwell Automation/5069-L310ER-NSE.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L310ER-NSE
 part_number: 5069-L310ER-NSE
-slug: 5069-l310er-nse
+slug: rockwell-automation-5069-l310er-nse
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L310ER.yaml b/device-types/Rockwell Automation/5069-L310ER.yaml
index 07297d3677268f6aa2c71235ea57810bf40133a3..623efddf1ceaa6b6b28a628bbd905ea833278e88 100644
--- a/device-types/Rockwell Automation/5069-L310ER.yaml	
+++ b/device-types/Rockwell Automation/5069-L310ER.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L310ER
 part_number: 5069-L310ER
-slug: 5069-l310er
+slug: rockwell-automation-5069-l310er
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L310ERM.yaml b/device-types/Rockwell Automation/5069-L310ERM.yaml
index 77a69aa69d43f57f14629e301b4f33ba7afe6379..c11c0f197f26acc5351dc3b7d487eb1fa9c4d8f5 100644
--- a/device-types/Rockwell Automation/5069-L310ERM.yaml	
+++ b/device-types/Rockwell Automation/5069-L310ERM.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L310ERM
 part_number: 5069-L310ERM
-slug: 5069-l310erm
+slug: rockwell-automation-5069-l310erm
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L310ERMS2.yaml b/device-types/Rockwell Automation/5069-L310ERMS2.yaml
index d46ed94a1b30b60edec3f2bfa60ef69eceee8cb7..4c1b8ac9a8c448f987de080e26c0d36ff83cec94 100644
--- a/device-types/Rockwell Automation/5069-L310ERMS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L310ERMS2.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L310ERMS2
 part_number: 5069-L310ERMS2
-slug: 5069-l310erms2
+slug: rockwell-automation-5069-l310erms2
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L310ERMS3.yaml b/device-types/Rockwell Automation/5069-L310ERMS3.yaml
index 4112b061d325021cd6788f53ecb44bde9a3232e7..cadae0865dd7c842da3dc732e5f5d2b731818bc7 100644
--- a/device-types/Rockwell Automation/5069-L310ERMS3.yaml	
+++ b/device-types/Rockwell Automation/5069-L310ERMS3.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L310ERMS3
 part_number: 5069-L310ERMS3
-slug: 5069-l310erms3
+slug: rockwell-automation-5069-l310erms3
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L310ERS2.yaml b/device-types/Rockwell Automation/5069-L310ERS2.yaml
index e83fd12892ddb3b5f7ea1e66198038c894757e86..d92cd3fbad62deb3ed8dcb7d2e84f9cbe39bf928 100644
--- a/device-types/Rockwell Automation/5069-L310ERS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L310ERS2.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L310ERS2
 part_number: 5069-L310ERS2
-slug: 5069-l310ers2
+slug: rockwell-automation-5069-l310ers2
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L320ER.yaml b/device-types/Rockwell Automation/5069-L320ER.yaml
index 86e60a84e2ee0169911e11fcbf970e985844837f..65d011858ab028f46c5710903ac824c98b98096d 100644
--- a/device-types/Rockwell Automation/5069-L320ER.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ER.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L320ER
 part_number: 5069-L320ER
-slug: 5069-l320er
+slug: rockwell-automation-5069-l320er
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L320ERM.yaml b/device-types/Rockwell Automation/5069-L320ERM.yaml
index 8e4677ca26dfef6354989b2067e010568a38d3a1..4249112fa4518013ed831b333800a513af03b8ed 100644
--- a/device-types/Rockwell Automation/5069-L320ERM.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERM.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L320ERM
 part_number: 5069-L320ERM
-slug: 5069-l320erm
+slug: rockwell-automation-5069-l320erm
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L320ERMK.yaml b/device-types/Rockwell Automation/5069-L320ERMK.yaml
index 594f5370ad48ce5a5c52b1d8c58b09a67a5f6afc..aa728504937d2844587fff953b44692388e3b690 100644
--- a/device-types/Rockwell Automation/5069-L320ERMK.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERMK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L320ERMK
 part_number: 5069-L320ERMK
-slug: 5069-l320ermk
+slug: rockwell-automation-5069-l320ermk
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L320ERMS2.yaml b/device-types/Rockwell Automation/5069-L320ERMS2.yaml
index 9535185dd265665202195cb51499a5366661a355..eb0324b72bbd53be455773c0a0489f885a44d5e0 100644
--- a/device-types/Rockwell Automation/5069-L320ERMS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERMS2.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L320ERMS2
 part_number: 5069-L320ERMS2
-slug: 5069-l320erms2
+slug: rockwell-automation-5069-l320erms2
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L320ERMS2K.yaml b/device-types/Rockwell Automation/5069-L320ERMS2K.yaml
index ce99fb04d1a321306a879d194fceeb0bb6818258..6cabea8eb321c65d6695f543915c045f293e9ab4 100644
--- a/device-types/Rockwell Automation/5069-L320ERMS2K.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERMS2K.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L320ERMS2K
 part_number: 5069-L320ERMS2K
-slug: 5069-l320erms2k
+slug: rockwell-automation-5069-l320erms2k
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L320ERMS3.yaml b/device-types/Rockwell Automation/5069-L320ERMS3.yaml
index df62a30b106ce01177598c84d52e069e268a8a58..c854e4c12016134e07d302798fd6750f887a57ed 100644
--- a/device-types/Rockwell Automation/5069-L320ERMS3.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERMS3.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L320ERMS3
 part_number: 5069-L320ERMS3
-slug: 5069-l320erms3
+slug: rockwell-automation-5069-l320erms3
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L320ERMS3K.yaml b/device-types/Rockwell Automation/5069-L320ERMS3K.yaml
index 4d444f91febdd0c25d256aca6a6f33a66c8ac364..b0ed7bdc2f3fd5349cfb26116741580a634215dc 100644
--- a/device-types/Rockwell Automation/5069-L320ERMS3K.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERMS3K.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L320ERMS3K
 part_number: 5069-L320ERMS3K
-slug: 5069-l320erms3k
+slug: rockwell-automation-5069-l320erms3k
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L320ERP.yaml b/device-types/Rockwell Automation/5069-L320ERP.yaml
index 30160f703e9cc146561088821fdc1839538c567d..042c380e337ec72566ce4ed25b5c8c0fbdf71ccd 100644
--- a/device-types/Rockwell Automation/5069-L320ERP.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERP.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L320ERP
 part_number: 5069-L320ERP
-slug: 5069-l320erp
+slug: rockwell-automation-5069-l320erp
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L320ERS2.yaml b/device-types/Rockwell Automation/5069-L320ERS2.yaml
index 40cd624056004b7538665d8491e68e125c99bfb1..f6c26034f16ad70abe9360d895178c6c3a119fe9 100644
--- a/device-types/Rockwell Automation/5069-L320ERS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERS2.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L320ERS2
 part_number: 5069-L320ERS2
-slug: 5069-l320ers2
+slug: rockwell-automation-5069-l320ers2
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L320ERS2K.yaml b/device-types/Rockwell Automation/5069-L320ERS2K.yaml
index c9812991396355f970da8e52387aee59d7c80483..2911185a99116ab90c7f2ef309285457d2c80fe6 100644
--- a/device-types/Rockwell Automation/5069-L320ERS2K.yaml	
+++ b/device-types/Rockwell Automation/5069-L320ERS2K.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L320ERS2K
 part_number: 5069-L320ERS2K
-slug: 5069-l320ers2k
+slug: rockwell-automation-5069-l320ers2k
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L330ER.yaml b/device-types/Rockwell Automation/5069-L330ER.yaml
index 82a61c7420101ae27e5b6b0dc3f2dd4978e0ac4a..7e33fd56fdea6a128d8603bb1b4b94830c050eaa 100644
--- a/device-types/Rockwell Automation/5069-L330ER.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ER.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L330ER
 part_number: 5069-L330ER
-slug: 5069-l330er
+slug: rockwell-automation-5069-l330er
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L330ERM.yaml b/device-types/Rockwell Automation/5069-L330ERM.yaml
index 2657cbea989cc9493117e8662a96208de0eacd64..7df9a882e59ef1dcb24b2c16f64155b06f262849 100644
--- a/device-types/Rockwell Automation/5069-L330ERM.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ERM.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L330ERM
 part_number: 5069-L330ERM
-slug: 5069-l330erm
+slug: rockwell-automation-5069-l330erm
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L330ERMK.yaml b/device-types/Rockwell Automation/5069-L330ERMK.yaml
index 16edb766d1acd930e1798f1e6813ff7fc69ff344..89f7b2d0f1d00980cb249e64c2d716b7d978231d 100644
--- a/device-types/Rockwell Automation/5069-L330ERMK.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ERMK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L330ERMK
 part_number: 5069-L330ERMK
-slug: 5069-l330ermk
+slug: rockwell-automation-5069-l330ermk
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L330ERMS2.yaml b/device-types/Rockwell Automation/5069-L330ERMS2.yaml
index 012f16bdff0295d2efc88865808374ff7fe57655..3fdd41d6fa58537a5451c575e115d41511a3ced5 100644
--- a/device-types/Rockwell Automation/5069-L330ERMS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ERMS2.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L330ERMS2
 part_number: 5069-L330ERMS2
-slug: 5069-l330erms2
+slug: rockwell-automation-5069-l330erms2
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L330ERMS2K.yaml b/device-types/Rockwell Automation/5069-L330ERMS2K.yaml
index 3d5970a75076a669a671b302c5e85715d3fc2b9a..e0583d21c871616c65750c8d724293563d3d2786 100644
--- a/device-types/Rockwell Automation/5069-L330ERMS2K.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ERMS2K.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L330ERMS2K
 part_number: 5069-L330ERMS2K
-slug: 5069-l330erms2k
+slug: rockwell-automation-5069-l330erms2k
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L330ERMS3.yaml b/device-types/Rockwell Automation/5069-L330ERMS3.yaml
index d6d9806c5d441dbdc86d859189794ff6026b1664..906ecbb7aa7fc35f9abebae4448cf952bb9e9156 100644
--- a/device-types/Rockwell Automation/5069-L330ERMS3.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ERMS3.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L330ERMS3
 part_number: 5069-L330ERMS3
-slug: 5069-l330erms3
+slug: rockwell-automation-5069-l330erms3
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L330ERMS3K.yaml b/device-types/Rockwell Automation/5069-L330ERMS3K.yaml
index d7492ca40cb471618ac2b9a2de1db4988edc0500..b86de0507e15c6ca71916ed8d83c02f58d7e169d 100644
--- a/device-types/Rockwell Automation/5069-L330ERMS3K.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ERMS3K.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L330ERMS3K
 part_number: 5069-L330ERMS3K
-slug: 5069-l330erms3k
+slug: rockwell-automation-5069-l330erms3k
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L330ERS2.yaml b/device-types/Rockwell Automation/5069-L330ERS2.yaml
index 7fbcda5f21dd2c9c83e0caa5b739ee1bedd1c48a..43b7f6997f9d2dd991a46668a03d1ee29a381f75 100644
--- a/device-types/Rockwell Automation/5069-L330ERS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ERS2.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L330ERS2
 part_number: 5069-L330ERS2
-slug: 5069-l330ers2
+slug: rockwell-automation-5069-l330ers2
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L330ERS2K.yaml b/device-types/Rockwell Automation/5069-L330ERS2K.yaml
index 8265324abe3e3a3c7b3f9d9a689b1d7cbd1960f4..bcc80e748036926348f09b4e19375f997a48132f 100644
--- a/device-types/Rockwell Automation/5069-L330ERS2K.yaml	
+++ b/device-types/Rockwell Automation/5069-L330ERS2K.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L330ERS2K
 part_number: 5069-L330ERS2K
-slug: 5069-l330ers2k
+slug: rockwell-automation-5069-l330ers2k
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L340ER.yaml b/device-types/Rockwell Automation/5069-L340ER.yaml
index 50d6aee829cc375cccc7fed90724bed94b91d7ec..e1d6ad664e42ebef0622249c1db7fcff56c4f3a6 100644
--- a/device-types/Rockwell Automation/5069-L340ER.yaml	
+++ b/device-types/Rockwell Automation/5069-L340ER.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L340ER
 part_number: 5069-L340ER
-slug: 5069-l340er
+slug: rockwell-automation-5069-l340er
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L340ERM.yaml b/device-types/Rockwell Automation/5069-L340ERM.yaml
index 649de80829ab0027cc380ab162ca69f5821b6746..3096942d83f7f45dba058620289a01636d5158df 100644
--- a/device-types/Rockwell Automation/5069-L340ERM.yaml	
+++ b/device-types/Rockwell Automation/5069-L340ERM.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L340ERM
 part_number: 5069-L340ERM
-slug: 5069-l340erm
+slug: rockwell-automation-5069-l340erm
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L340ERMS2.yaml b/device-types/Rockwell Automation/5069-L340ERMS2.yaml
index 3e4a41690279f5b2ce366d2b0ad96563521e4081..735c060ac4bc1051ca58fe1523aeb62c2b4929a6 100644
--- a/device-types/Rockwell Automation/5069-L340ERMS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L340ERMS2.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L340ERMS2
 part_number: 5069-L340ERMS2
-slug: 5069-l340erms2
+slug: rockwell-automation-5069-l340erms2
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L340ERMS3.yaml b/device-types/Rockwell Automation/5069-L340ERMS3.yaml
index 93d9a4c7ce20c4dde39f55fd277a3d04922b1f98..0b0d644d306af00d7bb2d879549df502e10fb862 100644
--- a/device-types/Rockwell Automation/5069-L340ERMS3.yaml	
+++ b/device-types/Rockwell Automation/5069-L340ERMS3.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L340ERMS3
 part_number: 5069-L340ERMS3
-slug: 5069-l340erms3
+slug: rockwell-automation-5069-l340erms3
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L340ERP.yaml b/device-types/Rockwell Automation/5069-L340ERP.yaml
index 4aecdfaf451f6dab4163547d9418498c3307a4a4..b9f98a3c7019271caafd09288f8034655165cd00 100644
--- a/device-types/Rockwell Automation/5069-L340ERP.yaml	
+++ b/device-types/Rockwell Automation/5069-L340ERP.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L340ERP
 part_number: 5069-L340ERP
-slug: 5069-l340erp
+slug: rockwell-automation-5069-l340erp
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L340ERS2.yaml b/device-types/Rockwell Automation/5069-L340ERS2.yaml
index aa5b8394a598c7be1d7f4d6214da56c4ee891261..eae2886c2ad8ec29343c7f60eeac535e8fbb4275 100644
--- a/device-types/Rockwell Automation/5069-L340ERS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L340ERS2.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L340ERS2
 part_number: 5069-L340ERS2
-slug: 5069-l340ers2
+slug: rockwell-automation-5069-l340ers2
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L350ERM.yaml b/device-types/Rockwell Automation/5069-L350ERM.yaml
index 1ff46721c54ef7499d728ef239ad11f1f554d448..ce93b1d93aa28e47333023326224b6c239112ff9 100644
--- a/device-types/Rockwell Automation/5069-L350ERM.yaml	
+++ b/device-types/Rockwell Automation/5069-L350ERM.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L350ERM
 part_number: 5069-L350ERM
-slug: 5069-l350erm
+slug: rockwell-automation-5069-l350erm
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L350ERMK.yaml b/device-types/Rockwell Automation/5069-L350ERMK.yaml
index 236209f11219d3951d473d5afd5c93b34628dee9..801e499172f285b811387290e036b5db6875d2f0 100644
--- a/device-types/Rockwell Automation/5069-L350ERMK.yaml	
+++ b/device-types/Rockwell Automation/5069-L350ERMK.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L350ERMK
 part_number: 5069-L350ERMK
-slug: 5069-l350ermk
+slug: rockwell-automation-5069-l350ermk
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L350ERMS2.yaml b/device-types/Rockwell Automation/5069-L350ERMS2.yaml
index 3289aa0e8adf880fca17ed545fa584c7464bcee0..9c093b52e0f46ae711fde4767bf078e251c17856 100644
--- a/device-types/Rockwell Automation/5069-L350ERMS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L350ERMS2.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L350ERMS2
 part_number: 5069-L350ERMS2
-slug: 5069-l350erms2
+slug: rockwell-automation-5069-l350erms2
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L350ERMS2K.yaml b/device-types/Rockwell Automation/5069-L350ERMS2K.yaml
index b2b2f95f718ffbabdc11e2b4f87b6b4ff22fa660..b2cedcb759fe66c189455c72215d63515e0ef029 100644
--- a/device-types/Rockwell Automation/5069-L350ERMS2K.yaml	
+++ b/device-types/Rockwell Automation/5069-L350ERMS2K.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L350ERMS2K
 part_number: 5069-L350ERMS2K
-slug: 5069-l350erms2k
+slug: rockwell-automation-5069-l350erms2k
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L350ERMS3.yaml b/device-types/Rockwell Automation/5069-L350ERMS3.yaml
index 2d00c6191b56ee6ddc7a298bf784934d097cff0c..f4d09c144b169183fd82018cf6f4c72fc4bcf3fe 100644
--- a/device-types/Rockwell Automation/5069-L350ERMS3.yaml	
+++ b/device-types/Rockwell Automation/5069-L350ERMS3.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L350ERMS3
 part_number: 5069-L350ERMS3
-slug: 5069-l350erms3
+slug: rockwell-automation-5069-l350erms3
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L350ERMS3K.yaml b/device-types/Rockwell Automation/5069-L350ERMS3K.yaml
index 5d1ac90a3d7dc33535611254e80d001b311c681d..539335ac6b9bb287292e66416711de2460226648 100644
--- a/device-types/Rockwell Automation/5069-L350ERMS3K.yaml	
+++ b/device-types/Rockwell Automation/5069-L350ERMS3K.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L350ERMS3K
 part_number: 5069-L350ERMS3K
-slug: 5069-l350erms3k
+slug: rockwell-automation-5069-l350erms3k
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L350ERS2.yaml b/device-types/Rockwell Automation/5069-L350ERS2.yaml
index e668a5ad6fcd7bf214cb27fec12a585071035c76..fb6e08550590cea96ac05b75d9e99e8c0e5f680f 100644
--- a/device-types/Rockwell Automation/5069-L350ERS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L350ERS2.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L350ERS2
 part_number: 5069-L350ERS2
-slug: 5069-l350ers2
+slug: rockwell-automation-5069-l350ers2
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L350ERS2K.yaml b/device-types/Rockwell Automation/5069-L350ERS2K.yaml
index 47984d663e316cbfe63947b92bdb00d581365ed9..4cb254031834e36e0f546f4ada70a97f0ce3be41 100644
--- a/device-types/Rockwell Automation/5069-L350ERS2K.yaml	
+++ b/device-types/Rockwell Automation/5069-L350ERS2K.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L350ERS2K
 part_number: 5069-L350ERS2K
-slug: 5069-l350ers2k
+slug: rockwell-automation-5069-l350ers2k
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L380ERM.yaml b/device-types/Rockwell Automation/5069-L380ERM.yaml
index 8ab56f0235e03c8e6ca6e657649f4723fcc8e1df..48e9dcd199dfbb4dd79f7c5212310a601e882cb1 100644
--- a/device-types/Rockwell Automation/5069-L380ERM.yaml	
+++ b/device-types/Rockwell Automation/5069-L380ERM.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5380 L380ERM
 part_number: 5069-L380ERM
-slug: 5069-l380erm
+slug: rockwell-automation-5069-l380erm
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L380ERMS2.yaml b/device-types/Rockwell Automation/5069-L380ERMS2.yaml
index 18a34667a2323cf604e339ef7db22a4271cdb572..b9520a05c84d63425e36f1488bde0a6c56d4a2af 100644
--- a/device-types/Rockwell Automation/5069-L380ERMS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L380ERMS2.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L380ERMS2
 part_number: 5069-L380ERMS2
-slug: 5069-l380erms2
+slug: rockwell-automation-5069-l380erms2
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L380ERMS3.yaml b/device-types/Rockwell Automation/5069-L380ERMS3.yaml
index 770a31ca31cd50f99efa1b615873f4608f921aff..427a0180d8dc75e5ce068e075ad5c933fff67e44 100644
--- a/device-types/Rockwell Automation/5069-L380ERMS3.yaml	
+++ b/device-types/Rockwell Automation/5069-L380ERMS3.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L380ERMS3
 part_number: 5069-L380ERMS3
-slug: 5069-l380erms3
+slug: rockwell-automation-5069-l380erms3
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L380ERS2.yaml b/device-types/Rockwell Automation/5069-L380ERS2.yaml
index a81b7e86236669cb950cc2b036bbcc0fa6f0c63b..e2fcf7cfd66a1f042ed28607ce674eb60bd1f839 100644
--- a/device-types/Rockwell Automation/5069-L380ERS2.yaml	
+++ b/device-types/Rockwell Automation/5069-L380ERS2.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactGuardLogix 5380 L380ERS2
 part_number: 5069-L380ERS2
-slug: 5069-l380ers2
+slug: rockwell-automation-5069-l380ers2
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L4100ERW.yaml b/device-types/Rockwell Automation/5069-L4100ERW.yaml
index bd5009dc2e9ab3360fbfd57fbe5b04d5748eb2f2..c967a0fab142edfc9fca695b3ce7bebff96738be 100644
--- a/device-types/Rockwell Automation/5069-L4100ERW.yaml	
+++ b/device-types/Rockwell Automation/5069-L4100ERW.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5480 L4100ERMW
 part_number: 5069-L4100ERMW
-slug: 5069-l4100ermw
+slug: rockwell-automation-5069-l4100ermw
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L4200ERW.yaml b/device-types/Rockwell Automation/5069-L4200ERW.yaml
index 395187d4224fd29fdac98d285f05f717e3512fc1..0bc1a08147bdb2e95c6bbd60675da8b242e2d5fe 100644
--- a/device-types/Rockwell Automation/5069-L4200ERW.yaml	
+++ b/device-types/Rockwell Automation/5069-L4200ERW.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5480 L4200ERMW
 part_number: 5069-L4200ERMW
-slug: 5069-l4200ermw
+slug: rockwell-automation-5069-l4200ermw
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L430ERW.yaml b/device-types/Rockwell Automation/5069-L430ERW.yaml
index e90281c05f2b743bf55e1c4ad733db1f49eb6669..b60241d430f8b2b79d2525d2cf8abc7d3c2916f4 100644
--- a/device-types/Rockwell Automation/5069-L430ERW.yaml	
+++ b/device-types/Rockwell Automation/5069-L430ERW.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5480 L430ERMW
 part_number: 5069-L430ERMW
-slug: 5069-l430ermw
+slug: rockwell-automation-5069-l430ermw
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rockwell Automation/5069-L450ERW.yaml b/device-types/Rockwell Automation/5069-L450ERW.yaml
index 40e6c057cc66a9aafd8c3c29eb41719e57374402..9a74382a5018008bbda2bf74c43e9cdaec5ed14d 100644
--- a/device-types/Rockwell Automation/5069-L450ERW.yaml	
+++ b/device-types/Rockwell Automation/5069-L450ERW.yaml	
@@ -2,7 +2,7 @@
 manufacturer: Rockwell Automation
 model: CompactLogix 5480 L450ERMW
 part_number: 5069-L450ERMW
-slug: 5069-l450ermw
+slug: rockwell-automation-5069-l450ermw
 u_height: 3
 is_full_depth: false
 interfaces:
diff --git a/device-types/Rohde & Schwarz/SITLine-ETH-40G.yaml b/device-types/Rohde & Schwarz/SITLine-ETH-40G.yaml
index 8f3172bffa07c696f581a7049ef69047596202ea..b91c31d3225764953b56bac65ef002599db13ef5 100644
--- a/device-types/Rohde & Schwarz/SITLine-ETH-40G.yaml	
+++ b/device-types/Rohde & Schwarz/SITLine-ETH-40G.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Rohde & Schwarz
 model: SITLine ETH40G
-slug: sitline-eth40g
+slug: rohde-and-schwarz-sitline-eth40g
 part_number: 5414.6130.02
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Rohde & Schwarz/SITLine-ETH-4G.yaml b/device-types/Rohde & Schwarz/SITLine-ETH-4G.yaml
index 7c5b3d27f7b44ea2cb5429db79adde88cd7fc969..8646f1eab89cd3d0c8646d26b736fbd151e66546 100644
--- a/device-types/Rohde & Schwarz/SITLine-ETH-4G.yaml	
+++ b/device-types/Rohde & Schwarz/SITLine-ETH-4G.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Rohde & Schwarz
 model: SITLine ETH4G
-slug: sitline-eth4g
+slug: rohde-and-schwarz-sitline-eth4g
 part_number: 5414.7766.02
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Rohde & Schwarz/SITLine-ETH-L 10G.yaml b/device-types/Rohde & Schwarz/SITLine-ETH-L 10G.yaml
index c2f00aa9b6f5edf82eabf9edf67c4bb4f755e8a9..85bb5efeb31f46cb0a14bd4616f7bfba43563364 100644
--- a/device-types/Rohde & Schwarz/SITLine-ETH-L 10G.yaml	
+++ b/device-types/Rohde & Schwarz/SITLine-ETH-L 10G.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Rohde & Schwarz
 model: SITLine ETH-L 10G
-slug: sitline-eth-l-10g
+slug: rohde-and-schwarz-sitline-eth-l-10g
 part_number: 5414.6282.23
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Rohde & Schwarz/SITLine-ETH-L 40G.yaml b/device-types/Rohde & Schwarz/SITLine-ETH-L 40G.yaml
index f29e74fbe77cf016727253a16e1418458e6677a9..c53f7497fa8a5b83bfa08355a71e71f3dfed7919 100644
--- a/device-types/Rohde & Schwarz/SITLine-ETH-L 40G.yaml	
+++ b/device-types/Rohde & Schwarz/SITLine-ETH-L 40G.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Rohde & Schwarz
 model: SITLine ETH-L 4x10G
-slug: sitline-eth-l-4x10g
+slug: rohde-and-schwarz-sitline-eth-l-4x10g
 part_number: 5414.6282.24
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Rohde & Schwarz/SITLine-ETH-L 4G.yaml b/device-types/Rohde & Schwarz/SITLine-ETH-L 4G.yaml
index 97180d3d2dfb295c98445a2ebdfd9b8a7a9159ba..83b03f3ea3ef3e5b2f3c0103615149098b951942 100644
--- a/device-types/Rohde & Schwarz/SITLine-ETH-L 4G.yaml	
+++ b/device-types/Rohde & Schwarz/SITLine-ETH-L 4G.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Rohde & Schwarz
 model: SITLine ETH-L 4x1G
-slug: sitline-eth-l-4x1g
+slug: rohde-and-schwarz-sitline-eth-l-4x1g
 part_number: 5414.6282.25
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Rohde & Schwarz/SITLine-ETH-S 10G.yaml b/device-types/Rohde & Schwarz/SITLine-ETH-S 10G.yaml
index f8006b98c93248d607bb04d5097de77f2352fb71..c87b5c5a9804536630244b467cd401df4f32fca0 100644
--- a/device-types/Rohde & Schwarz/SITLine-ETH-S 10G.yaml	
+++ b/device-types/Rohde & Schwarz/SITLine-ETH-S 10G.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Rohde & Schwarz
 model: SITLine ETH-S 10G
-slug: sitline-eth-s-10g
+slug: rohde-and-schwarz-sitline-eth-s-10g
 part_number: 5414.6260.23
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Rohde & Schwarz/SITLine-ETH-S 1G.yaml b/device-types/Rohde & Schwarz/SITLine-ETH-S 1G.yaml
index cdc762370f6a682a0b0f820620e8903d9d500393..c3f818ff7713daf8028c9746484bbb2bb8d52be0 100644
--- a/device-types/Rohde & Schwarz/SITLine-ETH-S 1G.yaml	
+++ b/device-types/Rohde & Schwarz/SITLine-ETH-S 1G.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Rohde & Schwarz
 model: SITLine ETH-S 1G
-slug: sitline-eth-s-1g
+slug: rohde-and-schwarz-sitline-eth-s-1g
 part_number: 5414.6260.22
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Rohde & Schwarz/TrustedVPN-L VS-NfD.yaml b/device-types/Rohde & Schwarz/TrustedVPN-L VS-NfD.yaml
index 9088b56084246b1938d513319a0ea57f452819b5..68b5102933d7c700c08d8109e695f63b6582f14b 100644
--- a/device-types/Rohde & Schwarz/TrustedVPN-L VS-NfD.yaml	
+++ b/device-types/Rohde & Schwarz/TrustedVPN-L VS-NfD.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Rohde & Schwarz
 model: TrustedVPN-L VS-NfD
-slug: trustedvpn-l-vsnfd
+slug: rohde-and-schwarz-trustedvpn-l-vs-nfd
 part_number: 3630.1751.13
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Rohde & Schwarz/TrustedVPN-L.yaml b/device-types/Rohde & Schwarz/TrustedVPN-L.yaml
index 758285aad1ba46ae6401aae33fffb3c5eb0130d9..68cf604c76451bb40b1309b15f0a87f0e136f3ac 100644
--- a/device-types/Rohde & Schwarz/TrustedVPN-L.yaml	
+++ b/device-types/Rohde & Schwarz/TrustedVPN-L.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Rohde & Schwarz
 model: TrustedVPN-L
-slug: trustedvpn-l
+slug: rohde-and-schwarz-trustedvpn-l
 part_number: 3630.1751.02
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Rohde & Schwarz/TrustedVPN-XL.yaml b/device-types/Rohde & Schwarz/TrustedVPN-XL.yaml
index de8f46b0aff8afb500ecff4b5ef12a95f32b4958..faa532ca60e1ecf527f11d9517c5868e7dd12b17 100644
--- a/device-types/Rohde & Schwarz/TrustedVPN-XL.yaml	
+++ b/device-types/Rohde & Schwarz/TrustedVPN-XL.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Rohde & Schwarz
 model: TrustedVPN-XL
-slug: trustedvpn-xl
+slug: rohde-and-schwarz-trustedvpn-xl
 part_number: 3630.1768.02
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ruckus/icx-7150-48p-4x10g.yaml b/device-types/Ruckus/icx-7150-48p-4x10g.yaml
index 011ad74304d422ef3cd466fa4d91f1bab4a5d5bb..81fc667c7821f25fedd64dc779110d39a7db0fd3 100644
--- a/device-types/Ruckus/icx-7150-48p-4x10g.yaml
+++ b/device-types/Ruckus/icx-7150-48p-4x10g.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ruckus
 model: ICX 7150-48P-4x10G
-slug: icx-7150-48p-4x10g
+slug: ruckus-icx-7150-48p-4x10g
 part_number: ICX-7150-48P-4x10G
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Ruckus/icx7150-24-2x10g.yaml b/device-types/Ruckus/icx7150-24-2x10g.yaml
index b3c318fda91908f1961f5c37c897e39f6807da80..d53117dd4cb4990cfd61f7937fb402d30efcb9e8 100644
--- a/device-types/Ruckus/icx7150-24-2x10g.yaml
+++ b/device-types/Ruckus/icx7150-24-2x10g.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ruckus
 model: ICX 7150-24-2x10G
-slug: icx7150-24-2x10g
+slug: ruckus-icx7150-24-2x10g
 part_number: ICX7150-24-2x10G
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Ruckus/icx7150-48pf-2x10g.yaml b/device-types/Ruckus/icx7150-48pf-2x10g.yaml
index c6e6f69b5b25bba2cc6a656180975f821ff428e4..7f33ca67be5867a26d640e06033c0a84b03a8a40 100644
--- a/device-types/Ruckus/icx7150-48pf-2x10g.yaml
+++ b/device-types/Ruckus/icx7150-48pf-2x10g.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ruckus
 model: ICX 7150-48PF-2x10G
-slug: icx7150-48pf-2x10g
+slug: ruckus-icx7150-48pf-2x10g
 part_number: ICX7150-48PF-2x10G
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Ruckus/icx7150-48zp-8x10g.yaml b/device-types/Ruckus/icx7150-48zp-8x10g.yaml
index 6deaf24490df6875e89868c50e46afbd30efb7a7..322f1690c2254b5c4506797d6e0760f9c7bc429c 100644
--- a/device-types/Ruckus/icx7150-48zp-8x10g.yaml
+++ b/device-types/Ruckus/icx7150-48zp-8x10g.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ruckus
 model: ICX 7150-48ZP-8x10G
-slug: icx7150-48zp-8x10g
+slug: ruckus-icx7150-48zp-8x10g
 part_number: ICX7150-48ZP-8x10G
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Ruckus/icx7150-c12p-2x10gr.yaml b/device-types/Ruckus/icx7150-c12p-2x10gr.yaml
index 24d5a0c71321bad7a8433ba5bd7786dbc442a8b3..7dbe79579c1077ece740a2df08f087a63294682a 100644
--- a/device-types/Ruckus/icx7150-c12p-2x10gr.yaml
+++ b/device-types/Ruckus/icx7150-c12p-2x10gr.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ruckus
 model: ICX 7150-C12P-2x10GR
-slug: icx7150-c12p-2x10gr
+slug: ruckus-icx7150-c12p-2x10gr
 part_number: ICX7150-C12P-2x10GR
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Solid Optics/SO-CHASSIS-MOD4.yml b/device-types/Solid Optics/SO-CHASSIS-MOD4.yml
index d43e4848e2dd010492a6545ee986e1aae5207613..606d7b497a56049e723f33007a283dbc41c6a270 100644
--- a/device-types/Solid Optics/SO-CHASSIS-MOD4.yml	
+++ b/device-types/Solid Optics/SO-CHASSIS-MOD4.yml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Solid Optics
 model: SO-CHASSIS-MOD4
-slug: so-chassis-mod4
+slug: solid-optics-so-chassis-mod4
 u_height: 1
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/Solid Optics/SO-DWDM-MUX-8CH-UPG.yaml b/device-types/Solid Optics/SO-DWDM-MUX-8CH-UPG.yaml
index c7ca5e86b8e56eff911c398c5df473e00857dc8d..4347f739f0a81b747948c898e04ccf2a31bf153a 100644
--- a/device-types/Solid Optics/SO-DWDM-MUX-8CH-UPG.yaml	
+++ b/device-types/Solid Optics/SO-DWDM-MUX-8CH-UPG.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Solid Optics
 model: SO-DWDM-MUX-8CH+UPG
-slug: so-dwdm-mux-8chupg
+slug: solid-optics-so-dwdm-mux-8ch-plus-upg
 u_height: 1
 is_full_depth: false
 front-ports:
diff --git a/device-types/Solid Optics/SO-DWDM-MUX-CH20-35-UPG-MON.yaml b/device-types/Solid Optics/SO-DWDM-MUX-CH20-35-UPG-MON.yaml
index e6d93161609784686b4f2bc2b6c36c14c7fec18b..3ebe4d100e1a17143a7f0479dfa2b8dfe71a3d7c 100644
--- a/device-types/Solid Optics/SO-DWDM-MUX-CH20-35-UPG-MON.yaml	
+++ b/device-types/Solid Optics/SO-DWDM-MUX-CH20-35-UPG-MON.yaml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Solid Optics
 model: SO-DWDM-MUX-CH20-35+UPG+MON
-slug: so-dwdm-mux-ch20-35upgmon
+slug: solid-optics-so-dwdm-mux-ch20-35-plus-upg-plus-mon
 u_height: 1
 is_full_depth: false
 front-ports:
diff --git a/device-types/Solid Optics/SO-MOD4-3xMPO-MMF-24xLC.yml b/device-types/Solid Optics/SO-MOD4-3xMPO-MMF-24xLC.yml
index 3e46425db78bc3d9375ac63b814dc276e94a03f6..2b7dc87a669d48ebc7d976a6f044931dd9ba8dc7 100644
--- a/device-types/Solid Optics/SO-MOD4-3xMPO-MMF-24xLC.yml	
+++ b/device-types/Solid Optics/SO-MOD4-3xMPO-MMF-24xLC.yml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Solid Optics
 model: SO-MOD4-3xMPO/MMF-24xLC
-slug: so-mod4-3xmpommf-24xlc
+slug: solid-optics-so-mod4-3xmpo-mmf-24xlc
 u_height: 0
 is_full_depth: false
 subdevice_role: child
diff --git a/device-types/SonicWall/NSa2650.yaml b/device-types/SonicWall/NSa2650.yaml
index 6013c6aff39157658adf0f328512670993b0c11e..f9cd225b5263f1113457397111247eb2882baa4b 100644
--- a/device-types/SonicWall/NSa2650.yaml
+++ b/device-types/SonicWall/NSa2650.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: NSa 2650
-slug: nsa-2650
+slug: sonicwall-nsa-2650
 part_number: NSA2650
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/NSa2700.yaml b/device-types/SonicWall/NSa2700.yaml
index 62ccde55972ee9b3a638874503018e8da302990b..dd5a59cb4c4b49d0420ecc89c0dadf84455858bc 100644
--- a/device-types/SonicWall/NSa2700.yaml
+++ b/device-types/SonicWall/NSa2700.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: NSa 2700
-slug: nsa-2700
+slug: sonicwall-nsa-2700
 part_number: NSA2700
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/NSa3650.yaml b/device-types/SonicWall/NSa3650.yaml
index 640d8c29359304807b2d1f03c72dfc6a1c29f5f9..56265fa2698cc421c86ff4b5f2fbea7ca75daf75 100644
--- a/device-types/SonicWall/NSa3650.yaml
+++ b/device-types/SonicWall/NSa3650.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: NSa 3650
-slug: nsa-3650
+slug: sonicwall-nsa-3650
 part_number: NSA3650
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/NSa3700.yaml b/device-types/SonicWall/NSa3700.yaml
index db9c689c370af9b00f847cc5234058c715292e1b..fea8acea3c5b5bf47d0b83f96e9bbe787286dce2 100644
--- a/device-types/SonicWall/NSa3700.yaml
+++ b/device-types/SonicWall/NSa3700.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: NSa 3700
-slug: nsa-3700
+slug: sonicwall-nsa-3700
 part_number: NSA3700
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/NSa4650.yaml b/device-types/SonicWall/NSa4650.yaml
index e14bd14544d78a4e6671dc4864e698313c2063f5..0d015d97723ab6b4af6b3b77aceba4b3180c4537 100644
--- a/device-types/SonicWall/NSa4650.yaml
+++ b/device-types/SonicWall/NSa4650.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: NSa 4650
-slug: nsa-4650
+slug: sonicwall-nsa-4650
 part_number: NSA4650
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/NSa4700.yaml b/device-types/SonicWall/NSa4700.yaml
index 426a4f542de510833ee5242eef4dc53deb2bbdd3..605b16a670047a95a7b64c4ab5528870a7af2026 100644
--- a/device-types/SonicWall/NSa4700.yaml
+++ b/device-types/SonicWall/NSa4700.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: NSa 4700
-slug: nsa-4700
+slug: sonicwall-nsa-4700
 part_number: NSA4700
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/NSa5650.yaml b/device-types/SonicWall/NSa5650.yaml
index b79bb7880597f3571d9b6792325aa2591a9dc2ef..8d03ef94fc8afe87c40360265629f2d9de723317 100644
--- a/device-types/SonicWall/NSa5650.yaml
+++ b/device-types/SonicWall/NSa5650.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: NSa 5650
-slug: nsa-5650
+slug: sonicwall-nsa-5650
 part_number: NSA5650
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/NSa5700.yaml b/device-types/SonicWall/NSa5700.yaml
index bc15cbf1a65cb2662e58d96d8b2c7cc8ff39d483..5cf7189037f6d56eee485d9251afe3b59ef89b83 100644
--- a/device-types/SonicWall/NSa5700.yaml
+++ b/device-types/SonicWall/NSa5700.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: NSa 5700
-slug: nsa-5700
+slug: sonicwall-nsa-5700
 part_number: NSA5700
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/NSa6700.yaml b/device-types/SonicWall/NSa6700.yaml
index 35b04161c4db956b5905089c7461b3b93581adb0..5f7f38420d02f2263723b2fd07a1787a6a50615b 100644
--- a/device-types/SonicWall/NSa6700.yaml
+++ b/device-types/SonicWall/NSa6700.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: NSa 6700
-slug: nsa-6700
+slug: sonicwall-nsa-6700
 part_number: NSA6700
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/NSsp13700.yaml b/device-types/SonicWall/NSsp13700.yaml
index 678d9bec8a669a1a969a20b44b4f9fcb79966aea..ef40b1fc94b927fc48d2391822df7b975ecf0202 100644
--- a/device-types/SonicWall/NSsp13700.yaml
+++ b/device-types/SonicWall/NSsp13700.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: NSsp 13700
-slug: nssp-13700
+slug: sonicwall-nssp-13700
 part_number: NSSP13700
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/NSsp15700.yaml b/device-types/SonicWall/NSsp15700.yaml
index 42ea9e19392c519d51de3ff7b78b32cb0f1b5ada..8feaeca64052714899557129edc117cfcab54258 100644
--- a/device-types/SonicWall/NSsp15700.yaml
+++ b/device-types/SonicWall/NSsp15700.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: NSsp 15700
-slug: nssp-15700
+slug: sonicwall-nssp-15700
 part_number: NSSP15700
 u_height: 2
 is_full_depth: true
diff --git a/device-types/SonicWall/SOHO.yaml b/device-types/SonicWall/SOHO.yaml
index 290e867603d3e733703a86ef466dcd85cfb43c3a..928944b983e48f23175cc13a9d69e41f49f35b5c 100644
--- a/device-types/SonicWall/SOHO.yaml
+++ b/device-types/SonicWall/SOHO.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: SOHO
-slug: soho
+slug: sonicwall-soho
 part_number: SOHO
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/SOHOW.yaml b/device-types/SonicWall/SOHOW.yaml
index c8c1866b3b2d0f13c376f467335510d30211ef7a..5fb66ce996665c635dfbcb2d4964a2e3e48bd0f6 100644
--- a/device-types/SonicWall/SOHOW.yaml
+++ b/device-types/SonicWall/SOHOW.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: SOHOW
-slug: sohow
+slug: sonicwall-sohow
 part_number: SOHOW
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ250.yaml b/device-types/SonicWall/TZ250.yaml
index 9dbcfca3410992bfa69db688c8538b99dd543181..314183ae694ae6d88a5e4028facc7b458145f659 100644
--- a/device-types/SonicWall/TZ250.yaml
+++ b/device-types/SonicWall/TZ250.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ250
-slug: tz250
+slug: sonicwall-tz250
 part_number: TZ250
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ250W.yaml b/device-types/SonicWall/TZ250W.yaml
index eaee1d6a9a78ae61a07d61eebf824ddaf9143497..c73dd2dfb93d80c5f67d040c69964d614b583e50 100644
--- a/device-types/SonicWall/TZ250W.yaml
+++ b/device-types/SonicWall/TZ250W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ250W
-slug: tz250w
+slug: sonicwall-tz250w
 part_number: TZ250W
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ270.yaml b/device-types/SonicWall/TZ270.yaml
index dabe4b8e6db6659626adcdf7a93676d7b45cbd56..d18ff9d7a7043745c3592b9cbef900c7249d7899 100644
--- a/device-types/SonicWall/TZ270.yaml
+++ b/device-types/SonicWall/TZ270.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ270
-slug: tz270
+slug: sonicwall-tz270
 part_number: TZ270
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ270W.yaml b/device-types/SonicWall/TZ270W.yaml
index 0c11b0507e5ade69ae97fd2cb4469902a0d0889b..ccbc107c9998566b692b23246b7fcd78378cdc70 100644
--- a/device-types/SonicWall/TZ270W.yaml
+++ b/device-types/SonicWall/TZ270W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ270W
-slug: tz270w
+slug: sonicwall-tz270w
 part_number: TZ270W
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ300.yaml b/device-types/SonicWall/TZ300.yaml
index 45dab7b862fef3da0de6a0708620c35bfa9b2756..f848e09bdaccf5ace1cc46d86b12e3dbdd06c939 100644
--- a/device-types/SonicWall/TZ300.yaml
+++ b/device-types/SonicWall/TZ300.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ300
-slug: tz300
+slug: sonicwall-tz300
 part_number: TZ300
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ300P.yaml b/device-types/SonicWall/TZ300P.yaml
index b112ae4f5ebe267fcb64a055c960eb35412cbe73..0810fd27db1599dd9630dce3075217ec8942a49f 100644
--- a/device-types/SonicWall/TZ300P.yaml
+++ b/device-types/SonicWall/TZ300P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ300P
-slug: tz300p
+slug: sonicwall-tz300p
 part_number: TZ300P
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ300W.yaml b/device-types/SonicWall/TZ300W.yaml
index 4fbac7f52c4fb55e33b595ef6b0be92863caa519..c722c4cce552e9653a13f4e701a7f14c74a8ec5c 100644
--- a/device-types/SonicWall/TZ300W.yaml
+++ b/device-types/SonicWall/TZ300W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ300W
-slug: tz300w
+slug: sonicwall-tz300w
 part_number: TZ300W
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ350.yaml b/device-types/SonicWall/TZ350.yaml
index c5a74c1a508221d08d54a4d32d20053709cf1eb9..5075de54dd87f0e437307fd2ed4a6d1c9e415347 100644
--- a/device-types/SonicWall/TZ350.yaml
+++ b/device-types/SonicWall/TZ350.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ350
-slug: tz350
+slug: sonicwall-tz350
 part_number: TZ350
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ350W.yaml b/device-types/SonicWall/TZ350W.yaml
index 3046db30294112bdac2b9132b9c3d598e728dc6f..bb575e63f7c3baa483f3d6928822adbc1b22d41b 100644
--- a/device-types/SonicWall/TZ350W.yaml
+++ b/device-types/SonicWall/TZ350W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ350W
-slug: tz350w
+slug: sonicwall-tz350w
 part_number: TZ350W
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ370.yaml b/device-types/SonicWall/TZ370.yaml
index e88311d06e5489a380628e3ac535310a88680719..34f14337b230048d1c59f5e6152a0e564e889abf 100644
--- a/device-types/SonicWall/TZ370.yaml
+++ b/device-types/SonicWall/TZ370.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ370
-slug: tz370
+slug: sonicwall-tz370
 part_number: TZ370
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ370W.yaml b/device-types/SonicWall/TZ370W.yaml
index 52d298bb4d19eeeaf588d18e04abe89c17030ad8..5cc0f05b0500ff3c93938297134ce4ff8b922b41 100644
--- a/device-types/SonicWall/TZ370W.yaml
+++ b/device-types/SonicWall/TZ370W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ370W
-slug: tz370w
+slug: sonicwall-tz370w
 part_number: TZ370W
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ400.yaml b/device-types/SonicWall/TZ400.yaml
index bd00e72b06608a3dbd29f50ec63330573f6e93f2..07720bfc11c6cd424fb5326548b1ab425892e6df 100644
--- a/device-types/SonicWall/TZ400.yaml
+++ b/device-types/SonicWall/TZ400.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ400
-slug: tz400
+slug: sonicwall-tz400
 part_number: TZ400
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ400W.yaml b/device-types/SonicWall/TZ400W.yaml
index 3ddfbd277e046bd4df04b289f4ffce4ff1fa2b9e..24793c5bda00175cbb0288246fb76646d536ffb7 100644
--- a/device-types/SonicWall/TZ400W.yaml
+++ b/device-types/SonicWall/TZ400W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ400W
-slug: tz400w
+slug: sonicwall-tz400w
 part_number: TZ400W
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ470.yaml b/device-types/SonicWall/TZ470.yaml
index 3fcda6d2450566fcabd2fb4d25131931deeff6f6..d700508b3f7e2b149d1981fb60591f1f83bd7081 100644
--- a/device-types/SonicWall/TZ470.yaml
+++ b/device-types/SonicWall/TZ470.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ470
-slug: tz470
+slug: sonicwall-tz470
 part_number: TZ470
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ470W.yaml b/device-types/SonicWall/TZ470W.yaml
index 633032e19a56cd7a01e2e24aaa7a5bd1978c6b6a..c700233f1013278f50b0021c55fbcac8c2bca5c0 100644
--- a/device-types/SonicWall/TZ470W.yaml
+++ b/device-types/SonicWall/TZ470W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ470W
-slug: tz470w
+slug: sonicwall-tz470w
 part_number: TZ470W
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ500.yaml b/device-types/SonicWall/TZ500.yaml
index c78165cdfd7d13e297adab4c366bb26b86f17cc3..925370cbfd9a9983ee6ec5e3faf1e8cf4544c893 100644
--- a/device-types/SonicWall/TZ500.yaml
+++ b/device-types/SonicWall/TZ500.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ500
-slug: tz500
+slug: sonicwall-tz500
 part_number: TZ500
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ500W.yaml b/device-types/SonicWall/TZ500W.yaml
index c377fdc9096669c3d712f50e39c552eb8cc8a2a0..65245720d3645dde8a6a4913d0551a06a14cb30f 100644
--- a/device-types/SonicWall/TZ500W.yaml
+++ b/device-types/SonicWall/TZ500W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ500W
-slug: tz500w
+slug: sonicwall-tz500w
 part_number: TZ500W
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ570.yaml b/device-types/SonicWall/TZ570.yaml
index d51ef50f134c81fb9ca14f6953f5aa5e4acbbe10..337487b9a5836909d4c7b41c2e39d594100507bf 100644
--- a/device-types/SonicWall/TZ570.yaml
+++ b/device-types/SonicWall/TZ570.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ570
-slug: tz570
+slug: sonicwall-tz570
 part_number: TZ570
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ570P.yaml b/device-types/SonicWall/TZ570P.yaml
index 46f2f69cd4bc0867decc60c563fe53bde1a26ace..0616a6f5e48f59a0c8c6bcde2898e4e54649fb30 100644
--- a/device-types/SonicWall/TZ570P.yaml
+++ b/device-types/SonicWall/TZ570P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ570P
-slug: tz570p
+slug: sonicwall-tz570p
 part_number: TZ570P
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ570W.yaml b/device-types/SonicWall/TZ570W.yaml
index 71b9c76c1567ddfaba6b2b13e0716a2959fc8003..9f7120f3401e4fed31b6203340e5d639e757bb61 100644
--- a/device-types/SonicWall/TZ570W.yaml
+++ b/device-types/SonicWall/TZ570W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ570W
-slug: tz570w
+slug: sonicwall-tz570w
 part_number: TZ570W
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ600.yaml b/device-types/SonicWall/TZ600.yaml
index 8b7e911fd171df6b5a0a6a24f048c189755553bb..9dcf1e991b9cf8dc18d502990d2f0baa83149e6e 100644
--- a/device-types/SonicWall/TZ600.yaml
+++ b/device-types/SonicWall/TZ600.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ600
-slug: tz600
+slug: sonicwall-tz600
 part_number: TZ600
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ600P.yaml b/device-types/SonicWall/TZ600P.yaml
index 1ff46707791e6137299d1a1efc3b88b572728d40..bd1069e7e3177c03d0ec217caf3338b8c8e77c05 100644
--- a/device-types/SonicWall/TZ600P.yaml
+++ b/device-types/SonicWall/TZ600P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ600P
-slug: tz600p
+slug: sonicwall-tz600p
 part_number: TZ600P
 u_height: 1
 is_full_depth: false
diff --git a/device-types/SonicWall/TZ670.yaml b/device-types/SonicWall/TZ670.yaml
index a7f2535b9f0b2dceb99cf538a74b3717517c4680..5c9dbaed712b369521ff8654abf8774b1e5e7473 100644
--- a/device-types/SonicWall/TZ670.yaml
+++ b/device-types/SonicWall/TZ670.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: SonicWall
 model: TZ670
-slug: tz670
+slug: sonicwall-tz670
 part_number: TZ670
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Sophos/XG-650.yaml b/device-types/Sophos/XG-650.yaml
index e27d62a71922b675afe0eb104a6c7735e2ae42ba..ae90fd1023758f16e237c9407cb3c08d3442ddca 100644
--- a/device-types/Sophos/XG-650.yaml
+++ b/device-types/Sophos/XG-650.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Sophos
 model: XG 650
-slug: xg-650
+slug: sophos-xg-650
 u_height: 2
 is_full_depth: true
 subdevice_role: parent
diff --git a/device-types/Supermicro/AS-1114S-WN10RT.yml b/device-types/Supermicro/AS-1114S-WN10RT.yml
index d1c713d898ed2f737808afe91ea3e865f487525c..031f23bf97fd636f3de16e68237872f33375bc6b 100644
--- a/device-types/Supermicro/AS-1114S-WN10RT.yml
+++ b/device-types/Supermicro/AS-1114S-WN10RT.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Supermicro
 model: AS-1114S-WN10RT
-slug: as-1114s-wn10rt
+slug: supermicro-as-1114s-wn10rt
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/Supermicro/AS-1123US-TR4.yml b/device-types/Supermicro/AS-1123US-TR4.yml
index 3d7b8c9768f325c7d90cb94f38e549346e261c2a..a367b01f40589d12bb77971362941088aff1b2c5 100644
--- a/device-types/Supermicro/AS-1123US-TR4.yml
+++ b/device-types/Supermicro/AS-1123US-TR4.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Supermicro
 model: AS-1123US-TR4
-slug: as-1123us-tr4
+slug: supermicro-as-1123us-tr4
 u_height: 1
 is_full_depth: true
 console-ports:
diff --git a/device-types/Supermicro/SYS-1019P-WTR.yaml b/device-types/Supermicro/SYS-1019P-WTR.yaml
index b80851a12a4b1400849ccc45156cde6c02a6a5ca..6462ea27401f98e02e157aa3b882d3ebd78310b3 100644
--- a/device-types/Supermicro/SYS-1019P-WTR.yaml
+++ b/device-types/Supermicro/SYS-1019P-WTR.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Supermicro
 model: SYS-1019P-WTR
-slug: sys-1019-wtr
+slug: supermicro-sys-1019p-wtr
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
diff --git a/device-types/Supermicro/SYS-2028U-E1CNR4T.yml b/device-types/Supermicro/SYS-2028U-E1CNR4T.yml
index 15bedccd6ff5ef3dd1508f5a1bea0469091dd959..72330e6f51fe9111ac26537d61daf15d663c334d 100644
--- a/device-types/Supermicro/SYS-2028U-E1CNR4T.yml
+++ b/device-types/Supermicro/SYS-2028U-E1CNR4T.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Supermicro
 model: SYS-2028U-E1CNR4T+
-slug: sys-2028u-e1cnr4tplus
+slug: supermicro-sys-2028u-e1cnr4t-plus
 u_height: 2
 is_full_depth: true
 console-ports:
diff --git a/device-types/Synology/DS1522+.yaml b/device-types/Synology/DS1522+.yaml
index e414ff9fe36ff94ffb45ad35b6049c1914a285c1..ad5e856113a4249bca261f187b82ed3ccc5246ba 100644
--- a/device-types/Synology/DS1522+.yaml
+++ b/device-types/Synology/DS1522+.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Synology
 model: DS1522+
-slug: ds1522plus
+slug: synology-ds1522-plus
 part_number: DS1522+
 u_height: 4
 comments: '[Synology DS1522+ Specs](https://www.synology.com/en-us/products/DS1522+#specs)'
diff --git a/device-types/Synology/DS1618+.yaml b/device-types/Synology/DS1618+.yaml
index a9eb3951ccb20d9a1618689901bc9678c890c797..3d19cb91693d67becc24728ad1d3ed6a0741c8da 100644
--- a/device-types/Synology/DS1618+.yaml
+++ b/device-types/Synology/DS1618+.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Synology
 model: DS1618+
-slug: ds1628plus
+slug: synology-ds1618-plus
 part_number: DS1618+
 u_height: 4
 is_full_depth: false
diff --git a/device-types/Synology/DS1817+.yaml b/device-types/Synology/DS1817+.yaml
index ecaa41e32580261a5b8f1b01b72d8949f4e148d6..13d9a5d0159844a93ee0c8a62e0ef5f74b0f322a 100644
--- a/device-types/Synology/DS1817+.yaml
+++ b/device-types/Synology/DS1817+.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Synology
 model: DS1817+
-slug: ds1817plus
+slug: synology-ds1817-plus
 part_number: DS1817+
 u_height: 4
 is_full_depth: false
diff --git a/device-types/Synology/DS220+.yaml b/device-types/Synology/DS220+.yaml
index 2bfee8693c87c263f7ab8ab3a2de7f06204e1c9f..b6b53dcc8f30dc48445867a00f92456b6bcabd4e 100644
--- a/device-types/Synology/DS220+.yaml
+++ b/device-types/Synology/DS220+.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Synology
 model: DS220+
-slug: ds220plus
+slug: synology-ds220-plus
 part_number: DS220+
 u_height: 4
 comments: '[Synology DS220+ Specs](https://www.synology.com/en-us/products/DS220+#specs)'
diff --git a/device-types/Synology/DS418.yaml b/device-types/Synology/DS418.yaml
index 5dad582d149d46cbb1ab4bb44bcc9808e45edf9f..9ea6c3d070846bf7c46ff5c9b57896717e4e4116 100644
--- a/device-types/Synology/DS418.yaml
+++ b/device-types/Synology/DS418.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Synology
 model: DS418
-slug: ds418
+slug: synology-ds418
 part_number: DS418
 u_height: 4
 comments: '[Synology DS418 Specs](https://www.synology.com/en-us/products/DS418#specs)'
diff --git a/device-types/Synology/DS920+.yaml b/device-types/Synology/DS920+.yaml
index 301d687b2058325c10526a8b1128e426774bc1b2..40bad80e11b16a2b082c3d422b4938b68236f468 100644
--- a/device-types/Synology/DS920+.yaml
+++ b/device-types/Synology/DS920+.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Synology
 model: DS920+
-slug: ds920plus
+slug: synology-ds920-plus
 part_number: DS920+
 u_height: 4
 comments: '[Synology DS920+ Specs](https://www.synology.com/de-de/products/DS920+#specs)'
diff --git a/device-types/Synology/RS1219plus.yaml b/device-types/Synology/RS1219plus.yaml
index a9995a6731bf2e851ff44f05f9f9861092aa238e..8fd92dcf18bd7fb7ab7597fe1d3b783d1a8c6731 100644
--- a/device-types/Synology/RS1219plus.yaml
+++ b/device-types/Synology/RS1219plus.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Synology
 model: RS1219+
-slug: rs1219plus
+slug: synology-rs1219-plus
 part_number: RS1219+
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Synology/RS1221plus.yaml b/device-types/Synology/RS1221plus.yaml
index 451e881e7ac8cb6ce6267bb594d2a0b7903932e7..3b5af68496b4ea539703758ded524a867d1fdc1b 100644
--- a/device-types/Synology/RS1221plus.yaml
+++ b/device-types/Synology/RS1221plus.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Synology
 model: RS1221+
-slug: rs1221plus
+slug: synology-rs1221-plus
 part_number: RS1221+
 u_height: 2
 is_full_depth: true
diff --git a/device-types/Synology/RS1619xs+.yaml b/device-types/Synology/RS1619xs+.yaml
index 1a7bb0c9f41c215077175c07d7ef848b055ef4b2..c4e4eaacbde25f3a84284980def913dc32d7d5f2 100644
--- a/device-types/Synology/RS1619xs+.yaml
+++ b/device-types/Synology/RS1619xs+.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Synology
 model: RS1619xs+
-slug: rs1219xsplus
+slug: synology-rs1619xs-plus
 part_number: RS1619xs+
 u_height: 1
 is_full_depth: true
diff --git a/device-types/Synology/ds1821+.yaml b/device-types/Synology/ds1821+.yaml
index 13f8fc2dcd7a2908b4515e04525aff15184d3754..312df6618efb576fab5befb16c314744c3ffa1a7 100644
--- a/device-types/Synology/ds1821+.yaml
+++ b/device-types/Synology/ds1821+.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Synology
 model: DS1821+
-slug: synology-ds1821plus
+slug: synology-ds1821-plus
 part_number: DS1821+
 u_height: 0
 is_full_depth: false
diff --git a/device-types/TP-Link/T2500G-10TS.yaml b/device-types/TP-Link/T2500G-10TS.yaml
index ca6344921cd2cb76c26a77c8f1bb535182c62ddc..c9eaacc914a109f20e3e3fceb242700dc202932a 100644
--- a/device-types/TP-Link/T2500G-10TS.yaml
+++ b/device-types/TP-Link/T2500G-10TS.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TP-Link
 model: T2500G-10TS
-slug: t2500g-10ts
+slug: tp-link-t2500g-10ts
 part_number: T2500G-10TS
 comments: '[TP-Link T2500G-10TS Datasheet](https://www.tp-link.com/us/business-networking/managed-switch/t2500g-10ts/#specifications)'
 is_full_depth: false
diff --git a/device-types/TP-Link/T2600G-28MPS.yaml b/device-types/TP-Link/T2600G-28MPS.yaml
index dfb24495135f9f8587390a21ba81045ccb15bb26..320bb12a78d2a434e97fb3e2b7f4164cb53b80d1 100644
--- a/device-types/TP-Link/T2600G-28MPS.yaml
+++ b/device-types/TP-Link/T2600G-28MPS.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TP-Link
 model: T2600G-28MPS
-slug: t2600g-28mps
+slug: tp-link-t2600g-28mps
 part_number: T2600G-28MPS
 comments: '[TP-Link T2600G-28MPS Datasheet](https://www.tp-link.com/us/business-networking/poe-switch/t2600g-28mps/#specifications)'
 is_full_depth: false
diff --git a/device-types/TP-Link/T2600G-28TS.yaml b/device-types/TP-Link/T2600G-28TS.yaml
index 728b2d9a24fd52f300394a48484eab02d9269c69..74ee5826eec35c2c2acdb6c5aab3919adee478e0 100644
--- a/device-types/TP-Link/T2600G-28TS.yaml
+++ b/device-types/TP-Link/T2600G-28TS.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TP-Link
 model: T2600G-28TS
-slug: t2600g-28ts
+slug: tp-link-t2600g-28ts
 part_number: T2600G-28TS
 comments: '[TP-Link T2600G-28TS Datasheet](https://www.tp-link.com/us/business-networking/managed-switch/t2600g-28ts/#specifications)'
 is_full_depth: false
diff --git a/device-types/TP-Link/TL-SG1005D.yaml b/device-types/TP-Link/TL-SG1005D.yaml
index 2d0f471b8b7c98078a80ec962933918dc994ea45..a0a3b78fa06a0b4e1b1d96d93c375b4083c531f8 100644
--- a/device-types/TP-Link/TL-SG1005D.yaml
+++ b/device-types/TP-Link/TL-SG1005D.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TP-Link
 model: TL-SG1005D
-slug: tplink-tl-sg1005d
+slug: tp-link-tl-sg1005d
 part_number: TL-SG105D
 comments: '[TP-Link TL-SG1005D](https://www.tp-link.com/us/home-networking/5-port-switch/tl-sg1005d/#specifications)'
 is_full_depth: false
diff --git a/device-types/TP-Link/TL-SG1024D.yaml b/device-types/TP-Link/TL-SG1024D.yaml
index 3200b2a44fafef7bbb9b17d4db77eda9ea43dcf9..700bea36a3a0dc373bbbecf5fc983d42d0c0f9ca 100644
--- a/device-types/TP-Link/TL-SG1024D.yaml
+++ b/device-types/TP-Link/TL-SG1024D.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TP-Link
 model: TL-SG1024D
-slug: tl-sg1024d
+slug: tp-link-tl-sg1024d
 part_number: TL-SG1024D
 is_full_depth: false
 u_height: 1
diff --git a/device-types/TP-Link/TL-SG105E.yaml b/device-types/TP-Link/TL-SG105E.yaml
index 8d8156bec4d2b3bec7a678e8426690c2b37ab766..e1b3f98b387c9cdb06527d1c9d134caf35d946aa 100644
--- a/device-types/TP-Link/TL-SG105E.yaml
+++ b/device-types/TP-Link/TL-SG105E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TP-Link
 model: TL-SG105E
-slug: tl-sg105e
+slug: tp-link-tl-sg105e
 part_number: TL-SG105E
 comments: '[TP-Link TL-SG105E](https://www.tp-link.com/us/home-networking/5-port-switch/tl-sg105e/#specifications)'
 is_full_depth: false
diff --git a/device-types/TP-Link/TL-SG108E.yaml b/device-types/TP-Link/TL-SG108E.yaml
index e548a48d8b5092b8df1c3dcf6c74bdece0ad6647..a3c8ce6058a0882c2a7e20fc5a3ac00294e07004 100644
--- a/device-types/TP-Link/TL-SG108E.yaml
+++ b/device-types/TP-Link/TL-SG108E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TP-Link
 model: TL-SG108E
-slug: tl-sg108e
+slug: tp-link-tl-sg108e
 part_number: TL-SG108E
 comments: '[TP-Link TL-SG108E](https://www.tp-link.com/us/home-networking/8-port-switch/tl-sg108e/#specifications)'
 is_full_depth: false
diff --git a/device-types/TP-Link/TL-SG3424P.yaml b/device-types/TP-Link/TL-SG3424P.yaml
index ff56a33ac4e48788c45c2a98d843a518f7267249..9759c948f681c36c7f035b95b0979b89100b30a7 100644
--- a/device-types/TP-Link/TL-SG3424P.yaml
+++ b/device-types/TP-Link/TL-SG3424P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TP-Link
 model: TL-SG3424P
-slug: tl-sg3424p
+slug: tp-link-tl-sg3424p
 part_number: TL-SG3424P
 comments: '[TP-Link tl-sg3424p](https://www.tp-link.com/us/business-networking/managed-switch/tl-sg3424p/#specifications)'
 is_full_depth: false
diff --git a/device-types/TP-Link/tl-sg3428mp.yaml b/device-types/TP-Link/tl-sg3428mp.yaml
index 4eab893a5f7aa0acd8fe3e9a3081382bd12fccb9..578133274497b1733ac13ecb9091a960ea81048c 100644
--- a/device-types/TP-Link/tl-sg3428mp.yaml
+++ b/device-types/TP-Link/tl-sg3428mp.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TP-Link
 model: TL-SG3428MP
-slug: tl-sg3428mp
+slug: tp-link-tl-sg3428mp
 part_number: TL-SG3428MP
 comments: '[TP-Link SG3428MP Datasheet](https://www.tp-link.com/es/business-networking/managed-switch/tl-sg3428mp/#specifications)'
 is_full_depth: false
diff --git a/device-types/Testing/Test.yaml b/device-types/Testing/Test.yaml
index 03817e99cd5967759802b5f69cada54809851e65..c2cfb8ecffcc7fc453ce370b859799fd16c21ae0 100644
--- a/device-types/Testing/Test.yaml
+++ b/device-types/Testing/Test.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Generic
 model: TEST-1000
-slug: test-1000
+slug: generic-test-1000
 u_height: 2
 subdevice_role: parent
 console-ports:
diff --git a/device-types/TrendNet/TC-P16C5E.yaml b/device-types/TrendNet/TC-P16C5E.yaml
index 769ac1056e0b1cbec40424a27958a12b4e113fb4..4b12cd349e6debe863e732dce5815c1039e0068f 100644
--- a/device-types/TrendNet/TC-P16C5E.yaml
+++ b/device-types/TrendNet/TC-P16C5E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TrendNet
-model: TC-P165E
-slug: tc_p16c5e
+model: TC-P16C5E
+slug: trendnet-tc-p16c5e
 u_height: 1
 is_full_depth: false
 front-ports:
diff --git a/device-types/TrendNet/TC-P24C5E.yaml b/device-types/TrendNet/TC-P24C5E.yaml
index 26535f4752bd7a58e32f0d2116813fd47962351c..3aa5b7da5ec19d33177dfc13a3db9b1fdf86ebd7 100644
--- a/device-types/TrendNet/TC-P24C5E.yaml
+++ b/device-types/TrendNet/TC-P24C5E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TrendNet
 model: TC-P24C5E
-slug: tc_p24c5e
+slug: trendnet-tc-p24c5e
 u_height: 1
 is_full_depth: false
 front-ports:
diff --git a/device-types/TrendNet/TC-P48C5E.yaml b/device-types/TrendNet/TC-P48C5E.yaml
index 63d106b8632ed050851c6510f1f3e7d5146e915b..fe34c4f86ba924438dfafc16026860487af98608 100644
--- a/device-types/TrendNet/TC-P48C5E.yaml
+++ b/device-types/TrendNet/TC-P48C5E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TrendNet
 model: TC-P48C5E
-slug: tc_p48c5e
+slug: trendnet-tc-p48c5e
 u_height: 2
 is_full_depth: false
 front-ports:
diff --git a/device-types/TrendNet/TE100-S16.yaml b/device-types/TrendNet/TE100-S16.yaml
index 5e5b7da116067b0dc022cc006d86ebbd795e9333..40f939f1ab4c85f66d603b8416e2d2b465c0f56e 100644
--- a/device-types/TrendNet/TE100-S16.yaml
+++ b/device-types/TrendNet/TE100-S16.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TrendNet
 model: TE100-S16
-slug: te100_s16
+slug: trendnet-te100-s16
 u_height: 1
 is_full_depth: false
 power-ports:
diff --git a/device-types/TrendNet/TEG-240WS.yaml b/device-types/TrendNet/TEG-240WS.yaml
index 7ba9bfd01236dcac33a4ff376c891c79a20cea2c..a0d328589d57674c7d770c5cfc298f4415dbf600 100644
--- a/device-types/TrendNet/TEG-240WS.yaml
+++ b/device-types/TrendNet/TEG-240WS.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TrendNet
-model: TEW-240WS
-slug: tew240ws
+model: TEG-240WS
+slug: trendnet-teg-240ws
 u_height: 1
 is_full_depth: false
 power-ports:
diff --git a/device-types/TrendNet/TEG-30284.yaml b/device-types/TrendNet/TEG-30284.yaml
index 6b8c3ef8b201a56353e91293d69197347906dd43..588d6f02773199f081ed715e63ccf3bacee966dc 100644
--- a/device-types/TrendNet/TEG-30284.yaml
+++ b/device-types/TrendNet/TEG-30284.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TrendNet
 model: TEG-30284
-slug: teg30284
+slug: trendnet-teg-30284
 u_height: 1
 is_full_depth: false
 power-ports:
diff --git a/device-types/TrendNet/TEG-S16Dg.yaml b/device-types/TrendNet/TEG-S16Dg.yaml
index e16b44102011875af435621c8e3505cbaa1fa527..bccde62305bd384da1b2e04c0d52526408a61cb4 100644
--- a/device-types/TrendNet/TEG-S16Dg.yaml
+++ b/device-types/TrendNet/TEG-S16Dg.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TrendNet
 model: TEG-S16Dg
-slug: teg_s16dg
+slug: trendnet-teg-s16dg
 u_height: 1
 is_full_depth: false
 power-ports:
diff --git a/device-types/TrendNet/TEG-S224.yaml b/device-types/TrendNet/TEG-S224.yaml
index 50489f47e032a238084c92dbef616daecac46e3e..94e3bd5610021d7fa6943fbf58179b36207c6077 100644
--- a/device-types/TrendNet/TEG-S224.yaml
+++ b/device-types/TrendNet/TEG-S224.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TrendNet
 model: TEG-S224
-slug: teg_s224
+slug: trendnet-teg-s224
 u_height: 1
 is_full_depth: false
 power-ports:
diff --git a/device-types/TrendNet/TEG-S50g.yaml b/device-types/TrendNet/TEG-S50g.yaml
index f33a01981e7ce004e320176fc2b40b64d7d724c0..99077c6a7f66db452d13547b899b313a53bca858 100644
--- a/device-types/TrendNet/TEG-S50g.yaml
+++ b/device-types/TrendNet/TEG-S50g.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TrendNet
 model: TEG-S50g
-slug: teg_s50g
+slug: trendnet-teg-s50g
 u_height: 0
 is_full_depth: false
 power-ports:
diff --git a/device-types/TrendNet/TEW-821DAP.yaml b/device-types/TrendNet/TEW-821DAP.yaml
index 6a5d9e05cb5bd0d9b03d18cf9aefee7e197bdf45..3fc23683821fe162f0645496a218630ef24ddf8f 100644
--- a/device-types/TrendNet/TEW-821DAP.yaml
+++ b/device-types/TrendNet/TEW-821DAP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TrendNet
 model: TEW-821DAP
-slug: tew_821dap
+slug: trendnet-tew-821dap
 u_height: 0
 is_full_depth: false
 power-ports:
diff --git a/device-types/TrendNet/TEW-WLC100.yaml b/device-types/TrendNet/TEW-WLC100.yaml
index 6a94f7fa016594f2ac0cfa1ab778e8f367d83662..f94acff8c036a6bbe01ac68ccf6921babec02499 100644
--- a/device-types/TrendNet/TEW-WLC100.yaml
+++ b/device-types/TrendNet/TEW-WLC100.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TrendNet
 model: TEW-WLC100
-slug: tew_wlc100
+slug: trendnet-tew-wlc100
 u_height: 1
 is_full_depth: false
 power-ports:
diff --git a/device-types/TrendNet/TK-802R.yaml b/device-types/TrendNet/TK-802R.yaml
index fff41447b2fdba67e3b544fd261cc2b46b2a8fde..f18b1606aff470562a7435e2266c62d35e942a2e 100644
--- a/device-types/TrendNet/TK-802R.yaml
+++ b/device-types/TrendNet/TK-802R.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TrendNet
 model: TK-802R
-slug: tk_802r
+slug: trendnet-tk-802r
 u_height: 1
 is_full_depth: false
 power-ports:
diff --git a/device-types/TrendNet/TPE-113Gi-A.yaml b/device-types/TrendNet/TPE-113Gi-A.yaml
index ebf31235af0f84bb5d1e65461a863a27ed7a532f..357e8e5d3ce93230745f0dbd66462432d6e26f74 100644
--- a/device-types/TrendNet/TPE-113Gi-A.yaml
+++ b/device-types/TrendNet/TPE-113Gi-A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: TrendNet
 model: TPE-113GI/A
-slug: tpe_113gi_a
+slug: trendnet-tpe-113gi-a
 u_height: 0
 is_full_depth: false
 power-ports:
diff --git a/device-types/Ubiquiti/AF-5XHD.yml b/device-types/Ubiquiti/AF-5XHD.yml
index e1fd7d5fe9655a19911b101a2e2e4d5c2b5b6da0..60b4e9efc964bcca76d6fe7f15d78a94529b3bdf 100644
--- a/device-types/Ubiquiti/AF-5XHD.yml
+++ b/device-types/Ubiquiti/AF-5XHD.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: airFiber AF-5XHD
-slug: airfiber-af-5xhd
+slug: ubiquiti-airfiber-af-5xhd
 part_number: AF-5XHD
 comments: |
   ath0 is setup to use ieee802.11ax as LTE currently doesn't allow wireless
diff --git a/device-types/Ubiquiti/AF-60-HD.yml b/device-types/Ubiquiti/AF-60-HD.yml
index d071251f2fa10c4bf291ecd49cd757d4e98e8140..9c37492955454b3eb30f7ab960104eb02b06fba1 100644
--- a/device-types/Ubiquiti/AF-60-HD.yml
+++ b/device-types/Ubiquiti/AF-60-HD.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: airFiber 60 HD
-slug: airfiber-60-hd
+slug: ubiquiti-airfiber-60-hd
 part_number: AF60-HD
 comments: |
   ubond0 is setup to use ieee802.11ax as LTE currently doesn't allow wireless
diff --git a/device-types/Ubiquiti/AF-60-LR.yml b/device-types/Ubiquiti/AF-60-LR.yml
index a8d37c9fb3df7d6681add66b93f56b1e8042a51e..5736aa509e6482271e232f685211302e7f89a27c 100644
--- a/device-types/Ubiquiti/AF-60-LR.yml
+++ b/device-types/Ubiquiti/AF-60-LR.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: airFiber 60 LR
-slug: airfiber-60-lr
+slug: ubiquiti-airfiber-60-lr
 part_number: AF60-LR
 comments: |
   ubond0 is setup to use ieee802.11ax as LTE currently doesn't allow wireless
diff --git a/device-types/Ubiquiti/AF-60.yml b/device-types/Ubiquiti/AF-60.yml
index f965ae705160efa6c798a6600b267ff8f86333b1..7ec35dd7315a8956264b17b2e3359b72f4d01690 100644
--- a/device-types/Ubiquiti/AF-60.yml
+++ b/device-types/Ubiquiti/AF-60.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: airFiber 60
-slug: airfiber-60
+slug: ubiquiti-airfiber-60
 part_number: AF-60
 comments: |
   ubond0 is setup to use ieee802.11ax as LTE currently doesn't allow wireless
diff --git a/device-types/Ubiquiti/Bullet-M2.yaml b/device-types/Ubiquiti/Bullet-M2.yaml
index 9ed892c4951e7dafa63529cfda55daf1295c5733..4da62092df0654f78481e0a943b3aae791096ee7 100644
--- a/device-types/Ubiquiti/Bullet-M2.yaml
+++ b/device-types/Ubiquiti/Bullet-M2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: Bullet M2
-slug: bullet-m2
+slug: ubiquiti-bullet-m2
 part_number: bullet m2
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/EP-R6.yaml b/device-types/Ubiquiti/EP-R6.yaml
index 42615458fe313a5a1b3c8e64b8fbabb586845a9e..efa4ce19cf436b56ba619c40fdd0657a103acb1b 100644
--- a/device-types/Ubiquiti/EP-R6.yaml
+++ b/device-types/Ubiquiti/EP-R6.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgePoint Router 6-Port
-slug: edgepoint-router-6-port
+slug: ubiquiti-edgepoint-router-6-port
 part_number: EP-R6
 comments: '[EdgePoint Router 6-Port](https://www.ui.com/downloads/datasheets/edgemax/EdgePoint_DS.pdf)'
 u_height: 0
diff --git a/device-types/Ubiquiti/EP-R8.yaml b/device-types/Ubiquiti/EP-R8.yaml
index 1cd13630ff929d1fd82a867f47496978b35e2e1e..0a96a544f553b0725f75bd90aeaa7a2265648004 100644
--- a/device-types/Ubiquiti/EP-R8.yaml
+++ b/device-types/Ubiquiti/EP-R8.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgePoint Router 8-Port
-slug: edgepoint-router-8-port
+slug: ubiquiti-edgepoint-router-8-port
 part_number: EP-R8
 comments: '[EdgePoint Router 8-Port](https://www.ui.com/downloads/datasheets/edgemax/EdgePoint_DS.pdf)'
 u_height: 0
diff --git a/device-types/Ubiquiti/EP-S16.yaml b/device-types/Ubiquiti/EP-S16.yaml
index 340f09f0c804b7c6bfe75f625cb949455217266e..00d9f6e1585c394043480a0f01a5f8f006d27c22 100644
--- a/device-types/Ubiquiti/EP-S16.yaml
+++ b/device-types/Ubiquiti/EP-S16.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgePoint EP-S16
-slug: edgepoint-ep-s16
+slug: ubiquiti-edgepoint-ep-s16
 part_number: EP-S16
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ER-10X.yaml b/device-types/Ubiquiti/ER-10X.yaml
index 65f3611478617cf00d56d7c711ba715cbbd24bf4..e49a0f3210adf6e37f4b2f23cb8e449aacd1801c 100644
--- a/device-types/Ubiquiti/ER-10X.yaml
+++ b/device-types/Ubiquiti/ER-10X.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeRouter 10X
-slug: er-10x
+slug: ubiquiti-er-10x
 part_number: ER-10X
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ER-12.yaml b/device-types/Ubiquiti/ER-12.yaml
index 312a6df2844bc7f5d7087b143bcacaf589a32331..a7b965dab182ffc6d20cd65104424ac8b32027e0 100644
--- a/device-types/Ubiquiti/ER-12.yaml
+++ b/device-types/Ubiquiti/ER-12.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeRouter 12
-slug: er-12
+slug: ubiquiti-er-12
 part_number: ER-12
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ER-12P.yaml b/device-types/Ubiquiti/ER-12P.yaml
index 0cc692766464b88ebaa168928f964e67910a8aec..00b6d1956d1b7068e9e4a9fb84fd0a55d07a83c4 100644
--- a/device-types/Ubiquiti/ER-12P.yaml
+++ b/device-types/Ubiquiti/ER-12P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeRouter 12P
-slug: er-12p
+slug: ubiquiti-er-12p
 part_number: ER-12P
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ER-4.yaml b/device-types/Ubiquiti/ER-4.yaml
index c10aa88c3f359b5a0df3e411882b82700a37d0ac..913298f027d2014c789f763a3c20eb9ab302ccf9 100644
--- a/device-types/Ubiquiti/ER-4.yaml
+++ b/device-types/Ubiquiti/ER-4.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeRouter 4
-slug: er-4
+slug: ubiquiti-er-4
 part_number: ER-4
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ER-6P.yaml b/device-types/Ubiquiti/ER-6P.yaml
index 4740921bb598dffd319877722b25212ef7dac9aa..209df176cc27439ac5491ea7dae035a1bd3be260 100644
--- a/device-types/Ubiquiti/ER-6P.yaml
+++ b/device-types/Ubiquiti/ER-6P.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeRouter 6P
-slug: er-6p
+slug: ubiquiti-er-6p
 part_number: ER-6P
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ER-8.yaml b/device-types/Ubiquiti/ER-8.yaml
index f646479d8d5caaf22f75ed00364ea7aeea74aa8f..b16aa8782312c177c33ae26ed769e2d9bac9b637 100644
--- a/device-types/Ubiquiti/ER-8.yaml
+++ b/device-types/Ubiquiti/ER-8.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeRouter 8
-slug: er-8
+slug: ubiquiti-er-8
 part_number: ER-8
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ER-X-SFP.yaml b/device-types/Ubiquiti/ER-X-SFP.yaml
index aa517d0b76118fc4da30887e2bcdf142018e5111..b8c6cd066de361cb5d876e5346e169bfd299beb0 100644
--- a/device-types/Ubiquiti/ER-X-SFP.yaml
+++ b/device-types/Ubiquiti/ER-X-SFP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: ER-X-SFP
-slug: er-x-sfp
+slug: ubiquiti-er-x-sfp
 u_height: 1
 is_full_depth: false
 comments: '[EdgeRouter X SFP - Advanced Gigabit Router with PoE and SFP](https://www.ui.com/edgemax/edgerouter-x-sfp/)'
diff --git a/device-types/Ubiquiti/ER-X.yaml b/device-types/Ubiquiti/ER-X.yaml
index d4c6af1d98ad81095e6ab646274dea320055d2d2..48b4a5d351b3ad4cec75bf151811653bd50d4d2d 100644
--- a/device-types/Ubiquiti/ER-X.yaml
+++ b/device-types/Ubiquiti/ER-X.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: ER-X
-slug: er-x
+slug: ubiquiti-er-x
 u_height: 1
 is_full_depth: false
 weight: 215
diff --git a/device-types/Ubiquiti/ERLite-3.yaml b/device-types/Ubiquiti/ERLite-3.yaml
index 6d656f5bed51837265813e9a1ce412b5e2a98345..8022cd3aa02ac265fe424da1f658d46e4ca2ebbe 100644
--- a/device-types/Ubiquiti/ERLite-3.yaml
+++ b/device-types/Ubiquiti/ERLite-3.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeRouter Lite
-slug: erlite-3
+slug: ubiquiti-erlite-3
 part_number: ERLite-3
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ERPoe-5.yaml b/device-types/Ubiquiti/ERPoe-5.yaml
index 86c4ce8cb07e64f5ca7f629469d86d570e9d035b..95ed6addde86c40743b3459e2dd6d175114ec73f 100644
--- a/device-types/Ubiquiti/ERPoe-5.yaml
+++ b/device-types/Ubiquiti/ERPoe-5.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeRouter PoE 5-Port
-slug: erpoe-5
+slug: ubiquiti-erpoe-5
 part_number: ERPoe-5
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ERPro-8.yaml b/device-types/Ubiquiti/ERPro-8.yaml
index 59888eddfe8846738e6ac881f0a819f8b3e6db6c..78d44fcee7da52cf0bafa32fdb291f8580fb6dfd 100644
--- a/device-types/Ubiquiti/ERPro-8.yaml
+++ b/device-types/Ubiquiti/ERPro-8.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeRouter Pro
-slug: edgerouter-pro
+slug: ubiquiti-edgerouter-pro
 part_number: ERPro-8
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ES-10X.yaml b/device-types/Ubiquiti/ES-10X.yaml
index 533bfa8252e3db164954ff634797fb6b494a6e60..fe056cf3f39a6ef38b17a41a9d09dbb6e2bf9b13 100644
--- a/device-types/Ubiquiti/ES-10X.yaml
+++ b/device-types/Ubiquiti/ES-10X.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: ES-10X
-slug: es-10x
+slug: ubiquiti-es-10x
 u_height: 1
 is_full_depth: false
 comments: '[EdgeSwitch 10X - Managed 10-Port Gigabit Switch with PoE Passthrough](https://www.ui.com/edgemax/edgeswitch-10x/)'
diff --git a/device-types/Ubiquiti/ES-10XP.yaml b/device-types/Ubiquiti/ES-10XP.yaml
index e9907f5665b5700389be093738e009b0a5b9c1d0..7676a87be191fb8bf85c4c54742008915b6a21cd 100644
--- a/device-types/Ubiquiti/ES-10XP.yaml
+++ b/device-types/Ubiquiti/ES-10XP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: ES-10XP
-slug: es-10xp
+slug: ubiquiti-es-10xp
 u_height: 1
 is_full_depth: false
 comments: '[EdgeSwitch 10XP - Managed 10-Port Gigabit Switch with PoE](https://www.ui.com/edgemax/edgeswitch-10xp/)'
diff --git a/device-types/Ubiquiti/ES-12F.yaml b/device-types/Ubiquiti/ES-12F.yaml
index 0ba404d4b9106039f45defdae5f4e3ef935a93ba..138edf7e2a8c07566ff847229f7e3b88935c729e 100644
--- a/device-types/Ubiquiti/ES-12F.yaml
+++ b/device-types/Ubiquiti/ES-12F.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: ES-12F
-slug: es-12f
+slug: ubiquiti-es-12f
 u_height: 1
 is_full_depth: false
 comments: '[EdgeSwitch 12 Fiber - Managed Gigabit Fiber Switch](https://www.ui.com/edgemax/edgeswitch-12f/)'
diff --git a/device-types/Ubiquiti/ES-16-150W.yaml b/device-types/Ubiquiti/ES-16-150W.yaml
index 0cf2310b4283f9a7b57ca166b8a15f6216e1fc23..ceb92b9b7da966bbdeb4b75768cb322e6c1d35f8 100644
--- a/device-types/Ubiquiti/ES-16-150W.yaml
+++ b/device-types/Ubiquiti/ES-16-150W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeSwitch 16 150W
-slug: es-16-150w
+slug: ubiquiti-es-16-150w
 part_number: ES-16-150W
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ES-16-XG.yaml b/device-types/Ubiquiti/ES-16-XG.yaml
index 8f79a1346de804c38c73c2b93c1ca39abc7896e8..9281d281ecf7ba281b436e30f60b6b24adfbdd25 100644
--- a/device-types/Ubiquiti/ES-16-XG.yaml
+++ b/device-types/Ubiquiti/ES-16-XG.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeSwitch 16 XG
-slug: es-16-xg
+slug: ubiquiti-es-16-xg
 part_number: ES-16-XG
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ES-24-250W.yaml b/device-types/Ubiquiti/ES-24-250W.yaml
index a83cd1234399bef79b4df33a2df5b83be7536164..c780b001733b35f07fc827e19a4406ba537af50f 100644
--- a/device-types/Ubiquiti/ES-24-250W.yaml
+++ b/device-types/Ubiquiti/ES-24-250W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeSwitch 24 250W
-slug: es-24-250w
+slug: ubiquiti-es-24-250w
 part_number: ES-24-250W
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ES-24-500W.yaml b/device-types/Ubiquiti/ES-24-500W.yaml
index 821654711cd2656aabd3bc68bc3c1228bc9285ab..1a83b4e0f90e31c2f2ffa101ca7bfd7a64f46b60 100644
--- a/device-types/Ubiquiti/ES-24-500W.yaml
+++ b/device-types/Ubiquiti/ES-24-500W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeSwitch 24 500W
-slug: es-24-500w
+slug: ubiquiti-es-24-500w
 part_number: ES-24-500W
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ES-24-LITE.yaml b/device-types/Ubiquiti/ES-24-LITE.yaml
index 0914b56ab64cc4f4efd6bd5e0ca45b8f0c39175d..da34418dd5bea588394efade63b38eb8d5491515 100644
--- a/device-types/Ubiquiti/ES-24-LITE.yaml
+++ b/device-types/Ubiquiti/ES-24-LITE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeSwitch 24 Lite
-slug: es-24-lite
+slug: ubiquiti-es-24-lite
 part_number: ES-24-LITE
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ES-48-500W.yaml b/device-types/Ubiquiti/ES-48-500W.yaml
index 9604b42198fad0b105f3e00f5435d1aed07e4c06..e401f99718828795389e9b0bbd15ab46c36cb31c 100644
--- a/device-types/Ubiquiti/ES-48-500W.yaml
+++ b/device-types/Ubiquiti/ES-48-500W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeSwitch 48 500W
-slug: es-48-500w
+slug: ubiquiti-es-48-500w
 part_number: ES-48-500W
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ES-48-750W.yaml b/device-types/Ubiquiti/ES-48-750W.yaml
index 06f86645a71dd034f3487cd2e7e5360d900c935b..6fa8045e02afd249fa6d6892aaba2090da4b4425 100644
--- a/device-types/Ubiquiti/ES-48-750W.yaml
+++ b/device-types/Ubiquiti/ES-48-750W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeSwitch 48 750W
-slug: es-48-750w
+slug: ubiquiti-es-48-750w
 part_number: ES-48-750W
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/ES-48-LITE.yaml b/device-types/Ubiquiti/ES-48-LITE.yaml
index e65449bcf2cc2ba55e590c30ccb37ea6fb330299..7ed7ac1af88d8b89ebbbb9d707d47c405ef5bf78 100644
--- a/device-types/Ubiquiti/ES-48-LITE.yaml
+++ b/device-types/Ubiquiti/ES-48-LITE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: EdgeSwitch 48 Lite
-slug: es-48-lite
+slug: ubiquiti-es-48-lite
 part_number: ES-48-LITE
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Ubiquiti/LAP-120.yaml b/device-types/Ubiquiti/LAP-120.yaml
index 4b2a14ac9f699d293ef2207f4c9ca6bdff43ad16..da113695ed82828953f2df820aa6ccdffaa35edc 100644
--- a/device-types/Ubiquiti/LAP-120.yaml
+++ b/device-types/Ubiquiti/LAP-120.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: LiteAP 120
-slug: lap-120
+slug: ubiquiti-liteap-120
 u_height: 0
 is_full_depth: false
 comments: '[LiteAP AC](https://www.ui.com/airmax/liteap-ac/)'
diff --git a/device-types/Ubiquiti/LBE-5AC-23.yaml b/device-types/Ubiquiti/LBE-5AC-23.yaml
index beb5e36f4bfc1a7c598fe4209e8d1332a85f9e28..12aaa7cf66a8c59fa8d7b1c57850189fa2f757a6 100644
--- a/device-types/Ubiquiti/LBE-5AC-23.yaml
+++ b/device-types/Ubiquiti/LBE-5AC-23.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: LiteBeam 5AC 23
-slug: lbe-5ac-23
+slug: ubiquiti-lbe-5ac-23
 part_number: LBE-5AC-23
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/LBE-5AC-Gen2.yaml b/device-types/Ubiquiti/LBE-5AC-Gen2.yaml
index ab614290b34a45d30aff9f008f6df60c55d5d740..665893d576ed42e7ff62738735d353248a1f3b48 100644
--- a/device-types/Ubiquiti/LBE-5AC-Gen2.yaml
+++ b/device-types/Ubiquiti/LBE-5AC-Gen2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: LiteBeam 5AC Gen2
-slug: lbe-5ac-gen2
+slug: ubiquiti-lbe-5ac-gen2
 part_number: LBE-5AC-Gen2
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/NBE-2AC-13.yaml b/device-types/Ubiquiti/NBE-2AC-13.yaml
index cf528c8738eb71a479ab6e396c0202c3ade4f1c0..06162684549a183d2292edc6d5273f541254b1d9 100644
--- a/device-types/Ubiquiti/NBE-2AC-13.yaml
+++ b/device-types/Ubiquiti/NBE-2AC-13.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: NBE-2AC-13
-slug: nbe-2ac-13
+slug: ubiquiti-nbe-2ac-13
 part_number: NBE-2AC-13
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/NBE-5AC-19.yaml b/device-types/Ubiquiti/NBE-5AC-19.yaml
index 20f520ed9762f3fe6d12f4de19cfd86db378d905..ba41878b70e9ce5d64110ebf78941a5231b86d78 100644
--- a/device-types/Ubiquiti/NBE-5AC-19.yaml
+++ b/device-types/Ubiquiti/NBE-5AC-19.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: NanoBeam 5AC 19
-slug: nbe-5ac-19
+slug: ubiquiti-nbe-5ac-19
 part_number: NBE-5AC-19
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/NBE-5AC-Gen2.yaml b/device-types/Ubiquiti/NBE-5AC-Gen2.yaml
index 1e59df45a73befbde82f3656802b214863bf2203..2588d62e408334dfdea9d51467f77037c3c8bf77 100644
--- a/device-types/Ubiquiti/NBE-5AC-Gen2.yaml
+++ b/device-types/Ubiquiti/NBE-5AC-Gen2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: NanoBeam 5AC Gen2
-slug: nbe-5ac-gen2
+slug: ubiquiti-nanobeam-5ac-gen2
 part_number: NBE-5AC-Ge2n
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/NBE-M5-19.yaml b/device-types/Ubiquiti/NBE-M5-19.yaml
index 585d9a4f97642c88770203eef56bad2073242958..083d6331cfa395b57019fc9543d880ba06f8ab2a 100644
--- a/device-types/Ubiquiti/NBE-M5-19.yaml
+++ b/device-types/Ubiquiti/NBE-M5-19.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: NanoBeam M5 19
-slug: nbe-m5-19
+slug: ubiquiti-nbe-m5-19
 part_number: NBE-M5-19
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/NS-5AC.yaml b/device-types/Ubiquiti/NS-5AC.yaml
index d4e71118591e20f57d94dbbbc0fddb149412fbab..3f0df07e14c113e16044abaa48ec0ef02c257d4f 100644
--- a/device-types/Ubiquiti/NS-5AC.yaml
+++ b/device-types/Ubiquiti/NS-5AC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: Nanostation 5AC
-slug: nanostation-5ac
+slug: ubiquiti-nanostation-5ac
 part_number: NS-5AC
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/NS-LOCO-M2.yaml b/device-types/Ubiquiti/NS-LOCO-M2.yaml
index b0fe48a7f66d3d2798821f07b3b937b3e393838d..6e42e0ced997678220feb98b9c8be4365e858f84 100644
--- a/device-types/Ubiquiti/NS-LOCO-M2.yaml
+++ b/device-types/Ubiquiti/NS-LOCO-M2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: NanoStation LOCO M2
-slug: nanostation-loco-m2
+slug: ubiquiti-nanostation-loco-m2
 part_number: nanostation loco m2
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/NS-LOCO-M5.yaml b/device-types/Ubiquiti/NS-LOCO-M5.yaml
index fc6961c31acd0ffb05b40390578cc7a610aec400..89f96e1114d33c9c4a1b04c1479da3555f7009b6 100644
--- a/device-types/Ubiquiti/NS-LOCO-M5.yaml
+++ b/device-types/Ubiquiti/NS-LOCO-M5.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: NanoStation LOCO M5
-slug: nanostation-loco-m5
+slug: ubiquiti-nanostation-loco-m5
 part_number: nanostation loco m5
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/NS-LOCO-M900.yaml b/device-types/Ubiquiti/NS-LOCO-M900.yaml
index 4d5d54a61a277ff74777f5e72eb92980c58edc90..cdaf55ce996321670319fdf03a955dfe5e690b97 100644
--- a/device-types/Ubiquiti/NS-LOCO-M900.yaml
+++ b/device-types/Ubiquiti/NS-LOCO-M900.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: NanoStation LOCO M900
-slug: nanostation-loco-m900
+slug: ubiquiti-nanostation-loco-m900
 part_number: nanostation loco m900
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/NS-LOCO5AC.yaml b/device-types/Ubiquiti/NS-LOCO5AC.yaml
index 07100d9038fb73ac6bf3589061b24ddff89cbf61..7c72d12358b188e176e2e59ab1d8485b003538ce 100644
--- a/device-types/Ubiquiti/NS-LOCO5AC.yaml
+++ b/device-types/Ubiquiti/NS-LOCO5AC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: Nano Station LOCO 5AC
-slug: nanostation-loco-5ac
+slug: ubiquiti-nano-station-loco-5ac
 part_number: LOCO5AC
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/NS-M2.yaml b/device-types/Ubiquiti/NS-M2.yaml
index aeb59ae07eb328ec503a0d8ac5a0071454a7e570..561c26695b2399db4e12e07d85e047c3f99dd138 100644
--- a/device-types/Ubiquiti/NS-M2.yaml
+++ b/device-types/Ubiquiti/NS-M2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: NanoStation M2
-slug: nanostation-m2
+slug: ubiquiti-nanostation-m2
 part_number: nanostation m2
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/NS-M5.yaml b/device-types/Ubiquiti/NS-M5.yaml
index 3c238810659602ccd06d6fdf689c6c9faf0d10fb..3f4efaa613d3ad03121fa0a034c606bd4f945885 100644
--- a/device-types/Ubiquiti/NS-M5.yaml
+++ b/device-types/Ubiquiti/NS-M5.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: NanoStation m5
-slug: nanostation-m5
+slug: ubiquiti-nanostation-m5
 part_number: nanostation m5
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/PBE-2AC-400.yaml b/device-types/Ubiquiti/PBE-2AC-400.yaml
index 65db2352dd7bd85eb11e6cc940814e9db906211a..5756be71fd2974230a561c331ddc73eed1664c1f 100644
--- a/device-types/Ubiquiti/PBE-2AC-400.yaml
+++ b/device-types/Ubiquiti/PBE-2AC-400.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: PowerBeam 2AC 400
-slug: pbe-2ac-300
+slug: ubiquiti-powerbeam-2ac-400
 part_number: PBE-2AC-400
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/PBE-5AC-300.yaml b/device-types/Ubiquiti/PBE-5AC-300.yaml
index e888d2981e27c3050ff1dd1ae63bca89e708f1c2..a6ceebb2a199e90bd4cd83aca787718e45e7f71d 100644
--- a/device-types/Ubiquiti/PBE-5AC-300.yaml
+++ b/device-types/Ubiquiti/PBE-5AC-300.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: PowerBeam 5AC 300
-slug: pbe-5ac-300
+slug: ubiquiti-pbe-5ac-300
 part_number: PBE-5AC-300
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/PBE-5AC-500.yaml b/device-types/Ubiquiti/PBE-5AC-500.yaml
index 1fd89203f846955442fe0ce92e5ee2e91bc568da..622a2cc3fbd723630c0c5b74e4eb4cc199b5f07e 100644
--- a/device-types/Ubiquiti/PBE-5AC-500.yaml
+++ b/device-types/Ubiquiti/PBE-5AC-500.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: PowerBeam 5AC 500
-slug: pbe-5ac-500
+slug: ubiquiti-pbe-5ac-500
 part_number: PBE-5AC-500
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/PBE-5AC-Gen2.yaml b/device-types/Ubiquiti/PBE-5AC-Gen2.yaml
index bca00aab818c9dd79ce13b981b9133b109e64eef..e2207c63e7f42119b83e465f2b40a4175697366d 100644
--- a/device-types/Ubiquiti/PBE-5AC-Gen2.yaml
+++ b/device-types/Ubiquiti/PBE-5AC-Gen2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: PowerBeam 5AC Gen2
-slug: pbe-5ac-gen2
+slug: ubiquiti-pbe-5ac-gen2
 part_number: PBE-5AC-Gen2
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/PBE-M2-400.yaml b/device-types/Ubiquiti/PBE-M2-400.yaml
index 1be1a52b16cdd4f06c51807d1cd411e1c7d888b4..7dbcdcf7d13e1b79e7d8466f592a2740ff7c304f 100644
--- a/device-types/Ubiquiti/PBE-M2-400.yaml
+++ b/device-types/Ubiquiti/PBE-M2-400.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: PowerBeam M2 400
-slug: pbe-m2-300
+slug: ubiquiti-powerbeam-m2-400
 part_number: PBE-M2-400
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/PS-M2.yaml b/device-types/Ubiquiti/PS-M2.yaml
index 54f8c6d19e0a53cec703079396833e85b7510328..97da70a15d96ca7e9c5abe8f03fb6d5e4eee6637 100644
--- a/device-types/Ubiquiti/PS-M2.yaml
+++ b/device-types/Ubiquiti/PS-M2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: PicoStation M2
-slug: picostation-m2
+slug: ubiquiti-picostation-m2
 part_number: picostation m2
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/R2AC-PRISM.yaml b/device-types/Ubiquiti/R2AC-PRISM.yaml
index 62dfbfe6f2f9c89d9508b4a5ffdac102e9323352..f9bc406b2273379baf3eb0afe75582117884b0c9 100644
--- a/device-types/Ubiquiti/R2AC-PRISM.yaml
+++ b/device-types/Ubiquiti/R2AC-PRISM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: Rocket 2AC Prism
-slug: rocket-2ac-prism
+slug: ubiquiti-rocket-2ac-prism
 part_number: R2AC-PRISM
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/RP-5AC-Gen2.yaml b/device-types/Ubiquiti/RP-5AC-Gen2.yaml
index 972bd5853d2380d7019fcadadbc588dc959d5d12..fad38282b5e360921b424e75838f7bab3f589db0 100644
--- a/device-types/Ubiquiti/RP-5AC-Gen2.yaml
+++ b/device-types/Ubiquiti/RP-5AC-Gen2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: Rocket Prism 5AC Gen2
-slug: rp-5ac-gen2
+slug: ubiquiti-rp-5ac-gen2
 part_number: RP-5AC-Gen2
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/Rocket-M2-Titanium.yaml b/device-types/Ubiquiti/Rocket-M2-Titanium.yaml
index a7ac1f864dc239dc9480072a62ee8de881709557..4491ddd322a465f1260b1b31030478db17963113 100644
--- a/device-types/Ubiquiti/Rocket-M2-Titanium.yaml
+++ b/device-types/Ubiquiti/Rocket-M2-Titanium.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: Rocket M2 Titanium
-slug: rocket-m2-titanium
+slug: ubiquiti-rocket-m2-titanium
 part_number: Rocket M2 Titanium
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/Rocket-M2.yaml b/device-types/Ubiquiti/Rocket-M2.yaml
index a575720acfa07a5a6b83263711560932f0132798..a87e9884fd9498622debaae269b650e91fa03c39 100644
--- a/device-types/Ubiquiti/Rocket-M2.yaml
+++ b/device-types/Ubiquiti/Rocket-M2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: Rocket M2
-slug: rocket-m2
+slug: ubiquiti-rocket-m2
 part_number: Rocket M2
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/Rocket-M5.yaml b/device-types/Ubiquiti/Rocket-M5.yaml
index 08982f65cdad2ea763f6bbcdbc36606e5ca39ae5..73aa2c515236a1abecd8725876a27740486fcc52 100644
--- a/device-types/Ubiquiti/Rocket-M5.yaml
+++ b/device-types/Ubiquiti/Rocket-M5.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: Rocket M5
-slug: rocket-m5
+slug: ubiquiti-rocket-m5
 part_number: Rocket M5
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/Rocket-M900.yaml b/device-types/Ubiquiti/Rocket-M900.yaml
index 5732ca3c5e16ff6da07723e3d6205ca2c065491c..54fd1a696908002913407d95b0de6814fe79380c 100644
--- a/device-types/Ubiquiti/Rocket-M900.yaml
+++ b/device-types/Ubiquiti/Rocket-M900.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: Rocket M900
-slug: rocket-m900
+slug: ubiquiti-rocket-m900
 part_number: rocket m900
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/SurgeProtector.yaml b/device-types/Ubiquiti/SurgeProtector.yaml
index f4b446e39282b10d1d1452739f4a2a7655f08b9e..0111b729e9a7409a3fbcf79bb5f92dc37851d16c 100644
--- a/device-types/Ubiquiti/SurgeProtector.yaml
+++ b/device-types/Ubiquiti/SurgeProtector.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: Surge Protector
-slug: surge-protector
+slug: ubiquiti-surge-protector
 part_number: ETH-SP-G2
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/U6-IW.yaml b/device-types/Ubiquiti/U6-IW.yaml
index 71a5f1420bcb0c2ef79a65427dde65d776d34a9f..20a9613f87c5e37361c22ff2376f56221ee94fa2 100644
--- a/device-types/Ubiquiti/U6-IW.yaml
+++ b/device-types/Ubiquiti/U6-IW.yaml
@@ -1,8 +1,8 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi U6 In-Wall Access Point
-slug: u6-iw
-part_number: u6-iw-us
+slug: ubiquiti-u6-iw
+part_number: u6-iw
 u_height: 0
 comments: '[UniFi 6 In-Wall Access Point](https://store.ui.com/products/access-point-wifi-6-in-wall)'
 is_full_depth: false
diff --git a/device-types/Ubiquiti/U6-LR.yaml b/device-types/Ubiquiti/U6-LR.yaml
index ea81307d13964e8d72c5830afe658dcb1f867aa6..3141487eb2ef1d8da28421148632afb668753f80 100644
--- a/device-types/Ubiquiti/U6-LR.yaml
+++ b/device-types/Ubiquiti/U6-LR.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: U6-LR
-slug: u6-lr
+slug: ubiquiti-u6-lr
 u_height: 0
 is_full_depth: false
 comments: '[UniFi 6 Long Range Access Point](https://store.ui.com/products/unifi-6-long-range-access-point)'
diff --git a/device-types/Ubiquiti/U6-Lite.yaml b/device-types/Ubiquiti/U6-Lite.yaml
index d0bfd4928422f46365f022b1ee0bf6ea7e3ab9d0..9f68416a43f2ffe13cd3ec65e1637ad250b8f701 100644
--- a/device-types/Ubiquiti/U6-Lite.yaml
+++ b/device-types/Ubiquiti/U6-Lite.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: U6-Lite
-slug: u6-lite
+slug: ubiquiti-u6-lite
 u_height: 0
 is_full_depth: false
 comments: '[UniFi 6 Lite Access Point](https://store.ui.com/products/unifi-ap-6-lite)'
diff --git a/device-types/Ubiquiti/U6-Mesh-US.yaml b/device-types/Ubiquiti/U6-Mesh-US.yaml
index da14f6c65dffb7d16f132643d42debc3b159e70a..c40b1fc0ad5c60b54fcee4868445c52670408e52 100644
--- a/device-types/Ubiquiti/U6-Mesh-US.yaml
+++ b/device-types/Ubiquiti/U6-Mesh-US.yaml
@@ -1,8 +1,8 @@
 ---
 manufacturer: Ubiquiti
 model: Unifi U6 Mesh Access Point
-part_number: U6-Mesh-US
-slug: u6-mesh-us
+part_number: U6-Mesh
+slug: ubiquiti-u6-mesh
 u_height: 0
 is_full_depth: false
 comments: '[UniFi 6 Mesh Access Point](https://store.ui.com/collections/unifi-network-wireless/products/access-point-wifi-6-mesh)'
diff --git a/device-types/Ubiquiti/U6-PRO.yaml b/device-types/Ubiquiti/U6-PRO.yaml
index d85cf13a428f54e8206ed3fd359d6ebaecbeb3de..725c1b5a13d24b919ffbdc32c52f741dd19b53ab 100644
--- a/device-types/Ubiquiti/U6-PRO.yaml
+++ b/device-types/Ubiquiti/U6-PRO.yaml
@@ -1,8 +1,8 @@
 ---
 manufacturer: Ubiquiti
 model: Unifi U6 Access Point Professional
-part_number: U6-PRO-US
-slug: u6-pro
+part_number: U6-PRO
+slug: ubiquiti-u6-pro
 u_height: 0
 is_full_depth: false
 comments: '[UniFi 6 Professional Access Point](https://store.ui.com/products/unifi-ap6-professional)'
diff --git a/device-types/Ubiquiti/UAP-AC-LR.yaml b/device-types/Ubiquiti/UAP-AC-LR.yaml
index 2345de2036b19681d58ab10710f723e9ef03362f..4a333b402f67e0e2228ef3e857378d2ead75ca54 100644
--- a/device-types/Ubiquiti/UAP-AC-LR.yaml
+++ b/device-types/Ubiquiti/UAP-AC-LR.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UAP-AC-LR
-slug: uap-ac-lr
+slug: ubiquiti-uap-ac-lr
 u_height: 0
 is_full_depth: false
 comments: '[Unifi AP AC Long Range](https://www.ui.com/unifi/unifi-ap-ac-lr/)'
diff --git a/device-types/Ubiquiti/UAP-AC-Lite.yaml b/device-types/Ubiquiti/UAP-AC-Lite.yaml
index dce22b45e11a96d3ab080a828227cde50873fbd2..b2b7d1aaa87d4954b59fcdc6790afee822d48012 100644
--- a/device-types/Ubiquiti/UAP-AC-Lite.yaml
+++ b/device-types/Ubiquiti/UAP-AC-Lite.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UAP-AC-LITE
-slug: uap-ac-lite
+slug: ubiquiti-uap-ac-lite
 u_height: 0
 is_full_depth: false
 comments: '[Unifi AP AC Lite](https://www.ui.com/unifi/unifi-ap-ac-lite/)'
diff --git a/device-types/Ubiquiti/UAP-AC-M-Pro.yaml b/device-types/Ubiquiti/UAP-AC-M-Pro.yaml
index 69cd84c3d1b969768983e0255a8741af9bb35e43..084ba704b5256b1280ddf206156d0252e1d44169 100644
--- a/device-types/Ubiquiti/UAP-AC-M-Pro.yaml
+++ b/device-types/Ubiquiti/UAP-AC-M-Pro.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: Unifi AC Mesh Pro
-slug: uap-ac-m-pro
+slug: ubiquiti-uap-ac-m-pro
 part_number: UAP-AC-M-Pro
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/UAP-AC-M.yaml b/device-types/Ubiquiti/UAP-AC-M.yaml
index 2cb7645a8a3b6e5de0c8d04719a3183f287606bb..7aca4a2de039fb52f5c96a15fa3bfd1fe97d665f 100644
--- a/device-types/Ubiquiti/UAP-AC-M.yaml
+++ b/device-types/Ubiquiti/UAP-AC-M.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: Unifi AC Mesh
-slug: uap-ac-m
+slug: ubiquiti-uap-ac-m
 part_number: UAP-AC-M
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/UAP-AC-Pro.yaml b/device-types/Ubiquiti/UAP-AC-Pro.yaml
index 7bf4edb24467bb171ff88283e1b64f13e84e8d87..8b17a8856e98816efa8e9573b8539d52e6764746 100644
--- a/device-types/Ubiquiti/UAP-AC-Pro.yaml
+++ b/device-types/Ubiquiti/UAP-AC-Pro.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UAP AC Pro
-slug: uap-ac-pro
+slug: ubiquiti-uap-ac-pro
 part_number: UAP-AC-Pro
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/UAP-FlexHD.yaml b/device-types/Ubiquiti/UAP-FlexHD.yaml
index 4ff2a73c5694285b7d4d4c9713bafb690ac22390..7e3923b5b19cc0950dce9f10a3f793a242a456eb 100644
--- a/device-types/Ubiquiti/UAP-FlexHD.yaml
+++ b/device-types/Ubiquiti/UAP-FlexHD.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UAP-FlexHD
-slug: uap-flexhd
+slug: ubiquiti-uap-flexhd
 u_height: 0
 is_full_depth: false
 comments: '[UniFi FlexHD Access Point](https://store.ui.com/products/unifi-flexhd)'
diff --git a/device-types/Ubiquiti/UAP-IW-HD.yaml b/device-types/Ubiquiti/UAP-IW-HD.yaml
index bf512a16df33bda1e72b07fdfb7e1ae7f1e7a5cb..3e61c3d0fd781a354d9fe9a608b7087d2e45a077 100644
--- a/device-types/Ubiquiti/UAP-IW-HD.yaml
+++ b/device-types/Ubiquiti/UAP-IW-HD.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi UAP InWall HD
-slug: uap-iw-hd
+slug: ubiquiti-uap-iw-hd
 part_number: UAP-IW-HD
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/UAP-Pro.yaml b/device-types/Ubiquiti/UAP-Pro.yaml
index dc472994a01972947be7a0df52b360864a4e617f..0c0291f1f1eb5250beeb1839a2944efce96512a4 100644
--- a/device-types/Ubiquiti/UAP-Pro.yaml
+++ b/device-types/Ubiquiti/UAP-Pro.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UAP pro
-slug: uap-pro
+slug: ubiquiti-uap-pro
 part_number: UAP-Pro
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/UAS-XG.yaml b/device-types/Ubiquiti/UAS-XG.yaml
index 496a29dd4f0b5aab72bd1ba4809c2eab8d79c9bb..46e2a9431823f01be7fd1b19a8263f9e1360634b 100644
--- a/device-types/Ubiquiti/UAS-XG.yaml
+++ b/device-types/Ubiquiti/UAS-XG.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Application Server
-slug: unifi-application-server
+slug: ubiquiti-unifi-application-server
 part_number: UAS-XG
 comments: |
   10G Rack-Mountable UniFi Application Server, (2) 1/10G LAN, (1) 1G IPMI LAN, (1) VGA rear, (2) USB 3.0 rear, (2) USB 2.0 front
diff --git a/device-types/Ubiquiti/UC-CK.yaml b/device-types/Ubiquiti/UC-CK.yaml
index cbd816725ca290947ef5b39f688dc65da71f57a0..f4a87a0736536ae780c3c08ae94c572abe362311 100644
--- a/device-types/Ubiquiti/UC-CK.yaml
+++ b/device-types/Ubiquiti/UC-CK.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Cloud Key
-slug: uc-ck
+slug: ubiquiti-uc-ck
 part_number: uc-ck
 comments: |
   Unifi Cloud Key Generation 1
diff --git a/device-types/Ubiquiti/UCK-G2-PLUS.yml b/device-types/Ubiquiti/UCK-G2-PLUS.yml
index 94c134c0dc4a799bf446a14a6bae952547c33d30..d30ef30e6dd5e805ee1af4650af85379fb7ea89a 100644
--- a/device-types/Ubiquiti/UCK-G2-PLUS.yml
+++ b/device-types/Ubiquiti/UCK-G2-PLUS.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: Cloud Key Gen2 Plus
-slug: cloud-key-gen2-plus
+slug: ubiquiti-cloud-key-gen2-plus
 part_number: uck-g2-plus
 comments: |
   Unifi Cloud Key Generation 2 Plus
diff --git a/device-types/Ubiquiti/UCK-G2.yml b/device-types/Ubiquiti/UCK-G2.yml
index cf8439b8ac8aad31fb176a478cccaba0655300a4..44c34bf0b276966d72e2dae4e4f73cf170a26b94 100644
--- a/device-types/Ubiquiti/UCK-G2.yml
+++ b/device-types/Ubiquiti/UCK-G2.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: Cloud Key Gen2
-slug: cloud-key-gen2
+slug: ubiquiti-cloud-key-gen2
 part_number: uck-g2
 comments: |
   Unifi Cloud Key Generation 2
diff --git a/device-types/Ubiquiti/UDM-Pro-SE.yaml b/device-types/Ubiquiti/UDM-Pro-SE.yaml
index 7e46b6637c6069c00f6b4fc8a5cbd5c92e689be2..0d8bd1ced4a1e2d567f5642599fee737dd766a8f 100644
--- a/device-types/Ubiquiti/UDM-Pro-SE.yaml
+++ b/device-types/Ubiquiti/UDM-Pro-SE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Dream Machine Pro Special Edition
-slug: udm-pro-se
+slug: ubiquiti-unifi-dream-machine-pro-special-edition
 airflow: front-to-rear
 part_number: UDM-SE
 comments: |
diff --git a/device-types/Ubiquiti/UDM-Pro.yaml b/device-types/Ubiquiti/UDM-Pro.yaml
index 7da176494a5437dd37c207929c3c4f71897b77d0..25e9711899551de7d12c757f9ed85aef7a1109e7 100644
--- a/device-types/Ubiquiti/UDM-Pro.yaml
+++ b/device-types/Ubiquiti/UDM-Pro.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Dream Machine Pro
-slug: unifi-dream-machine-pro
+slug: ubiquiti-unifi-dream-machine-pro
 airflow: front-to-rear
 part_number: UDM-Pro
 comments: |
diff --git a/device-types/Ubiquiti/UDM.yaml b/device-types/Ubiquiti/UDM.yaml
index 77866d4a16dbce5e966cf7fbda98a84a1c22fc11..3b1b17d9720b585171fe2d3883f5d5f62857b937 100644
--- a/device-types/Ubiquiti/UDM.yaml
+++ b/device-types/Ubiquiti/UDM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Dream Machine
-slug: udm
+slug: ubiquiti-udm
 airflow: passive
 part_number: UDM
 comments: |
diff --git a/device-types/Ubiquiti/UF-OLT.yaml b/device-types/Ubiquiti/UF-OLT.yaml
index 80a50269e303ec1a058c5e215b5c07a12f71763d..9cb81006dc01a4a145b56ea074a8a3d5522dfcd9 100644
--- a/device-types/Ubiquiti/UF-OLT.yaml
+++ b/device-types/Ubiquiti/UF-OLT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: 8‑Port GPON Optical Line Terminal
-slug: uf-olt
+slug: ubiquiti-uf-olt
 part_number: UF-OLT
 is_full_depth: false
 u_height: 1
diff --git a/device-types/Ubiquiti/UNVR.yaml b/device-types/Ubiquiti/UNVR.yaml
index 9a926d71ca110d2fc54f96ae913070f0e9e6eed1..9688d4fb9f05ce9d54106d2ce5bfe9ae9fa3ec19 100644
--- a/device-types/Ubiquiti/UNVR.yaml
+++ b/device-types/Ubiquiti/UNVR.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Protect Network Video Recorder
-slug: unifi-protect-network-video-recorder
+slug: ubiquiti-unifi-protect-network-video-recorder
 part_number: UNVR
 comments: |
   Network Video Recorder with four bays,
diff --git a/device-types/Ubiquiti/US-16-150W.yaml b/device-types/Ubiquiti/US-16-150W.yaml
index 6e96ae7cb9c61bcbd33c6a59c0389791595b6efc..a9ab77f3737a8cf535da19e0c027526d88bb55ab 100644
--- a/device-types/Ubiquiti/US-16-150W.yaml
+++ b/device-types/Ubiquiti/US-16-150W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 16 PoE 150W Gen1
-slug: unifi-switch-16-poe-150w-gen1
+slug: ubiquiti-unifi-switch-16-poe-150w-gen1
 part_number: US-16-150W
 comments: |
   UniFi Switch 16 PoE 150W (30W + max. 120W PoE), Gen1, (16) Gigabit PoE+ IEEE 802.3af/at and 24V Passive PoE, (2) SFP
diff --git a/device-types/Ubiquiti/US-16-XG.yaml b/device-types/Ubiquiti/US-16-XG.yaml
index 5140b4df5b39dfba3429169f36f6dec22284d072..bc8937eb2fe5df779b668e652fed5006a78462f9 100644
--- a/device-types/Ubiquiti/US-16-XG.yaml
+++ b/device-types/Ubiquiti/US-16-XG.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 16 XG
-slug: unifi-switch-16-xg
+slug: ubiquiti-unifi-switch-16-xg
 part_number: US-16-XG
 comments: |
   UniFi Switch 16 XG, 10G 16-Port Managed Aggregation Switch, 56W (32W with no GBICs), (12) SFP+, (4) 1/10 Gigabit
diff --git a/device-types/Ubiquiti/US-24-250W.yaml b/device-types/Ubiquiti/US-24-250W.yaml
index b0507de3ca0c6233548b15417d2b376ac4a7bcf7..c49f9a2d10dc49356942c6403caebc90968334b9 100644
--- a/device-types/Ubiquiti/US-24-250W.yaml
+++ b/device-types/Ubiquiti/US-24-250W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 24 PoE 250W Gen1
-slug: unifi-switch-24-poe-250w-gen1
+slug: ubiquiti-unifi-switch-24-poe-250w-gen1
 part_number: US-24-250W
 comments: |
   UniFi Switch 24 PoE 250W (30W + max. 220W PoE), Gen1, (24) Gigabit PoE+ IEEE 802.3af/at and 24V Passive PoE, (2) SFP
diff --git a/device-types/Ubiquiti/US-24-500W.yaml b/device-types/Ubiquiti/US-24-500W.yaml
index 96d2d82500fea356ff37b0b8411657cf9ce06752..3890d38fb1230d34d2a3e2f21d726db7395c1d66 100644
--- a/device-types/Ubiquiti/US-24-500W.yaml
+++ b/device-types/Ubiquiti/US-24-500W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 24 PoE 500W Gen1
-slug: unifi-switch-24-poe-500w-gen1
+slug: ubiquiti-unifi-switch-24-poe-500w-gen1
 part_number: US-24-500W
 comments: |
   UniFi Switch 24 PoE 500W (30W + max. 470W PoE), Gen1, (24) Gigabit PoE+ IEEE 802.3af/at and 24V Passive PoE, (2) SFP
diff --git a/device-types/Ubiquiti/US-24.yaml b/device-types/Ubiquiti/US-24.yaml
index 7bca9427b662448c8264c7954e2e26ab10797643..f54e79cb93297fbecef98d3c20bdd29d85408aad 100644
--- a/device-types/Ubiquiti/US-24.yaml
+++ b/device-types/Ubiquiti/US-24.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 24 Gen1
-slug: unifi-switch-24-gen1
+slug: ubiquiti-unifi-switch-24-gen1
 part_number: US-24
 comments: |
   UniFi Switch 24 non-PoE, Gen1, (24) Gigabit, (2) SFP
diff --git a/device-types/Ubiquiti/US-48-500W.yaml b/device-types/Ubiquiti/US-48-500W.yaml
index bd39ac8b0a68fcdbf2084eae9c34794d88947d81..fbe64e26aa0faa866696bd43b11c52e9e7eafb87 100644
--- a/device-types/Ubiquiti/US-48-500W.yaml
+++ b/device-types/Ubiquiti/US-48-500W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 48 PoE 500W Gen1
-slug: unifi-switch-48-poe-500w-gen1
+slug: ubiquiti-unifi-switch-48-poe-500w-gen1
 part_number: US-48-500W
 comments: |
   UniFi Switch 48 PoE 500W (64W + max. 436W PoE) Gen1, (48) Gigabit PoE+ IEEE 802.3af/at and 24V Passive PoE, (2) SFP+, (2) SFP
diff --git a/device-types/Ubiquiti/US-48-750W.yaml b/device-types/Ubiquiti/US-48-750W.yaml
index fcd6f2a7be13a81fd7a105086378e6413f579b20..89b8c123b29303e0abf0b68f498bcecb5988914c 100644
--- a/device-types/Ubiquiti/US-48-750W.yaml
+++ b/device-types/Ubiquiti/US-48-750W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 48 PoE 750W Gen1
-slug: unifi-switch-48-poe-750w-gen1
+slug: ubiquiti-unifi-switch-48-poe-750w-gen1
 part_number: US-48-750W
 comments: |
   UniFi Switch 48 PoE 750W (64W + max. 686W PoE) Gen1, (48) Gigabit PoE+ IEEE 802.3af/at and 24V Passive PoE, (2) SFP+, (2) SFP
diff --git a/device-types/Ubiquiti/US-48.yaml b/device-types/Ubiquiti/US-48.yaml
index 7e7e67b928fd5f4555343ca2bd9ded0f7ed938a0..a84bb5e7bd6c470d57148d01230f05d62e3597f9 100644
--- a/device-types/Ubiquiti/US-48.yaml
+++ b/device-types/Ubiquiti/US-48.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 48 Gen1
-slug: unifi-switch-48-gen1
+slug: ubiquiti-unifi-switch-48-gen1
 part_number: US-48
 comments: |
   UniFi Switch 48 Gen1, non-PoE, (48) Gigabit, (2) SFP+, (2) SFP
diff --git a/device-types/Ubiquiti/US-8-150W.yaml b/device-types/Ubiquiti/US-8-150W.yaml
index 9d0398c3f52ea89813fc5e3702309fda3bb95237..864734f36edee7468ed0f6e9a9803d0f6fd93dd1 100644
--- a/device-types/Ubiquiti/US-8-150W.yaml
+++ b/device-types/Ubiquiti/US-8-150W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: US-8-150W
-slug: us-8-150w
+slug: ubiquiti-us-8-150w
 comments: |
   [UniFi Switch PoE 8 (150W)](https://store.ui.com/collections/unifi-network-switching/products/unifi-switch-8-150w) (20W + max. 130W PoE), Gen1, (8) Gigabit PoE+ IEEE 802.3af/at and 24V Passive PoE, (2) SFP
 
diff --git a/device-types/Ubiquiti/US-8-60W.yaml b/device-types/Ubiquiti/US-8-60W.yaml
index 0adb93e70e9d1d07472fd71d4779df0279d5301f..3f8f31a9d193a354d757c5144ceaa1a41b60c59d 100644
--- a/device-types/Ubiquiti/US-8-60W.yaml
+++ b/device-types/Ubiquiti/US-8-60W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 8 PoE 60W Gen1
-slug: unifi-switch-8-poe-60w-gen1
+slug: ubiquiti-unifi-switch-8-poe-60w-gen1
 part_number: US-8-60W
 comments: |
   UniFi Switch 8 PoE 60W (12.4W + PoE), Gen1, Desk/WallMount, External VDC PSU, (8) Gigabit, (5-8) Gigabit PoE: IEEE802.3a
diff --git a/device-types/Ubiquiti/US-8.yaml b/device-types/Ubiquiti/US-8.yaml
index b35daf8e5673d9f87bbbaf92f56f298f72d9921a..94fe59f57b9a7078385c801b63e91437e13f572c 100644
--- a/device-types/Ubiquiti/US-8.yaml
+++ b/device-types/Ubiquiti/US-8.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 8 Gen1
-slug: unifi-switch-8-gen1
+slug: ubiquiti-unifi-switch-8-gen1
 part_number: US-8
 comments: |
   UniFi Switch 8 non-PoE, Gen1, Desk/WallMount, External VDC PSU, (8) Gigabit, (1/8) Gigabit PoE Passthrough Port: 802.3af/at or 48V
diff --git a/device-types/Ubiquiti/US-XG-6POE.yaml b/device-types/Ubiquiti/US-XG-6POE.yaml
index c0c49c9bd983543732c18d7294e5eb7ac66b372e..052f416a533a6e42e4ef51b02fb8685bdb849121 100644
--- a/device-types/Ubiquiti/US-XG-6POE.yaml
+++ b/device-types/Ubiquiti/US-XG-6POE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch XG 6PoE
-slug: unifi-switch-xg-6poe
+slug: ubiquiti-unifi-switch-xg-6poe
 part_number: US-XG-6POE
 comments: |
   UniFi Switch XG 6PoE, 10G 6-Port Switch with 802.3bt PoE++, (40W w/o PoE) External VDC PSU (4) 1/10 Gigabit 60W PoE++ IEEE 802.3bt, (2) SFP+
diff --git a/device-types/Ubiquiti/USG-PRO-4.yaml b/device-types/Ubiquiti/USG-PRO-4.yaml
index 5781f8f033ae91220ad2332758b3e4adc4c17ab2..0b15e251a9e15a70293ebd70147c351a0295afd2 100644
--- a/device-types/Ubiquiti/USG-PRO-4.yaml
+++ b/device-types/Ubiquiti/USG-PRO-4.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Security Gateway Pro
-slug: unifi-security-gateway-pro
+slug: ubiquiti-unifi-security-gateway-pro
 part_number: USG-PRO-4
 comments: |
   UniFi Security Gateway Pro, (2) Gigabit LAN, (2) 1 Gbps RJ45/SFP Combination WAN Ports*
diff --git a/device-types/Ubiquiti/USG.yaml b/device-types/Ubiquiti/USG.yaml
index 5256bda1226ec496605f2acb4df702d7de2e4078..56ac64424cfe647616821086c506867433fda7fb 100644
--- a/device-types/Ubiquiti/USG.yaml
+++ b/device-types/Ubiquiti/USG.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: USG
-slug: usg
+slug: ubiquiti-usg
 u_height: 1
 is_full_depth: false
 comments: '[UniFi Security Gateway - Enterprise Gateway Router with Gigabit Ethernet](https://www.ui.com/unifi-routing/usg/)'
diff --git a/device-types/Ubiquiti/USIP-R.yml b/device-types/Ubiquiti/USIP-R.yml
index c8ceb19f8f2e8c0c14b8bb3a907f1d6002ce4eea..6adf253bd6e39c34539069cf7125b1f0d28529d4 100644
--- a/device-types/Ubiquiti/USIP-R.yml
+++ b/device-types/Ubiquiti/USIP-R.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UISP Router
-slug: uisp-router
+slug: ubiquiti-uisp-router
 part_number: UISP-R
 u_height: 0
 is_full_depth: false
diff --git a/device-types/Ubiquiti/USP-RPS.yaml b/device-types/Ubiquiti/USP-RPS.yaml
index 6f559e7f65ce39564f8017fabfe75c7b80483061..ff74e0fffbc93cf0717717aafd3bf8e76e4ac8d6 100644
--- a/device-types/Ubiquiti/USP-RPS.yaml
+++ b/device-types/Ubiquiti/USP-RPS.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi SmartPower RPS
-slug: unifi-smartpower-rps
+slug: ubiquiti-unifi-smartpower-rps
 airflow: front-to-rear
 part_number: USP-RPS
 comments: |
diff --git a/device-types/Ubiquiti/USW-16-PoE.yaml b/device-types/Ubiquiti/USW-16-PoE.yaml
index e51ee3d90a72147c40889877af318738794b463d..7ff171f6d5022bb649ec5d6964fec8ace2978a04 100644
--- a/device-types/Ubiquiti/USW-16-PoE.yaml
+++ b/device-types/Ubiquiti/USW-16-PoE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 16 PoE Gen2
-slug: unifi-switch-16-poe-gen2
+slug: ubiquiti-unifi-switch-16-poe-gen2
 part_number: USW-16-POE
 comments: |
   UniFi Switch 16 PoE (18W + max. 42W PoE), Gen2, (16) Gigabit, (1-8) Gigabit PoE+ IEEE 802.3af/at, (2) SFP
diff --git a/device-types/Ubiquiti/USW-24-PoE.yaml b/device-types/Ubiquiti/USW-24-PoE.yaml
index 6e8398638db351f18c2b6b100e3f6b02a6b8dc75..637899a76e08deeec12a836c417a8adce6de1e4c 100644
--- a/device-types/Ubiquiti/USW-24-PoE.yaml
+++ b/device-types/Ubiquiti/USW-24-PoE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 24 PoE Gen2
-slug: unifi-switch-24-poe-gen2
+slug: ubiquiti-unifi-switch-24-poe-gen2
 part_number: USW-24-POE
 comments: |
   UniFi Switch 24 PoE (25W + max. 95W PoE), Gen2, (24) Gigabit, (1-16) Gigabit PoE+ IEEE 802.3af/at, (2) SFP
diff --git a/device-types/Ubiquiti/USW-24.yaml b/device-types/Ubiquiti/USW-24.yaml
index 20317bdc0f789ff0e719fe5ba8acea5a223888ab..a934ebe09e860059d521e5324dda54c1e69349e4 100644
--- a/device-types/Ubiquiti/USW-24.yaml
+++ b/device-types/Ubiquiti/USW-24.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 24 Gen2
-slug: unifi-switch-24-gen2
+slug: ubiquiti-unifi-switch-24-gen2
 part_number: USW-24
 comments: |
   UniFi Switch 24 (25W), Gen2, (24) Gigabit, (2) SFP
diff --git a/device-types/Ubiquiti/USW-48-PoE.yaml b/device-types/Ubiquiti/USW-48-PoE.yaml
index 67af1a962bcced6fd2252585c6d987c3cc81c99d..8cfc092cbd770805185aa4368a726d3abc2df494 100644
--- a/device-types/Ubiquiti/USW-48-PoE.yaml
+++ b/device-types/Ubiquiti/USW-48-PoE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 48 PoE Gen2
-slug: unifi-switch-48-poe-gen2
+slug: ubiquiti-unifi-switch-48-poe-gen2
 part_number: USW-48-POE
 comments: |
   UniFi Switch 48 PoE (45W + max. 195W PoE), Gen2, (48) Gigabit, (1-32) Gigabit PoE+ IEEE 802.3af/at, (4) 1G SFP
diff --git a/device-types/Ubiquiti/USW-48.yaml b/device-types/Ubiquiti/USW-48.yaml
index d55be8177dbf7846b14ac220dd14b3f9e66ca4ee..2fcb09048f9afa42f0c049eca3822d4edcf75e0b 100644
--- a/device-types/Ubiquiti/USW-48.yaml
+++ b/device-types/Ubiquiti/USW-48.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 48 Gen2
-slug: unifi-switch-48-gen2
+slug: ubiquiti-unifi-switch-48-gen2
 part_number: USW-48
 comments: |
   UniFi Switch 48 PoE (40W), Gen2, (48) Gigabit, (1-32) Gigabit (4) 1G SFP
diff --git a/device-types/Ubiquiti/USW-Aggregation.yaml b/device-types/Ubiquiti/USW-Aggregation.yaml
index 3409242d0b44e0f5bed5eba9eda534faed30543e..68f5c09ebc083c569e9f325f51fe9edae32fe4d3 100644
--- a/device-types/Ubiquiti/USW-Aggregation.yaml
+++ b/device-types/Ubiquiti/USW-Aggregation.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch Aggregation
-slug: unifi-switch-aggregation
+slug: ubiquiti-unifi-switch-aggregation
 part_number: USW-Aggregation
 comments: |
   UniFi Switch Aggregation, 10G 8-Port Managed Aggregation Switch, 30W, (8) SFP+
diff --git a/device-types/Ubiquiti/USW-Enterprise-48-PoE.yaml b/device-types/Ubiquiti/USW-Enterprise-48-PoE.yaml
index 85cfd81ec5e18162b6f2ecefd89b0f240d178dad..06594faa6fab67b3b5ece4580ff9234302cc329b 100644
--- a/device-types/Ubiquiti/USW-Enterprise-48-PoE.yaml
+++ b/device-types/Ubiquiti/USW-Enterprise-48-PoE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch Enterprise 48 PoE
-slug: unifi-switch-enterprise-48-poe
+slug: ubiquiti-unifi-switch-enterprise-48-poe
 part_number: USW-Enterprise-48-PoE
 comments: |
   UniFi Switch Enterprise 48 PoE (150W + max. 720W PoE), (48) 2.5 Gigabit PoE+ IEEE 802.3af/at, (4) SFP+
diff --git a/device-types/Ubiquiti/USW-Flex-Mini.yaml b/device-types/Ubiquiti/USW-Flex-Mini.yaml
index 5893f01e59a44d205b076b2f91ee38106e2bf2b2..711fdcecae594f578d9801cbafb62320db17e410 100644
--- a/device-types/Ubiquiti/USW-Flex-Mini.yaml
+++ b/device-types/Ubiquiti/USW-Flex-Mini.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch Flex Mini
-slug: unifi-usw-flex-mini
+slug: ubiquiti-unifi-switch-flex-mini
 part_number: USW-Flex-Mini
 comments: |
   107.16 x 70.15 x 21.17 mm (4.22 x 2.76 x 0.83")
diff --git a/device-types/Ubiquiti/USW-Flex.yaml b/device-types/Ubiquiti/USW-Flex.yaml
index 808cf5842f6feb2791aa823b3c593a312f93d35c..92e2b7886cd2ed3c2be11781839047b855215ae5 100644
--- a/device-types/Ubiquiti/USW-Flex.yaml
+++ b/device-types/Ubiquiti/USW-Flex.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch Flex
-slug: unifi-usw-flex
+slug: ubiquiti-unifi-switch-flex
 part_number: USW-Flex
 comments: |
   122.5 x 107.1 x 28.0 mm (4.82 x 4.22 x 1.10")
diff --git a/device-types/Ubiquiti/USW-Lite-16-PoE.yaml b/device-types/Ubiquiti/USW-Lite-16-PoE.yaml
index 505bff2dd2f883b0e853f8903f88de89b37f140c..6483d3d039a1fec007f7c7fc802e46f8b00ad3da 100644
--- a/device-types/Ubiquiti/USW-Lite-16-PoE.yaml
+++ b/device-types/Ubiquiti/USW-Lite-16-PoE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch Lite 16 PoE
-slug: unifi-switch-lite-16-poe
+slug: ubiquiti-unifi-switch-lite-16-poe
 part_number: USW-Lite-16-PoE
 comments: |
   UniFi Switch Lite 16 PoE (16) Gigabit, (1-8) Gigabit PoE+ IEEE 802.3af/at
diff --git a/device-types/Ubiquiti/USW-Lite-8-PoE.yaml b/device-types/Ubiquiti/USW-Lite-8-PoE.yaml
index a6502626cd8a9c02fac69442b878c4c37c072aa8..f9ff85e3dbfa78715085d2681648e046317e0e6a 100644
--- a/device-types/Ubiquiti/USW-Lite-8-PoE.yaml
+++ b/device-types/Ubiquiti/USW-Lite-8-PoE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch Lite 8 PoE
-slug: unifi-switch-lite-8-poe
+slug: ubiquiti-unifi-switch-lite-8-poe
 part_number: USW-Lite-8-PoE
 comments: |
   UniFi Switch Lite 8 PoE (8) Gigabit, (1-4) Gigabit PoE+ IEEE 802.3af/at
diff --git a/device-types/Ubiquiti/USW-Pro-24-PoE.yaml b/device-types/Ubiquiti/USW-Pro-24-PoE.yaml
index a41f19df3fa3c1083d1637284b4e0eda1a283786..3f362517877a5b6ac279e954c33f8718ec95f228 100644
--- a/device-types/Ubiquiti/USW-Pro-24-PoE.yaml
+++ b/device-types/Ubiquiti/USW-Pro-24-PoE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 24 Pro PoE Gen2
-slug: unifi-switch-24-pro-poe-gen2
+slug: ubiquiti-unifi-switch-24-pro-poe-gen2
 part_number: USW-PRO-24-POE
 comments: |
   UniFi Switch 24 Pro PoE (50W + max. 400W PoE), Gen2, (24) Gigabit, (1-16) Gigabit PoE+ IEEE 802.3af/at, (17-24) Gigabit 60W PoE++ IEEE 802.3bt, (2) SFP+
diff --git a/device-types/Ubiquiti/USW-Pro-24.yaml b/device-types/Ubiquiti/USW-Pro-24.yaml
index bb16e538ce08a585ddb18611cb74f9cbf1a735c2..f3a511711978012255dffff69b506e2fd222bdb0 100644
--- a/device-types/Ubiquiti/USW-Pro-24.yaml
+++ b/device-types/Ubiquiti/USW-Pro-24.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: USW-PRO-24
-slug: usw-pro-24
+slug: ubiquiti-usw-pro-24
 comments: |
   [UniFi Switch Pro 24](https://store.ui.com/collections/unifi-network-switching/products/usw-pro-24)
 
diff --git a/device-types/Ubiquiti/USW-Pro-48-PoE.yaml b/device-types/Ubiquiti/USW-Pro-48-PoE.yaml
index f68728c581b3c94385474c9fc53d60b42836c41f..9ea3d0fc8dec7a6d076a08fc2867f5fe777933f8 100644
--- a/device-types/Ubiquiti/USW-Pro-48-PoE.yaml
+++ b/device-types/Ubiquiti/USW-Pro-48-PoE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 48 Pro PoE Gen2
-slug: unifi-switch-48-pro-poe-gen2
+slug: ubiquiti-unifi-switch-48-pro-poe-gen2
 part_number: USW-PRO-48-POE
 comments: |
   UniFi Switch 48 Pro PoE (60W + max. 600W PoE), Gen2, (48) Gigabit, (1-40) Gigabit PoE+ IEEE 802.3af/at, (41-48) 60W PoE++ IEEE 802.3bt, (4) SFP+
diff --git a/device-types/Ubiquiti/USW-Pro-48.yaml b/device-types/Ubiquiti/USW-Pro-48.yaml
index 601b6211144fc9b7a1cf4f54543e268037425d35..9f5070ccae775d3adff9bde4236634156c29f616 100644
--- a/device-types/Ubiquiti/USW-Pro-48.yaml
+++ b/device-types/Ubiquiti/USW-Pro-48.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch 48 Pro
-slug: unifi-switch-48-pro
+slug: ubiquiti-unifi-switch-48-pro
 part_number: USW-Pro-48
 comments: |
   UniFi Switch 48 Pro, Gen2, (48) Gigabit, (4) SFP+
diff --git a/device-types/Ubiquiti/USW-Pro-Aggregation.yaml b/device-types/Ubiquiti/USW-Pro-Aggregation.yaml
index a1006eb4c267592228323cec2e4c1f3f2a30868c..f43fb544ba26148f75f4789c4063ccc295dfb41b 100644
--- a/device-types/Ubiquiti/USW-Pro-Aggregation.yaml
+++ b/device-types/Ubiquiti/USW-Pro-Aggregation.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: UniFi Switch Pro Aggregation
-slug: unifi-switch-pro-aggregation
+slug: ubiquiti-unifi-switch-pro-aggregation
 part_number: USW-Pro-Aggregation
 comments: |
   UniFi Switch Pro Aggregation, 10G 28-Port and 25G 4-Port Managed Aggregation Switch, 100W, (28) SFP+ (4) SFP28
diff --git a/device-types/Ubiquiti/airCube-AC.yml b/device-types/Ubiquiti/airCube-AC.yml
index 67a4732d83f73b7e5182f88b51339dc08fe6a51d..87b476a8f84d034ba2e9d0fba580837538bb2a1d 100644
--- a/device-types/Ubiquiti/airCube-AC.yml
+++ b/device-types/Ubiquiti/airCube-AC.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: airCube-AC
-slug: aircube-ac
+slug: ubiquiti-aircube-ac
 part_number: aircube-ac
 comments: |
   24VDC, 0.83A or PoE 24V In on LAN Port 1
diff --git a/device-types/Ubiquiti/airCube-ISP.yaml b/device-types/Ubiquiti/airCube-ISP.yaml
index 64f64995ed7a91460b4233f8581e5f62cd68c6ee..5d7c2d14dc1ebdbee3c12271fb3315f6cfa7f108 100644
--- a/device-types/Ubiquiti/airCube-ISP.yaml
+++ b/device-types/Ubiquiti/airCube-ISP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Ubiquiti
 model: airCube-ISP
-slug: aircube-isp
+slug: ubiquiti-aircube-isp
 part_number: aircube-isp
 comments: |
   PoE 24V In on LAN Port 1 or 2A Micro USB Adapter (Not Included)
diff --git a/device-types/V-Solution/V-Solution_V1600D2.yaml b/device-types/V-Solution/V-Solution_V1600D2.yaml
index 04d882872e91de6498c32ea9455719672b47484f..8a55425508cdaed62a6e5f1236e3ff8fdbeed52f 100644
--- a/device-types/V-Solution/V-Solution_V1600D2.yaml
+++ b/device-types/V-Solution/V-Solution_V1600D2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: V-Solution
 model: V1600D2
-slug: v1600d2
+slug: v-solution-v1600d2
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Vertiv/ACS8008SAC.yaml b/device-types/Vertiv/ACS8008SAC.yaml
index e352f75d91a25e655f5779edc809b0da2429ff91..0467474c0380a0b8af5d031c1ae3a61881e0d474 100644
--- a/device-types/Vertiv/ACS8008SAC.yaml
+++ b/device-types/Vertiv/ACS8008SAC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Vertiv
 model: ACS8008SAC
-slug: acs8008sac
+slug: vertiv-acs8008sac
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Vertiv/ACS8016DAC.yaml b/device-types/Vertiv/ACS8016DAC.yaml
index 200574199729efa02651006047139bb0265ad0c0..5c20005df2624b4d36a7bddb76b407412fefec4e 100644
--- a/device-types/Vertiv/ACS8016DAC.yaml
+++ b/device-types/Vertiv/ACS8016DAC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Vertiv
 model: ACS8016DAC
-slug: acs8016dac
+slug: vertiv-acs8016dac
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Vertiv/ACS8016SAC.yaml b/device-types/Vertiv/ACS8016SAC.yaml
index b79e56a19194beabe736b19a2160c738390e1f3f..11e730897bec06f96b930bb0f6df3d482d28552e 100644
--- a/device-types/Vertiv/ACS8016SAC.yaml
+++ b/device-types/Vertiv/ACS8016SAC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Vertiv
 model: ACS8016SAC
-slug: acs8016sac
+slug: vertiv-acs8016sac
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Vertiv/ACS8032SAC.yaml b/device-types/Vertiv/ACS8032SAC.yaml
index 29f2b3efedca5a662828df5eca294b3ef79d7533..5c133a0e51c60b23ad8cc39b57f38d6014ada96b 100644
--- a/device-types/Vertiv/ACS8032SAC.yaml
+++ b/device-types/Vertiv/ACS8032SAC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Vertiv
 model: ACS8032SAC
-slug: acs8032sac
+slug: vertiv-acs8032sac
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Vertiv/ACS8048DAC.yaml b/device-types/Vertiv/ACS8048DAC.yaml
index b7953eecf1799cb82bd318fd5f55e9fc59355476..2e04afbd9d0f3ddd83d4352ef524b65352f09512 100644
--- a/device-types/Vertiv/ACS8048DAC.yaml
+++ b/device-types/Vertiv/ACS8048DAC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Vertiv
 model: ACS8048DAC
-slug: acs8048dac
+slug: vertiv-acs8048dac
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/Vertiv/ACS8048SAC.yaml b/device-types/Vertiv/ACS8048SAC.yaml
index cf09dda30e02109f0700d366ddf4f064694aa6fd..063981d38641b9d61632c6c08abb02b56ee075c1 100644
--- a/device-types/Vertiv/ACS8048SAC.yaml
+++ b/device-types/Vertiv/ACS8048SAC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Vertiv
 model: ACS8048SAC
-slug: acs8048sac
+slug: vertiv-acs8048sac
 u_height: 1
 is_full_depth: false
 console-ports:
diff --git a/device-types/WTI/CPM-1600-1-EC.yaml b/device-types/WTI/CPM-1600-1-EC.yaml
index 9801e26fa5288100fa83284b5c653de5d6256f01..ce0b91acd4c63fbfe287ce31a55d8a9a6a5a7deb 100644
--- a/device-types/WTI/CPM-1600-1-EC.yaml
+++ b/device-types/WTI/CPM-1600-1-EC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: CPM-1600-1-EC
-slug: cpm-1600-1-ec
+slug: wti-cpm-1600-1-ec
 airflow: passive
 part_number: CPM-1600-1-EC
 is_full_depth: false
diff --git a/device-types/WTI/CPM-1600-1-ECAM.yaml b/device-types/WTI/CPM-1600-1-ECAM.yaml
index b9e3f84d0a1ed3f6ca88bfbcf61ce3efa75b4886..b3a97617c37e75bd7f987aa1827b10f9c7653d3c 100644
--- a/device-types/WTI/CPM-1600-1-ECAM.yaml
+++ b/device-types/WTI/CPM-1600-1-ECAM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: CPM-1600-1-ECAM
-slug: cpm-1600-1-ecam
+slug: wti-cpm-1600-1-ecam
 airflow: passive
 part_number: CPM-1600-1-ECAM
 is_full_depth: false
diff --git a/device-types/WTI/CPM-800-1-A-VZW.yaml b/device-types/WTI/CPM-800-1-A-VZW.yaml
index f291524cedcf8331560d561c1bd77a3768f288b6..759f9990013c172def02685929a17b3383505f5a 100644
--- a/device-types/WTI/CPM-800-1-A-VZW.yaml
+++ b/device-types/WTI/CPM-800-1-A-VZW.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: CPM-800-1-A-VZW
-slug: cpm-800-1-a-vzw
+slug: wti-cpm-800-1-a-vzw
 airflow: passive
 part_number: CPM-800-1-A-VZW
 is_full_depth: false
diff --git a/device-types/WTI/CPM-800-1-A.yaml b/device-types/WTI/CPM-800-1-A.yaml
index 7237a833507ec1b91de13c20340f65a0bce7749d..6a1f07f2fccf4b947a199143928f1774845ba2b9 100644
--- a/device-types/WTI/CPM-800-1-A.yaml
+++ b/device-types/WTI/CPM-800-1-A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: CPM-800-1-A
-slug: cpm-800-1-a
+slug: wti-cpm-800-1-a
 airflow: passive
 part_number: CPM-800-1-A
 is_full_depth: false
diff --git a/device-types/WTI/CPM-800-1-AM.yaml b/device-types/WTI/CPM-800-1-AM.yaml
index 41653be6b72b825d491750cc33b9b3c71fde7432..fafc150ff07d77081d45c586684b12ea230772af 100644
--- a/device-types/WTI/CPM-800-1-AM.yaml
+++ b/device-types/WTI/CPM-800-1-AM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: CPM-800-1-AM
-slug: cpm-800-1-am
+slug: wti-cpm-800-1-am
 airflow: passive
 part_number: CPM-800-1-AM
 is_full_depth: false
diff --git a/device-types/WTI/CPM-800-1-E.yaml b/device-types/WTI/CPM-800-1-E.yaml
index 21270122acca6604d7fded3e21746b2b5c9500df..c6489548494c181337a500d49b33555ba61a8eff 100644
--- a/device-types/WTI/CPM-800-1-E.yaml
+++ b/device-types/WTI/CPM-800-1-E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: CPM-800-1-E
-slug: cpm-800-1-e
+slug: wti-cpm-800-1-e
 airflow: passive
 part_number: CPM-800-1-E
 is_full_depth: false
diff --git a/device-types/WTI/CPM-800-1-EA.yaml b/device-types/WTI/CPM-800-1-EA.yaml
index ec9acb01cf212330bf64e57006c2c28e7633faa0..9f0ab1526e4aee57fd46708267c2cfc489345b4f 100644
--- a/device-types/WTI/CPM-800-1-EA.yaml
+++ b/device-types/WTI/CPM-800-1-EA.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: CPM-800-1-EA
-slug: cpm-800-1-ea
+slug: wti-cpm-800-1-ea
 airflow: passive
 part_number: CPM-800-1-EA
 is_full_depth: false
diff --git a/device-types/WTI/CPM-800-1-ECA.yaml b/device-types/WTI/CPM-800-1-ECA.yaml
index aeb6f86b5d0c75ea9fa86bd645bc45204668c847..d8155fda80c2685cb63e522dfe0334d66f5d1a8b 100644
--- a/device-types/WTI/CPM-800-1-ECA.yaml
+++ b/device-types/WTI/CPM-800-1-ECA.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: CPM-800-1-ECA
-slug: cpm-800-1-eca
+slug: wti-cpm-800-1-eca
 airflow: passive
 part_number: CPM-800-1-ECA
 is_full_depth: false
diff --git a/device-types/WTI/CPM-800-2-A-VZW.yaml b/device-types/WTI/CPM-800-2-A-VZW.yaml
index f2de706050fecf925f03e029ca114923f4b005bf..5117fe01f5527bca964518449a88b3802fe8b015 100644
--- a/device-types/WTI/CPM-800-2-A-VZW.yaml
+++ b/device-types/WTI/CPM-800-2-A-VZW.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: CPM-800-2-A-VZW
-slug: cpm-800-2-a-vzw
+slug: wti-cpm-800-2-a-vzw
 airflow: passive
 part_number: CPM-800-2-A-VZW
 is_full_depth: false
diff --git a/device-types/WTI/CPM-800-2-A.yaml b/device-types/WTI/CPM-800-2-A.yaml
index 6db535f97a615cdc269c18173289fa4da8ccb94e..d805d7c28a2d76fb7bdf947cc890d84bb4f590bc 100644
--- a/device-types/WTI/CPM-800-2-A.yaml
+++ b/device-types/WTI/CPM-800-2-A.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: CPM-800-2-A
-slug: cpm-800-2-a
+slug: wti-cpm-800-2-a
 airflow: passive
 part_number: CPM-800-2-A
 is_full_depth: false
diff --git a/device-types/WTI/CPM-800-2-AM.yaml b/device-types/WTI/CPM-800-2-AM.yaml
index b94f24bb1284c3a3871209d0f080ce73e9360cbb..863a203a657fb00f4fe15404358ca7743399036f 100644
--- a/device-types/WTI/CPM-800-2-AM.yaml
+++ b/device-types/WTI/CPM-800-2-AM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: CPM-800-2-AM
-slug: cpm-800-2-am
+slug: wti-cpm-800-2-am
 airflow: passive
 part_number: CPM-800-2-AM
 is_full_depth: false
diff --git a/device-types/WTI/CPM-800-2-E.yaml b/device-types/WTI/CPM-800-2-E.yaml
index dd4d17e4c4b5490629734ff21e1d58905b3ec8fa..eda57f2049e2e97eeb1455f07e74513cfa824559 100644
--- a/device-types/WTI/CPM-800-2-E.yaml
+++ b/device-types/WTI/CPM-800-2-E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: CPM-800-2-E
-slug: cpm-800-2-e
+slug: wti-cpm-800-2-e
 airflow: passive
 part_number: CPM-800-2-E
 is_full_depth: false
diff --git a/device-types/WTI/CPM-800-2-EA.yaml b/device-types/WTI/CPM-800-2-EA.yaml
index 4a236cb3eba5614554dc9f683c664cc3bb9bef43..315f5de76be11131ca8833fe1ecb25d3725f563b 100644
--- a/device-types/WTI/CPM-800-2-EA.yaml
+++ b/device-types/WTI/CPM-800-2-EA.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: CPM-800-2-EA
-slug: cpm-800-2-ea
+slug: wti-cpm-800-2-ea
 airflow: passive
 part_number: CPM-800-2-EA
 is_full_depth: false
diff --git a/device-types/WTI/DSM-24NM-DP.yaml b/device-types/WTI/DSM-24NM-DP.yaml
index dedb1e237a19d5efbfff76cecf18f36fb0eaca44..eed395cbd8d49485feee8446e7605dfcf2adaaff 100644
--- a/device-types/WTI/DSM-24NM-DP.yaml
+++ b/device-types/WTI/DSM-24NM-DP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: DSM-24NM-DP
-slug: dsm-24nm-dp
+slug: wti-dsm-24nm-dp
 airflow: passive
 part_number: DSM-24NM-DP
 is_full_depth: false
diff --git a/device-types/WTI/DSM-24NM-E.yaml b/device-types/WTI/DSM-24NM-E.yaml
index 835c88bf308f833fa65d7ef11f869a7d4d57c9c3..e216154f8d4840375380f5448de4fc87d7561d3e 100644
--- a/device-types/WTI/DSM-24NM-E.yaml
+++ b/device-types/WTI/DSM-24NM-E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: DSM-24NM-E
-slug: dsm-24nm-e
+slug: wti-dsm-24nm-e
 airflow: passive
 part_number: DSM-24NM-E
 is_full_depth: false
diff --git a/device-types/WTI/DSM-24NM.yaml b/device-types/WTI/DSM-24NM.yaml
index c9ddc381abe658def6fbe684ef50034d8ec95de7..638488b6ea8a5d145d2ef2a9b56b10b664e2a936 100644
--- a/device-types/WTI/DSM-24NM.yaml
+++ b/device-types/WTI/DSM-24NM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: DSM-24NM
-slug: dsm-24nm
+slug: wti-dsm-24nm
 airflow: passive
 part_number: DSM-24NM
 is_full_depth: false
diff --git a/device-types/WTI/DSM-40NM-DP.yaml b/device-types/WTI/DSM-40NM-DP.yaml
index 591afc0bfc274482d0e84e10c26728fce22eef8b..11925ae2751f34c6cbc9f0145e0513518d1f2f77 100644
--- a/device-types/WTI/DSM-40NM-DP.yaml
+++ b/device-types/WTI/DSM-40NM-DP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: DSM-40NM-DP
-slug: dsm-40nm-dp
+slug: wti-dsm-40nm-dp
 airflow: passive
 part_number: DSM-40NM-DP
 is_full_depth: false
diff --git a/device-types/WTI/DSM-40NM-E.yaml b/device-types/WTI/DSM-40NM-E.yaml
index c4253525058b741852bdd5fc82bc45ada810fd3e..3d2196e41ab944e811d00c80997b9de4292625c3 100644
--- a/device-types/WTI/DSM-40NM-E.yaml
+++ b/device-types/WTI/DSM-40NM-E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: DSM-40NM-E
-slug: dsm-40nm-e
+slug: wti-dsm-40nm-e
 airflow: passive
 part_number: DSM-40NM-E
 is_full_depth: false
diff --git a/device-types/WTI/DSM-40NM.yaml b/device-types/WTI/DSM-40NM.yaml
index cc67fa07c6f07d4a565c9b13b7615de6813c1e3b..e95db8d43f332faa4b1f5cbf039c4240032ecd2e 100644
--- a/device-types/WTI/DSM-40NM.yaml
+++ b/device-types/WTI/DSM-40NM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: DSM-40NM
-slug: dsm-40nm
+slug: wti-dsm-40nm
 airflow: passive
 part_number: DSM-40NM
 is_full_depth: false
diff --git a/device-types/WTI/DSM-8NM-DP.yaml b/device-types/WTI/DSM-8NM-DP.yaml
index 8e9863ebb7f41e43a681f9571d8de2d9d80364c6..e7e02e7d350c274db2b0c9387eb75cfb0d996b78 100644
--- a/device-types/WTI/DSM-8NM-DP.yaml
+++ b/device-types/WTI/DSM-8NM-DP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: DSM-8NM-DP
-slug: dsm-8nm-dp
+slug: wti-dsm-8nm-dp
 airflow: passive
 part_number: DSM-8NM-DP
 is_full_depth: false
diff --git a/device-types/WTI/DSM-8NM-E.yaml b/device-types/WTI/DSM-8NM-E.yaml
index 86dec6ddf51aa7e7636713d07698c6e9db2b5bcc..cce46a7e15c4670de38ce85af2b70805f3ba7440 100644
--- a/device-types/WTI/DSM-8NM-E.yaml
+++ b/device-types/WTI/DSM-8NM-E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: DSM-8NM-E
-slug: dsm-8nm-e
+slug: wti-dsm-8nm-e
 airflow: passive
 part_number: DSM-8NM-E
 is_full_depth: false
diff --git a/device-types/WTI/DSM-8NM.yaml b/device-types/WTI/DSM-8NM.yaml
index 94cd2ab6ed5cb07f418b917c4c04dbf5ad6e9807..2ea2e2f9164bcf60d5d74f251b327df96976cb95 100644
--- a/device-types/WTI/DSM-8NM.yaml
+++ b/device-types/WTI/DSM-8NM.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: DSM-8NM
-slug: dsm-8nm
+slug: wti-dsm-8nm
 airflow: passive
 part_number: DSM-8NM
 is_full_depth: false
diff --git a/device-types/WTI/NBB-20VD20-1.yml b/device-types/WTI/NBB-20VD20-1.yml
index 7c13f7b3a07a6b20643cb762140b142ed2f82527..4bd83027e5ae594f50bef2a79551064fbda77891 100644
--- a/device-types/WTI/NBB-20VD20-1.yml
+++ b/device-types/WTI/NBB-20VD20-1.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: NBB-20VD20-1
-slug: nbb-20vd20-1
+slug: wti-nbb-20vd20-1
 airflow: passive
 part_number: NBB-20VD20-1
 is_full_depth: false
diff --git a/device-types/WTI/NPS-8H20-ATS-1.yml b/device-types/WTI/NPS-8H20-ATS-1.yml
index 9b4281082d79e04e96718dabf6532c8a13f79729..3b7a25d34e1bdddd77e2ddf8a45868d280e7226f 100644
--- a/device-types/WTI/NPS-8H20-ATS-1.yml
+++ b/device-types/WTI/NPS-8H20-ATS-1.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: NPS-8H20-ATS-1
-slug: nps-8h20-ats-1
+slug: wti-nps-8h20-ats-1
 airflow: passive
 part_number: NPS-8H20-ATS-1
 is_full_depth: false
diff --git a/device-types/WTI/REM-0R4-1-E.yaml b/device-types/WTI/REM-0R4-1-E.yaml
index 6f0fc63191b65054cc3e579f8d9467446f7d5192..3866fdd8758c39854755d694a35de4b4419f048d 100644
--- a/device-types/WTI/REM-0R4-1-E.yaml
+++ b/device-types/WTI/REM-0R4-1-E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-0R4-1-E
-slug: rem-0r4-1-e
+slug: wti-rem-0r4-1-e
 airflow: passive
 part_number: REM-0R4-1-E
 is_full_depth: false
diff --git a/device-types/WTI/REM-0R4-1-N.yaml b/device-types/WTI/REM-0R4-1-N.yaml
index 293c1cb71c862373cbe70ae6d0d74ed55d459d8e..c83d0a83fd965aa737915cf85a5f609c7df3b751 100644
--- a/device-types/WTI/REM-0R4-1-N.yaml
+++ b/device-types/WTI/REM-0R4-1-N.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-0R4-1-N
-slug: rem-0r4-1-n
+slug: wti-rem-0r4-1-n
 airflow: passive
 part_number: REM-0R4-1-N
 is_full_depth: false
diff --git a/device-types/WTI/REM-0R4-1-NE.yaml b/device-types/WTI/REM-0R4-1-NE.yaml
index 6366119fe7ac940272cb5d4ea4edfe88e53059df..1d3ae8caf998651249e6721ccffb80ef1f7fd738 100644
--- a/device-types/WTI/REM-0R4-1-NE.yaml
+++ b/device-types/WTI/REM-0R4-1-NE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-0R4-1-NE
-slug: rem-0r4-1-ne
+slug: wti-rem-0r4-1-ne
 airflow: passive
 part_number: REM-0R4-1-NE
 is_full_depth: false
diff --git a/device-types/WTI/REM-0R4-1-W.yaml b/device-types/WTI/REM-0R4-1-W.yaml
index ae3e9734070b6f10e982b05904b8a84c7070bd1f..e9fb9342ef1e5b012b0c33f45c7ce167b94701ec 100644
--- a/device-types/WTI/REM-0R4-1-W.yaml
+++ b/device-types/WTI/REM-0R4-1-W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-0R4-1-W
-slug: rem-0r4-1-w
+slug: wti-rem-0r4-1-w
 airflow: passive
 part_number: REM-0R4-1-W
 is_full_depth: false
diff --git a/device-types/WTI/REM-0R4-1-WE.yaml b/device-types/WTI/REM-0R4-1-WE.yaml
index 7c36a23498c4d740ef42afb4b6d1feb8e6acd606..357295718a09352abb846771f90e48222ef9ac79 100644
--- a/device-types/WTI/REM-0R4-1-WE.yaml
+++ b/device-types/WTI/REM-0R4-1-WE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-0R4-1-WE
-slug: rem-0r4-1-we
+slug: wti-rem-0r4-1-we
 airflow: passive
 part_number: REM-0R4-1-WE
 is_full_depth: false
diff --git a/device-types/WTI/REM-0R4-1.yaml b/device-types/WTI/REM-0R4-1.yaml
index e057b59ad4400621e458c645a99cb06c09eff61a..b0e3e682946d33080e8850cad8e5c980812688e0 100644
--- a/device-types/WTI/REM-0R4-1.yaml
+++ b/device-types/WTI/REM-0R4-1.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-0R4-1
-slug: rem-0r4-1
+slug: wti-rem-0r4-1
 airflow: passive
 part_number: REM-0R4-1
 is_full_depth: false
diff --git a/device-types/WTI/REM-0R4-2-E.yaml b/device-types/WTI/REM-0R4-2-E.yaml
index 1dea6793e8a1c6d9c4b9795bc8f9d1864b51de6b..0bd337c72600726c51f68a6f7fb3a9241909c49c 100644
--- a/device-types/WTI/REM-0R4-2-E.yaml
+++ b/device-types/WTI/REM-0R4-2-E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-0R4-2-E
-slug: rem-0r4-2-e
+slug: wti-rem-0r4-2-e
 airflow: passive
 part_number: REM-0R4-2-E
 is_full_depth: false
diff --git a/device-types/WTI/REM-0R4-2-N.yaml b/device-types/WTI/REM-0R4-2-N.yaml
index 608b52f5b83c936c41d250c5f57dfc54a4cb78d0..87c3eaf5e870a36a0b54ccd9593ff28ec4b403ca 100644
--- a/device-types/WTI/REM-0R4-2-N.yaml
+++ b/device-types/WTI/REM-0R4-2-N.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-0R4-2-N
-slug: rem-0r4-2-n
+slug: wti-rem-0r4-2-n
 airflow: passive
 part_number: REM-0R4-2-N
 is_full_depth: false
diff --git a/device-types/WTI/REM-0R4-2-NE.yaml b/device-types/WTI/REM-0R4-2-NE.yaml
index 26dca95800ba6db5466abe0387313d120860c169..f88b9a18146f90b51defe659b0ee17861bc40d5b 100644
--- a/device-types/WTI/REM-0R4-2-NE.yaml
+++ b/device-types/WTI/REM-0R4-2-NE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-0R4-2-NE
-slug: rem-0r4-2-ne
+slug: wti-rem-0r4-2-ne
 airflow: passive
 part_number: REM-0R4-2-NE
 is_full_depth: false
diff --git a/device-types/WTI/REM-0R4-2-W.yaml b/device-types/WTI/REM-0R4-2-W.yaml
index 2fa49fc4a680951be25d9dc5740c565f43f6e405..dd44178e92ec4b98f963086679532c61f7eeebda 100644
--- a/device-types/WTI/REM-0R4-2-W.yaml
+++ b/device-types/WTI/REM-0R4-2-W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-0R4-2-W
-slug: rem-0r4-2-w
+slug: wti-rem-0r4-2-w
 airflow: passive
 part_number: REM-0R4-2-W
 is_full_depth: false
diff --git a/device-types/WTI/REM-0R4-2-WE.yaml b/device-types/WTI/REM-0R4-2-WE.yaml
index 90dc74457855eb896f3b86f77cb71d99878f7377..e520b924447e2bca66c7096eb5929a14e78d5341 100644
--- a/device-types/WTI/REM-0R4-2-WE.yaml
+++ b/device-types/WTI/REM-0R4-2-WE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-0R4-2-WE
-slug: rem-0r4-2-we
+slug: wti-rem-0r4-2-we
 airflow: passive
 part_number: REM-0R4-2-WE
 is_full_depth: false
diff --git a/device-types/WTI/REM-0R4-2.yaml b/device-types/WTI/REM-0R4-2.yaml
index 80d913e38d57b5358e18f2863d3efc83ba267c64..76160ea8eab27cfb628a103896ee54a1f4eae22c 100644
--- a/device-types/WTI/REM-0R4-2.yaml
+++ b/device-types/WTI/REM-0R4-2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-0R4-2
-slug: rem-0r4-2
+slug: wti-rem-0r4-2
 airflow: passive
 part_number: REM-0R4-2
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R0-E.yaml b/device-types/WTI/REM-4R0-E.yaml
index 0cfe18949ee7d3865a71914413cb7623975f8b79..c55521b1f884daab066414ab7787b6896df7aa57 100644
--- a/device-types/WTI/REM-4R0-E.yaml
+++ b/device-types/WTI/REM-4R0-E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R0-E
-slug: rem-4r0-e
+slug: wti-rem-4r0-e
 airflow: passive
 part_number: REM-4R0-E
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R0-NE.yaml b/device-types/WTI/REM-4R0-NE.yaml
index fe65118a019a908e88213ac67df62a2f8840db83..40cd120d44ab026edd6f87296702cbc13d1c2b2f 100644
--- a/device-types/WTI/REM-4R0-NE.yaml
+++ b/device-types/WTI/REM-4R0-NE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R0-NE
-slug: rem-4r0-ne
+slug: wti-rem-4r0-ne
 airflow: passive
 part_number: REM-4R0-NE
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R0-W.yaml b/device-types/WTI/REM-4R0-W.yaml
index b2757f5d8a40fa262bfe4da00a8ccb07e88235d1..bee4ca56dee79941c0e695ee295e66a38082b2fc 100644
--- a/device-types/WTI/REM-4R0-W.yaml
+++ b/device-types/WTI/REM-4R0-W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R0-W
-slug: rem-4r0-w
+slug: wti-rem-4r0-w
 airflow: passive
 part_number: REM-4R0-W
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R0-WE.yaml b/device-types/WTI/REM-4R0-WE.yaml
index 62dc01512512355619ec046bb57c6e1a63e8be3d..3454c858861bebb6ed61d514fc886712c4b7c8be 100644
--- a/device-types/WTI/REM-4R0-WE.yaml
+++ b/device-types/WTI/REM-4R0-WE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R0-WE
-slug: rem-4r0-we
+slug: wti-rem-4r0-we
 airflow: passive
 part_number: REM-4R0-WE
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R0.yaml b/device-types/WTI/REM-4R0.yaml
index aca15f06bf0b9e5c0c456520645119c5ae2bc895..d4091775dc1c96da198850df5ef927e51f0508af 100644
--- a/device-types/WTI/REM-4R0.yaml
+++ b/device-types/WTI/REM-4R0.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R0
-slug: rem-4r0
+slug: wti-rem-4r0
 airflow: passive
 part_number: REM-4R0
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R4-1-E.yaml b/device-types/WTI/REM-4R4-1-E.yaml
index 28115cc1d2948e915167178f7583894277da9e65..f3c80c866875e9f534c9f2051ebf593db7d81d2f 100644
--- a/device-types/WTI/REM-4R4-1-E.yaml
+++ b/device-types/WTI/REM-4R4-1-E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R4-1-E
-slug: rem-4r4-1-e
+slug: wti-rem-4r4-1-e
 airflow: passive
 part_number: REM-4R4-1-E
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R4-1-N.yaml b/device-types/WTI/REM-4R4-1-N.yaml
index a0abf7de15ec84db890c526ac8442fac6bf9b825..af092590346e225c2db040453a54456a83e4e497 100644
--- a/device-types/WTI/REM-4R4-1-N.yaml
+++ b/device-types/WTI/REM-4R4-1-N.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R4-1-N
-slug: rem-4r4-1-n
+slug: wti-rem-4r4-1-n
 airflow: passive
 part_number: REM-4R4-1-N
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R4-1-NE.yaml b/device-types/WTI/REM-4R4-1-NE.yaml
index edcc8f41f3d7f9f04edd671805ab908dc5ead826..6a35fc372ad78549b9cf4ad42ab82c3a1241ca74 100644
--- a/device-types/WTI/REM-4R4-1-NE.yaml
+++ b/device-types/WTI/REM-4R4-1-NE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R4-1-NE
-slug: rem-4r4-1-ne
+slug: wti-rem-4r4-1-ne
 airflow: passive
 part_number: REM-4R4-1-NE
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R4-1-W.yaml b/device-types/WTI/REM-4R4-1-W.yaml
index 9c41c9e586d0f252c9819c9b772b7da3c50290f1..f25ffcea7e5065ff92e627c6b28539846753f708 100644
--- a/device-types/WTI/REM-4R4-1-W.yaml
+++ b/device-types/WTI/REM-4R4-1-W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R4-1-W
-slug: rem-4r4-1-w
+slug: wti-rem-4r4-1-w
 airflow: passive
 part_number: REM-4R4-1-W
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R4-1-WE.yaml b/device-types/WTI/REM-4R4-1-WE.yaml
index 0f9bc54608881fd0245ee856de57d0cf3b552081..2deb35b5d28b2a3d352403e08820db4a21353770 100644
--- a/device-types/WTI/REM-4R4-1-WE.yaml
+++ b/device-types/WTI/REM-4R4-1-WE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R4-1-WE
-slug: rem-4r4-1-we
+slug: wti-rem-4r4-1-we
 airflow: passive
 part_number: REM-4R4-1-WE
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R4-1.yaml b/device-types/WTI/REM-4R4-1.yaml
index 91981511e0813c6c5c3b53a8f928b89b09212f33..74f8825d41e62f182d980496d47c431784f85955 100644
--- a/device-types/WTI/REM-4R4-1.yaml
+++ b/device-types/WTI/REM-4R4-1.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R4-1
-slug: rem-4r4-1
+slug: wti-rem-4r4-1
 airflow: passive
 part_number: REM-4R4-1
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R4-2-E.yaml b/device-types/WTI/REM-4R4-2-E.yaml
index 80cb8a038a6a50acb6db40219eb6055428059091..c60a74ce9c7af0aaf5dfb7b049fb2b22b55a4dda 100644
--- a/device-types/WTI/REM-4R4-2-E.yaml
+++ b/device-types/WTI/REM-4R4-2-E.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R4-2-E
-slug: rem-4r4-2-e
+slug: wti-rem-4r4-2-e
 airflow: passive
 part_number: REM-4R4-2-E
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R4-2-N.yaml b/device-types/WTI/REM-4R4-2-N.yaml
index e9f9f0e0e5a94cd950936c5aea0fb1caaf99c234..706bb463d3617127d07044f2d14c9ba9bfd041c7 100644
--- a/device-types/WTI/REM-4R4-2-N.yaml
+++ b/device-types/WTI/REM-4R4-2-N.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R4-2-N
-slug: rem-4r4-2-n
+slug: wti-rem-4r4-2-n
 airflow: passive
 part_number: REM-4R4-2-N
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R4-2-NE.yaml b/device-types/WTI/REM-4R4-2-NE.yaml
index 80790e7267b85adaaf12af7176f7a4ae804e5191..9dacf69443f3e6a023e743511f32500807a02d1f 100644
--- a/device-types/WTI/REM-4R4-2-NE.yaml
+++ b/device-types/WTI/REM-4R4-2-NE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R4-2-NE
-slug: rem-4r4-2-ne
+slug: wti-rem-4r4-2-ne
 airflow: passive
 part_number: REM-4R4-2-NE
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R4-2-W.yaml b/device-types/WTI/REM-4R4-2-W.yaml
index 216db797530914835ce4a35683b8536cf72f10fd..9f252aa3173752000014248abc95fd3c761c1349 100644
--- a/device-types/WTI/REM-4R4-2-W.yaml
+++ b/device-types/WTI/REM-4R4-2-W.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R4-2-W
-slug: rem-4r4-2-w
+slug: wti-rem-4r4-2-w
 airflow: passive
 part_number: REM-4R4-2-W
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R4-2-WE.yaml b/device-types/WTI/REM-4R4-2-WE.yaml
index a11e644f95b3e1d42e0d2af9684cf5b490b6bd72..254bebee639d96d4389e8170008243e9c4f83612 100644
--- a/device-types/WTI/REM-4R4-2-WE.yaml
+++ b/device-types/WTI/REM-4R4-2-WE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R4-2-WE
-slug: rem-4r4-2-we
+slug: wti-rem-4r4-2-we
 airflow: passive
 part_number: REM-4R4-2-WE
 is_full_depth: false
diff --git a/device-types/WTI/REM-4R4-2.yaml b/device-types/WTI/REM-4R4-2.yaml
index e23cb3020ef6efb1397dbbfcd068620e9fadb665..8c77afdae638ce43626f47f122118e58509cb14c 100644
--- a/device-types/WTI/REM-4R4-2.yaml
+++ b/device-types/WTI/REM-4R4-2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: REM-4R4-2
-slug: rem-4r4-2
+slug: wti-rem-4r4-2
 airflow: passive
 part_number: REM-4R4-2
 is_full_depth: false
diff --git a/device-types/WTI/VMR-16HD20-2.yaml b/device-types/WTI/VMR-16HD20-2.yaml
index 494fa275288f703c4ee63f0fdfa8212628ca0160..cc3d390bd07e97b8f56ce2327b3188cf06980338 100644
--- a/device-types/WTI/VMR-16HD20-2.yaml
+++ b/device-types/WTI/VMR-16HD20-2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: VMR-16HD20-2
-slug: vmr-16hd20-2
+slug: wti-vmr-16hd20-2
 airflow: passive
 part_number: VMR-16HD20-2
 is_full_depth: false
diff --git a/device-types/WTI/VMR-8H20-ATS-1.yaml b/device-types/WTI/VMR-8H20-ATS-1.yaml
index 7a509569562e455d504aa404a8c1b3607b557271..2b7aacb0cb9dfa13798e08f7174a6454c35225a8 100644
--- a/device-types/WTI/VMR-8H20-ATS-1.yaml
+++ b/device-types/WTI/VMR-8H20-ATS-1.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: VMR-8H20-ATS-1
-slug: vmr-8h20-ats-1
+slug: wti-vmr-8h20-ats-1
 airflow: passive
 part_number: VMR-8H20-ATS-1
 is_full_depth: false
diff --git a/device-types/WTI/VMR-8H20-ATS-2.yaml b/device-types/WTI/VMR-8H20-ATS-2.yaml
index c8d9464fa80e8c936d6da271e8c647879ad1b835..6d784cabe0a60043cb3ce500a6232e9728a03a87 100644
--- a/device-types/WTI/VMR-8H20-ATS-2.yaml
+++ b/device-types/WTI/VMR-8H20-ATS-2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: VMR-8H20-ATS-2
-slug: vmr-8h20-ats-2
+slug: wti-vmr-8h20-ats-2
 airflow: passive
 part_number: VMR-8H20-ATS-2
 is_full_depth: false
diff --git a/device-types/WTI/VMR-8HS20-1.yaml b/device-types/WTI/VMR-8HS20-1.yaml
index c9590e0a8a51960aeb49f151cf80ac8277775b68..da8f768922f3d498eebde9c69d957bc176eafb96 100644
--- a/device-types/WTI/VMR-8HS20-1.yaml
+++ b/device-types/WTI/VMR-8HS20-1.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: VMR-8HS20-1
-slug: vmr-8hs20-1
+slug: wti-vmr-8hs20-1
 airflow: passive
 part_number: VMR-8HS20-1
 is_full_depth: false
diff --git a/device-types/WTI/VMR-8HS20-2.yaml b/device-types/WTI/VMR-8HS20-2.yaml
index 3c74f73b4a6bf55ec6cf6cbf0e049a17dc9110b1..b4ea1d0d659a52a892d6a84f31296b9a2558f2a9 100644
--- a/device-types/WTI/VMR-8HS20-2.yaml
+++ b/device-types/WTI/VMR-8HS20-2.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: VMR-8HS20-2
-slug: vmr-8hs20-2
+slug: wti-vmr-8hs20-2
 airflow: passive
 part_number: VMR-8HS20-2
 is_full_depth: false
diff --git a/device-types/WTI/VMR-HD4D16H.yaml b/device-types/WTI/VMR-HD4D16H.yaml
index d4e0f6204933cd5412f674f4b0e2f5024336269f..b0b0ab93c9d1cac07e1660f77ca559ebf2b56529 100644
--- a/device-types/WTI/VMR-HD4D16H.yaml
+++ b/device-types/WTI/VMR-HD4D16H.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: WTI
 model: VMR-HD4D16H
-slug: vmr-hd4d16h
+slug: wti-vmr-hd4d16h
 airflow: passive
 part_number: VMR-HD4D16H
 is_full_depth: false
diff --git a/device-types/YAMAHA/SWX2110-16G.yaml b/device-types/YAMAHA/SWX2110-16G.yaml
index 6cbbf4086c65e973cdd822344654954dd987ab1b..6b370fafe1425f22f5e0a27028a6ca3d5ceb0bcc 100644
--- a/device-types/YAMAHA/SWX2110-16G.yaml
+++ b/device-types/YAMAHA/SWX2110-16G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2110-16G
-slug: swx2110-16g
+slug: yamaha-swx2110-16g
 u_height: 1
 comments: |
   "Simple" Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2110-5G.yaml b/device-types/YAMAHA/SWX2110-5G.yaml
index 97a22faed636b18a23c5bd820efb374a78993d4e..3e6180eb5281c191afd0701b7c4f675096d6dd6c 100644
--- a/device-types/YAMAHA/SWX2110-5G.yaml
+++ b/device-types/YAMAHA/SWX2110-5G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2110-5G
-slug: swx2110-5g
+slug: yamaha-swx2110-5g
 u_height: 1
 comments: |
   "Simple" Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2110-8G.yaml b/device-types/YAMAHA/SWX2110-8G.yaml
index 31e929a5699c1054afc25824094d392b7396838f..4370edd2a8455e7b13f1c8b5d43af9d659cc47e5 100644
--- a/device-types/YAMAHA/SWX2110-8G.yaml
+++ b/device-types/YAMAHA/SWX2110-8G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2110-8G
-slug: swx2110-8g
+slug: yamaha-swx2110-8g
 u_height: 1
 comments: |
   "Simple" Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2110P-8G.yaml b/device-types/YAMAHA/SWX2110P-8G.yaml
index a9af293be663b823a823f7aad0fe9eca0503fd4e..aa0a394ae61ac595c3e511c39261203c55666e89 100644
--- a/device-types/YAMAHA/SWX2110P-8G.yaml
+++ b/device-types/YAMAHA/SWX2110P-8G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2110P-8G
-slug: swx2110p-8g
+slug: yamaha-swx2110p-8g
 u_height: 1
 comments: |
   "Simple" PoE-compatible Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2210-16G.yaml b/device-types/YAMAHA/SWX2210-16G.yaml
index e3e4b44b40b7623a532dda561529749170725bf9..6f042dace6dfd34228fc8f6b0d9a6f4ebefbcbb4 100644
--- a/device-types/YAMAHA/SWX2210-16G.yaml
+++ b/device-types/YAMAHA/SWX2210-16G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2210-16G
-slug: swx2210-16g
+slug: yamaha-swx2210-16g
 u_height: 1
 comments: |
   "Smart" Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2210-24G.yaml b/device-types/YAMAHA/SWX2210-24G.yaml
index 54e44a561d29e1317dffba507f6cb0dced323746..2cb6d9ebd08353ea31ab45e6abab07abb784f0e4 100644
--- a/device-types/YAMAHA/SWX2210-24G.yaml
+++ b/device-types/YAMAHA/SWX2210-24G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2210-24G
-slug: swx2210-24g
+slug: yamaha-swx2210-24g
 u_height: 1
 comments: |
   "Smart" Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2210-8G.yaml b/device-types/YAMAHA/SWX2210-8G.yaml
index 33d827a9383c408418184bae755cb6adc75d4334..d4f28f79b91876e00d0a2b3d5bd6e9345327dc9b 100644
--- a/device-types/YAMAHA/SWX2210-8G.yaml
+++ b/device-types/YAMAHA/SWX2210-8G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2210-8G
-slug: swx2210-8g
+slug: yamaha-swx2210-8g
 u_height: 1
 comments: |
   "Smart" Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2210P-10G.yaml b/device-types/YAMAHA/SWX2210P-10G.yaml
index 64f23ef225cb2d9c6c43b7d30985c0eaf312a63b..799d4aea3df8bda1e5f90ff4070ffd8ff545f07a 100644
--- a/device-types/YAMAHA/SWX2210P-10G.yaml
+++ b/device-types/YAMAHA/SWX2210P-10G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2210P-10G
-slug: swx2210p-10g
+slug: yamaha-swx2210p-10g
 u_height: 1
 comments: |
   "Smart" PoE-compatible Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2210P-18G.yaml b/device-types/YAMAHA/SWX2210P-18G.yaml
index 239aa2b7b3df9a5c92dcc04c042758d6d9ef13e1..520409f15de6db07b740d3bf05c68f77d77edb52 100644
--- a/device-types/YAMAHA/SWX2210P-18G.yaml
+++ b/device-types/YAMAHA/SWX2210P-18G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2210P-18G
-slug: swx2210p-18g
+slug: yamaha-swx2210p-18g
 u_height: 1
 comments: |
   "Smart" PoE-compatible Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2210P-28G.yaml b/device-types/YAMAHA/SWX2210P-28G.yaml
index 0a1b6296f27cd217619d07475e62a08afb4268f5..7b758a7d8e1294f8c3a7963d8fee40b5333ae123 100644
--- a/device-types/YAMAHA/SWX2210P-28G.yaml
+++ b/device-types/YAMAHA/SWX2210P-28G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2210P-28G
-slug: swx2210p-28g
+slug: yamaha-swx2210p-28g
 u_height: 1
 comments: |
   "Smart" PoE-compatible Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2220-10NT.yaml b/device-types/YAMAHA/SWX2220-10NT.yaml
index 93db193bb30a8bc17888eedb1f904764701c8f23..e02e2fe8afe89ae6ab5c3c0f8b18b7750c3593f6 100644
--- a/device-types/YAMAHA/SWX2220-10NT.yaml
+++ b/device-types/YAMAHA/SWX2220-10NT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2220-10NT
-slug: swx2220-10nt
+slug: yamaha-swx2220-10nt
 u_height: 1
 comments: |
   2.5G/10G-compatible "Smart" Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2221P-10NT.yaml b/device-types/YAMAHA/SWX2221P-10NT.yaml
index 4cccbc0e3c6c0fe3c66466faa3070a1f6c0a6ad6..b93e00dcf577a6cf4bb196919d3b938eea6df744 100644
--- a/device-types/YAMAHA/SWX2221P-10NT.yaml
+++ b/device-types/YAMAHA/SWX2221P-10NT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2221P-10NT
-slug: swx2221p-10nt
+slug: yamaha-swx2221p-10nt
 u_height: 1
 comments: |
   2.5G/10G and PoE-compatible "Smart" Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2310-10G.yaml b/device-types/YAMAHA/SWX2310-10G.yaml
index 43f640710d1845fd668d636e8be2f21d3c5e7f87..3df35475245c7566de2dd4234928a70b36297c7c 100644
--- a/device-types/YAMAHA/SWX2310-10G.yaml
+++ b/device-types/YAMAHA/SWX2310-10G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2310-10G
-slug: swx2310-10g
+slug: yamaha-swx2310-10g
 u_height: 1
 comments: |
   "Intelligent" Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2310-18GT.yaml b/device-types/YAMAHA/SWX2310-18GT.yaml
index c5f31428de7140c751bf84f4abc9aa90f9e21d70..c97f140ca8b72f9986d9367e49978ce90cfb5e3b 100644
--- a/device-types/YAMAHA/SWX2310-18GT.yaml
+++ b/device-types/YAMAHA/SWX2310-18GT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2310-18GT
-slug: swx2310-18gt
+slug: yamaha-swx2310-18gt
 u_height: 1
 comments: |
   "Intelligent" Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2310-28GT.yaml b/device-types/YAMAHA/SWX2310-28GT.yaml
index b2ec9d2790adbb83957e971795cc4d3461d93b7b..1d11735dc25380aca14d5ceceb919151bddaeeec 100644
--- a/device-types/YAMAHA/SWX2310-28GT.yaml
+++ b/device-types/YAMAHA/SWX2310-28GT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2310-28GT
-slug: swx2310-28gt
+slug: yamaha-swx2310-28gt
 u_height: 1
 comments: |
   "Intelligent" Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2310-52GT.yaml b/device-types/YAMAHA/SWX2310-52GT.yaml
index 436cfbf675d516390779d803f11696933171c9d7..577d19380d4a2b8fa4ef1a45a84dba9451259e23 100644
--- a/device-types/YAMAHA/SWX2310-52GT.yaml
+++ b/device-types/YAMAHA/SWX2310-52GT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2310-52GT
-slug: swx2310-52gt
+slug: yamaha-swx2310-52gt
 u_height: 1
 comments: |
   "Intelligent" Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2310P-10G.yaml b/device-types/YAMAHA/SWX2310P-10G.yaml
index 628158dbf12db17ee68980434e20513bbae3d691..9fb1ab5798b32bfa9045f1809b62939261b26f25 100644
--- a/device-types/YAMAHA/SWX2310P-10G.yaml
+++ b/device-types/YAMAHA/SWX2310P-10G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2310P-10G
-slug: swx2310p-10g
+slug: yamaha-swx2310p-10g
 u_height: 1
 comments: |
   "Intelligent" PoE-compatible Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2310P-18G.yaml b/device-types/YAMAHA/SWX2310P-18G.yaml
index 8262cbd45a703c960fdeee543579ef4e22dc7c54..ab39666074ab14a2468c7c093668e5eaf0c5a038 100644
--- a/device-types/YAMAHA/SWX2310P-18G.yaml
+++ b/device-types/YAMAHA/SWX2310P-18G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2310P-18G
-slug: swx2310p-18g
+slug: yamaha-swx2310p-18g
 u_height: 1
 comments: |
   "Intelligent" PoE-compatible Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2310P-28GT.yaml b/device-types/YAMAHA/SWX2310P-28GT.yaml
index c2b1f52466b632794a5285bbbf76fccecf5cc3ad..834a9b23ab2dd008063f6739760e0265302ef6ed 100644
--- a/device-types/YAMAHA/SWX2310P-28GT.yaml
+++ b/device-types/YAMAHA/SWX2310P-28GT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2310P-28GT
-slug: swx2310p-28gt
+slug: yamaha-swx2310p-28gt
 u_height: 1
 comments: |
   "Intelligent" PoE-compatible Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2320-16MT.yaml b/device-types/YAMAHA/SWX2320-16MT.yaml
index d4f26b908855ec5a3150f686ec38ace46caa45f8..813743f1c63de5fb2708a23fc4bb1802e0f69e19 100644
--- a/device-types/YAMAHA/SWX2320-16MT.yaml
+++ b/device-types/YAMAHA/SWX2320-16MT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2320-16MT
-slug: swx2320-16mt
+slug: yamaha-swx2320-16mt
 u_height: 1
 comments: |
   10G/mGig-Compatible "Intelligent" Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX2322P-16MT.yaml b/device-types/YAMAHA/SWX2322P-16MT.yaml
index f1f4b80a35a724a54ca445fe642e926ceff5b127..8f580cbdeeb26bc49305bbd84144b305009c75e5 100644
--- a/device-types/YAMAHA/SWX2322P-16MT.yaml
+++ b/device-types/YAMAHA/SWX2322P-16MT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX2322P-16MT
-slug: swx2322p-16mt
+slug: yamaha-swx2322p-16mt
 u_height: 1
 comments: |
   PoE-Compatible "Intelligent" Layer 2 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX3100-10G.yaml b/device-types/YAMAHA/SWX3100-10G.yaml
index c5f23980c3ecc8be2b417312a6cd2d14b0967d59..57fe0aa69898c24b863b8adddf57a7042c1477d4 100644
--- a/device-types/YAMAHA/SWX3100-10G.yaml
+++ b/device-types/YAMAHA/SWX3100-10G.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX3100-10G
-slug: swx3100-10g
+slug: yamaha-swx3100-10g
 u_height: 1
 comments: |
   "Lightweight" Layer 3 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX3100-18GT.yaml b/device-types/YAMAHA/SWX3100-18GT.yaml
index dc13d5fa76ff519b1929f926f2a0340872454acb..d7f971e6e0390a5dc04c1939631aa49869dc4d5b 100644
--- a/device-types/YAMAHA/SWX3100-18GT.yaml
+++ b/device-types/YAMAHA/SWX3100-18GT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX3100-18GT
-slug: swx3100-18gt
+slug: yamaha-swx3100-18gt
 u_height: 1
 comments: |
   "Lightweight" Layer 3 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX3200-28GT.yaml b/device-types/YAMAHA/SWX3200-28GT.yaml
index c1546ba5fffa63828b85bffb30381b01ffc10f2b..2a24ca2837b1ee92e0dbd2164fd115bc2393b75c 100644
--- a/device-types/YAMAHA/SWX3200-28GT.yaml
+++ b/device-types/YAMAHA/SWX3200-28GT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX3200-28GT
-slug: swx3200-28gt
+slug: yamaha-swx3200-28gt
 u_height: 1
 comments: |
   "Standard" Layer 3 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX3200-52GT.yaml b/device-types/YAMAHA/SWX3200-52GT.yaml
index 7a92f19f60f52ef128f2c3a2db5e19770853f706..afd37cf29d544ea8e2ae6a7f7248bbf8a3b24abd 100644
--- a/device-types/YAMAHA/SWX3200-52GT.yaml
+++ b/device-types/YAMAHA/SWX3200-52GT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX3200-52GT
-slug: swx3200-52gt
+slug: yamaha-swx3200-52gt
 u_height: 1
 comments: |
   "Standard" Layer 3 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX3220-16MT.yaml b/device-types/YAMAHA/SWX3220-16MT.yaml
index 475e53090b74883cba70e65f9a896ece82d01d45..11da4adf4e8e99fe27b43447ba447683931e2e28 100644
--- a/device-types/YAMAHA/SWX3220-16MT.yaml
+++ b/device-types/YAMAHA/SWX3220-16MT.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX3220-16MT
-slug: swx3220-16mt
+slug: yamaha-swx3220-16mt
 u_height: 1
 comments: |
   10G/mGig-Compatible "Standard" Layer 3 Switch, manufactured by YAMAHA.
diff --git a/device-types/YAMAHA/SWX3220-16TMs.yaml b/device-types/YAMAHA/SWX3220-16TMs.yaml
index 2c2ea843998b42b2cfb723a338355997edd8560d..da0d767dec07a0954dd22475b042e05deeed562a 100644
--- a/device-types/YAMAHA/SWX3220-16TMs.yaml
+++ b/device-types/YAMAHA/SWX3220-16TMs.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: YAMAHA
 model: SWX3220-16TMs
-slug: swx3220-16tms
+slug: yamaha-swx3220-16tms
 u_height: 1
 comments: |
   10G/mGig-Compatible "Standard" Layer 3 Switch, manufactured by YAMAHA.
diff --git a/device-types/ZPE/NSC-T48R-STND-DAC.yaml b/device-types/ZPE/NSC-T48R-STND-DAC.yaml
index fb20b2758d9d3b933a42cb86b2c0875dc182a51f..a3f216f171af924e3ae198f397ef0f68b6df2bd9 100644
--- a/device-types/ZPE/NSC-T48R-STND-DAC.yaml
+++ b/device-types/ZPE/NSC-T48R-STND-DAC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: ZPE
 model: NSC-T48R-STND-DAC
-slug: nsc-t48r-stnd-dac
+slug: zpe-nsc-t48r-stnd-dac
 part_number: NSC-T48R-STND-DAC
 u_height: 1
 is_full_depth: false
diff --git a/device-types/ZTE/C300.yaml b/device-types/ZTE/C300.yaml
index 5f8f4dfa4f836cf35538dc55b7e3a7516f7f81c1..799d04012214f9b8f20591a44192cf2547fada38 100644
--- a/device-types/ZTE/C300.yaml
+++ b/device-types/ZTE/C300.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: ZTE
 model: ZXA10 C300
-slug: zxa10-c300
+slug: zte-zxa10-c300
 u_height: 9
 is_full_depth: false
 subdevice_role: parent
diff --git a/device-types/ZTE/ZXA10-F822-16.yaml b/device-types/ZTE/ZXA10-F822-16.yaml
index 9f5a8eb261dac5964b45bba658d2b4059556ecb0..b804ddc50fc03a7dcc67bca453ccab47d9e35111 100644
--- a/device-types/ZTE/ZXA10-F822-16.yaml
+++ b/device-types/ZTE/ZXA10-F822-16.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: ZTE
 model: ZXA10 F822 16
-slug: zxa10-f822-16
+slug: zte-zxa10-f822-16
 u_height: 1
 is_full_depth: false
 airflow: rear-to-front
diff --git a/device-types/ZTE/ZXA10-F822-24.yaml b/device-types/ZTE/ZXA10-F822-24.yaml
index fc4d6cca7dce2eb2467a2a3e777837a11e4fc0a2..ba6a8532adcb7e71193f2993604a0ecf0dd2ec59 100644
--- a/device-types/ZTE/ZXA10-F822-24.yaml
+++ b/device-types/ZTE/ZXA10-F822-24.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: ZTE
 model: ZXA10 F822 24
-slug: zxa10-f822-24
+slug: zte-zxa10-f822-24
 u_height: 1
 is_full_depth: false
 airflow: rear-to-front
diff --git a/device-types/ZTE/ZXA10-F832-16.yaml b/device-types/ZTE/ZXA10-F832-16.yaml
index 1dbe216fc8691fdefd4e46f85660f65cf368f2fe..5d77a6016573531a742a5ace27c168661750f9c1 100644
--- a/device-types/ZTE/ZXA10-F832-16.yaml
+++ b/device-types/ZTE/ZXA10-F832-16.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: ZTE
 model: ZXA10 F832 16
-slug: zxa10-f832-16
+slug: zte-zxa10-f832-16
 u_height: 1
 is_full_depth: false
 airflow: rear-to-front
diff --git a/device-types/ZTE/ZXA10-F832-24.yaml b/device-types/ZTE/ZXA10-F832-24.yaml
index 819636b945018bf76b04a7a2926c45f46d77cf19..f693f69be14a030dde9aabad940f9de5a790f446 100644
--- a/device-types/ZTE/ZXA10-F832-24.yaml
+++ b/device-types/ZTE/ZXA10-F832-24.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: ZTE
 model: ZXA10 F832 24
-slug: zxa10-f832-24
+slug: zte-zxa10-f832-24
 u_height: 1
 is_full_depth: false
 airflow: rear-to-front
diff --git a/device-types/Zyxel/USG310.yaml b/device-types/Zyxel/USG310.yaml
index e341dacba38e8d318e17f5d8dcd46983401a6d37..10cfbf92657c1db601d0c11b87aca7624ed84837 100644
--- a/device-types/Zyxel/USG310.yaml
+++ b/device-types/Zyxel/USG310.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Zyxel
 model: USG 310
-slug: zyxel-usg310
+slug: zyxel-usg-310
 part_number: USG310-EU0102F
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Zyxel/XGS1930-28.yaml b/device-types/Zyxel/XGS1930-28.yaml
index 94bdd0b32353e59379cd341866558c040c282618..539edb5d7196fbabe0e61d3c8fc4d8115b9ba24a 100644
--- a/device-types/Zyxel/XGS1930-28.yaml
+++ b/device-types/Zyxel/XGS1930-28.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Zyxel
 model: XGS1930-28
-slug: xgs1930-28
+slug: zyxel-xgs1930-28
 part_number: XGS1930-28
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Zyxel/XGS1930-28HP.yaml b/device-types/Zyxel/XGS1930-28HP.yaml
index e666a3da87a1c48e413cc7874bba87079eda3bca..fab8f7aacb9772f42b22cf65d224e78125f6b04e 100644
--- a/device-types/Zyxel/XGS1930-28HP.yaml
+++ b/device-types/Zyxel/XGS1930-28HP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Zyxel
 model: XGS1930-28HP
-slug: xgs1930-28hp
+slug: zyxel-xgs1930-28hp
 part_number: XGS1930-28HP
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Zyxel/XGS1930-52.yaml b/device-types/Zyxel/XGS1930-52.yaml
index de5aeb0b692f08099c91cea91c3bda324369e89a..ebd691a76c338b8aeb5ab286a7467603f0ee0fef 100644
--- a/device-types/Zyxel/XGS1930-52.yaml
+++ b/device-types/Zyxel/XGS1930-52.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Zyxel
 model: XGS1930-52
-slug: xgs1930-52
+slug: zyxel-xgs1930-52
 part_number: XGS1930-52
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Zyxel/XGS1930-52HP.yaml b/device-types/Zyxel/XGS1930-52HP.yaml
index ac6878cfc0c388911a7f271d945f2bad1e0bdd61..e8db0240053e5710d296a8bb79ee5e4a88c1b3cd 100644
--- a/device-types/Zyxel/XGS1930-52HP.yaml
+++ b/device-types/Zyxel/XGS1930-52HP.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Zyxel
 model: XGS1930-52HP
-slug: xgs1930-52hp
+slug: zyxel-xgs1930-52hp
 part_number: XGS1930-52HP
 u_height: 1
 is_full_depth: false
diff --git a/device-types/ghipsystems/GS5104-1471-EC.yaml b/device-types/ghipsystems/GS5104-1471-EC.yaml
index e47d05825ebe38041af743dabb0269ca2b365acb..262a7e13272d617f0ad560b234de4cf66cd9db5c 100644
--- a/device-types/ghipsystems/GS5104-1471-EC.yaml
+++ b/device-types/ghipsystems/GS5104-1471-EC.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: ghipsystems
 model: GS5104-1471-EC
-slug: gs5104-1471-ec
+slug: ghipsystems-gs5104-1471-ec
 comments: '[4 Channels 1471-1531nm, LC/UPC, Dual Fiber, CWDM](https://ghipsystems.com/cms/en/wdm-catalogue/express-cwdm/)'
 part_number: GS5104-1471-EC
 u_height: 1
diff --git a/elevation-images/Nokia/nokia-7220-ixr-d1.front.png b/elevation-images/Nokia/nokia-7220-ixr-d1-88g-48baset-4sfpp.front.png
similarity index 100%
rename from elevation-images/Nokia/nokia-7220-ixr-d1.front.png
rename to elevation-images/Nokia/nokia-7220-ixr-d1-88g-48baset-4sfpp.front.png
diff --git a/elevation-images/Nokia/nokia-7220-ixr-d1.rear.png b/elevation-images/Nokia/nokia-7220-ixr-d1-88g-48baset-4sfpp.rear.png
similarity index 100%
rename from elevation-images/Nokia/nokia-7220-ixr-d1.rear.png
rename to elevation-images/Nokia/nokia-7220-ixr-d1-88g-48baset-4sfpp.rear.png
diff --git a/elevation-images/Nokia/nokia-7220-ixr-d2.front.png b/elevation-images/Nokia/nokia-7220-ixr-d2-25-100ge.front.png
similarity index 100%
rename from elevation-images/Nokia/nokia-7220-ixr-d2.front.png
rename to elevation-images/Nokia/nokia-7220-ixr-d2-25-100ge.front.png
diff --git a/elevation-images/Nokia/nokia-7220-ixr-d2.rear.png b/elevation-images/Nokia/nokia-7220-ixr-d2-25-100ge.rear.png
similarity index 100%
rename from elevation-images/Nokia/nokia-7220-ixr-d2.rear.png
rename to elevation-images/Nokia/nokia-7220-ixr-d2-25-100ge.rear.png
diff --git a/elevation-images/Nokia/nokia-7220-ixr-d2l.front.png b/elevation-images/Nokia/nokia-7220-ixr-d2l-25-100ge.front.png
similarity index 100%
rename from elevation-images/Nokia/nokia-7220-ixr-d2l.front.png
rename to elevation-images/Nokia/nokia-7220-ixr-d2l-25-100ge.front.png
diff --git a/elevation-images/Nokia/nokia-7220-ixr-d2l.rear.png b/elevation-images/Nokia/nokia-7220-ixr-d2l-25-100ge.rear.png
similarity index 100%
rename from elevation-images/Nokia/nokia-7220-ixr-d2l.rear.png
rename to elevation-images/Nokia/nokia-7220-ixr-d2l-25-100ge.rear.png
diff --git a/elevation-images/Nokia/nokia-7220-ixr-d3.front.png b/elevation-images/Nokia/nokia-7220-ixr-d3-32-100ge.front.png
similarity index 100%
rename from elevation-images/Nokia/nokia-7220-ixr-d3.front.png
rename to elevation-images/Nokia/nokia-7220-ixr-d3-32-100ge.front.png
diff --git a/elevation-images/Nokia/nokia-7220-ixr-d3.rear.png b/elevation-images/Nokia/nokia-7220-ixr-d3-32-100ge.rear.png
similarity index 100%
rename from elevation-images/Nokia/nokia-7220-ixr-d3.rear.png
rename to elevation-images/Nokia/nokia-7220-ixr-d3-32-100ge.rear.png
diff --git a/elevation-images/Nokia/nokia-7220-ixr-d3l.front.png b/elevation-images/Nokia/nokia-7220-ixr-d3l-32-100ge.front.png
similarity index 100%
rename from elevation-images/Nokia/nokia-7220-ixr-d3l.front.png
rename to elevation-images/Nokia/nokia-7220-ixr-d3l-32-100ge.front.png
diff --git a/elevation-images/Nokia/nokia-7220-ixr-d3l.rear.png b/elevation-images/Nokia/nokia-7220-ixr-d3l-32-100ge.rear.png
similarity index 100%
rename from elevation-images/Nokia/nokia-7220-ixr-d3l.rear.png
rename to elevation-images/Nokia/nokia-7220-ixr-d3l-32-100ge.rear.png
diff --git a/elevation-images/Nokia/nokia-7220-ixr-h3.front.png b/elevation-images/Nokia/nokia-7220-ixr-h3-32qsfpdd-2sfpp.front.png
similarity index 100%
rename from elevation-images/Nokia/nokia-7220-ixr-h3.front.png
rename to elevation-images/Nokia/nokia-7220-ixr-h3-32qsfpdd-2sfpp.front.png
diff --git a/elevation-images/Nokia/nokia-7220-ixr-h3.rear.png b/elevation-images/Nokia/nokia-7220-ixr-h3-32qsfpdd-2sfpp.rear.png
similarity index 100%
rename from elevation-images/Nokia/nokia-7220-ixr-h3.rear.png
rename to elevation-images/Nokia/nokia-7220-ixr-h3-32qsfpdd-2sfpp.rear.png
diff --git a/scripts/fix-slugs.py b/scripts/fix-slugs.py
new file mode 100644
index 0000000000000000000000000000000000000000..cf1909b8982ab86029645e95369bb05ed4e5e09e
--- /dev/null
+++ b/scripts/fix-slugs.py
@@ -0,0 +1,81 @@
+from os import walk, path
+import yaml
+
+root_dir = f"{path.dirname(path.realpath(__file__))}/../device-types"
+# root_dir = f"{path.dirname(path.realpath(__file__))}/../device-types/Cisco"
+
+total = 0
+
+for root, dirs, files in walk(root_dir):
+  for file in files:
+    if file.split(".")[1] == "yaml" or file.split(".")[1] == "yml":
+      fileChanged = False
+      data = []
+      with open(path.join(root, file), 'r') as stream:
+        try:
+          data = stream.readlines()
+          # data = yaml.safe_load(stream)
+          
+          slugManufacturer = ""
+          slugManufacturerIDX = 0
+          slug = ""
+          slugIDX = 0
+          model = ""
+          modelIDX = 0
+          partNumber = ""
+          partNumberIDX = 0
+          
+          for idx, line in enumerate(data):
+            if "manufacturer: " in line:
+              # slugManufacturer = data['manufacturer'].casefold().replace(" ", "-")
+              slugManufacturer = line.split(": ")[1].casefold().replace(" ", "-").strip()
+              slugManufacturerIDX = idx
+            if "slug: " in line:
+              slug = line.split(": ")[1].strip()
+              slugIDX = idx
+            if "model: " in line:
+              model = line.split(": ")[1].strip()
+              modelIDX = idx
+            if "part_number: " in line:
+              partNumber = line.split(": ")[1].strip()
+              partNumberIDX = idx
+
+          transformedModel = model.casefold().replace(" ", "-").replace("sfp+", "sfpp").replace("poe+", "poep").replace("-+", "-plus").replace("+", "-plus-").replace("_", "-").replace("&", "-and-").replace("!", "").replace("/", "-").replace(",", "").replace("'", "").replace("*", "-")
+          transformedPartNumber = partNumber.casefold().replace(" ", "-").replace("-+", "-plus").replace("+", "-plus-").replace("_", "-").replace("&", "-and-").replace("!", "").replace("/", "-").replace(",", "").replace("'", "").replace("*", "-")
+          transformedManufacturer = slugManufacturer.casefold().replace(" ", "-").replace("sfp+", "sfpp").replace("poe+", "poep").replace("-+", "-plus-").replace("+", "-plus").replace("_", "-").replace("!", "").replace("/", "-").replace(",", "").replace("'", "").replace("*", "-")
+          
+          if "&" in transformedManufacturer:
+            transformedManufacturer = transformedManufacturer.replace("&", "-and-")
+            if "--and--" in transformedManufacturer:
+              transformedManufacturer = transformedManufacturer.replace("--and--", "-and-")
+          
+          newSlug = f"{transformedManufacturer}-{transformedModel}"
+          newPartSlug = f"{slugManufacturer}-{transformedPartNumber}"
+          newComboSlug = f"{slugManufacturer}-{transformedModel}-{transformedPartNumber}"
+          slugManufacturerDash = f"{slugManufacturer}-"
+          if slugManufacturer != "apple":
+            if newSlug.count(slugManufacturerDash) > 1:
+              newSlug = newSlug.replace(f"{slugManufacturer}-", "", 1)
+            if newPartSlug.count(slugManufacturerDash) > 1:
+              newPartSlug = newPartSlug.replace(f"{slugManufacturer}-", "", 1)
+            if newComboSlug.count(slugManufacturerDash) > 1:
+              newComboSlug = newComboSlug.replace(f"{slugManufacturer}-", "", 1)
+            
+            if newSlug[-1] == "-":
+                newSlug = newSlug[:-1]
+            if newSlug != slug and newPartSlug != slug and newComboSlug != slug:
+              print(f"{newSlug} != {slug}")
+              data[slugIDX] = f"slug: {newSlug}\n"
+              total = total + 1
+              fileChanged = True
+
+        except yaml.YAMLError as exc:
+          print(exc)
+        stream.close()
+
+      if fileChanged:
+        with open(path.join(root, file), 'w') as file:
+          file.writelines(data)
+          file.close()
+      
+print(f"Total Left: {total}")
\ No newline at end of file