From 7ab7852a3b6ff23db433c052eed83291df2e0522 Mon Sep 17 00:00:00 2001
From: "Daniel W. Anner" <daniel.anner@danstechsupport.com>
Date: Mon, 22 May 2023 16:38:34 -0400
Subject: [PATCH] Slug Migration (#1375)

* Migrated device slugs for 3com

* Migrated device slugs for A10

* migrating manufacturers slugs

* Migrated device slugs for AVM

* Migrated device slugs for Avocent

* Migrated device slugs for Brocade

* Migrated device slugs for Calix

* Migrated device slugs for Checkpoint

* Migrated device slugs for more Checkpoint files

* Migrated device slugs for Ciena

* Migrated device slugs for Citrix

* Migrated device slugs for Colable

* Migrated device slugs for Corning

* Migrated device slugs for CryptoPro

* Migrated device slugs for CyberPower

* Migrated device slugs for Datacom

* Migrating slug definition for manufacturer Deciso

* Migrating slug definition for manufacturer Dell

* Migrating slug definition for manufacturer Extreme Networks

* Migrating slug definition for manufacturer F5

* Migrating slug definition for manufacturer Fortinet

* Migrating slug definition for manufacturer FS

* Migrating slug definition for manufacturer Generic

* Migrating slug definition for manufacturer Huawei

* Migrating slug definition for manufacturer LANCOM

* Migrating slug definition for manufacturer Lenovo

* Migrating slug definition for manufacturer Mikrotik

* Migrating slug definition for manufacturer Opengear

* Migrating slug definition for manufacturer Palo Alto

* Migrating slug definition for manufacturer Panduit

* Migrating slug definition for manufacturer QNAP

* Migrating slug definition for manufacturer Rockwell Automation

* Migrating slug definition for manufacturer Ubiquiti

* Migrating slug definition for manufacturer Yamaha

* Migrating slug definition for manufacturer WTI

* Migrating slug definition for manufacturers

* Migrating slug definition for manufacturer Rohde & Schwarz

* fixing double slugs and file names

* fixing slug names to match proper format

* fixing slug names to match proper format

* fixing slugs to match proper format

* fixing slugs to match proper format for Nokia. Also fixed file names for elevation images.

* fixing slugs to match proper format

* fixing slugs to match proper format

* fixing slugs to match proper format for manufacturer Cisco

* fixing slugs to match proper format for manufacturer MikroTik

* fixing slugs to match proper format for manufacturer Ubiquiti

* adding sloppy script used to migrate files
---
 .gitignore                                    |   1 +
 device-types/3Com/4200G-12_Port.yml           |   4 +-
 device-types/3Com/4200G-24_Port.yml           |   4 +-
 device-types/3Com/4200G-48_Port.yml           |   4 +-
 device-types/3Com/4200G-PWR-24_port.yml       |   4 +-
 device-types/3Com/4210G-24_Port.yml           |   4 +-
 device-types/3Com/4210G-48_Port.yml           |   4 +-
 device-types/3Com/4210G-PWR-24_Port.yml       |   4 +-
 device-types/A10/TH4440.yaml                  |   2 +-
 device-types/A10/TH6430.yaml                  |   2 +-
 device-types/ADVA/FSP_150-XG120PRO-SH.yaml    |   4 +-
 .../ADVA/FSP_150-XG418-100G-CFP2.yaml         |   2 +-
 device-types/ADVA/FSP_150-XG418-100G.yaml     |   2 +-
 .../ADVA/FSP_150-XG480-100G-CFP2.yaml         |   2 +-
 device-types/ADVA/FSP_150-XG480-100G.yaml     |   2 +-
 device-types/ADVA/FSP_150-XG480-25G-100G.yaml |   2 +-
 device-types/APC/AP4431.yaml                  |   2 +-
 device-types/APC/AP7721.yaml                  |   2 +-
 device-types/APC/AP7723.yaml                  |   2 +-
 device-types/APC/AP7821.yaml                  |   2 +-
 device-types/APC/AP7830.yaml                  |   2 +-
 device-types/APC/AP7854.yml                   |   2 +-
 device-types/APC/AP7901B.yaml                 |   2 +-
 device-types/APC/AP7920.yaml                  |   2 +-
 device-types/APC/AP7921B.yaml                 |   2 +-
 device-types/APC/AP7922B.yaml                 |   2 +-
 device-types/APC/AP7941.yaml                  |   2 +-
 device-types/APC/AP8641.yaml                  |   2 +-
 device-types/APC/AP8853.yaml                  |   2 +-
 device-types/APC/AP8865.yaml                  |   2 +-
 device-types/APC/AP8868.yaml                  |   2 +-
 device-types/APC/AP8886.yaml                  |   2 +-
 device-types/APC/AP8932.yaml                  |   2 +-
 device-types/APC/AP8941.yaml                  |   2 +-
 device-types/APC/AP8953.yaml                  |   2 +-
 device-types/APC/AP8958.yaml                  |   2 +-
 device-types/APC/AP8959.yaml                  |   2 +-
 device-types/APC/AP8959EU3.yml                |   2 +-
 device-types/APC/AP8965.yaml                  |   2 +-
 device-types/APC/AP9319.yaml                  |   2 +-
 device-types/APC/APDU9941.yaml                |   2 +-
 device-types/APC/APTF10KT01.yaml              |   2 +-
 device-types/APC/AR8425A.yaml                 |   2 +-
 device-types/APC/BN450M.yaml                  |   2 +-
 device-types/APC/SMT1000.yaml                 |   2 +-
 device-types/APC/SMT1500.yaml                 |   2 +-
 device-types/APC/SMT1500RM2U.yaml             |   2 +-
 device-types/APC/SMT1500RM2UC.yaml            |   2 +-
 device-types/APC/SMT1500RMI2U.yaml            |   2 +-
 device-types/APC/SMT2200RMI2UNC.yaml          |   2 +-
 device-types/APC/SMT3000RMI2UC.yaml           |   2 +-
 device-types/APC/SMX1000I.yaml                |   2 +-
 device-types/APC/SMX120BP.yaml                |   2 +-
 device-types/APC/SMX2200HV.yaml               |   2 +-
 device-types/APC/SMX3000HVNC.yaml             |   2 +-
 device-types/APC/SRT2200RMXLI.yaml            |   2 +-
 device-types/APC/SRT3000RMXLT.yaml            |   2 +-
 device-types/APC/SRT5KRMXLI.yaml              |   2 +-
 device-types/APC/SRT5KRMXLT-IEC.yaml          |   2 +-
 device-types/APC/SRT5KRMXLT.yaml              |   2 +-
 device-types/APC/SRT5KRMXLW-HW.yaml           |   2 +-
 device-types/APC/SRT5KXLJ.yaml                |   2 +-
 device-types/APC/SRT6KRMXLI.yaml              |   2 +-
 device-types/APC/SRT8KRMXLT.yaml              |   2 +-
 device-types/APC/SUA1500RMI2U.yaml            |   2 +-
 device-types/APC/SURT192RMXLBP2.yaml          |   2 +-
 device-types/APC/SURT2000RMXLI.yaml           |   2 +-
 device-types/APC/SURT20KRMXLT.yaml            |   2 +-
 device-types/APC/ats-4421.yml                 |   2 +-
 device-types/APC/ats-7723.yml                 |   2 +-
 device-types/APC/epdu1016b.yml                |   2 +-
 device-types/AVM/7530.yaml                    |   2 +-
 device-types/AVM/7590.yaml                    |   2 +-
 device-types/ActionTec/C1000A.yaml            |   2 +-
 device-types/ActionTec/GT724R.yaml            |   2 +-
 device-types/Adtran/MX2800.yaml               |   2 +-
 device-types/Adtran/NV4660.yaml               |   2 +-
 device-types/Adtran/TA-5000-23in.yaml         |   2 +-
 device-types/Alcatel-Lucent/OS6450-24.yaml    |   2 +-
 device-types/Alcatel-Lucent/OS6450-48.yaml    |   2 +-
 device-types/Alcatel-Lucent/OS6450-P24.yaml   |   2 +-
 device-types/Alcatel-Lucent/OS6450-P48.yaml   |   2 +-
 device-types/Alcatel-Lucent/OS6860-48.yaml    |   2 +-
 device-types/Alcatel-Lucent/OS6860E-24.yaml   |   2 +-
 device-types/Alcatel-Lucent/OS6860E-48.yaml   |   2 +-
 device-types/Alcatel-Lucent/OS6860E-U28.yaml  |   2 +-
 device-types/Alcatel-Lucent/OS6900-X20.yaml   |   2 +-
 device-types/Alcatel-Lucent/OS6900-X40.yaml   |   2 +-
 device-types/Allied Telesis/AR1050V.yaml      |   2 +-
 device-types/Allied Telesis/AR2010V.yaml      |   2 +-
 device-types/Allied Telesis/AR2050V.yaml      |   2 +-
 device-types/Allied Telesis/AR3050S.yaml      |   2 +-
 device-types/Allied Telesis/AR4050S.yaml      |   2 +-
 device-types/Allied Telesis/AT-MCR12.yaml     |   2 +-
 .../Allied Telesis/GS980MX-10HSm.yaml         |   2 +-
 .../Allied Telesis/GS980MX-18HSm.yaml         |   2 +-
 device-types/Allied Telesis/GS980MX-28.yaml   |   2 +-
 .../Allied Telesis/GS980MX-28PSm.yaml         |   2 +-
 device-types/Allied Telesis/GS980MX-52.yaml   |   2 +-
 .../Allied Telesis/GS980MX-52PSm.yaml         |   2 +-
 device-types/Allied Telesis/IE200-6FP.yaml    |   2 +-
 device-types/Allied Telesis/IE200-6FT.yaml    |   2 +-
 device-types/Allied Telesis/IE200-6GP.yaml    |   2 +-
 device-types/Allied Telesis/IE200-6GT.yaml    |   2 +-
 device-types/Allied Telesis/IE300-12GP.yaml   |   2 +-
 device-types/Allied Telesis/IE300-12GT.yaml   |   2 +-
 device-types/Allied Telesis/IE340-12GP.yaml   |   2 +-
 device-types/Allied Telesis/IE340-12GT.yaml   |   2 +-
 device-types/Allied Telesis/IE340-20GP.yaml   |   2 +-
 device-types/Allied Telesis/IE340L-18GP.yaml  |   2 +-
 device-types/Allied Telesis/x230-10GP.yaml    |   2 +-
 device-types/Allied Telesis/x230-10GT.yaml    |   2 +-
 device-types/Allied Telesis/x230-18GP.yaml    |   2 +-
 device-types/Allied Telesis/x230-18GT.yaml    |   2 +-
 device-types/Allied Telesis/x230-28GP.yaml    |   2 +-
 device-types/Allied Telesis/x230-28GT.yaml    |   2 +-
 device-types/Allied Telesis/x230L-17GT.yaml   |   2 +-
 device-types/Allied Telesis/x230L-26GT.yaml   |   2 +-
 device-types/Allied Telesis/x510-28GPX.yaml   |   2 +-
 device-types/Allied Telesis/x510-28GSX.yaml   |   2 +-
 device-types/Allied Telesis/x510-28GTX.yaml   |   2 +-
 device-types/Allied Telesis/x510-52GPX.yaml   |   2 +-
 device-types/Allied Telesis/x510-52GTX.yaml   |   2 +-
 device-types/Allied Telesis/x510L-28GP.yaml   |   2 +-
 device-types/Allied Telesis/x510L-28GT.yaml   |   2 +-
 device-types/Allied Telesis/x510L-52GP.yaml   |   2 +-
 device-types/Allied Telesis/x510L-52GT.yaml   |   2 +-
 device-types/Allied Telesis/x530-10GHXm.yaml  |   2 +-
 device-types/Allied Telesis/x530-18GHXm.yaml  |   2 +-
 device-types/Allied Telesis/x530-28GPXm.yaml  |   2 +-
 device-types/Allied Telesis/x530-28GTXm.yaml  |   2 +-
 device-types/Allied Telesis/x530-52GPXm.yaml  |   2 +-
 device-types/Allied Telesis/x530-52GTXm.yaml  |   2 +-
 .../Allied Telesis/x530DP-28GHXm.yaml         |   2 +-
 .../Allied Telesis/x530DP-52GHXm.yaml         |   2 +-
 device-types/Allied Telesis/x530L-10GHXm.yaml |   2 +-
 device-types/Allied Telesis/x530L-18GHXm.yaml |   2 +-
 device-types/Allied Telesis/x530L-28GPX.yaml  |   2 +-
 device-types/Allied Telesis/x530L-28GTX.yaml  |   2 +-
 device-types/Allied Telesis/x530L-52GPX.yaml  |   2 +-
 device-types/Allied Telesis/x530L-52GTX.yaml  |   2 +-
 device-types/Allied Telesis/x8106.yaml        |   2 +-
 device-types/Allied Telesis/x8112.yaml        |   2 +-
 device-types/Allied Telesis/x908Gen2.yaml     |   2 +-
 device-types/Allied Telesis/x930-28GPX.yaml   |   2 +-
 device-types/Allied Telesis/x930-28GSTX.yaml  |   2 +-
 device-types/Allied Telesis/x930-28GTX.yaml   |   2 +-
 device-types/Allied Telesis/x930-52GPX.yaml   |   2 +-
 device-types/Allied Telesis/x930-52GTX.yaml   |   2 +-
 device-types/Allied Telesis/x950-28XSQ.yaml   |   2 +-
 device-types/Allied Telesis/x950-28XTQm.yaml  |   2 +-
 device-types/Allied Telesis/x950-52XSQ.yaml   |   2 +-
 device-types/Allied Telesis/x950-52XTQm.yaml  |   2 +-
 device-types/Alpha/CXC.yaml                   |   2 +-
 device-types/Alpha/CXCM1-HP.yaml              |   2 +-
 device-types/Apple/AppleTV-A1427.yaml         |   2 +-
 device-types/Apple/AppleTV-A1469.yaml         |   2 +-
 device-types/Apple/AppleTV-A1625.yaml         |   2 +-
 device-types/Apple/AppleTV-A1842.yaml         |   2 +-
 device-types/Apple/AppleTV-A2169.yaml         |   2 +-
 device-types/Arista/CCS-720XP-24Y6.yaml       |   2 +-
 device-types/Arista/CCS-720XP-24ZY4.yaml      |   2 +-
 device-types/Arista/CCS-720XP-48Y6.yaml       |   2 +-
 device-types/Arista/CCS-720XP-48ZC2.yaml      |   2 +-
 device-types/Arista/CCS-720XP-96ZC2.yaml      |   2 +-
 device-types/Arista/DCS-7010T-48.yaml         |   2 +-
 device-types/Arista/DCS-7010TX-48.yaml        |   2 +-
 device-types/Arista/DCS-7020SR-24C2.yaml      |   2 +-
 device-types/Arista/DCS-7020SR-32C2.yaml      |   2 +-
 device-types/Arista/DCS-7020TR-48.yaml        |   2 +-
 device-types/Arista/DCS-7048T-A.yaml          |   2 +-
 device-types/Arista/DCS-7050CX3-32S.yaml      |   2 +-
 device-types/Arista/DCS-7050QX-32S.yaml       |   2 +-
 device-types/Arista/DCS-7050S-52.yaml         |   2 +-
 device-types/Arista/DCS-7050S-64.yaml         |   2 +-
 device-types/Arista/DCS-7050SX-64.yaml        |   2 +-
 device-types/Arista/DCS-7050SX2-72Q.yaml      |   2 +-
 device-types/Arista/DCS-7050SX3-48YC12.yaml   |   2 +-
 device-types/Arista/DCS-7050SX3-48YC8.yaml    |   2 +-
 device-types/Arista/DCS-7050T-52.yaml         |   2 +-
 device-types/Arista/DCS-7050T-64.yaml         |   2 +-
 device-types/Arista/DCS-7050TX-48.yaml        |   2 +-
 device-types/Arista/DCS-7050TX-72Q.yaml       |   2 +-
 device-types/Arista/DCS-7050TX3-48C8.yaml     |   2 +-
 device-types/Arista/DCS-7060CX-32S.yaml       |   2 +-
 device-types/Arista/DCS-7060CX2-32S.yaml      |   2 +-
 device-types/Arista/DCS-7060DX4-32.yaml       |   2 +-
 device-types/Arista/DCS-7060PX4-32.yaml       |   2 +-
 device-types/Arista/DCS-7060SX2-48YC6.yaml    |   2 +-
 device-types/Arista/DCS-7124SX.yaml           |   2 +-
 device-types/Arista/DCS-7148SX.yaml           |   2 +-
 device-types/Arista/DCS-7150S-24.yaml         |   2 +-
 device-types/Arista/DCS-7150S-52.yaml         |   2 +-
 device-types/Arista/DCS-7150S-64.yaml         |   2 +-
 device-types/Arista/DCS-7150SC-24.yaml        |   2 +-
 device-types/Arista/DCS-7150SC-64.yaml        |   2 +-
 device-types/Arista/DCS-7260CX3-64-F.yaml     |   2 +-
 device-types/Arista/DCS-7280CR2-60.yaml       |   2 +-
 device-types/Arista/DCS-7280CR2A-30.yaml      |   2 +-
 device-types/Arista/DCS-7280CR3-32D4.yaml     |   2 +-
 device-types/Arista/DCS-7280CR3-32P4.yaml     |   2 +-
 device-types/Arista/DCS-7280QR-C36.yaml       |   2 +-
 device-types/Arista/DCS-7280SR-48C6.yaml      |   2 +-
 device-types/Arista/DCS-7280SR-48YC6.yaml     |   2 +-
 device-types/Arista/DCS-7280SR2-48YC6.yaml    |   2 +-
 device-types/Arista/DCS-7280SR2K-48C6-M.yaml  |   2 +-
 device-types/Arista/DCS-7280SR3-48YC8.yaml    |   2 +-
 device-types/Arista/DCS-7280SRA-48C6-M.yaml   |   2 +-
 device-types/Arista/DCS-7280SRA-48C6.yaml     |   2 +-
 device-types/Arista/DCS-7280TR-48C6.yaml      |   2 +-
 device-types/Arista/DCS-7368.yaml             |   2 +-
 device-types/Arista/DCS-7508.yaml             |   2 +-
 device-types/Avocent/ACS16.yaml               |   2 +-
 device-types/Avocent/Cyclades-TS1000.yaml     |   2 +-
 device-types/Avocent/DSR2035.yaml             |   2 +-
 device-types/Avocent/DSRIQ-PS2.yaml           |   2 +-
 device-types/Avocent/DSRIQ-SRL.yaml           |   2 +-
 device-types/Avocent/DSRIQ-USB.yaml           |   2 +-
 device-types/Avocent/DSRIQ-VSN.yaml           |   2 +-
 device-types/Avocent/PM10-15A.yaml            |   2 +-
 device-types/Avocent/PM10-20A.yaml            |   2 +-
 device-types/Avocent/PM10-L20A.yaml           |   2 +-
 device-types/Avocent/PM10-L30A.yaml           |   2 +-
 device-types/Avocent/PM10i-10A.yaml           |   2 +-
 device-types/Avocent/PM10i-15A.yaml           |   2 +-
 device-types/Avocent/PM10i-16A.yaml           |   2 +-
 device-types/Avocent/PM10i-20A.yaml           |   2 +-
 device-types/Avocent/PM10i-L30A.yaml          |   2 +-
 device-types/Avocent/PM20-20A.yaml            |   2 +-
 device-types/Avocent/PM20-L20A.yaml           |   2 +-
 device-types/Avocent/PM20-L30A.yaml           |   2 +-
 device-types/Avocent/PM20i-16A.yaml           |   2 +-
 device-types/Avocent/PM20i-20A.yaml           |   2 +-
 device-types/Avocent/PM20i-L30A.yaml          |   2 +-
 device-types/Avocent/PM3000.yaml              |   2 +-
 device-types/Avocent/PM3009H.yaml             |   2 +-
 device-types/Brocade/fws624g.yaml             |   2 +-
 device-types/Brocade/fws648g.yaml             |   2 +-
 device-types/Brocade/icx6450-48.yaml          |   2 +-
 device-types/Brocade/icx6610-24.yaml          |   2 +-
 device-types/Brocade/icx6610-48.yaml          |   2 +-
 device-types/Brocade/icx6610-48p.yaml         |   2 +-
 device-types/Brocade/icx6650-64.yaml          |   2 +-
 device-types/Brocade/icx7150-c12.yaml         |   2 +-
 device-types/Brocade/icx7250-24.yaml          |   2 +-
 device-types/Brocade/icx7250-48.yaml          |   2 +-
 device-types/Brocade/icx7450-48.yaml          |   2 +-
 device-types/Calix/E7-2.yaml                  |   2 +-
 device-types/Calix/E7-20.yaml                 |   2 +-
 device-types/Canon/IR-ADV-C3520.yaml          |   2 +-
 device-types/Canon/IR-ADV-C3530-III.yaml      |   2 +-
 device-types/Canon/IR-ADV-C3530.yaml          |   2 +-
 device-types/Canon/IR-ADV-C3720.yaml          |   2 +-
 .../Check Point/1500_3600_3800-RM-DUAL.yaml   |   5 +-
 device-types/Check Point/SG23800.yaml         |   2 +-
 device-types/Check Point/SG3600.yaml          |   2 +-
 device-types/Check Point/SG6400.yaml          |   2 +-
 device-types/Ciena/3926.yaml                  |   2 +-
 device-types/Ciena/3928.yaml                  |   2 +-
 device-types/Ciena/3930.yaml                  |   2 +-
 device-types/Ciena/5142.yaml                  |   2 +-
 device-types/Ciena/5160.yaml                  |   2 +-
 device-types/Ciena/5170.yaml                  |   2 +-
 device-types/Ciena/5171.yaml                  |   2 +-
 device-types/Cisco/2951-K9.yaml               |   2 +-
 device-types/Cisco/C1000-48FP-4G-L.yaml       |   2 +-
 device-types/Cisco/C6807-XL.yaml              |   2 +-
 device-types/Cisco/C7206VXR.yaml              |   2 +-
 device-types/Cisco/C9200L-48PL-4G.yaml        |   2 +-
 device-types/Cisco/CDB-MNT-RACK5-C14.yaml     |   2 +-
 device-types/Cisco/CISCO3925.yaml             |   4 +-
 device-types/Cisco/CISCO7606-S.yaml           |   4 +-
 device-types/Cisco/CISCO7609-S.yaml           |   4 +-
 device-types/Cisco/CS-500.yaml                |   2 +-
 device-types/Cisco/ISR1111-8P.yaml            |   2 +-
 device-types/Cisco/ISR1111-8PLTEEA.yaml       |   2 +-
 device-types/Cisco/ISR1111-8PLTEEAWA.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTEEAWB.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTEEAWE.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTEEAWF.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTEEAWH.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTEEAWN.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTEEAWQ.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTEEAWR.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTEEAWZ.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTELA.yaml       |   2 +-
 device-types/Cisco/ISR1111-8PLTELAWA.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTELAWB.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTELAWE.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTELAWF.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTELAWH.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTELAWN.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTELAWQ.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTELAWR.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PLTELAWZ.yaml     |   2 +-
 device-types/Cisco/ISR1111-8PWA.yaml          |   2 +-
 device-types/Cisco/ISR1111-8PWB.yaml          |   2 +-
 device-types/Cisco/ISR1111-8PWE.yaml          |   2 +-
 device-types/Cisco/ISR1111-8PWF.yaml          |   2 +-
 device-types/Cisco/ISR1111-8PWH.yaml          |   2 +-
 device-types/Cisco/ISR1111-8PWN.yaml          |   2 +-
 device-types/Cisco/ISR1111-8PWQ.yaml          |   2 +-
 device-types/Cisco/ISR1111-8PWR.yaml          |   2 +-
 device-types/Cisco/ISR1111-8PWZy.yaml         |   2 +-
 device-types/Cisco/ISR1121.yaml               |   2 +-
 device-types/Cisco/ISR1161-8P.yaml            |   2 +-
 device-types/Cisco/N3K-C3132Q-40GX.yaml       |   2 +-
 device-types/Cisco/N7K-7702.yaml              |   2 +-
 device-types/Cisco/WS-C2960+24PC-L.yaml       |   2 +-
 device-types/Cisco/WS-C2960+24TC-L.yaml       |   2 +-
 device-types/Cisco/WS-C2960+48TC-L.yaml       |   2 +-
 device-types/Cisco/WS-C3850-12X48U.yaml       |   2 +-
 device-types/Cisco/WS-C4500X-16SFP+.yaml      |   2 +-
 device-types/Cisco/WS-C4500X-32SFP+.yaml      |   2 +-
 device-types/Cisco/WS-C4507R+E.yaml           |   2 +-
 device-types/Cisco/WS-C4510R+E.yaml           |   2 +-
 device-types/Citrix/MPX-59xx.yaml             |   2 +-
 device-types/Citrix/SDX-14000.yaml            |   2 +-
 device-types/Colable/COL5141A.yaml            |   2 +-
 device-types/Corning/EDGE-01U-SP.yaml         |   2 +-
 device-types/Corning/EDGE-01U.yaml            |   2 +-
 device-types/Corning/EDGE-02U.yaml            |   2 +-
 device-types/Corning/EDGE-04U.yaml            |   2 +-
 device-types/CryptoPro/NGATE-320.yaml         |   2 +-
 device-types/CryptoPro/NGATE-600.yaml         |   2 +-
 device-types/CyberPower/CPS1215RMS.yaml       |   2 +-
 device-types/CyberPower/OR1000LCDRM1U.yaml    |   2 +-
 device-types/CyberPower/OR1500LCDRTXL2U.yaml  |   2 +-
 device-types/CyberPower/OR2200LCDRT2U.yaml    |   2 +-
 device-types/CyberPower/PDU15M2F12R.yaml      |   2 +-
 device-types/CyberPower/cps1220rms.yaml       |   2 +-
 device-types/CyberPower/cps1500pfclcd.yaml    |   2 +-
 .../Datacom/DM4610-OLT-4GPON+4GX+2XS.yaml     |   2 +-
 device-types/Deciso/DEC2600.yaml              |   2 +-
 device-types/Deciso/DEC2610.yaml              |   2 +-
 device-types/Deciso/DEC2630.yaml              |   2 +-
 device-types/Deciso/DEC2640.yaml              |   2 +-
 device-types/Deciso/DEC2650.yaml              |   2 +-
 device-types/Deciso/DEC2685.yaml              |   2 +-
 device-types/Deciso/DEC3840.yaml              |   2 +-
 device-types/Deciso/DEC3850.yaml              |   2 +-
 device-types/Deciso/DEC3860.yaml              |   2 +-
 device-types/Deciso/DEC4020.yaml              |   2 +-
 device-types/Deciso/DEC4040.yaml              |   2 +-
 device-types/Deciso/DEC4610.yaml              |   2 +-
 device-types/Deciso/DEC4620.yaml              |   2 +-
 device-types/Deciso/DEC4630.yaml              |   2 +-
 device-types/Deciso/DEC4640.yaml              |   2 +-
 device-types/Deciso/DEC600.yaml               |   2 +-
 device-types/Deciso/DEC610.yaml               |   2 +-
 device-types/Deciso/DEC620.yaml               |   2 +-
 device-types/Deciso/DEC630.yaml               |   2 +-
 device-types/Deciso/DEC670.yaml               |   2 +-
 device-types/Deciso/DEC690.yaml               |   2 +-
 device-types/Deciso/DEC740.yaml               |   2 +-
 device-types/Deciso/DEC750.yaml               |   2 +-
 device-types/Deciso/DEC840.yaml               |   2 +-
 device-types/Deciso/DEC850.yaml               |   2 +-
 device-types/Dell/49H29.yaml                  |   4 +-
 device-types/Dell/DKMMLED185-207.yml          |   2 +-
 device-types/Dell/DMPU2016-G01.yml            |   2 +-
 device-types/Delta/PD1215-RM.yaml             |   2 +-
 ...onsole_Server-32p.yaml => Digi-CM-32.yaml} |   5 +-
 ...CM_Console_Server.yaml => Digi-CM-48.yaml} |   5 +-
 .../smart_power_supply_pro.yaml               |   2 +-
 device-types/Eaton/5PX2200IRT.yaml            |   2 +-
 device-types/Eaton/9PX3000iRT2U.yaml          |   2 +-
 device-types/Eaton/9PXEBM180.yaml             |   4 +-
 device-types/Eaton/9PXEBM72RT2U.yaml          |   4 +-
 .../Eaton/Tripp-Lite-PDUMH20HVAT.yaml         |   2 +-
 .../Eaton/Tripp-Lite-SMART1500LCD.yaml        |   2 +-
 device-types/Edgecore/5812-54X-O-AC-B.yaml    |   2 +-
 device-types/Edgecore/5912-54X-O-AC-F.yaml    |   2 +-
 device-types/Edgecore/5912-54XM-O-AC-F.yaml   |   2 +-
 device-types/Edgecore/7726-32X-O.yaml         |   2 +-
 device-types/Eltex/MES3348.yml                |   2 +-
 device-types/EnGenius/EWS5912FP.yaml          |   2 +-
 device-types/Ericsson/R6672.yml               |   2 +-
 device-types/Extreme Networks/5520-24T.yaml   |   2 +-
 .../Extreme Networks/715W_AC_PSU_FB.yaml      |   2 +-
 .../Extreme Networks/BR-MLXE-16-MR2-M-AC.yaml |   2 +-
 .../Extreme Networks/BR-MLXE-32-MR2-M-AC.yaml |   2 +-
 .../Extreme Networks/BR-MLXE-4-MR2-M-AC.yaml  |   2 +-
 .../Extreme Networks/BR-MLXE-8-MR2-M-AC.yaml  |   2 +-
 .../Extreme Networks/BR-SLX-9140-48V-AC.yaml  |   2 +-
 .../Extreme Networks/BR-SLX-9150-48XT-AC.yaml |   2 +-
 .../Extreme Networks/BR-SLX-9150-48Y-AC.yaml  |   2 +-
 .../Extreme Networks/BR-SLX-9240-32C-AC.yaml  |   2 +-
 .../Extreme Networks/BR-SLX-9250-32C-AC.yaml  |   2 +-
 .../Extreme Networks/BR-SLX-9540-48S-AC.yaml  |   2 +-
 .../BR-SLX-9640-24S-12C-AC.yaml               |   2 +-
 .../Extreme Networks/BR-SLX-9740-40C-AC.yaml  |   2 +-
 .../Extreme Networks/BR-SLX-9740-80C-AC.yaml  |   2 +-
 .../Extreme Networks/VSP-7400-48Y-8C.yaml     |   2 +-
 .../Extreme Networks/X440-G2-24p-10GE4.yaml   |   2 +-
 .../Extreme Networks/X440-G2-24t-10GE4.yaml   |   2 +-
 .../Extreme Networks/X440-G2-24x-10GE4.yaml   |   2 +-
 .../Extreme Networks/X460-G2-24t-10GE4.yaml   |   2 +-
 .../Extreme Networks/X460-G2-48p-10GE4.yaml   |   2 +-
 .../Extreme Networks/X460-G2_VIM-2x.yaml      |   2 +-
 device-types/F5/BIG-IP_3900.yaml              |   2 +-
 device-types/F5/BIG-IP_4200v.yaml             |   2 +-
 device-types/F5/BIG-IP_5200v.yaml             |   2 +-
 device-types/F5/BIG-IP_5250v.yaml             |   2 +-
 device-types/F5/BIG-IP_VPR-C2400.yaml         |   2 +-
 device-types/F5/BIG-IP_i2600.yaml             |   2 +-
 device-types/F5/BIG-IP_i2800.yaml             |   2 +-
 device-types/F5/BIG-IP_i4600.yaml             |   2 +-
 device-types/F5/BIG-IP_i4800.yaml             |   2 +-
 device-types/F5/BIG-IP_i5800.yaml             |   2 +-
 device-types/FS/FHD-1UFCE.yaml                |   2 +-
 device-types/FS/FHD-2UFCE.yaml                |   2 +-
 device-types/FS/FHD-FPP5DRL.yml               |   2 +-
 device-types/FS/FHU-FPP48FLCSMF.yaml          |   2 +-
 device-types/FS/FHX-1UFSP.yaml                |   2 +-
 device-types/FS/FMU-1UFMX-N.yaml              |   2 +-
 device-types/FS/FMU-C182761M.yaml             |   2 +-
 device-types/FS/FMU-D402160M.yaml             |   2 +-
 device-types/FS/FMU-MC042733.yaml             |   2 +-
 device-types/FS/FMU-MC082745.yaml             |   2 +-
 device-types/FS/FMU-MC084761EM3.yaml          |   2 +-
 device-types/FS/FMU-MD085360EM3.yaml          |   2 +-
 device-types/FS/N5860-48SC.yaml               |   2 +-
 device-types/FS/PDU-2PE42I-VMO.yaml           |   2 +-
 device-types/FS/S3800-24F4S.yaml              |   2 +-
 device-types/FS/S3900-24T4S-R.yaml            |   2 +-
 device-types/FS/S3900-24T4S.yaml              |   2 +-
 device-types/FS/S3900-48T6S-R.yaml            |   2 +-
 .../Factor-TS/DIONIS-DPS-2004-RM-4E.yaml      |   4 +-
 .../Factor-TS/DIONIS-DPS-3010-RM-6E-4S.yaml   |   4 +-
 device-types/Fortinet/FG-100E.yaml            |   2 +-
 device-types/Fortinet/FG-100F.yaml            |   2 +-
 device-types/Fortinet/FG-101F.yaml            |   2 +-
 device-types/Fortinet/FG-1100E.yaml           |   2 +-
 device-types/Fortinet/FG-1101E.yaml           |   2 +-
 device-types/Fortinet/FG-140E-POE.yaml        |   2 +-
 device-types/Fortinet/FG-1500D.yaml           |   2 +-
 device-types/Fortinet/FG-1500DT.yaml          |   2 +-
 device-types/Fortinet/FG-1800F.yaml           |   2 +-
 device-types/Fortinet/FG-200D.yaml            |   2 +-
 device-types/Fortinet/FG-200E.yaml            |   2 +-
 device-types/Fortinet/FG-200F.yaml            |   2 +-
 device-types/Fortinet/FG-201E.yaml            |   2 +-
 device-types/Fortinet/FG-3000D.yaml           |   2 +-
 device-types/Fortinet/FG-300E.yaml            |   2 +-
 device-types/Fortinet/FG-301E.yaml            |   2 +-
 device-types/Fortinet/FG-400E.yaml            |   2 +-
 device-types/Fortinet/FG-40F.yaml             |   2 +-
 device-types/Fortinet/FG-500E.yaml            |   2 +-
 device-types/Fortinet/FG-50E.yaml             |   2 +-
 device-types/Fortinet/FG-600D.yaml            |   2 +-
 device-types/Fortinet/FG-600E.yaml            |   2 +-
 device-types/Fortinet/FG-600F.yaml            |   2 +-
 device-types/Fortinet/FG-601E.yaml            |   2 +-
 device-types/Fortinet/FG-601F.yaml            |   2 +-
 device-types/Fortinet/FG-60E.yaml             |   2 +-
 device-types/Fortinet/FG-60F.yaml             |   2 +-
 device-types/Fortinet/FG-80E-POE.yaml         |   2 +-
 device-types/Fortinet/FG-80E.yaml             |   2 +-
 device-types/Fortinet/FG-80F.yaml             |   2 +-
 device-types/Fortinet/FG-81E-POE.yaml         |   2 +-
 device-types/Fortinet/FG-81E.yaml             |   2 +-
 device-types/Fortinet/FG-81F.yaml             |   2 +-
 device-types/Fortinet/FG-90D.yml              |   2 +-
 device-types/Fortinet/FWB-2000E.yaml          |   2 +-
 device-types/Fujitsu/primergy_bx2560_m1.yaml  |   2 +-
 device-types/Fujitsu/primergy_bx2560_m2.yaml  |   2 +-
 device-types/Fujitsu/primergy_bx924_s4.yaml   |   2 +-
 device-types/Fujitsu/primergy_tx100_s1.yml    |   2 +-
 device-types/Fujitsu/primergy_tx1310_m1.yml   |   2 +-
 device-types/Fujitsu/primergy_tx1310_m3.yml   |   2 +-
 device-types/Fujitsu/primergy_tx1330_m4.yml   |   2 +-
 .../Generic/24-port_copper_patch_panel.yaml   |   2 +-
 .../24-port_copper_patch_panel_half.yaml      |   4 +-
 .../Generic/48-port_copper_patch_panel.yaml   |   2 +-
 .../48-port_copper_patch_panel_half.yaml      |   4 +-
 .../Generic/LC-12-port_fiber_patch_panel.yaml |   2 +-
 .../LC-12-port_fiber_patch_panel_half.yaml    |   4 +-
 .../Generic/LC-24-port_fiber_patch_panel.yaml |   2 +-
 .../LC-24-port_fiber_patch_panel_half.yaml    |   4 +-
 .../Generic/LC-48-port_fiber_patch_panel.yaml |   2 +-
 .../LC-48-port_fiber_patch_panel_half.yaml    |   4 +-
 .../SC-24-double-port_fiber_patch_panel.yaml  |   2 +-
 ...24-double-port_fiber_patch_panel_half.yaml |   4 +-
 .../Generic/SC-24-port_fiber_patch_panel.yaml |   2 +-
 .../SC-24-port_fiber_patch_panel_half.yaml    |   4 +-
 .../Generic/cable-management-panel-1ru.yaml   |   2 +-
 .../Generic/cable-management-panel-2ru.yaml   |   2 +-
 device-types/Generic/shelf-1he.yaml           |   2 +-
 device-types/Generic/shelf-2he.yaml           |   2 +-
 device-types/Generic/wall-box-2-utp.yaml      |   2 +-
 device-types/Generic/wall-box-3-utp.yaml      |   2 +-
 device-types/Generic/wall-box-4-utp.yaml      |   2 +-
 device-types/Generic/wall-box-6-utp.yaml      |   2 +-
 .../HPE/Aruba-10000-48Y6C-R8P13A.yaml         |   2 +-
 .../HPE/Aruba-10000-48Y6C-R8P14A.yaml         |   2 +-
 device-types/HPE/Aruba-2530-48-PoEP.yml       |   2 +-
 device-types/HPE/Aruba-3810M-24G-1-slot.yaml  |   2 +-
 device-types/HPE/Aruba-5406R-zl2.yaml         |   4 +-
 device-types/HPE/Aruba-8325-32C-JL626A.yaml   |   2 +-
 device-types/HPE/Aruba-8325-32C-JL627A.yaml   |   2 +-
 device-types/HPE/Aruba-8325-48Y8C-JL624A.yaml |   2 +-
 device-types/HPE/Aruba-8325-48Y8C-JL625A.yaml |   2 +-
 device-types/HPE/Aruba-8360-12C-JL708C.yaml   |   2 +-
 device-types/HPE/Aruba-8360-12C-JL709C.yaml   |   2 +-
 device-types/HPE/Aruba-8360-16Y2C-JL702C.yaml |   2 +-
 device-types/HPE/Aruba-8360-16Y2C-JL703C.yaml |   2 +-
 .../HPE/Aruba-8360-24XF2C-JL710C.yaml         |   4 +-
 .../HPE/Aruba-8360-24XF2C-JL711C.yaml         |   2 +-
 device-types/HPE/Aruba-8360-32Y4C-JL700C.yaml |   2 +-
 device-types/HPE/Aruba-8360-32Y4C-JL701C.yaml |   2 +-
 .../HPE/Aruba-8360-48XT4C-JL706C.yaml         |   2 +-
 .../HPE/Aruba-8360-48XT4C-JL707C.yaml         |   2 +-
 device-types/HPE/Aruba-8360-48Y6C-JL704C.yaml |   2 +-
 device-types/HPE/Aruba-8360-48Y6C-JL705C.yaml |   2 +-
 device-types/HPE/FlexFabric-5800-48G.yml      |   2 +-
 device-types/HPE/FlexFabric-5945-2-slot.yaml  |   2 +-
 .../HPE/FlexNetwork-5130-48G-4SFPP-HI.yml     |   2 +-
 .../FlexNetwork-5130-48G-PoEP-4SFPP-HI.yml    |   2 +-
 ...HP-5120-48G-EI-with-2-Interface-Slots.yaml |   4 +-
 device-types/HPE/OfficeConnect-1810-24G.yml   |   2 +-
 device-types/HPE/OfficeConnect-1820-48G.yml   |   2 +-
 .../HPE/OfficeConnect-1920S-48-PoE+-4SFP.yml  |   2 +-
 device-types/HPE/ProCurve-2524.yaml           |   2 +-
 device-types/HPE/ProCurve-2626.yaml           |   2 +-
 device-types/HPE/ProLiant-DL180-Gen6.yaml     |   2 +-
 device-types/HPE/ProLiant-DL320e-Gen8.yml     |   2 +-
 device-types/HPE/ProLiant-DL360-Gen7.yaml     |   2 +-
 device-types/HPE/ProLiant-DL360-Gen9.yaml     |   2 +-
 device-types/HPE/ProLiant-DL360e-Gen8.yaml    |   2 +-
 device-types/HPE/ProLiant-DL380-Gen5.yml      |   2 +-
 device-types/HPE/ProLiant-DL380-Gen6.yml      |   2 +-
 device-types/HPE/ProLiant-DL380-Gen7.yml      |   2 +-
 device-types/HPE/ProLiant-DL380-Gen9.yaml     |   2 +-
 device-types/HPE/ProLiant-DL380p-Gen8.yaml    |   2 +-
 device-types/Huawei/AR6121E.yaml              |   2 +-
 device-types/Huawei/ATN910I-D.yaml            |   2 +-
 device-types/Huawei/CE6851-48S6Q-HI.yaml      |   2 +-
 device-types/Huawei/Huawei_2288H_V5.yaml      |   2 +-
 .../Huawei/Huawei_CE6820H-48S6CQ.yaml         |   2 +-
 .../Huawei/Huawei_Dorado_3000_v6.yaml         |   2 +-
 .../Huawei/Huawei_S5732-H24UM2CC.yaml         |   2 +-
 device-types/Huawei/NE40E-M2K-B.yaml          |   2 +-
 .../Huawei/S1720-28GWR-PWR-4TP-E.yaml         |   2 +-
 device-types/Huawei/S5720-28X-LI-24S-DC.yaml  |   2 +-
 device-types/Huawei/S5731-S24T4X.yaml         |   2 +-
 device-types/Huawei/S5732-H48XUM2CC.yaml      |   2 +-
 device-types/Huawei/S5735-L24P4X-A1.yaml      |   2 +-
 device-types/Huawei/S5735-L24T4X-A.yaml       |   2 +-
 device-types/Huawei/S6720-30C-EI-24S-AC.yaml  |   2 +-
 device-types/Huawei/S6720-30C-EI-24S-DC.yaml  |   2 +-
 device-types/Huawei/S6720S-26Q-EI-24S-AC.yaml |   2 +-
 device-types/Huawei/S6730-H24X6C.yaml         |   2 +-
 device-types/Huawei/S6730-H48X6C.yaml         |   2 +-
 .../Huawei/huawei-s5720-56c-ei-48s-ac.yaml    |   2 +-
 device-types/IBM/BladeCenter-GS22.yaml        |   6 ++
 ...{bladecenter_h.yaml => BladeCenter-H.yaml} |   2 +-
 ...x3550_type_7978.yaml => System-x3550.yaml} |   4 +-
 ...rver_x226_86482DG.yml => eServer-x226.yml} |   5 +-
 device-types/IBM/hs22_type_7870.yaml          |   6 --
 device-types/Infinera/CloudXpress2.yml        |   2 +-
 device-types/Infoblox/IB-1410.yaml            |   2 +-
 device-types/Infoblox/IB-1420.yaml            |   2 +-
 device-types/Infoblox/TE-1415-NS1GD-AC.yaml   |   2 +-
 device-types/Infoblox/TE-805-HW-AC-B.yaml     |   2 +-
 device-types/Infoblox/TE-815-NS1GD-AC.yaml    |   2 +-
 .../Infotecs/VIPNET-COORDINATOR-HW1000C.yaml  |   2 +-
 device-types/Inspur/NF5180M6.yaml             |   2 +-
 device-types/Inspur/NF8260M6.yaml             |   2 +-
 device-types/Juniper/SRX210HE2.yaml           |   2 +-
 device-types/Juniper/SRX380-P.yaml            |   2 +-
 device-types/LANCOM/GS-1108.yaml              |   2 +-
 device-types/LANCOM/GS-1108P.yaml             |   2 +-
 device-types/LANCOM/GS-1326.yaml              |   2 +-
 device-types/LANCOM/GS-2310.yaml              |   2 +-
 device-types/LANCOM/GS-2310P-plus.yaml        |   2 +-
 device-types/LANCOM/GS-2310P.yaml             |   2 +-
 device-types/LANCOM/GS-2326-plus.yaml         |   2 +-
 device-types/LANCOM/GS-2326.yaml              |   2 +-
 device-types/LANCOM/GS-2326P-plus.yaml        |   2 +-
 device-types/LANCOM/GS-2328.yaml              |   2 +-
 device-types/LANCOM/GS-2328F.yaml             |   2 +-
 device-types/LANCOM/GS-2328P.yaml             |   2 +-
 device-types/LANCOM/GS-2352.yaml              |   2 +-
 device-types/LANCOM/GS-2352P.yaml             |   2 +-
 device-types/LANCOM/GS-3126X.yaml             |   2 +-
 device-types/LANCOM/GS-3126XP.yaml            |   2 +-
 device-types/LANCOM/GS-3152X.yaml             |   2 +-
 device-types/LANCOM/GS-3152XP.yaml            |   2 +-
 device-types/LANCOM/GS-3152XSP.yaml           |   2 +-
 device-types/LANCOM/GS-3510XP.yaml            |   2 +-
 device-types/LANCOM/GS-3528X.yaml             |   2 +-
 device-types/LANCOM/GS-3528XP.yaml            |   2 +-
 device-types/LANCOM/ISG-1000.yaml             |   2 +-
 device-types/LANCOM/ISG-4000.yaml             |   2 +-
 device-types/LANCOM/ISG-8000.yaml             |   2 +-
 device-types/LANCOM/LN-1700.yaml              |   2 +-
 device-types/LANCOM/LN-1700B.yaml             |   2 +-
 device-types/LANCOM/LN-1700UE.yaml            |   2 +-
 device-types/LANCOM/LN-1702.yaml              |   2 +-
 device-types/LANCOM/LN-1702B.yaml             |   2 +-
 device-types/LANCOM/WLC-1000.yaml             |   2 +-
 device-types/LANCOM/WLC-30.yaml               |   2 +-
 device-types/LANCOM/WLC-4006-plus.yaml        |   2 +-
 device-types/LANCOM/WLC-4025-plus.yaml        |   2 +-
 device-types/LANCOM/WLC-4025.yaml             |   2 +-
 device-types/LANCOM/WLC-4100.yaml             |   2 +-
 device-types/Lenovo/FLEX-SYSTEM.yaml          |   4 +-
 device-types/Lenovo/SR530.yaml                |   2 +-
 device-types/Lenovo/SR550.yaml                |   2 +-
 device-types/Lenovo/SR630.yaml                |   4 +-
 device-types/Lenovo/SR650.yaml                |   2 +-
 device-types/Lenovo/ThinkSystem_AUKJ.yaml     |   2 +-
 device-types/Lenovo/ThinkSystem_AUKK.yaml     |   2 +-
 device-types/Lenovo/system_x3250_M6.yaml      |   2 +-
 device-types/Lenovo/system_x3550_M5.yaml      |   2 +-
 device-types/Lenovo/system_x3750_M4.yaml      |   2 +-
 device-types/Leviton/49255-H24.yaml           |   2 +-
 device-types/Leviton/49255-Q48.yaml           |   2 +-
 device-types/Leviton/5R1UM-F03.yml            |   2 +-
 device-types/Leviton/5R2UM-F06.yml            |   2 +-
 device-types/Leviton/5R3UM-F09.yml            |   2 +-
 device-types/Leviton/5R3UM-F12.yml            |   2 +-
 device-types/Mellanox/SB7800.yml              |   2 +-
 device-types/Mellanox/SN2010.yml              |   2 +-
 device-types/Mellanox/SN2700.yml              |   2 +-
 device-types/Mellanox/SN3700.yml              |   2 +-
 device-types/Mellanox/SN3700C.yml             |   2 +-
 device-types/Mellanox/SN4600.yml              |   2 +-
 device-types/Mellanox/SN4600C.yml             |   2 +-
 device-types/Mellanox/SN4700.yml              |   2 +-
 device-types/Mellanox/SX6036.yml              |   2 +-
 .../MikroTik/C52iG-5HaxD2HaxD-TC.yaml         |   2 +-
 .../MikroTik/C53UiG-5HPaxD2HPaxD.yaml         |   2 +-
 device-types/MikroTik/CCR1009-7G-1C-1S+.yaml  |   2 +-
 .../MikroTik/CCR1009-7G-1C-1S+PC.yaml         |   2 +-
 device-types/MikroTik/CCR1009-7G-1C-PC.yaml   |   2 +-
 device-types/MikroTik/CCR1009-8G-1S-1S+.yaml  |   2 +-
 device-types/MikroTik/CCR1016-12G.yaml        |   2 +-
 device-types/MikroTik/CCR1016-12S-1S+.yaml    |   2 +-
 device-types/MikroTik/CCR1036-12G-4S-EM.yaml  |   2 +-
 device-types/MikroTik/CCR1036-12G-4S.yaml     |   2 +-
 device-types/MikroTik/CCR1036-8G-2S+.yaml     |   2 +-
 device-types/MikroTik/CCR1036-8G-2S+EM.yaml   |   2 +-
 device-types/MikroTik/CCR1072-1G-8S+.yaml     |   2 +-
 device-types/MikroTik/CCR2004-16G-2S+.yaml    |   2 +-
 device-types/MikroTik/CCR2004-1G-12S+2XS.yaml |   2 +-
 device-types/MikroTik/CCR2116-12G-4SX.yaml    |   2 +-
 .../MikroTik/CCR2216-1G-12XS-2XQ.yaml         |   2 +-
 device-types/MikroTik/CRS106-1C-5S.yaml       |   2 +-
 device-types/MikroTik/CRS112-8G-4S-IN.yaml    |   2 +-
 device-types/MikroTik/CRS112-8P-4S-IN.yaml    |   2 +-
 .../MikroTik/CRS125-24G-1S-2HnD-IN.yaml       |   2 +-
 device-types/MikroTik/CRS125-24G-1S-IN.yaml   |   2 +-
 device-types/MikroTik/CRS125-24G-1S-RM.yaml   |   2 +-
 .../MikroTik/CRS212-1G-10S-1S+IN.yaml         |   2 +-
 device-types/MikroTik/CRS226-24G-2S+RM.yaml   |   2 +-
 device-types/MikroTik/CRS305-1G-4S+IN.yaml    |   2 +-
 device-types/MikroTik/CRS309-1G-8S+IN.yaml    |   2 +-
 device-types/MikroTik/CRS310-1G-5S-4S+IN.yaml |   2 +-
 device-types/MikroTik/CRS312-4C+8XG-RM.yaml   |   2 +-
 device-types/MikroTik/CRS317-1G-16S+RM.yaml   |   2 +-
 device-types/MikroTik/CRS326-24G-2S+RM.yaml   |   2 +-
 device-types/MikroTik/CRS326-24S+2Q+RM.yaml   |   2 +-
 device-types/MikroTik/CRS328-24P-4S+RM.yaml   |   2 +-
 .../MikroTik/CRS328-4C-20S-4S+RM.yaml         |   2 +-
 .../MikroTik/CRS354-48G-4S+2Q+RM.yaml         |   2 +-
 .../MikroTik/CRS354-48P-4S+2Q+RM.yaml         |   2 +-
 device-types/MikroTik/CRS504-4XQ-IN.yaml      |   2 +-
 device-types/MikroTik/CRS518-16XS-2XQ.yaml    |   2 +-
 device-types/MikroTik/CSS326-24G-2S+RM.yaml   |   2 +-
 device-types/MikroTik/RB1100AHx2.yaml         |   2 +-
 .../MikroTik/RB1100AHx4-Dude-Edition.yaml     |   2 +-
 device-types/MikroTik/RB1100AHx4.yaml         |   2 +-
 device-types/MikroTik/RB2011UiAS-IN.yaml      |   2 +-
 device-types/MikroTik/RB2011UiAS-RM.yaml      |   2 +-
 device-types/MikroTik/RB2011iL-RM.yaml        |   2 +-
 device-types/MikroTik/RB2011iLS-IN.yaml       |   2 +-
 device-types/MikroTik/RB260GS.yaml            |   2 +-
 device-types/MikroTik/RB260GSP.yaml           |   2 +-
 device-types/MikroTik/RB3011UiAS-RM.yaml      |   2 +-
 device-types/MikroTik/RB5009UG+S+IN.yaml      |   2 +-
 device-types/MikroTik/RB5009UPr+S+IN.yaml     |   2 +-
 device-types/MikroTik/RB750Gr3.yaml           |   2 +-
 device-types/MikroTik/RB750r2.yaml            |   2 +-
 device-types/MikroTik/RB750r3.yaml            |   2 +-
 device-types/MikroTik/RB760iGS.yaml           |   2 +-
 device-types/MikroTik/RB941-2nD.yaml          |   2 +-
 device-types/MikroTik/RB951G-2HnD.yaml        |   2 +-
 device-types/MikroTik/RB960PGS.yaml           |   2 +-
 device-types/MikroTik/RBLHGR&R11e-LTE-US.yaml |   2 +-
 device-types/MikroTik/RBLHGR&R11e-LTE6.yaml   |   2 +-
 device-types/MikroTik/RBLtAP-2HnD.yaml        |   2 +-
 device-types/MikroTik/RBSXTR&R11e-LTE6.yaml   |   2 +-
 device-types/Mimosa Networks/a5.yaml          |   2 +-
 device-types/Mimosa Networks/a5c.yaml         |   2 +-
 device-types/Mimosa Networks/a5x.yaml         |   2 +-
 device-types/Mimosa Networks/b5c.yaml         |   2 +-
 device-types/Mimosa Networks/b5x.yaml         |   2 +-
 device-types/Mimosa Networks/c5c.yaml         |   2 +-
 device-types/Mimosa Networks/c5x.yaml         |   2 +-
 device-types/Mimosa Networks/c6x.yaml         |   2 +-
 device-types/NEC/UNIVERGE-IX2015.yaml         |   2 +-
 device-types/NEC/UNIVERGE-IX2025.yaml         |   2 +-
 device-types/NEC/UNIVERGE-IX2106.yaml         |   2 +-
 device-types/NEC/UNIVERGE-IX2107.yaml         |   2 +-
 device-types/NEC/UNIVERGE-IX2215.yaml         |   2 +-
 device-types/NEC/UNIVERGE-IX2235.yaml         |   2 +-
 device-types/NEC/UNIVERGE-IX2310.yaml         |   2 +-
 device-types/NetApp/FAS2750.yaml              |   2 +-
 device-types/NetApp/FAS8200.yaml              |   2 +-
 device-types/NetApp/X3172A.yaml               |   2 +-
 device-types/NetApp/X3218A.yaml               |   2 +-
 device-types/NetApp/X3219A.yaml               |   2 +-
 device-types/Netgate/7100.yaml                |   2 +-
 device-types/Netgear/GS105.yaml               |   2 +-
 device-types/Netgear/GS105E.yaml              |   2 +-
 device-types/Netgear/GS108.yaml               |   2 +-
 device-types/Netgear/GS108E.yaml              |   2 +-
 device-types/Netgear/GS116.yaml               |   2 +-
 device-types/Netgear/GS116E.yaml              |   2 +-
 device-types/Netgear/GSM7252PS.yaml           |   6 +-
 device-types/Netgear/JGS524.yaml              |   2 +-
 device-types/Netgear/M4300-12X12F.yaml        |   2 +-
 device-types/Netonix/WS-12-120-AC.yaml        |   2 +-
 device-types/Netonix/WS-24-400A.yaml          |   2 +-
 device-types/Nokia/7210-SAS-Sx.yaml           |   2 +-
 device-types/Nokia/7220-IXR-D1.yaml           |   2 +-
 device-types/Nokia/7220-IXR-D2.yaml           |   2 +-
 device-types/Nokia/7220-IXR-D2L.yaml          |   2 +-
 device-types/Nokia/7220-IXR-D3.yaml           |   2 +-
 device-types/Nokia/7220-IXR-D3L.yaml          |   2 +-
 device-types/Nokia/7220-IXR-H3.yaml           |   2 +-
 .../jetson-xavier-nx-developer-kit.yaml       |   2 +-
 device-types/Opengear/ACM7008-2-M.yaml        |   2 +-
 device-types/Opengear/CM7116-2-DAC-US.yaml    |   2 +-
 device-types/Opengear/CM7116-2-SAC-US.yaml    |   2 +-
 device-types/Opengear/CM7132-2-DAC-US.yaml    |   2 +-
 device-types/Opengear/CM7148-2-DAC-US.yaml    |   2 +-
 device-types/Opengear/CM7148-2-SAC-US.yaml    |   2 +-
 device-types/Opengear/CM7196-2-DAC-US.yaml    |   2 +-
 device-types/Opengear/IM4216-2.yaml           |   2 +-
 device-types/Opengear/IM4232-2.yaml           |   2 +-
 device-types/Opengear/IM4248-2.yaml           |   2 +-
 device-types/Opengear/IM7216-2-DAC-US.yaml    |   2 +-
 device-types/Opengear/IM7232-2-DAC-US.yaml    |   2 +-
 device-types/Opengear/IM7248-2-DAC-LMA.yaml   |   2 +-
 device-types/Opengear/IM7248-2-DAC-LMP.yaml   |   2 +-
 device-types/Opengear/IM7248-2-DAC-LMV.yaml   |   2 +-
 device-types/Opengear/IM7248-2-DAC-LR.yaml    |   2 +-
 device-types/Opengear/IM7248-2-DAC-US.yaml    |   2 +-
 device-types/Opengear/IM7248-2-DAC.yaml       |   2 +-
 device-types/Opengear/OM2248-L-EU.yaml        |   2 +-
 device-types/Opengear/OM2248-L.yaml           |   2 +-
 device-types/PC Engines/APU.yaml              |   2 +-
 device-types/PC Engines/APU2.yaml             |   2 +-
 device-types/PC Engines/APU4.yaml             |   2 +-
 device-types/Palo Alto/M-100.yaml             |   2 +-
 device-types/Palo Alto/M-500.yaml             |   2 +-
 device-types/Palo Alto/PA-200.yaml            |   2 +-
 device-types/Palo Alto/PA-220.yaml            |   2 +-
 device-types/Palo Alto/PA-3020.yaml           |   2 +-
 device-types/Palo Alto/PA-3050.yaml           |   2 +-
 device-types/Palo Alto/PA-3060.yaml           |   2 +-
 device-types/Palo Alto/PA-3220.yaml           |   2 +-
 device-types/Palo Alto/PA-3250.yaml           |   2 +-
 device-types/Palo Alto/PA-3260.yaml           |   2 +-
 device-types/Palo Alto/PA-500.yaml            |   2 +-
 device-types/Palo Alto/PA-5050.yaml           |   2 +-
 device-types/Palo Alto/PA-5060.yaml           |   2 +-
 device-types/Palo Alto/PA-5220.yaml           |   2 +-
 device-types/Palo Alto/PA-5250.yaml           |   2 +-
 device-types/Palo Alto/PA-5260.yaml           |   2 +-
 device-types/Palo Alto/PA-5280.yaml           |   2 +-
 device-types/Palo Alto/PA-7080.yaml           |   2 +-
 device-types/Palo Alto/PA-820.yaml            |   2 +-
 device-types/Palo Alto/PA-850.yaml            |   2 +-
 device-types/Panduit/CDPP8RG-S.yaml           |   2 +-
 device-types/Panduit/CDPP8RG.yaml             |   2 +-
 device-types/Panduit/CP24BLY.yaml             |   2 +-
 device-types/Panduit/CP48BLY.yaml             |   2 +-
 device-types/Panduit/CP48HDBL.yaml            |   2 +-
 device-types/Panduit/CPA24BLY.yaml            |   2 +-
 device-types/Panduit/CPA48BLY.yaml            |   2 +-
 device-types/Panduit/CPA48HDBL.yaml           |   2 +-
 device-types/Panduit/CPP24FMWBLY.yaml         |   2 +-
 device-types/Panduit/CPP24WBLY.yaml           |   2 +-
 device-types/Panduit/CPP48FMWBLY.yaml         |   2 +-
 device-types/Panduit/CPP48HDEWBL.yaml         |   2 +-
 device-types/Panduit/CPP48WBLY.yaml           |   2 +-
 device-types/Panduit/CPP72FMWBLY.yaml         |   2 +-
 device-types/Panduit/CPPA24FMWBLY.yaml        |   2 +-
 device-types/Panduit/CPPA48FMWBLY.yaml        |   2 +-
 device-types/Panduit/CPPA48HDWBLY.yaml        |   2 +-
 device-types/Panduit/CPPA72FMWBLY.yaml        |   2 +-
 device-types/Panduit/FCE1.yaml                |   2 +-
 device-types/Panduit/FCE1U.yaml               |   2 +-
 device-types/Panduit/FCE2.yaml                |   2 +-
 device-types/Panduit/FCE2U.yaml               |   2 +-
 device-types/Panduit/FMD1.yaml                |   2 +-
 device-types/Panduit/FMD2.yaml                |   2 +-
 device-types/Panduit/FRME1.yaml               |   2 +-
 device-types/Panduit/FRME2.yaml               |   2 +-
 device-types/Panduit/FRME4.yaml               |   2 +-
 device-types/Panduit/FWME2.yaml               |   2 +-
 device-types/Panduit/FWME4.yaml               |   2 +-
 device-types/Panduit/FWME8.yaml               |   2 +-
 device-types/Panduit/P36G18M.yaml             |   2 +-
 device-types/Parks/Fiberlink_30028.yaml       |   2 +-
 device-types/Peplink/Balance-1350.yaml        |   2 +-
 device-types/Peplink/Balance-305.yaml         |   2 +-
 device-types/QCT/D51B-2U_DUAL_1G_LOM.yml      |   4 +-
 device-types/QNAP/Qnap_TS-1683XU-RP.yaml      |   2 +-
 device-types/QNAP/Qnap_TS-h1886XU-RP.yaml     |   2 +-
 device-types/QNAP/TS-1263U-RP.yaml            |   2 +-
 device-types/QNAP/TS-212.yml                  |   2 +-
 device-types/QNAP/TS-412.yml                  |   2 +-
 device-types/QNAP/TS-453U-RP.yml              |   2 +-
 device-types/QNAP/TS-453mini.yml              |   2 +-
 device-types/QNAP/TS-469L.yml                 |   2 +-
 device-types/QNAP/TS-469U-RP.yml              |   2 +-
 device-types/QNAP/TS-873.yml                  |   2 +-
 device-types/QNAP/ts-1283xu-rp.yml            |   2 +-
 device-types/QNAP/ts-431xeu.yml               |   2 +-
 device-types/QNAP/ts-459pro+.yml              |   2 +-
 device-types/QTECH/QSW-6900-32H.yaml          |   2 +-
 device-types/Qotom/Q330G4.yaml                |   2 +-
 device-types/RAD/ETX-2i-10G.yaml              |   2 +-
 device-types/Raritan/PX2-2493.yaml            |   2 +-
 device-types/Raritan/PX3-5469R.yaml           |   2 +-
 device-types/Raritan/PX3-5497V.yaml           |   2 +-
 device-types/Raritan/PX3-5664U.yaml           |   2 +-
 device-types/Raritan/PX3-5724V.yaml           |   2 +-
 device-types/Raritan/PX3-5870V.yaml           |   2 +-
 device-types/Raritan/PX3TS-5184CR.yaml        |   2 +-
 device-types/Raspberry Pi/RPI3-MODB-1GB.yaml  |   2 +-
 device-types/Raspberry Pi/RPI3-MODBP-1GB.yaml |   2 +-
 device-types/Raspberry Pi/RPI4-MODB-1GB.yaml  |   2 +-
 device-types/Raspberry Pi/RPI4-MODB-2GB.yaml  |   2 +-
 device-types/Raspberry Pi/RPI4-MODB-4GB.yaml  |   2 +-
 device-types/Raspberry Pi/RPI4-MODB-8GB.yaml  |   2 +-
 device-types/Riverbed/CX1555.yaml             |   2 +-
 device-types/Riverbed/CX3070.yaml             |   2 +-
 device-types/Riverbed/CX5055.yaml             |   2 +-
 device-types/Riverbed/CX555.yaml              |   2 +-
 device-types/Riverbed/CX570.yaml              |   2 +-
 device-types/Riverbed/CX7055.yaml             |   2 +-
 device-types/Riverbed/CX7070.yaml             |   2 +-
 device-types/Riverbed/CX755.yaml              |   2 +-
 device-types/Riverbed/CX770.yaml              |   2 +-
 .../Rockwell Automation/1756-A10.yaml         |   2 +-
 .../Rockwell Automation/1756-A10K.yaml        |   2 +-
 .../Rockwell Automation/1756-A10XT.yaml       |   2 +-
 .../Rockwell Automation/1756-A13.yaml         |   2 +-
 .../Rockwell Automation/1756-A13K.yaml        |   2 +-
 .../Rockwell Automation/1756-A17.yaml         |   2 +-
 .../Rockwell Automation/1756-A17K.yaml        |   2 +-
 device-types/Rockwell Automation/1756-A4.yaml |   2 +-
 .../Rockwell Automation/1756-A4K.yaml         |   2 +-
 device-types/Rockwell Automation/1756-A7.yaml |   2 +-
 .../Rockwell Automation/1756-A7K.yaml         |   2 +-
 .../Rockwell Automation/1756-A7XT.yaml        |   2 +-
 .../Rockwell Automation/1756-CMS1B1.yaml      |   2 +-
 .../Rockwell Automation/1756-CMS1C1.yaml      |   2 +-
 .../Rockwell Automation/1756-EN2F.yaml        |   2 +-
 .../Rockwell Automation/1756-EN2FK.yaml       |   2 +-
 .../Rockwell Automation/1756-EN2T.yaml        |   2 +-
 .../Rockwell Automation/1756-EN2TK.yaml       |   2 +-
 .../Rockwell Automation/1756-EN2TP.yaml       |   2 +-
 .../Rockwell Automation/1756-EN2TPK.yaml      |   2 +-
 .../Rockwell Automation/1756-EN2TR.yaml       |   2 +-
 .../Rockwell Automation/1756-EN2TRK.yaml      |   2 +-
 .../Rockwell Automation/1756-EN3TR.yaml       |   2 +-
 .../Rockwell Automation/1756-EN3TRK.yaml      |   2 +-
 .../Rockwell Automation/1756-EN4TR.yaml       |   2 +-
 .../Rockwell Automation/1756-EN4TRK.yaml      |   2 +-
 .../Rockwell Automation/1756-ENBT.yaml        |   2 +-
 .../Rockwell Automation/1756-ENBTK.yaml       |   2 +-
 .../Rockwell Automation/1756-EWEB.yaml        |   4 +-
 .../Rockwell Automation/1756-L81E-NSE.yaml    |   2 +-
 .../Rockwell Automation/1756-L81E.yaml        |   2 +-
 .../Rockwell Automation/1756-L81EK.yaml       |   2 +-
 .../Rockwell Automation/1756-L81EP.yaml       |   2 +-
 .../Rockwell Automation/1756-L81ES.yaml       |   2 +-
 .../Rockwell Automation/1756-L81ESK.yaml      |   2 +-
 .../Rockwell Automation/1756-L82E-NSE.yaml    |   2 +-
 .../Rockwell Automation/1756-L82E.yaml        |   2 +-
 .../Rockwell Automation/1756-L82EK.yaml       |   2 +-
 .../Rockwell Automation/1756-L82ES.yaml       |   2 +-
 .../Rockwell Automation/1756-L82ESK.yaml      |   2 +-
 .../Rockwell Automation/1756-L83E-NSE.yaml    |   2 +-
 .../Rockwell Automation/1756-L83E.yaml        |   2 +-
 .../Rockwell Automation/1756-L83EK.yaml       |   2 +-
 .../Rockwell Automation/1756-L83EP.yaml       |   2 +-
 .../Rockwell Automation/1756-L83ES.yaml       |   2 +-
 .../Rockwell Automation/1756-L83ESK.yaml      |   2 +-
 .../Rockwell Automation/1756-L84E-NSE.yaml    |   2 +-
 .../Rockwell Automation/1756-L84E.yaml        |   2 +-
 .../Rockwell Automation/1756-L84EK.yaml       |   2 +-
 .../Rockwell Automation/1756-L84ES.yaml       |   2 +-
 .../Rockwell Automation/1756-L84ESK.yaml      |   2 +-
 .../Rockwell Automation/1756-L85E-NSE.yaml    |   2 +-
 .../Rockwell Automation/1756-L85E.yaml        |   2 +-
 .../Rockwell Automation/1756-L85EK.yaml       |   2 +-
 .../Rockwell Automation/1756-L85EP.yaml       |   2 +-
 .../Rockwell Automation/1783-BMS06SA.yaml     |   2 +-
 .../Rockwell Automation/1783-BMS06SGA.yaml    |   2 +-
 .../Rockwell Automation/1783-BMS06SGL.yaml    |   2 +-
 .../Rockwell Automation/1783-BMS06SL.yaml     |   2 +-
 .../Rockwell Automation/1783-BMS06TA.yaml     |   2 +-
 .../Rockwell Automation/1783-BMS06TGA.yaml    |   2 +-
 .../Rockwell Automation/1783-BMS06TGL.yaml    |   2 +-
 .../Rockwell Automation/1783-BMS06TL.yaml     |   2 +-
 .../Rockwell Automation/1783-BMS10CA.yaml     |   2 +-
 .../Rockwell Automation/1783-BMS10CGA.yaml    |   2 +-
 .../Rockwell Automation/1783-BMS10CGL.yaml    |   2 +-
 .../Rockwell Automation/1783-BMS10CGN.yaml    |   2 +-
 .../Rockwell Automation/1783-BMS10CGP.yaml    |   2 +-
 .../Rockwell Automation/1783-BMS10CL.yaml     |   2 +-
 .../Rockwell Automation/1783-BMS20CA.yaml     |   2 +-
 .../Rockwell Automation/1783-BMS20CGL.yaml    |   2 +-
 .../Rockwell Automation/1783-BMS20CGN.yaml    |   2 +-
 .../Rockwell Automation/1783-BMS20CGP.yaml    |   2 +-
 .../Rockwell Automation/1783-BMS20CGPK.yaml   |   2 +-
 .../Rockwell Automation/1783-BMS20CL.yaml     |   2 +-
 .../Rockwell Automation/1783-BMS4S2SGA.yaml   |   2 +-
 .../Rockwell Automation/1783-BMS4S2SGL.yaml   |   2 +-
 .../Rockwell Automation/1783-HMS16T4CGN.yaml  |   2 +-
 .../Rockwell Automation/1783-HMS16TG4CGN.yaml |   2 +-
 .../Rockwell Automation/1783-HMS16TG4CGR.yaml |   2 +-
 .../Rockwell Automation/1783-HMS4C4CGN.yaml   |   2 +-
 .../Rockwell Automation/1783-HMS4EG8CGN.yaml  |   2 +-
 .../Rockwell Automation/1783-HMS4EG8CGR.yaml  |   2 +-
 .../Rockwell Automation/1783-HMS4S8E4CGN.yaml |   2 +-
 .../1783-HMS4SG8EG4CGN.yaml                   |   2 +-
 .../1783-HMS4SG8EG4CGR.yaml                   |   2 +-
 .../Rockwell Automation/1783-HMS4T4E4CGN.yaml |   2 +-
 .../Rockwell Automation/1783-HMS8S4CGN.yaml   |   2 +-
 .../Rockwell Automation/1783-HMS8SG4CGN.yaml  |   2 +-
 .../Rockwell Automation/1783-HMS8SG4CGR.yaml  |   2 +-
 .../Rockwell Automation/1783-HMS8T4CGN.yaml   |   2 +-
 .../Rockwell Automation/1783-HMS8TG4CGN.yaml  |   2 +-
 .../Rockwell Automation/1783-HMS8TG4CGR.yaml  |   2 +-
 .../1783-HMS8TG8EG4CGN.yaml                   |   2 +-
 .../1783-HMS8TG8EG4CGR.yaml                   |   2 +-
 .../Rockwell Automation/5069-AEN2TR.yaml      |   2 +-
 .../Rockwell Automation/5069-AENTR.yaml       |   2 +-
 .../Rockwell Automation/5069-AENTRK.yaml      |   2 +-
 .../Rockwell Automation/5069-L306ER.yaml      |   2 +-
 .../Rockwell Automation/5069-L306ERM.yaml     |   2 +-
 .../Rockwell Automation/5069-L306ERMS2.yaml   |   2 +-
 .../Rockwell Automation/5069-L306ERMS3.yaml   |   2 +-
 .../Rockwell Automation/5069-L306ERS2.yaml    |   2 +-
 .../Rockwell Automation/5069-L3100ERM.yaml    |   2 +-
 .../Rockwell Automation/5069-L3100ERMS2.yaml  |   2 +-
 .../Rockwell Automation/5069-L3100ERMS3.yaml  |   2 +-
 .../Rockwell Automation/5069-L3100ERS2.yaml   |   2 +-
 .../Rockwell Automation/5069-L310ER-NSE.yaml  |   2 +-
 .../Rockwell Automation/5069-L310ER.yaml      |   2 +-
 .../Rockwell Automation/5069-L310ERM.yaml     |   2 +-
 .../Rockwell Automation/5069-L310ERMS2.yaml   |   2 +-
 .../Rockwell Automation/5069-L310ERMS3.yaml   |   2 +-
 .../Rockwell Automation/5069-L310ERS2.yaml    |   2 +-
 .../Rockwell Automation/5069-L320ER.yaml      |   2 +-
 .../Rockwell Automation/5069-L320ERM.yaml     |   2 +-
 .../Rockwell Automation/5069-L320ERMK.yaml    |   2 +-
 .../Rockwell Automation/5069-L320ERMS2.yaml   |   2 +-
 .../Rockwell Automation/5069-L320ERMS2K.yaml  |   2 +-
 .../Rockwell Automation/5069-L320ERMS3.yaml   |   2 +-
 .../Rockwell Automation/5069-L320ERMS3K.yaml  |   2 +-
 .../Rockwell Automation/5069-L320ERP.yaml     |   2 +-
 .../Rockwell Automation/5069-L320ERS2.yaml    |   2 +-
 .../Rockwell Automation/5069-L320ERS2K.yaml   |   2 +-
 .../Rockwell Automation/5069-L330ER.yaml      |   2 +-
 .../Rockwell Automation/5069-L330ERM.yaml     |   2 +-
 .../Rockwell Automation/5069-L330ERMK.yaml    |   2 +-
 .../Rockwell Automation/5069-L330ERMS2.yaml   |   2 +-
 .../Rockwell Automation/5069-L330ERMS2K.yaml  |   2 +-
 .../Rockwell Automation/5069-L330ERMS3.yaml   |   2 +-
 .../Rockwell Automation/5069-L330ERMS3K.yaml  |   2 +-
 .../Rockwell Automation/5069-L330ERS2.yaml    |   2 +-
 .../Rockwell Automation/5069-L330ERS2K.yaml   |   2 +-
 .../Rockwell Automation/5069-L340ER.yaml      |   2 +-
 .../Rockwell Automation/5069-L340ERM.yaml     |   2 +-
 .../Rockwell Automation/5069-L340ERMS2.yaml   |   2 +-
 .../Rockwell Automation/5069-L340ERMS3.yaml   |   2 +-
 .../Rockwell Automation/5069-L340ERP.yaml     |   2 +-
 .../Rockwell Automation/5069-L340ERS2.yaml    |   2 +-
 .../Rockwell Automation/5069-L350ERM.yaml     |   2 +-
 .../Rockwell Automation/5069-L350ERMK.yaml    |   2 +-
 .../Rockwell Automation/5069-L350ERMS2.yaml   |   2 +-
 .../Rockwell Automation/5069-L350ERMS2K.yaml  |   2 +-
 .../Rockwell Automation/5069-L350ERMS3.yaml   |   2 +-
 .../Rockwell Automation/5069-L350ERMS3K.yaml  |   2 +-
 .../Rockwell Automation/5069-L350ERS2.yaml    |   2 +-
 .../Rockwell Automation/5069-L350ERS2K.yaml   |   2 +-
 .../Rockwell Automation/5069-L380ERM.yaml     |   2 +-
 .../Rockwell Automation/5069-L380ERMS2.yaml   |   2 +-
 .../Rockwell Automation/5069-L380ERMS3.yaml   |   2 +-
 .../Rockwell Automation/5069-L380ERS2.yaml    |   2 +-
 .../Rockwell Automation/5069-L4100ERW.yaml    |   2 +-
 .../Rockwell Automation/5069-L4200ERW.yaml    |   2 +-
 .../Rockwell Automation/5069-L430ERW.yaml     |   2 +-
 .../Rockwell Automation/5069-L450ERW.yaml     |   2 +-
 .../Rohde & Schwarz/SITLine-ETH-40G.yaml      |   2 +-
 .../Rohde & Schwarz/SITLine-ETH-4G.yaml       |   2 +-
 .../Rohde & Schwarz/SITLine-ETH-L 10G.yaml    |   2 +-
 .../Rohde & Schwarz/SITLine-ETH-L 40G.yaml    |   2 +-
 .../Rohde & Schwarz/SITLine-ETH-L 4G.yaml     |   2 +-
 .../Rohde & Schwarz/SITLine-ETH-S 10G.yaml    |   2 +-
 .../Rohde & Schwarz/SITLine-ETH-S 1G.yaml     |   2 +-
 .../Rohde & Schwarz/TrustedVPN-L VS-NfD.yaml  |   2 +-
 .../Rohde & Schwarz/TrustedVPN-L.yaml         |   2 +-
 .../Rohde & Schwarz/TrustedVPN-XL.yaml        |   2 +-
 device-types/Ruckus/icx-7150-48p-4x10g.yaml   |   2 +-
 device-types/Ruckus/icx7150-24-2x10g.yaml     |   2 +-
 device-types/Ruckus/icx7150-48pf-2x10g.yaml   |   2 +-
 device-types/Ruckus/icx7150-48zp-8x10g.yaml   |   2 +-
 device-types/Ruckus/icx7150-c12p-2x10gr.yaml  |   2 +-
 device-types/Solid Optics/SO-CHASSIS-MOD4.yml |   2 +-
 .../Solid Optics/SO-DWDM-MUX-8CH-UPG.yaml     |   2 +-
 .../SO-DWDM-MUX-CH20-35-UPG-MON.yaml          |   2 +-
 .../Solid Optics/SO-MOD4-3xMPO-MMF-24xLC.yml  |   2 +-
 device-types/SonicWall/NSa2650.yaml           |   2 +-
 device-types/SonicWall/NSa2700.yaml           |   2 +-
 device-types/SonicWall/NSa3650.yaml           |   2 +-
 device-types/SonicWall/NSa3700.yaml           |   2 +-
 device-types/SonicWall/NSa4650.yaml           |   2 +-
 device-types/SonicWall/NSa4700.yaml           |   2 +-
 device-types/SonicWall/NSa5650.yaml           |   2 +-
 device-types/SonicWall/NSa5700.yaml           |   2 +-
 device-types/SonicWall/NSa6700.yaml           |   2 +-
 device-types/SonicWall/NSsp13700.yaml         |   2 +-
 device-types/SonicWall/NSsp15700.yaml         |   2 +-
 device-types/SonicWall/SOHO.yaml              |   2 +-
 device-types/SonicWall/SOHOW.yaml             |   2 +-
 device-types/SonicWall/TZ250.yaml             |   2 +-
 device-types/SonicWall/TZ250W.yaml            |   2 +-
 device-types/SonicWall/TZ270.yaml             |   2 +-
 device-types/SonicWall/TZ270W.yaml            |   2 +-
 device-types/SonicWall/TZ300.yaml             |   2 +-
 device-types/SonicWall/TZ300P.yaml            |   2 +-
 device-types/SonicWall/TZ300W.yaml            |   2 +-
 device-types/SonicWall/TZ350.yaml             |   2 +-
 device-types/SonicWall/TZ350W.yaml            |   2 +-
 device-types/SonicWall/TZ370.yaml             |   2 +-
 device-types/SonicWall/TZ370W.yaml            |   2 +-
 device-types/SonicWall/TZ400.yaml             |   2 +-
 device-types/SonicWall/TZ400W.yaml            |   2 +-
 device-types/SonicWall/TZ470.yaml             |   2 +-
 device-types/SonicWall/TZ470W.yaml            |   2 +-
 device-types/SonicWall/TZ500.yaml             |   2 +-
 device-types/SonicWall/TZ500W.yaml            |   2 +-
 device-types/SonicWall/TZ570.yaml             |   2 +-
 device-types/SonicWall/TZ570P.yaml            |   2 +-
 device-types/SonicWall/TZ570W.yaml            |   2 +-
 device-types/SonicWall/TZ600.yaml             |   2 +-
 device-types/SonicWall/TZ600P.yaml            |   2 +-
 device-types/SonicWall/TZ670.yaml             |   2 +-
 device-types/Sophos/XG-650.yaml               |   2 +-
 device-types/Supermicro/AS-1114S-WN10RT.yml   |   2 +-
 device-types/Supermicro/AS-1123US-TR4.yml     |   2 +-
 device-types/Supermicro/SYS-1019P-WTR.yaml    |   2 +-
 device-types/Supermicro/SYS-2028U-E1CNR4T.yml |   2 +-
 device-types/Synology/DS1522+.yaml            |   2 +-
 device-types/Synology/DS1618+.yaml            |   2 +-
 device-types/Synology/DS1817+.yaml            |   2 +-
 device-types/Synology/DS220+.yaml             |   2 +-
 device-types/Synology/DS418.yaml              |   2 +-
 device-types/Synology/DS920+.yaml             |   2 +-
 device-types/Synology/RS1219plus.yaml         |   2 +-
 device-types/Synology/RS1221plus.yaml         |   2 +-
 device-types/Synology/RS1619xs+.yaml          |   2 +-
 device-types/Synology/ds1821+.yaml            |   2 +-
 device-types/TP-Link/T2500G-10TS.yaml         |   2 +-
 device-types/TP-Link/T2600G-28MPS.yaml        |   2 +-
 device-types/TP-Link/T2600G-28TS.yaml         |   2 +-
 device-types/TP-Link/TL-SG1005D.yaml          |   2 +-
 device-types/TP-Link/TL-SG1024D.yaml          |   2 +-
 device-types/TP-Link/TL-SG105E.yaml           |   2 +-
 device-types/TP-Link/TL-SG108E.yaml           |   2 +-
 device-types/TP-Link/TL-SG3424P.yaml          |   2 +-
 device-types/TP-Link/tl-sg3428mp.yaml         |   2 +-
 device-types/Testing/Test.yaml                |   2 +-
 device-types/TrendNet/TC-P16C5E.yaml          |   4 +-
 device-types/TrendNet/TC-P24C5E.yaml          |   2 +-
 device-types/TrendNet/TC-P48C5E.yaml          |   2 +-
 device-types/TrendNet/TE100-S16.yaml          |   2 +-
 device-types/TrendNet/TEG-240WS.yaml          |   4 +-
 device-types/TrendNet/TEG-30284.yaml          |   2 +-
 device-types/TrendNet/TEG-S16Dg.yaml          |   2 +-
 device-types/TrendNet/TEG-S224.yaml           |   2 +-
 device-types/TrendNet/TEG-S50g.yaml           |   2 +-
 device-types/TrendNet/TEW-821DAP.yaml         |   2 +-
 device-types/TrendNet/TEW-WLC100.yaml         |   2 +-
 device-types/TrendNet/TK-802R.yaml            |   2 +-
 device-types/TrendNet/TPE-113Gi-A.yaml        |   2 +-
 device-types/Ubiquiti/AF-5XHD.yml             |   2 +-
 device-types/Ubiquiti/AF-60-HD.yml            |   2 +-
 device-types/Ubiquiti/AF-60-LR.yml            |   2 +-
 device-types/Ubiquiti/AF-60.yml               |   2 +-
 device-types/Ubiquiti/Bullet-M2.yaml          |   2 +-
 device-types/Ubiquiti/EP-R6.yaml              |   2 +-
 device-types/Ubiquiti/EP-R8.yaml              |   2 +-
 device-types/Ubiquiti/EP-S16.yaml             |   2 +-
 device-types/Ubiquiti/ER-10X.yaml             |   2 +-
 device-types/Ubiquiti/ER-12.yaml              |   2 +-
 device-types/Ubiquiti/ER-12P.yaml             |   2 +-
 device-types/Ubiquiti/ER-4.yaml               |   2 +-
 device-types/Ubiquiti/ER-6P.yaml              |   2 +-
 device-types/Ubiquiti/ER-8.yaml               |   2 +-
 device-types/Ubiquiti/ER-X-SFP.yaml           |   2 +-
 device-types/Ubiquiti/ER-X.yaml               |   2 +-
 device-types/Ubiquiti/ERLite-3.yaml           |   2 +-
 device-types/Ubiquiti/ERPoe-5.yaml            |   2 +-
 device-types/Ubiquiti/ERPro-8.yaml            |   2 +-
 device-types/Ubiquiti/ES-10X.yaml             |   2 +-
 device-types/Ubiquiti/ES-10XP.yaml            |   2 +-
 device-types/Ubiquiti/ES-12F.yaml             |   2 +-
 device-types/Ubiquiti/ES-16-150W.yaml         |   2 +-
 device-types/Ubiquiti/ES-16-XG.yaml           |   2 +-
 device-types/Ubiquiti/ES-24-250W.yaml         |   2 +-
 device-types/Ubiquiti/ES-24-500W.yaml         |   2 +-
 device-types/Ubiquiti/ES-24-LITE.yaml         |   2 +-
 device-types/Ubiquiti/ES-48-500W.yaml         |   2 +-
 device-types/Ubiquiti/ES-48-750W.yaml         |   2 +-
 device-types/Ubiquiti/ES-48-LITE.yaml         |   2 +-
 device-types/Ubiquiti/LAP-120.yaml            |   2 +-
 device-types/Ubiquiti/LBE-5AC-23.yaml         |   2 +-
 device-types/Ubiquiti/LBE-5AC-Gen2.yaml       |   2 +-
 device-types/Ubiquiti/NBE-2AC-13.yaml         |   2 +-
 device-types/Ubiquiti/NBE-5AC-19.yaml         |   2 +-
 device-types/Ubiquiti/NBE-5AC-Gen2.yaml       |   2 +-
 device-types/Ubiquiti/NBE-M5-19.yaml          |   2 +-
 device-types/Ubiquiti/NS-5AC.yaml             |   2 +-
 device-types/Ubiquiti/NS-LOCO-M2.yaml         |   2 +-
 device-types/Ubiquiti/NS-LOCO-M5.yaml         |   2 +-
 device-types/Ubiquiti/NS-LOCO-M900.yaml       |   2 +-
 device-types/Ubiquiti/NS-LOCO5AC.yaml         |   2 +-
 device-types/Ubiquiti/NS-M2.yaml              |   2 +-
 device-types/Ubiquiti/NS-M5.yaml              |   2 +-
 device-types/Ubiquiti/PBE-2AC-400.yaml        |   2 +-
 device-types/Ubiquiti/PBE-5AC-300.yaml        |   2 +-
 device-types/Ubiquiti/PBE-5AC-500.yaml        |   2 +-
 device-types/Ubiquiti/PBE-5AC-Gen2.yaml       |   2 +-
 device-types/Ubiquiti/PBE-M2-400.yaml         |   2 +-
 device-types/Ubiquiti/PS-M2.yaml              |   2 +-
 device-types/Ubiquiti/R2AC-PRISM.yaml         |   2 +-
 device-types/Ubiquiti/RP-5AC-Gen2.yaml        |   2 +-
 device-types/Ubiquiti/Rocket-M2-Titanium.yaml |   2 +-
 device-types/Ubiquiti/Rocket-M2.yaml          |   2 +-
 device-types/Ubiquiti/Rocket-M5.yaml          |   2 +-
 device-types/Ubiquiti/Rocket-M900.yaml        |   2 +-
 device-types/Ubiquiti/SurgeProtector.yaml     |   2 +-
 device-types/Ubiquiti/U6-IW.yaml              |   4 +-
 device-types/Ubiquiti/U6-LR.yaml              |   2 +-
 device-types/Ubiquiti/U6-Lite.yaml            |   2 +-
 device-types/Ubiquiti/U6-Mesh-US.yaml         |   4 +-
 device-types/Ubiquiti/U6-PRO.yaml             |   4 +-
 device-types/Ubiquiti/UAP-AC-LR.yaml          |   2 +-
 device-types/Ubiquiti/UAP-AC-Lite.yaml        |   2 +-
 device-types/Ubiquiti/UAP-AC-M-Pro.yaml       |   2 +-
 device-types/Ubiquiti/UAP-AC-M.yaml           |   2 +-
 device-types/Ubiquiti/UAP-AC-Pro.yaml         |   2 +-
 device-types/Ubiquiti/UAP-FlexHD.yaml         |   2 +-
 device-types/Ubiquiti/UAP-IW-HD.yaml          |   2 +-
 device-types/Ubiquiti/UAP-Pro.yaml            |   2 +-
 device-types/Ubiquiti/UAS-XG.yaml             |   2 +-
 device-types/Ubiquiti/UC-CK.yaml              |   2 +-
 device-types/Ubiquiti/UCK-G2-PLUS.yml         |   2 +-
 device-types/Ubiquiti/UCK-G2.yml              |   2 +-
 device-types/Ubiquiti/UDM-Pro-SE.yaml         |   2 +-
 device-types/Ubiquiti/UDM-Pro.yaml            |   2 +-
 device-types/Ubiquiti/UDM.yaml                |   2 +-
 device-types/Ubiquiti/UF-OLT.yaml             |   2 +-
 device-types/Ubiquiti/UNVR.yaml               |   2 +-
 device-types/Ubiquiti/US-16-150W.yaml         |   2 +-
 device-types/Ubiquiti/US-16-XG.yaml           |   2 +-
 device-types/Ubiquiti/US-24-250W.yaml         |   2 +-
 device-types/Ubiquiti/US-24-500W.yaml         |   2 +-
 device-types/Ubiquiti/US-24.yaml              |   2 +-
 device-types/Ubiquiti/US-48-500W.yaml         |   2 +-
 device-types/Ubiquiti/US-48-750W.yaml         |   2 +-
 device-types/Ubiquiti/US-48.yaml              |   2 +-
 device-types/Ubiquiti/US-8-150W.yaml          |   2 +-
 device-types/Ubiquiti/US-8-60W.yaml           |   2 +-
 device-types/Ubiquiti/US-8.yaml               |   2 +-
 device-types/Ubiquiti/US-XG-6POE.yaml         |   2 +-
 device-types/Ubiquiti/USG-PRO-4.yaml          |   2 +-
 device-types/Ubiquiti/USG.yaml                |   2 +-
 device-types/Ubiquiti/USIP-R.yml              |   2 +-
 device-types/Ubiquiti/USP-RPS.yaml            |   2 +-
 device-types/Ubiquiti/USW-16-PoE.yaml         |   2 +-
 device-types/Ubiquiti/USW-24-PoE.yaml         |   2 +-
 device-types/Ubiquiti/USW-24.yaml             |   2 +-
 device-types/Ubiquiti/USW-48-PoE.yaml         |   2 +-
 device-types/Ubiquiti/USW-48.yaml             |   2 +-
 device-types/Ubiquiti/USW-Aggregation.yaml    |   2 +-
 .../Ubiquiti/USW-Enterprise-48-PoE.yaml       |   2 +-
 device-types/Ubiquiti/USW-Flex-Mini.yaml      |   2 +-
 device-types/Ubiquiti/USW-Flex.yaml           |   2 +-
 device-types/Ubiquiti/USW-Lite-16-PoE.yaml    |   2 +-
 device-types/Ubiquiti/USW-Lite-8-PoE.yaml     |   2 +-
 device-types/Ubiquiti/USW-Pro-24-PoE.yaml     |   2 +-
 device-types/Ubiquiti/USW-Pro-24.yaml         |   2 +-
 device-types/Ubiquiti/USW-Pro-48-PoE.yaml     |   2 +-
 device-types/Ubiquiti/USW-Pro-48.yaml         |   2 +-
 .../Ubiquiti/USW-Pro-Aggregation.yaml         |   2 +-
 device-types/Ubiquiti/airCube-AC.yml          |   2 +-
 device-types/Ubiquiti/airCube-ISP.yaml        |   2 +-
 .../V-Solution/V-Solution_V1600D2.yaml        |   2 +-
 device-types/Vertiv/ACS8008SAC.yaml           |   2 +-
 device-types/Vertiv/ACS8016DAC.yaml           |   2 +-
 device-types/Vertiv/ACS8016SAC.yaml           |   2 +-
 device-types/Vertiv/ACS8032SAC.yaml           |   2 +-
 device-types/Vertiv/ACS8048DAC.yaml           |   2 +-
 device-types/Vertiv/ACS8048SAC.yaml           |   2 +-
 device-types/WTI/CPM-1600-1-EC.yaml           |   2 +-
 device-types/WTI/CPM-1600-1-ECAM.yaml         |   2 +-
 device-types/WTI/CPM-800-1-A-VZW.yaml         |   2 +-
 device-types/WTI/CPM-800-1-A.yaml             |   2 +-
 device-types/WTI/CPM-800-1-AM.yaml            |   2 +-
 device-types/WTI/CPM-800-1-E.yaml             |   2 +-
 device-types/WTI/CPM-800-1-EA.yaml            |   2 +-
 device-types/WTI/CPM-800-1-ECA.yaml           |   2 +-
 device-types/WTI/CPM-800-2-A-VZW.yaml         |   2 +-
 device-types/WTI/CPM-800-2-A.yaml             |   2 +-
 device-types/WTI/CPM-800-2-AM.yaml            |   2 +-
 device-types/WTI/CPM-800-2-E.yaml             |   2 +-
 device-types/WTI/CPM-800-2-EA.yaml            |   2 +-
 device-types/WTI/DSM-24NM-DP.yaml             |   2 +-
 device-types/WTI/DSM-24NM-E.yaml              |   2 +-
 device-types/WTI/DSM-24NM.yaml                |   2 +-
 device-types/WTI/DSM-40NM-DP.yaml             |   2 +-
 device-types/WTI/DSM-40NM-E.yaml              |   2 +-
 device-types/WTI/DSM-40NM.yaml                |   2 +-
 device-types/WTI/DSM-8NM-DP.yaml              |   2 +-
 device-types/WTI/DSM-8NM-E.yaml               |   2 +-
 device-types/WTI/DSM-8NM.yaml                 |   2 +-
 device-types/WTI/NBB-20VD20-1.yml             |   2 +-
 device-types/WTI/NPS-8H20-ATS-1.yml           |   2 +-
 device-types/WTI/REM-0R4-1-E.yaml             |   2 +-
 device-types/WTI/REM-0R4-1-N.yaml             |   2 +-
 device-types/WTI/REM-0R4-1-NE.yaml            |   2 +-
 device-types/WTI/REM-0R4-1-W.yaml             |   2 +-
 device-types/WTI/REM-0R4-1-WE.yaml            |   2 +-
 device-types/WTI/REM-0R4-1.yaml               |   2 +-
 device-types/WTI/REM-0R4-2-E.yaml             |   2 +-
 device-types/WTI/REM-0R4-2-N.yaml             |   2 +-
 device-types/WTI/REM-0R4-2-NE.yaml            |   2 +-
 device-types/WTI/REM-0R4-2-W.yaml             |   2 +-
 device-types/WTI/REM-0R4-2-WE.yaml            |   2 +-
 device-types/WTI/REM-0R4-2.yaml               |   2 +-
 device-types/WTI/REM-4R0-E.yaml               |   2 +-
 device-types/WTI/REM-4R0-NE.yaml              |   2 +-
 device-types/WTI/REM-4R0-W.yaml               |   2 +-
 device-types/WTI/REM-4R0-WE.yaml              |   2 +-
 device-types/WTI/REM-4R0.yaml                 |   2 +-
 device-types/WTI/REM-4R4-1-E.yaml             |   2 +-
 device-types/WTI/REM-4R4-1-N.yaml             |   2 +-
 device-types/WTI/REM-4R4-1-NE.yaml            |   2 +-
 device-types/WTI/REM-4R4-1-W.yaml             |   2 +-
 device-types/WTI/REM-4R4-1-WE.yaml            |   2 +-
 device-types/WTI/REM-4R4-1.yaml               |   2 +-
 device-types/WTI/REM-4R4-2-E.yaml             |   2 +-
 device-types/WTI/REM-4R4-2-N.yaml             |   2 +-
 device-types/WTI/REM-4R4-2-NE.yaml            |   2 +-
 device-types/WTI/REM-4R4-2-W.yaml             |   2 +-
 device-types/WTI/REM-4R4-2-WE.yaml            |   2 +-
 device-types/WTI/REM-4R4-2.yaml               |   2 +-
 device-types/WTI/VMR-16HD20-2.yaml            |   2 +-
 device-types/WTI/VMR-8H20-ATS-1.yaml          |   2 +-
 device-types/WTI/VMR-8H20-ATS-2.yaml          |   2 +-
 device-types/WTI/VMR-8HS20-1.yaml             |   2 +-
 device-types/WTI/VMR-8HS20-2.yaml             |   2 +-
 device-types/WTI/VMR-HD4D16H.yaml             |   2 +-
 device-types/YAMAHA/SWX2110-16G.yaml          |   2 +-
 device-types/YAMAHA/SWX2110-5G.yaml           |   2 +-
 device-types/YAMAHA/SWX2110-8G.yaml           |   2 +-
 device-types/YAMAHA/SWX2110P-8G.yaml          |   2 +-
 device-types/YAMAHA/SWX2210-16G.yaml          |   2 +-
 device-types/YAMAHA/SWX2210-24G.yaml          |   2 +-
 device-types/YAMAHA/SWX2210-8G.yaml           |   2 +-
 device-types/YAMAHA/SWX2210P-10G.yaml         |   2 +-
 device-types/YAMAHA/SWX2210P-18G.yaml         |   2 +-
 device-types/YAMAHA/SWX2210P-28G.yaml         |   2 +-
 device-types/YAMAHA/SWX2220-10NT.yaml         |   2 +-
 device-types/YAMAHA/SWX2221P-10NT.yaml        |   2 +-
 device-types/YAMAHA/SWX2310-10G.yaml          |   2 +-
 device-types/YAMAHA/SWX2310-18GT.yaml         |   2 +-
 device-types/YAMAHA/SWX2310-28GT.yaml         |   2 +-
 device-types/YAMAHA/SWX2310-52GT.yaml         |   2 +-
 device-types/YAMAHA/SWX2310P-10G.yaml         |   2 +-
 device-types/YAMAHA/SWX2310P-18G.yaml         |   2 +-
 device-types/YAMAHA/SWX2310P-28GT.yaml        |   2 +-
 device-types/YAMAHA/SWX2320-16MT.yaml         |   2 +-
 device-types/YAMAHA/SWX2322P-16MT.yaml        |   2 +-
 device-types/YAMAHA/SWX3100-10G.yaml          |   2 +-
 device-types/YAMAHA/SWX3100-18GT.yaml         |   2 +-
 device-types/YAMAHA/SWX3200-28GT.yaml         |   2 +-
 device-types/YAMAHA/SWX3200-52GT.yaml         |   2 +-
 device-types/YAMAHA/SWX3220-16MT.yaml         |   2 +-
 device-types/YAMAHA/SWX3220-16TMs.yaml        |   2 +-
 device-types/ZPE/NSC-T48R-STND-DAC.yaml       |   2 +-
 device-types/ZTE/C300.yaml                    |   2 +-
 device-types/ZTE/ZXA10-F822-16.yaml           |   2 +-
 device-types/ZTE/ZXA10-F822-24.yaml           |   2 +-
 device-types/ZTE/ZXA10-F832-16.yaml           |   2 +-
 device-types/ZTE/ZXA10-F832-24.yaml           |   2 +-
 device-types/Zyxel/USG310.yaml                |   2 +-
 device-types/Zyxel/XGS1930-28.yaml            |   2 +-
 device-types/Zyxel/XGS1930-28HP.yaml          |   2 +-
 device-types/Zyxel/XGS1930-52.yaml            |   2 +-
 device-types/Zyxel/XGS1930-52HP.yaml          |   2 +-
 device-types/ghipsystems/GS5104-1471-EC.yaml  |   2 +-
 ...a-7220-ixr-d1-88g-48baset-4sfpp.front.png} | Bin
 ...ia-7220-ixr-d1-88g-48baset-4sfpp.rear.png} | Bin
 ...g => nokia-7220-ixr-d2-25-100ge.front.png} | Bin
 ...ng => nokia-7220-ixr-d2-25-100ge.rear.png} | Bin
 ... => nokia-7220-ixr-d2l-25-100ge.front.png} | Bin
 ...g => nokia-7220-ixr-d2l-25-100ge.rear.png} | Bin
 ...g => nokia-7220-ixr-d3-32-100ge.front.png} | Bin
 ...ng => nokia-7220-ixr-d3-32-100ge.rear.png} | Bin
 ... => nokia-7220-ixr-d3l-32-100ge.front.png} | Bin
 ...g => nokia-7220-ixr-d3l-32-100ge.rear.png} | Bin
 ...okia-7220-ixr-h3-32qsfpdd-2sfpp.front.png} | Bin
 ...nokia-7220-ixr-h3-32qsfpdd-2sfpp.rear.png} | Bin
 scripts/fix-slugs.py                          |  81 ++++++++++++++++++
 1328 files changed, 1446 insertions(+), 1360 deletions(-)
 rename device-types/Digi/{DigiCM_Console_Server-32p.yaml => Digi-CM-32.yaml} (95%)
 rename device-types/Digi/{DigiCM_Console_Server.yaml => Digi-CM-48.yaml} (97%)
 create mode 100644 device-types/IBM/BladeCenter-GS22.yaml
 rename device-types/IBM/{bladecenter_h.yaml => BladeCenter-H.yaml} (97%)
 rename device-types/IBM/{system_x3550_type_7978.yaml => System-x3550.yaml} (89%)
 rename device-types/IBM/{eServer_x226_86482DG.yml => eServer-x226.yml} (83%)
 delete mode 100644 device-types/IBM/hs22_type_7870.yaml
 rename elevation-images/Nokia/{nokia-7220-ixr-d1.front.png => nokia-7220-ixr-d1-88g-48baset-4sfpp.front.png} (100%)
 rename elevation-images/Nokia/{nokia-7220-ixr-d1.rear.png => nokia-7220-ixr-d1-88g-48baset-4sfpp.rear.png} (100%)
 rename elevation-images/Nokia/{nokia-7220-ixr-d2.front.png => nokia-7220-ixr-d2-25-100ge.front.png} (100%)
 rename elevation-images/Nokia/{nokia-7220-ixr-d2.rear.png => nokia-7220-ixr-d2-25-100ge.rear.png} (100%)
 rename elevation-images/Nokia/{nokia-7220-ixr-d2l.front.png => nokia-7220-ixr-d2l-25-100ge.front.png} (100%)
 rename elevation-images/Nokia/{nokia-7220-ixr-d2l.rear.png => nokia-7220-ixr-d2l-25-100ge.rear.png} (100%)
 rename elevation-images/Nokia/{nokia-7220-ixr-d3.front.png => nokia-7220-ixr-d3-32-100ge.front.png} (100%)
 rename elevation-images/Nokia/{nokia-7220-ixr-d3.rear.png => nokia-7220-ixr-d3-32-100ge.rear.png} (100%)
 rename elevation-images/Nokia/{nokia-7220-ixr-d3l.front.png => nokia-7220-ixr-d3l-32-100ge.front.png} (100%)
 rename elevation-images/Nokia/{nokia-7220-ixr-d3l.rear.png => nokia-7220-ixr-d3l-32-100ge.rear.png} (100%)
 rename elevation-images/Nokia/{nokia-7220-ixr-h3.front.png => nokia-7220-ixr-h3-32qsfpdd-2sfpp.front.png} (100%)
 rename elevation-images/Nokia/{nokia-7220-ixr-h3.rear.png => nokia-7220-ixr-h3-32qsfpdd-2sfpp.rear.png} (100%)
 create mode 100644 scripts/fix-slugs.py

diff --git a/.gitignore b/.gitignore
index ca2bab3d..b51323fe 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 c187e3c7..e58279b8 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 21cf0bd4..8530d240 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 042ddca0..0095a376 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 6d79c9bc..d8710c21 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 7e637f07..e2f17563 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 dc67334b..72ca55c2 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 fd664ec4..5670758d 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 0f2386b1..5508e689 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 6dd9258e..13bdff2e 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 2e7c4022..0f2bcd3c 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 16e0fe4f..721b0519 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 3527e29f..8050c5db 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 1547ea36..e70200ad 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 ad843fec..a9d2c79a 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 a5f7975d..7b0c5505 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 29d030d2..01064cd0 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 3795da39..cb5cf7a2 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 5eaa2b34..4991ff16 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 7cec6d15..079f0b37 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 6522fd09..9f218cda 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 d7b273d6..48f95485 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 c798e1b4..57f2b981 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 8b1ffcf8..c4b1b25f 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 ff59d058..2ecb462b 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 b586df9b..bbbc8d53 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 d2001406..283809f1 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 41b8db2b..5a0100f4 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 63729fc2..987d8f87 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 d05651f0..5a9da04d 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 a7f0ca3c..364c5251 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 336cb540..e54fe403 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 713ce6cb..3a40a92d 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 ada8dd3b..de53823a 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 8254b50f..8cbc95c6 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 c2a7535c..cd7a0cde 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 e5b903de..c097c3ab 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 403cf604..6e75c7d4 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 b7d88f5d..4526a830 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 a52e0d9d..9f495d08 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 bc826d34..8aac2737 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 7903f541..ac579670 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 84f58a6d..2ee11409 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 bd30b976..44d80ec7 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 24b00e4f..7c1e529b 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 231ff9e4..f0ac06c0 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 68f136b9..e1dd8e83 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 9c0dd41e..37e69799 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 4881da13..25dc8d35 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 15a7b372..e09b349a 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 47b59d5b..ea80b52d 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 b5f463a9..d72f7c36 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 c0398c3b..58c1000a 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 0c941ab9..7cd743fa 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 880d2864..f44651f7 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 5252146e..c0c04e73 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 076dd350..1443c4d0 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 f5105224..bfe094bb 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 e3700e34..c09599bf 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 d1d290ed..ebe2c1eb 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 1763d850..2abb2a7e 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 ed6ed8e9..783a6968 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 0bd1ccdb..444a23ad 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 5a283f70..0589f2dc 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 f01fe8f5..5099a7f0 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 0f1490f2..d4b79a14 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 d07bb2d4..aae82a02 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 4a1b8fb8..f8a48462 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 cb28901a..7869ee50 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 b978bfec..baf3feb4 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 552223ec..be3bf358 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 0a149872..a6c063aa 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 1a62b7cd..bcca9a23 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 124ed56d..3013e2b2 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 5444afed..98cb0b59 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 7b88aedb..490cf199 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 3b1f3857..b394af37 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 328028d4..f6503759 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 024ef6d6..c6d0176d 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 74863dda..b3a8c06a 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 74b32ab5..d543ee93 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 e1a92dc2..6dc9e968 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 f64b9f3f..825dc6c0 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 799aaad9..d28b36f6 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 e4301cb7..97beaebf 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 cef34c77..208aab44 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 fa013cd3..977e7d1f 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 2ef98d64..630f94e9 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 f93fe7c1..3fa1455f 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 620558e8..27ef886f 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 cc40ee4f..41523d1b 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 eb5b8932..d4fcfb79 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 a6f0442d..fdb668cc 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 9cf8e723..ff9aaa9e 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 21afbf8d..68113844 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 69483172..481ed422 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 e94cedfe..461cc58a 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 37b3b564..79f9473c 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 7b250860..82f8ebc4 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 34883971..4e710c4c 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 a6877327..d1a7f7f9 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 b5276b62..5db63997 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 3c07df49..98afc730 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 8095d816..cf4212d2 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 90f70da3..2037532c 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 9e7ef9e0..ef1db63c 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 e43192c0..784555ba 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 1c2bd212..080e8c03 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 d8d7a860..db0de001 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 25814276..2c4f0358 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 aaede107..d9b1e01f 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 43339422..ee04c6c8 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 51ae05eb..2b6f6ad2 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 8ed69440..6fd1bbbd 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 b19a5e75..c1fee0af 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 44c0fe7d..e5b9c63d 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 93794c30..140112ce 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 2e2c3bf2..a1cde7f2 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 fb886fd9..09c6821a 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 c8a5e754..9ba4ff58 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 79c439eb..1326341a 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 cfb44c28..308a5f2a 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 74fc501e..c83e4713 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 284c9bb8..6aa0c725 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 1e0c2e5d..8c70bdfe 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 e9e6aaa2..f1b534db 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 7b01924e..176556f8 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 71b3e32b..3fe8fb59 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 0d77e4d1..a867a240 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 e05ceaa9..3826d025 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 e1009b1a..1fe7d140 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 2e6b8173..6e92e884 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 24532d20..05ffb531 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 60630d6a..8fb96e97 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 72389799..5fd9c49d 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 b8ad0d47..9255a6f6 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 314a7aae..14be9bf0 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 e2f3dcc3..27d4bd71 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 25f6ee60..86e85ce4 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 a5f37d15..65ebd522 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 183d4fe1..5d8bd058 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 b155af65..f2da4f2a 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 c8b1a70a..0575a588 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 48855ba8..39b355fb 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 b90bf09a..f2795556 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 ab3c5341..09b2c293 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 f50a7fa1..e6ba496f 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 92747655..345f3408 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 30322dc2..dd66f5f5 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 5ec5a600..0226945e 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 b5e21faf..956f39d9 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 5433e5c5..d214c631 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 20568f5e..f461e1b5 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 885d5108..717ddaf5 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 54b03e35..ea3a3e62 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 70006d1c..54b0ea7f 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 44a08250..d65c5f63 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 76f6419d..d53c61ba 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 ad2e94c8..a96727fd 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 78d35434..7a51af8d 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 b11e47f3..c2d23b1d 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 c8cafa23..6e0c95e8 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 b9ee849e..93a361f2 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 3fce45af..a3e67019 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 c57c91e4..bc33790d 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 38352348..80ad535c 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 66095ec3..403dafa9 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 b0aba97c..109e237d 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 73fb1f19..1b86f035 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 9a278d93..0a7d6747 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 d0481d05..0416107d 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 68d599a1..0011354e 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 9c353057..2904148a 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 9bb4549b..b3741302 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 b71b1a51..ec44d70d 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 c3cbd62b..c9d06a40 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 a5939154..80ffacd8 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 e3bb697e..d1a12313 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 b7272527..744c3263 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 5cdfe39d..8cc4ebfa 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 2cbea679..cccaac76 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 4efa943f..723aad99 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 59ea10af..2f573195 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 6e63418e..e74b7e06 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 946195b9..26158e65 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 5eacdbab..cc894659 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 ab1e2126..2738dd4c 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 72cf0606..1679543b 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 5f111c76..9263629c 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 dc8fd0c5..fb7356b3 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 6549222d..e45245bc 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 9a7c8f31..972541a2 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 24df92e9..653ca63d 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 7e1db91a..b8814e07 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 a8df4ab0..d7aa3f2c 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 5cf4309a..c3f80916 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 4e9a5051..128b0ecc 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 1064b03e..3fa04e1d 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 dada2cff..10893b2e 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 cd19e210..db794f28 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 2cd5a24b..1cde3304 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 eff680ff..6119be33 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 bb560bd9..3d152d24 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 fdb0a546..723b9bfb 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 b7087974..cafab69d 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 874ece1e..1cc0080c 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 68a5ae6a..a0a64b8d 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 30245fdf..a03953f7 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 00155449..b345bcf6 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 a354e1a7..8b86c688 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 a8970e20..698129f2 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 bd3c163b..3a3b0a52 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 bb24bb28..9d5b47d5 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 eed92911..de34a96c 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 ad7f601f..d7c053a5 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 c107b7d8..2a8abd1d 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 0c1f5a17..9fa97127 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 f8f8fe0d..e25f06be 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 c7893f16..12e6b86f 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 0b6debca..1301d0dc 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 b0398328..b043c9fd 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 f3b8b26b..85962c11 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 2e973447..3c3a9bf8 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 6a1cea44..139e57cd 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 e593104a..eb63543a 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 b7fa4ea6..af683523 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 7eba5de2..69d9d261 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 6d1c6021..43ce95c7 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 600ac203..a636da9e 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 f11b7a20..15249e12 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 eedf7c73..efa4160b 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 97330968..84852676 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 851bcec1..66c1e33c 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 9381e094..0501a16e 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 4ff44195..71ddcfde 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 090c81b5..aa8c8b60 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 0be54852..92aba870 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 088af73a..6f5a31da 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 e99c3a23..070ff0e1 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 e3ef8c0c..e6a4d6f8 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 5d625c01..768dcf6d 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 d71b97c7..51edf4d2 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 763698db..4e590a80 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 83771c70..35abc1a3 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 e7ba9c20..5df49870 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 91be725e..0de8c953 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 99290b96..4b19a778 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 24837aeb..378d89d5 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 b862c935..a80a22f3 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 80fe500f..240eb61f 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 fa0aa0c1..141f5b64 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 8e8056be..00485428 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 b929f832..9e44f107 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 3ac5db15..0de9c99d 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 78f61e4d..f4962bf8 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 fa7ab632..16c52a02 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 de1c28d4..850d5c4f 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 16b989eb..bc85bcdd 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 88e5c796..738f22ad 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 48282c67..6549e5d5 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 081ea4b6..2373b252 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 58b5e478..d1fee300 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 164a7416..910d3be9 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 77355522..0eaddd19 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 02392681..74a75b63 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 91782395..a2e0be0f 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 222639e0..b3245a13 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 b087502e..dd57e316 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 e1a9f2a9..25122bc9 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 fa0e4288..8ae729ec 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 f40be929..3508f834 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 bc784585..492de7fe 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 5284ceaa..f40881fb 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 852b9271..7fef4090 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 fec0fc7c..51de5338 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 cd2c2d81..b5c303f4 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 2322fc4d..804ddc29 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 2dbe4bba..477a7927 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 eb9ca07f..06cbeefb 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 8d05f74c..b5c26bf1 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 5dff41e3..4a34adc5 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 9a9af69d..52baba7f 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 06b16b05..1177273d 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 4659e5c7..a05a83cd 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 591939bf..2b7605c7 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 a310e3f5..667ec295 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 af058bf9..d7e02709 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 1ce6b499..4df911d1 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 da349b60..a9b62fc9 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 69eacb81..7be46bc6 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 7b3dc6c2..f1d82ec9 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 52a1659b..e475d5e9 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 4585bda0..c694172d 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 a0069328..67271ebc 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 fc4a1221..1b0bd216 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 22f432dc..54aab5fa 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 7aa37c55..230138bb 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 4e50c881..384a0010 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 84498d74..26b4381f 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 a71e0c65..e45c144a 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 13c62519..360c36ca 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 e03d0225..9c381a74 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 73da783e..438aecf3 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 bdadd431..6afd0309 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 b702281d..8d8f679e 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 b28f6eb1..558ae119 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 a0907ef3..0973cd7b 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 54a52fa0..548ab715 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 e601d7ba..823cb116 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 a1dee6cf..3110f4fb 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 80180b88..06c5f67b 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 7076100b..82562d34 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 c923f804..600f3e9f 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 0be1442b..1ae63e49 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 de47c001..04d1439f 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 5604bd8c..d1b6cb97 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 6d64bd2a..1064159c 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 c1df6da4..5a25b0b9 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 86d197e6..6a848ac7 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 b93502be..4b4aa30d 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 f732f559..9ac00a41 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 a0863235..d1e449df 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 c959043d..613004cc 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 afc02232..fea06bd8 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 0d79f878..ac8c8025 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 9ca7a108..d011dab4 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 adb9e522..ccee0fd1 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 823c6f47..85695609 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 1d3f7144..f8cb802f 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 2443071d..1590a66b 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 58129854..e8efcd50 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 03ef8265..350f5e50 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 a96e7bfe..5a89b67b 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 fdeb9e7b..b0cda8ec 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 8f9903eb..d5171846 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 a7e48244..540e4afe 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 d12f58c7..09d14c3c 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 3ce8d57f..755f914a 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 161326a4..30e73c48 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 b994601f..dceeff48 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 4dcddb00..4d959dce 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 16d1a00e..60f4663f 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 c38384cc..57894f5d 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 ccbc2373..1445e02c 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 3f3e75f1..383d25f1 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 39dda6c4..449374ff 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 f5276486..c014a90b 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 c3ce79e2..18732ed6 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 afd5b186..ec3b8ac0 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 b0848833..f431c266 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 a6344527..cea78eb2 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 8eb8a257..c53af689 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 b9130114..5f814ae0 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 c9bafe8a..f32e29c4 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 5315e543..88d11ee1 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 6af6473d..7bec3b95 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 a388c92b..520427db 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 02c9d6d6..13700c76 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 945218f8..61a70787 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 ebd88e99..f20c8f92 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 b52b238d..2d72cf3a 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 f80308b1..76d983b4 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 5f1bc07c..6b7788d1 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 31023518..b6c93ffd 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 b8f959ac..84ba50b6 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 2d018b69..d27b36c0 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 919e4335..7a4944ac 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 b4a67bee..4fb487fb 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 ae360b1f..ec122533 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 d9f8153e..ab3011ce 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 3366aea9..84851b06 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 447e8248..08f8cd03 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 0233b971..c6a5f96f 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 13cbc892..44932819 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 bd571db5..fe9768ba 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 6bdc6b6d..14284fbd 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 034ea79a..5d1b0dba 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 aa17256f..afcd6f9b 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 be5ae504..e660c376 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 b8f27a74..d136ea89 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 6e6581a0..e398fbfc 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 d80d9a79..22eae5b6 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 4a91e604..8b39960b 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 fc2d9a89..5d8e2eda 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 3e698e72..c862632e 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 69a14b97..a01bb5e0 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 1be074a5..d2ac79f5 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 795851f5..238eb866 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 4dc6597c..aac5eb90 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 a4d6467f..691b40a1 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 3c3719f1..ae32bc15 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 49d055df..6df4e36a 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 5cb1291c..59949a64 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 55f943f6..0a7c06e1 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 be9acd09..33735077 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 0e58d188..3f0cbb67 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 fffeac15..5e3511a2 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 8e565ee0..a9322a24 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 534e03be..cefa26b4 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 0b95ad96..855e220c 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 4d4c9f9b..9e6ef819 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 37c33974..cd274349 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 4a88eea7..a7eaf45b 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 cb1e604e..6c790bb5 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 ce98c39f..a25ce75b 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 74d78be5..b3041e9f 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 6d1cb10d..3d083221 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 d8df66cd..d3295c40 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 0698b64b..21a58302 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 5aaa1a66..9145b85a 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 ba1b6c0e..533fc036 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 c19d2aff..3d4638f8 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 123cef0f..bb740e1b 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 3896a201..bafef774 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 e5de6cff..d7f2bad5 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 b6560d18..8e107417 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 7c23b549..6992ff3e 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 b8744f12..b1e02c1b 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 17d79671..332ec18b 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 ace1cbcb..01f44a49 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 578e4013..322e2b89 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 23d0b200..1bcce4e5 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 ac2331a5..ae16ec95 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 b4bc7996..12a4155c 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 cbafa8d9..b919f802 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 7249a818..b4541d05 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 65700808..fd2ab78a 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 b339988a..a3571f37 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 9ce839f0..acf3dd93 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 51a75bee..9e7d2b5a 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 e2625c4e..35a66c49 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 0ff63b81..86577514 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 db497ccc..0172c23d 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 404b69ab..4bee7d5e 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 c21726d1..1190700c 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 9d168854..88fbebe6 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 96fd9f50..e7f6c48b 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 fa03da44..1e5548fa 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 c9bebebf..541f66f1 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 350ec306..0e287b69 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 1ea738a0..54a936d2 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 41b92eee..28c683c3 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 89b4727d..8f572ba3 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 bd593ef0..2e1828e9 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 0a40be94..89466213 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 81561c06..a6539230 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 34498e2c..99b67a2f 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 c9bc3a9a..08c429db 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 8ce022e4..23ee433e 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 cd1155a5..8f6d2b0b 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 956eeb21..c9a56158 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 0737c1f4..e175dbb7 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 0372dc2f..2804d073 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 17a9f07e..c6f1ddc6 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 e790eb74..f15827a2 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 bbf11de2..e0654661 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 53e35650..18a5f0a2 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 9d8c0599..97f2f630 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 e00a75fc..c88d8211 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 dfa7ebfc..7ab1f523 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 1ecb5132..d964bd11 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 20b911d9..96b0768a 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 9451a3c6..f615054a 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 2f12ba34..e7119f66 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 a78a3aae..04f8de3e 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 655d5db0..ebb09bab 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 8e4c4b6c..9746a83a 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 dc7e310d..2d28be51 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 758ce47c..be0031f4 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 ead5e834..bfc560ae 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 48d6295c..4f77e8ff 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 ad3a8f2f..1da44be0 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 773e3424..201c4e81 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 298e0b25..601a976c 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 aa045547..08b40357 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 68ee7c75..301b0e5c 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 eeaec2bd..26eecf7b 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 fa59cc2e..7b5096b5 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 0e714e1c..8608c9cb 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 9205f23b..60e10fcf 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 0735e9f9..d2b13258 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 e7dd180e..d0f6fc7c 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 31d073bd..1b8aa5a0 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 1304ec77..907ef01b 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 b81dc853..4f84dbb3 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 fbba81d6..a4b870b8 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 507f642d..f9d45bec 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 03567921..7d0ad4c9 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 df797906..ee097691 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 0d05f7cc..23f3058d 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 7db81c16..94882583 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 c64e39d2..84142f69 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 fa443e0f..abcc3a90 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 12be89b2..2c2e2c0d 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 613e4be4..9500e13a 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 57c5a98c..73af8283 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 cdb3ea64..47d40e01 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 2676f4e0..74bd4928 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 cb3bd1dd..d2e5a538 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 8f93f301..602ae8bb 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 9c54289c..5f8fd4ec 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 694c294b..ba8e3948 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 2dc5e7c9..7f614ef1 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 051c7913..5aea0690 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 7d89de52..c0405527 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 d7e3661c..3c40eade 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 1e596bbd..d10f596a 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 e865653b..93beea97 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 86380daa..46fa4c3b 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 3cac2824..37d6200e 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 999e12ef..1e1527cb 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 c65e5819..fbfefbbd 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 63a93770..24f8b8e8 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 30af2373..a43f26fe 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 c635563e..35006b69 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 3d90efe3..bb7ed819 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 bccf3d67..47a93b75 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 98569b86..5866466d 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 247df551..6b586696 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 b4555ac8..c8a77662 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 8b5d2e80..c3c9bbb0 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 c35be0b3..228f3b74 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 e68655b7..e095c941 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 df4beb1b..46685137 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 79233905..3394313e 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 d95d7c13..782c2f98 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 2119bff7..64516e8a 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 b75cbd5b..def56e43 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 6267f8df..558f0b17 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 f3eb235f..c49a207d 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 807da7e0..c1327550 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 b9c32a55..d6a2bd8f 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 d975f812..8e842929 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 f2351ef9..c915d052 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 12335cc8..b506a7b6 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 4dc70cc9..24508829 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 113862d6..72ad5d38 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 e84e5328..5c851aaa 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 e1250563..f3112045 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 eebb8a05..7031d997 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 6fa1208a..ce7cc95e 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 123e4487..3ae98f28 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 5a9f7e69..5171163d 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 78976e2a..8e761a86 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 b6f94fcc..8ea25df5 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 d67d2649..d63966da 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 c8f9fae5..613d60da 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 7d23c9e1..d1c4d862 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 51b86c8e..48e570c4 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 793e93df..5b817f93 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 30fadde9..b9a12838 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 baec6968..a24512dd 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 3a755703..039bb891 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 e04b771e..7230c521 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 7564f383..91ae0200 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 00000000..e0800631
--- /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 e0bc6f69..3c269e3a 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 5c757e92..903f9cbb 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 cac60333..d559a334 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 1aad1aee..00000000
--- 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 7d0ada69..ea73dbef 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 8f4f29d2..a785f08b 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 f9edc9cb..33a5b16f 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 6c4369cf..582645f7 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 68c6137d..65c14110 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 c03c93be..6240ef2c 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 7fc5fef1..d8d02629 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 c5ad9790..86a370b9 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 6efb3000..33949160 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 722107b9..d361173c 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 9618e76f..401c5c12 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 7e8c34cd..18fe7dc3 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 040c7dcc..a1488944 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 6b5ca566..4b899f35 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 78fa5b06..bf74fa50 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 063776e1..169366b6 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 c417099a..a6b80173 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 571b6392..44ee67c0 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 e1ff8136..9471b13d 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 42122b14..f8d50618 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 2a87b210..4b9066e6 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 09bb0a93..503c7af8 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 2a7b2a76..9c43fee0 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 a8e2a8a2..65713146 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 506e532b..d75af5fc 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 7d142b3c..c21261a3 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 ea93c4e5..3ba72b2c 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 59f9d2ae..cc31fcce 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 acb0cd04..33e6cfcb 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 3bce3404..87e5dcf4 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 0771c295..441cc6dd 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 25107d9c..c85c2a39 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 e31fc89d..424523d9 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 462b973e..73d3ede3 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 52ddf66e..341f070a 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 c0077238..183202f3 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 c69998e3..3a61c08f 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 d762aa9d..c530fa22 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 22ae8a54..82c294e2 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 0cddcb04..b799db82 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 57bf56a6..279e4927 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 d50e8d48..e16fc77c 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 0a391de9..3d0a949a 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 c61ac247..11aac29f 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 2ba179a8..f052915e 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 87653b32..16247f01 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 e31d4172..53d27621 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 6789ca29..036db273 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 e76ff767..d78d2b9c 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 c7cbe026..d7d5e55b 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 b50b904b..347657bc 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 09061c82..d468fa39 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 096e9675..1a3bd385 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 f19ad236..fe13cfd2 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 2537628e..c1769af3 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 8d65acfe..99736474 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 8e2e56aa..eb1c74eb 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 9d6610d3..e09d1b6a 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 b9374d1e..de72e6d1 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 0be6da08..210bcde3 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 86d5f2b2..9ad7e1fa 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 a2cc2e31..ce3a1d86 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 21d1724e..e51443dc 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 502ee83e..edf66803 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 c6c0e696..f4b04d6f 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 1d0bd772..ba0d1eca 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 609110ba..b8d89a23 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 06faa25b..ad079b7f 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 9570a414..5e9be84a 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 784acc84..b702a1ce 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 952c616e..bbde7da8 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 5ea23718..a65cced7 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 f5a0838d..b27f36d0 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 c0486517..505f9dd2 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 9589c819..84bb2852 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 1cc57314..5bbc545d 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 d565bc3f..40007b4f 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 3ac82906..48b7a080 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 4e012230..077b5f63 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 ee910364..c39ad999 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 4034aafa..72375ad2 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 5d761275..40665bd9 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 d6a416af..6468f0aa 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 fbda5576..8b52998f 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 c10b607d..4c967571 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 9f95aad1..2171c266 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 2bc6f304..5b9e3d50 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 e7b96a66..235bb148 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 2746f80a..c7333d40 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 50a65c3b..433baf08 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 d2e96f0a..3f4905da 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 20c43a35..4296a5eb 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 b7c53b88..91cd7155 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 e6773a23..b651f12b 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 21751a04..da85731a 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 781028a6..eb1b0d96 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 7c50880b..31024ce6 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 484989be..fe2c3fb8 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 5d3f00a5..0726ac0b 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 86b02ba9..8060c69f 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 e0f6cd0b..00fb998f 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 1a5a919f..0ca0f030 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 cfeb44cf..27b3c915 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 7c83d238..114bcd51 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 7af1a14a..317fd2c1 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 a1bb2ef9..dd2d2c95 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 6bd0e63b..cc48488b 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 f6aea7cb..391e0f1e 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 c28898ce..65d7b510 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 5866add9..63d23765 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 bc21323f..cc15ac99 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 67a61cae..79263f7d 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 7c68dcbf..7076a586 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 808072dd..2dbb43e8 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 abed250e..b6d1e98e 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 a98a0958..4606b0ef 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 283eb6d3..dfeaac5d 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 3148c542..af7b61e3 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 d9d2de07..e445feb4 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 e7ec2df3..57f40398 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 28a8956b..f5e52655 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 3a7037f6..231c20c2 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 06d4af6d..c4b0ecc0 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 eb6eaef4..8d5d0dce 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 54a67380..333ccc51 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 93cdc3bf..49ed161d 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 549b1fcf..b3fd6d30 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 2df025db..b757e38c 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 97a2af2f..f97e4e36 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 de7e247e..61e2b366 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 846c616c..3a385f3e 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 e13c070c..4fcb46e2 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 7df1fb6f..417bdc71 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 4fb041f6..77111dc1 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 d31cfbab..c40eb0be 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 d855886d..30451231 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 f9fe96ab..00c9a95d 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 944af684..3d1022b6 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 c8c884bc..9a2e9c68 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 44ff12f1..fddbfa73 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 137247bf..6535034c 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 c85a4212..3e5ba5e3 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 0040af7f..cb3aece8 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 75549064..ac8799e3 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 ec47aabe..5e624bab 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 cb27bcd5..46e7cf9e 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 d685c8f6..fb9c9f98 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 3f292c83..9d4d29ec 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 b3bb4d52..46bbd518 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 6ca04e91..ffb9f8f5 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 cfcfa065..4ee0411d 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 5323335c..e5b28715 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 a8f41e7a..bf1e3734 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 9abdc449..30326937 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 a20d080c..081c3553 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 a7698feb..434bee31 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 af35f7f4..411b50f1 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 a0c189fb..50af9ff5 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 5905894b..439974b1 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 a2f20c38..b524295d 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 47955a32..c81a531a 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 eea16251..132e526b 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 b5a0c575..39d12c63 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 1f1ee9ca..a8648766 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 4aed15b9..c5bddbba 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 0f157f91..8a92e4c4 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 ee9026ff..7affc1c8 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 f9e38034..b7f67015 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 462d069d..db7d73fd 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 65f0effc..c432d2d9 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 838f3a61..77d2cf3d 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 465def28..40acdccb 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 274bfebb..4a810473 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 1c0e4032..b761289b 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 4d565041..3c850aaf 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 30f99362..9335e2f2 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 ec990c8a..d44d99bc 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 91f4a5d0..bcbf2421 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 ca5ca652..a24120e4 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 aaf634d0..dd8a6b81 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 88c46e7e..b3a1a7b0 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 5b450cbf..ac1bd2be 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 10994538..1e4b4265 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 3fbbb31b..fabac88c 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 acab54ed..cd38b56f 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 10ebe01a..eca091de 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 21825a4d..a0d2dd14 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 0aa90b96..6d08e8dc 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 d53ae47e..7ce7b778 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 7f39304d..bc3e79b0 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 b5365740..5a0c1f08 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 b0335ea7..2c6673cf 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 1339d244..999fc202 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 b67da910..5a6db2b4 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 eac25896..24595c98 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 076724d2..df15fa07 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 ca9a79fa..12bae13d 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 27b394c4..5c584e1f 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 b2a3d099..690040fe 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 abfe99b1..240acf17 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 3b3197a4..154a3e44 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 f37d77c8..044ce692 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 17bb7194..8914486e 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 567dfb25..5ab6ad14 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 3adb3762..b46019eb 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 3ebe1904..7e83bd2b 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 ed08497d..28ee796d 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 93c4710f..82883ec6 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 c7c851b6..51dd4108 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 9e420261..b6146a0c 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 68c33d21..e1f994d3 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 f34182dd..9f208e49 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 f910e9b7..153b146a 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 5a06d0d1..b5495abb 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 bf6c44cc..8b202f61 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 948b37ae..d626dbd5 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 b279527b..bdd0cb39 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 a38404e4..df38e982 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 09cb5727..8b015904 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 8b15d3b6..59145f01 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 46a9d4ab..6dd50d0a 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 7ea9328e..83b15a98 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 0b39b22b..44ccbe5b 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 422693f7..29fcf2ae 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 dd29e47d..9187a824 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 c53c348b..28ff9893 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 8636f027..3d9cb570 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 41c21da6..799d7cd7 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 ec413dea..971712df 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 a1e1674e..cd7cefdb 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 695da1c4..fc48e39c 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 ba8a6573..ad175f7e 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 6d8287e1..6b50fbc0 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 0e17e5ee..f3a07a5a 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 c706839c..a1ac0a73 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 2ee2b735..ad9a0f7c 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 90f421d4..b04fe673 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 14ec5c58..50fb9cfd 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 bbcd9773..a9c46c3e 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 f9403d9c..9301024a 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 3eeb05c1..d0fa2faf 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 c44c250b..e32e4814 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 9ea67cff..e024b1bd 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 5281eb05..8e37bcc3 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 605cb8eb..c29d0bfd 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 963185c4..809453ab 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 555d1f94..83c663ae 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 0727f2b8..f83b8f56 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 5cd96e38..a8b1a023 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 1ad1eb12..49f03b5e 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 34c815a3..bb670f6f 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 6ffacbbd..3fb8b5df 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 ae44b3c3..6c890d83 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 ec22c29a..1070283d 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 adf4aa0a..cc618ab8 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 775d6890..234e2ef5 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 f4f4591f..8127b440 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 acd892fa..b74f1103 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 b8262e6f..b8b26bbc 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 09a13dd0..bf7bba07 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 14b0897f..553582e3 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 c8db8379..32d99e7b 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 f26f61ae..19b977a3 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 4fb853c3..8d26063d 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 1877cbcb..f6514d69 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 40d9e3de..f0e3f4a2 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 6a2fa1e5..e06f9839 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 0468b944..e60f27da 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 866cfa6a..7c5c08fa 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 52533b50..36c9c334 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 2f99607a..b0ddebd8 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 8fb95016..9114672b 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 a7d4e874..51299a4c 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 ad3a58f2..27447fe8 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 1f78eba4..d0ed7fb3 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 1bab047e..455c1fac 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 ce9606d5..38447cb5 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 6e2ecd3d..ee7789a6 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 5bac49d4..a2ee5128 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 d33bb09a..88a01203 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 f4b7d9a1..b38f506f 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 1364db57..cc6aca53 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 bab89f98..eac27705 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 2fe4e37e..9bddc6e3 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 da0487bb..b095b0e0 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 b0676c2d..ff7b05fb 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 064a3c12..604a59eb 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 4fefc307..bd347c84 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 db5a51fc..e24500ae 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 16ba8ae0..a97dd7a9 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 3174c80d..d61282ee 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 e5e6f056..4a69d701 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 8e0360f6..874d2a1f 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 070ad226..7188f388 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 93326384..a4267e78 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 7bd798e2..0bcd6f1a 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 7253ee62..d99b2463 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 7521badb..7c25fede 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 19a0cd3c..0cd63526 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 24d6cf44..8dbdce2c 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 9f18a190..fd0d2105 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 8bab39e6..c41c9571 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 e02ed1f2..33665443 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 9fd76028..fbbe0fb5 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 9b9c4d7b..17989168 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 457d69e7..0294c44c 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 c3cc6234..6d3a0f2b 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 e04f6fc4..cb798cd9 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 bf826dd5..582c67e4 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 9b7bf0f0..302e785a 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 027c496f..f2b77ac4 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 bbd9d6d7..20103213 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 0515fa4b..e75c96ea 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 be664f1a..373abc6e 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 5725d0b8..03979f8b 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 b879ab3f..47918d8f 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 f08a6b64..0166a54b 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 8adef9b7..73e6c943 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 aad49f30..1a765ea3 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 a9b88bdb..a31170e3 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 158e9323..e25ac36f 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 51f56155..eeb3dc88 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 dbf6ce24..bbf3fc4f 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 51863005..361d54d2 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 55e51318..2f8fdcb7 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 67856302..680b2de4 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 4dd04ead..3e8becdb 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 a2c44040..27a88d65 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 d5fa7b2d..40a2030e 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 6aae50a5..f37ef941 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 015513c8..391fc5a4 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 0221b091..83465100 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 d25dfaac..23574a03 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 9f452e47..2a8657a7 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 5c2a5e38..01117e7c 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 d01e3969..3debfae0 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 a1ecaad6..896c3d6b 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 c03e6a8b..e734e2b1 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 896374cf..9bbb3ddc 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 9811e281..dd40702f 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 b8a81af3..cd3b1603 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 8ce02546..25d4bdf1 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 ee825712..24807e4e 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 fbceade2..ebdae1d9 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 8948d57a..7b1ee18f 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 6efd9d2f..082a2692 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 918291d5..93ca2b7f 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 77445362..415de5e0 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 cb18ff86..3b4ed125 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 f6bccd50..65e953db 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 f9e708ff..627f1b73 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 331ee693..72bb79a6 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 0809d031..884e8956 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 9d564b9a..8dc6a6fd 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 1b3c6e97..ffa91b53 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 b0d8223e..96a5e160 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 5eefcb43..d7f5a8da 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 878c65c0..e4559834 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 a7b96b37..a9c5642c 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 ef2e9375..d584bee7 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 9348036d..13b5ba91 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 9e5c8b31..6ccf2488 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 2c992731..5f7dce63 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 f0366afe..9c839d8c 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 9adee701..b5695caf 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 241847a5..16cc2698 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 48b537ba..e1265257 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 2f6c5f9c..eef2565a 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 328e15c7..57c879fd 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 09ea548c..33bd7484 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 d63f7ef3..ca0cf092 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 8d2d3980..de83c666 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 416367b9..d76ef845 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 8ee885a0..5de2e68f 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 f63b59ea..8626e6ab 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 b27ba230..e761e5bb 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 a8b6a487..296fdd2c 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 2d87592c..cbd53765 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 15ff6b98..00f803a2 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 9c5fb7f3..21a91d59 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 acabfa5f..f364eaef 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 586f338b..ce2c0d66 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 3f2eea42..92b201dd 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 49e703f0..a3e16905 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 4d12dbba..ea2e4988 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 3ea23683..5f5176a9 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 166b2cbb..4a82808f 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 cf1c9549..5ad2319e 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 5a2bf5c3..163d07cc 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 3fd01eff..ba0a1143 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 f7da9b22..cbdd27ed 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 9b2c72af..2c825952 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 85fac044..a44c2b45 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 b78555cc..2a80a78f 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 4d5c8e08..cca7504d 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 1c93bcf8..3b01bdb9 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 55b1faa7..37a74c31 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 9a6e9fad..9ce8bd68 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 07297d36..623efddf 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 77a69aa6..c11c0f19 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 d46ed94a..4c1b8ac9 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 4112b061..cadae086 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 e83fd128..d92cd3fb 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 86e60a84..65d01185 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 8e4677ca..4249112f 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 594f5370..aa728504 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 9535185d..eb0324b7 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 ce99fb04..6cabea8e 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 df62a30b..c854e4c1 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 4d444f91..b0ed7bdc 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 30160f70..042c380e 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 40cd6240..f6c26034 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 c9812991..2911185a 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 82a61c74..7e33fd56 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 2657cbea..7df9a882 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 16edb766..89f7b2d0 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 012f16bd..3fdd41d6 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 3d5970a7..e0583d21 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 d6d9806c..906ecbb7 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 d7492ca4..b86de050 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 7fbcda5f..43b7f699 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 8265324a..bcc80e74 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 50d6aee8..e1d6ad66 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 649de808..3096942d 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 3e4a4169..735c060a 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 93d9a4c7..0b0d644d 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 4aecdfaf..b9f98a3c 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 aa5b8394..eae2886c 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 1ff46721..ce93b1d9 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 236209f1..801e4991 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 3289aa0e..9c093b52 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 b2b2f95f..b2cedcb7 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 2d00c619..f4d09c14 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 5d1ac90a..539335ac 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 e668a5ad..fb6e0855 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 47984d66..4cb25403 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 8ab56f02..48e9dcd1 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 18a34667..b9520a05 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 770a31ca..427a0180 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 a81b7e86..e2fcf7cf 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 bd5009dc..c967a0fa 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 395187d4..0bc1a081 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 e90281c0..b60241d4 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 40e6c057..9a74382a 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 8f3172bf..b91c31d3 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 7c5b3d27..8646f1ea 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 c2f00aa9..85bb5efe 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 f29e74fb..c53f7497 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 97180d3d..83b03f3e 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 f8006b98..c87b5c5a 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 cdc76237..c3f818ff 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 9088b560..68b51029 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 758285aa..68cf604c 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 de8f46b0..faa532ca 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 011ad743..81fc667c 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 b3c318fd..d53117dd 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 c6e6f69b..7f33ca67 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 6deaf244..322f1690 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 24d5a0c7..7dbe7957 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 d43e4848..606d7b49 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 c7ca5e86..4347f739 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 e6d93161..3ebe4d10 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 3e46425d..2b7dc87a 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 6013c6af..f9cd225b 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 62ccde55..dd5a59cb 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 640d8c29..56265fa2 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 db9c689c..fea8acea 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 e14bd145..0d015d97 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 426a4f54..605b16a6 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 b79bb788..8d03ef94 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 bc15cbf1..5cf71890 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 35b04161..5f7f3842 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 678d9bec..ef40b1fc 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 42ea9e19..8feaeca6 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 290e8676..928944b9 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 c8c1866b..5fb66ce9 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 9dbcfca3..314183ae 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 eaee1d6a..c73dd2df 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 dabe4b8e..d18ff9d7 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 0c11b050..ccbc107c 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 45dab7b8..f848e09b 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 b112ae4f..0810fd27 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 4fbac7f5..c722c4cc 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 c5a74c1a..5075de54 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 3046db30..bb575e63 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 e88311d0..34f14337 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 52d298bb..5cc0f05b 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 bd00e72b..07720bfc 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 3ddfbd27..24793c5b 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 3fcda6d2..d700508b 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 633032e1..c700233f 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 c78165cd..925370cb 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 c377fdc9..65245720 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 d51ef50f..337487b9 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 46f2f69c..0616a6f5 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 71b9c76c..9f7120f3 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 8b7e911f..9dcf1e99 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 1ff46707..bd1069e7 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 a7f2535b..5c9dbaed 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 e27d62a7..ae90fd10 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 d1c713d8..031f23bf 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 3d7b8c97..a367b01f 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 b80851a1..6462ea27 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 15bedccd..72330e6f 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 e414ff9f..ad5e8561 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 a9eb3951..3d19cb91 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 ecaa41e3..13d9a5d0 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 2bfee869..b6b53dcc 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 5dad582d..9ea6c3d0 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 301d687b..40bad80e 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 a9995a67..8fd92dcf 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 451e881e..3b5af684 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 1a7bb0c9..c4e4eaac 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 13f8fc2d..312df661 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 ca634492..c9eaacc9 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 dfb24495..320bb12a 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 728b2d9a..74ee5826 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 2d0f471b..a0a3b78f 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 3200b2a4..700bea36 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 8d8156be..e1b3f98b 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 e548a48d..a3c8ce60 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 ff56a33a..9759c948 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 4eab893a..57813327 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 03817e99..c2cfb8ec 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 769ac105..4b12cd34 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 26535f47..3aa5b7da 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 63d106b8..fe34c4f8 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 5e5b7da1..40f939f1 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 7ba9bfd0..a0d32858 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 6b8c3ef8..588d6f02 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 e16b4410..bccde623 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 50489f47..94e3bd56 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 f33a0198..99077c6a 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 6a5d9e05..3fc23683 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 6a94f7fa..f94acff8 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 fff41447..f18b1606 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 ebf31235..357e8e5d 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 e1fd7d5f..60b4e9ef 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 d071251f..9c374929 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 a8d37c9f..5736aa50 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 f965ae70..7ec35dd7 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 9ed892c4..4da62092 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 42615458..efa4ce19 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 1cd13630..0a96a544 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 340f09f0..00d9f6e1 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 65f36114..e49a0f32 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 312a6df2..a7b965da 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 0cc69276..00b6d195 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 c10aa88c..913298f0 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 4740921b..209df176 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 f646479d..b16aa878 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 aa517d0b..b8c6cd06 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 d4c6af1d..48b4a5d3 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 6d656f5b..8022cd3a 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 86c4ce8c..95ed6add 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 59888edd..78d44fce 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 533bfa82..fe056cf3 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 e9907f56..7676a87b 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 0ba404d4..138edf7e 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 0cf2310b..ceb92b9b 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 8f79a134..9281d281 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 a83cd123..c780b001 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 82165471..1a83b4e0 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 0914b56a..da34418d 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 9604b421..e401f997 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 06f86645..6fa8045e 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 e65449bc..7ed7ac1a 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 4b2a14ac..da113695 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 beb5e36f..12aaa7cf 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 ab614290..665893d5 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 cf528c87..06162684 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 20f520ed..ba41878b 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 1e59df45..2588d62e 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 585d9a4f..083d6331 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 d4e71118..3f0df07e 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 b0fe48a7..6e42e0ce 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 fc6961c3..89f96e11 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 4d5d54a6..cdaf55ce 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 07100d90..7c72d123 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 aeb59ae0..561c2669 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 3c238810..3f4efaa6 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 65db2352..5756be71 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 e888d298..a6ceebb2 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 1fd89203..622a2cc3 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 bca00aab..e2207c63 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 1be1a52b..7dbcdcf7 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 54f8c6d1..97da70a1 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 62dfbfe6..f9bc406b 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 972bd585..fad38282 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 a7ac1f86..4491ddd3 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 a575720a..a87e9884 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 08982f65..73aa2c51 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 5732ca3c..54fd1a69 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 f4b446e3..0111b729 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 71a5f142..20a9613f 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 ea81307d..3141487e 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 d0bfd492..9f68416a 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 da14f6c6..c40b1fc0 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 d85cf13a..725c1b5a 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 2345de20..4a333b40 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 dce22b45..b2b7d1aa 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 69cd84c3..084ba704 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 2cb7645a..7aca4a2d 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 7bf4edb2..8b17a885 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 4ff2a73c..7e3923b5 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 bf512a16..3e61c3d0 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 dc472994..0c0291f1 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 496a29dd..46e2a943 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 cbd81672..f4a87a07 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 94c134c0..d30ef30e 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 cf8439b8..44c34bf0 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 7e46b663..0d8bd1ce 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 7da17649..25e97118 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 77866d4a..3b1b17d9 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 80a50269..9cb81006 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 9a926d71..9688d4fb 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 6e96ae7c..a9ab77f3 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 5140b4df..bc8937eb 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 b0507de3..c49f9a2d 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 96d2d825..3890d38f 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 7bca9427..f54e79cb 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 bd39ac8b..fbe64e26 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 fcd6f2a7..89b8c123 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 7e7e67b9..a84bb5e7 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 9d0398c3..864734f3 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 0adb93e7..3f8f31a9 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 b35daf8e..94fe59f5 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 c0c49c9b..052f416a 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 5781f8f0..0b15e251 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 5256bda1..56ac6442 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 c8ceb19f..6adf253b 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 6f559e7f..ff74e0ff 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 e51ee3d9..7ff171f6 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 6e839863..637899a7 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 20317bdc..a934ebe0 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 67af1a96..8cfc092c 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 d55be817..2fcb0904 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 3409242d..68f5c09e 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 85cfd81e..06594faa 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 5893f01e..711fdcec 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 808cf584..92e2b788 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 505bff2d..6483d3d0 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 a6502626..f9ff85e3 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 a41f19df..3f362517 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 bb16e538..f3a51171 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 f68728c5..9ea3d0fc 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 601b6211..9f5070cc 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 a1006eb4..f43fb544 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 67a4732d..87b476a8 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 64f64995..5d7c2d14 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 04d88287..8a554255 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 e352f75d..0467474c 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 20057419..5c20005d 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 b79e56a1..11e73089 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 29f2b3ef..5c133a0e 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 b7953eec..2e04afbd 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 cf09dda3..063981d3 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 9801e26f..ce0b91ac 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 b9e3f84d..b3a97617 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 f291524c..759f9990 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 7237a833..6a1f07f2 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 41653be6..fafc150f 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 21270122..c6489548 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 ec9acb01..9f0ab152 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 aeb6f86b..d8155fda 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 f2de7060..5117fe01 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 6db535f9..d805d7c2 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 b94f24bb..863a203a 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 dd4d17e4..eda57f20 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 4a236cb3..315f5de7 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 dedb1e23..eed395cb 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 835c88bf..e216154f 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 c9ddc381..638488b6 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 591afc0b..11925ae2 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 c4253525..3d2196e4 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 cc67fa07..e95db8d4 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 8e9863eb..e7e02e7d 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 86dec6dd..cce46a7e 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 94cd2ab6..2ea2e2f9 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 7c13f7b3..4bd83027 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 9b428108..3b7a25d3 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 6f0fc631..3866fdd8 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 293c1cb7..c83d0a83 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 6366119f..1d3ae8ca 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 ae3e9734..e9fb9342 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 7c36a234..35729571 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 e057b59a..b0e3e682 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 1dea6793..0bd337c7 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 608b52f5..87c3eaf5 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 26dca958..f88b9a18 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 2fa49fc4..dd44178e 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 90dc7445..e520b924 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 80d913e3..76160ea8 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 0cfe1894..c55521b1 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 fe65118a..40cd120d 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 b2757f5d..bee4ca56 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 62dc0151..3454c858 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 aca15f06..d4091775 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 28115cc1..f3c80c86 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 a0abf7de..af092590 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 edcc8f41..6a35fc37 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 9c41c9e5..f25ffcea 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 0f9bc546..2deb35b5 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 91981511..74f8825d 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 80cb8a03..c60a74ce 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 e9f9f0e0..706bb463 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 80790e72..9dacf694 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 216db797..9f252aa3 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 a11e644f..254bebee 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 e23cb302..8c77afda 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 494fa275..cc3d390b 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 7a509569..2b7aacb0 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 c8d9464f..6d784cab 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 c9590e0a..da8f7689 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 3c74f73b..b4ea1d0d 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 d4e0f620..b0b0ab93 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 6cbbf408..6b370faf 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 97a22fae..3e6180eb 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 31e929a5..4370edd2 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 a9af293b..aa0a394a 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 e3e4b44b..6f042dac 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 54e44a56..2cb6d9eb 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 33d827a9..d4f28f79 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 64f23ef2..799d4aea 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 239aa2b7..520409f1 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 0a1b6296..7b758a7d 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 93db193b..e02e2fe8 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 4cccbc0e..b93e00dc 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 43f64071..3df35475 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 c5f31428..c97f140c 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 b2ec9d27..1d11735d 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 436cfbf6..577d1938 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 628158db..9fb1ab57 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 8262cbd4..ab396660 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 c2b1f524..834a9b23 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 d4f26b90..813743f1 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 f1f4b80a..8f580cbd 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 c5f23980..57fe0aa6 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 dc13d5fa..d7f971e6 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 c1546ba5..2a24ca28 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 7a92f19f..afd37cf2 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 475e5309..11da4adf 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 2c2ea843..da0d767d 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 fb20b275..a3f216f1 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 5f8f4dfa..799d0401 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 9f5a8eb2..b804ddc5 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 fc4d6cca..ba6a8532 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 1dbe216f..5d77a601 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 819636b9..f693f69b 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 e341dacb..10cfbf92 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 94bdd0b3..539edb5d 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 e666a3da..fab8f7aa 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 de5aeb0b..ebd691a7 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 ac6878cf..e8db0240 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 e47d0582..262a7e13 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 00000000..cf1909b8
--- /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
-- 
GitLab