diff --git a/device-types/Ubiquiti/U6-Enterprise.yaml b/device-types/Ubiquiti/U6-Enterprise.yaml
index 22e4b6e2601c46b311edae71cba2ea1dfa48e5de..b3da8c7a26a08e6ec19a5b995476e137dd74e472 100644
--- a/device-types/Ubiquiti/U6-Enterprise.yaml
+++ b/device-types/Ubiquiti/U6-Enterprise.yaml
@@ -1,17 +1,23 @@
---
manufacturer: Ubiquiti
-model: UniFi U6 Access Point Enterprise
+model: U6 Enterprise
part_number: U6-Enterprise
slug: ubiquiti-u6-enterprise
u_height: 0
is_full_depth: false
-weight: 2.1
-weight_unit: lb
-comments: '[UniFi 6 Enterprise Access Point](https://store.ui.com/products/u6-enterprise)'
+airflow: passive
+weight: 960
+weight_unit: g
+comments: |
+ [U6 Access Point Enterprise](https://store.ui.com/products/u6-enterprise)
interfaces:
- - name: Port 1
+ - name: eth0
type: 2.5gbase-t
poe_mode: pd
poe_type: type2-ieee802.3at
- - name: Wlan 0
+ - name: wlan0
+ type: ieee802.11ax
+ - name: wlan1
+ type: ieee802.11ax
+ - name: wlan2
type: ieee802.11ax
diff --git a/device-types/Ubiquiti/U6-IW.yaml b/device-types/Ubiquiti/U6-IW.yaml
index 20a9613f87c5e37361c22ff2376f56221ee94fa2..a21eb5cc735e68c21ed6fac7f1c1b043f454f2a6 100644
--- a/device-types/Ubiquiti/U6-IW.yaml
+++ b/device-types/Ubiquiti/U6-IW.yaml
@@ -1,28 +1,37 @@
---
manufacturer: Ubiquiti
-model: UniFi U6 In-Wall Access Point
+model: U6 In-Wall
slug: ubiquiti-u6-iw
-part_number: 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)'
+comments: |
+ [Access Point U6 In-Wall](https://store.ui.com/products/access-point-wifi-6-in-wall)
is_full_depth: false
+airflow: passive
+weight: 460
+weight_unit: g
interfaces:
- - name: Port 1
+ - name: eth0
type: 1000base-t
- poe_mode: pse
+ poe_mode: pd
poe_type: type2-ieee802.3at
- - name: Port 2
+ - name: eth1
+ label: '1'
type: 1000base-t
- - name: Port 3
+ poe_mode: pse
+ poe_type: type2-ieee802.3at
+ - name: eth2
+ label: '2'
type: 1000base-t
- - name: Port 4
+ - name: eth3
+ label: '3'
type: 1000base-t
- - name: Port 5
+ - name: eth4
+ label: '4'
type: 1000base-t
- poe_mode: pd
- poe_type: type2-ieee802.3at
- mgmt_only: true
- - name: Wlan 0
- type: ieee802.11n
- - name: Wlan 1
- type: ieee802.11ac
+ - name: wlan0
+ type: ieee802.11ax
+ - name: wlan1
+ type: ieee802.11ax
+ - name: wlan2
+ type: ieee802.11ax
diff --git a/device-types/Ubiquiti/U6-LR.yaml b/device-types/Ubiquiti/U6-LR.yaml
index 3141487eb2ef1d8da28421148632afb668753f80..9e4a997de57eba1e1f4031b928c0967fe72b6807 100644
--- a/device-types/Ubiquiti/U6-LR.yaml
+++ b/device-types/Ubiquiti/U6-LR.yaml
@@ -1,10 +1,21 @@
---
manufacturer: Ubiquiti
-model: U6-LR
+model: U6 Long-Range
+part_number: 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)'
+comments: |
+ [Access Point U6 Long-Range](https://store.ui.com/products/unifi-6-long-range-access-point)
+airflow: passive
+weight: 800.0
+weight_unit: g
interfaces:
- - name: lan0
+ - name: eth0
type: 1000base-t
+ poe_mode: pd
+ poe_type: type2-ieee802.3at
+ - name: wlan0
+ type: ieee802.11ax
+ - name: wlan1
+ type: ieee802.11ax
diff --git a/device-types/Ubiquiti/U6-Lite.yaml b/device-types/Ubiquiti/U6-Lite.yaml
index 9f68416a43f2ffe13cd3ec65e1637ad250b8f701..27998ab11a29c730b13a4cb71674ff5940ee58a1 100644
--- a/device-types/Ubiquiti/U6-Lite.yaml
+++ b/device-types/Ubiquiti/U6-Lite.yaml
@@ -1,10 +1,21 @@
---
manufacturer: Ubiquiti
-model: U6-Lite
+model: U6 Lite
+part_number: 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)'
+comments: |
+ [UniFi 6 Lite Access Point](https://store.ui.com/products/unifi-ap-6-lite)
+airflow: passive
+weight: 300.0
+weight_unit: g
interfaces:
- name: lan0
type: 1000base-t
+ poe_mode: pd
+ poe_type: type1-ieee802.3af
+ - name: wlan0
+ type: ieee802.11ax
+ - name: wlan1
+ type: ieee802.11ax
diff --git a/device-types/Ubiquiti/U6-Mesh-US.yaml b/device-types/Ubiquiti/U6-Mesh.yaml
similarity index 50%
rename from device-types/Ubiquiti/U6-Mesh-US.yaml
rename to device-types/Ubiquiti/U6-Mesh.yaml
index c40b1fc0ad5c60b54fcee4868445c52670408e52..0051f356f395e1602be453363108912841c14840 100644
--- a/device-types/Ubiquiti/U6-Mesh-US.yaml
+++ b/device-types/Ubiquiti/U6-Mesh.yaml
@@ -1,18 +1,21 @@
---
manufacturer: Ubiquiti
-model: Unifi U6 Mesh Access Point
+model: U6 Mesh
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)'
+comments: |
+ [Access Point U6 Mesh](https://store.ui.com/collections/unifi-network-wireless/products/access-point-wifi-6-mesh)
+airflow: passive
+weight: 400
+weight_unit: g
interfaces:
- name: eth0
type: 1000base-t
poe_mode: pd
poe_type: type2-ieee802.3at
- mgmt_only: false
- name: wlan0
- type: ieee802.11n
+ type: ieee802.11ax
- name: wlan1
- type: ieee802.11ac
+ type: ieee802.11ax
diff --git a/device-types/Ubiquiti/U6-PRO.yaml b/device-types/Ubiquiti/U6-Pro.yaml
similarity index 61%
rename from device-types/Ubiquiti/U6-PRO.yaml
rename to device-types/Ubiquiti/U6-Pro.yaml
index 725c1b5a13d24b919ffbdc32c52f741dd19b53ab..5c50b447eb4add36b5586d0d399b5b059ae7eb5b 100644
--- a/device-types/Ubiquiti/U6-PRO.yaml
+++ b/device-types/Ubiquiti/U6-Pro.yaml
@@ -1,11 +1,15 @@
---
manufacturer: Ubiquiti
-model: Unifi U6 Access Point Professional
-part_number: U6-PRO
+model: U6 Professional
+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)'
+comments: |
+ [Access Point U6 Pro](https://store.ui.com/products/unifi-ap6-professional)
+airflow: passive
+weight: 460
+weight_unit: g
interfaces:
- name: Port 1
type: 1000base-t
diff --git a/device-types/Ubiquiti/UAP-AC-LR.yaml b/device-types/Ubiquiti/UAP-AC-LR.yaml
index 4a333b402f67e0e2228ef3e857378d2ead75ca54..ecb4b14d9c5a82932b62efc63ecb363125778cc3 100644
--- a/device-types/Ubiquiti/UAP-AC-LR.yaml
+++ b/device-types/Ubiquiti/UAP-AC-LR.yaml
@@ -1,13 +1,19 @@
---
manufacturer: Ubiquiti
-model: UAP-AC-LR
+model: AC Long-Range
+part_number: 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/)'
+comments: |
+ [Access Point AC Long-Range](https://store.ui.com/collections/wireless/products/unifi-ac-lr)
+weight: 240.0
+weight_unit: g
interfaces:
- - name: lan0
+ - name: eth0
type: 1000base-t
+ poe_mode: pd
+ poe_type: type1-ieee802.3af
- name: wlan0
type: ieee802.11n
- name: wlan1
diff --git a/device-types/Ubiquiti/UAP-AC-Lite.yaml b/device-types/Ubiquiti/UAP-AC-Lite.yaml
index b2b7d1aaa87d4954b59fcdc6790afee822d48012..bb3f920d19f220e52f71b1b78dd87c360b4ca123 100644
--- a/device-types/Ubiquiti/UAP-AC-Lite.yaml
+++ b/device-types/Ubiquiti/UAP-AC-Lite.yaml
@@ -1,10 +1,13 @@
---
manufacturer: Ubiquiti
-model: UAP-AC-LITE
+model: AC Lite
+part_number: 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/)'
+weight: 170
+weight_unit: g
+comments: '[AC Lite](https://www.ui.com/unifi/unifi-ap-ac-lite/)'
interfaces:
- name: lan0
type: 1000base-t
diff --git a/device-types/Ubiquiti/UAP-AC-M-Pro.yaml b/device-types/Ubiquiti/UAP-AC-M-Pro.yaml
index 084ba704b5256b1280ddf206156d0252e1d44169..7bb6cb2b4761e9a8e45d19d7f1b0a7a579a4b52f 100644
--- a/device-types/Ubiquiti/UAP-AC-M-Pro.yaml
+++ b/device-types/Ubiquiti/UAP-AC-M-Pro.yaml
@@ -1,15 +1,20 @@
---
manufacturer: Ubiquiti
-model: Unifi AC Mesh Pro
+model: AC Mesh Professional
+part_number: UAP-AC-M-PRO
slug: ubiquiti-uap-ac-m-pro
-part_number: UAP-AC-M-Pro
u_height: 0
is_full_depth: false
-comments: '[Unifi Mesh](https://unifi-mesh.ui.com/)'
+comments: |
+ [Access Point AC Mesh Pro](https://store.ui.com/collections/wireless/products/unifi-ac-mesh-pro-ap)
+weight: 633.0
+weight_unit: g
interfaces:
- - name: main
+ - name: eth0
type: 1000base-t
- - name: secondary
+ poe_mode: pd
+ poe_type: type1-ieee802.3af
+ - name: eth1
type: 1000base-t
- name: wlan0
type: ieee802.11n
diff --git a/device-types/Ubiquiti/UAP-AC-M.yaml b/device-types/Ubiquiti/UAP-AC-M.yaml
index 7aca4a2de039fb52f5c96a15fa3bfd1fe97d665f..8b0f4372ae298c577ea5d2ff0ee5e0e6bc166bfd 100644
--- a/device-types/Ubiquiti/UAP-AC-M.yaml
+++ b/device-types/Ubiquiti/UAP-AC-M.yaml
@@ -1,11 +1,12 @@
---
manufacturer: Ubiquiti
-model: Unifi AC Mesh
-slug: ubiquiti-uap-ac-m
+model: AC Mesh
part_number: UAP-AC-M
+slug: ubiquiti-uap-ac-m
u_height: 0
is_full_depth: false
-comments: '[Unifi Mesh](https://unifi-mesh.ui.com/)'
+comments: |
+ [Access Point AC Mesh](https://store.ui.com/collections/wireless/products/unifi-ac-mesh-ap)
interfaces:
- name: lan0
type: 1000base-t
diff --git a/device-types/Ubiquiti/UAP-AC-Pro.yaml b/device-types/Ubiquiti/UAP-AC-Pro.yaml
index 8b17a8856e98816efa8e9573b8539d52e6764746..689a7a73fb4e80e9f65a05e3493744ef905819e6 100644
--- a/device-types/Ubiquiti/UAP-AC-Pro.yaml
+++ b/device-types/Ubiquiti/UAP-AC-Pro.yaml
@@ -1,15 +1,20 @@
---
manufacturer: Ubiquiti
-model: UAP AC Pro
+model: AC Professional
+part_number: UAP-AC-PRO
slug: ubiquiti-uap-ac-pro
-part_number: UAP-AC-Pro
u_height: 0
is_full_depth: false
-comments: '[Unifi AP AC Pro](https://www.ui.com/unifi/unifi-ap-ac-pro/)'
+comments: |
+ [Access Point AC Pro](https://store.ui.com/collections/wireless/products/uap-ac-pro)'
+weight: 350.0
+weight_unit: g
interfaces:
- - name: lan0
+ - name: eth0
type: 1000base-t
- - name: lan1
+ poe_mode: pd
+ poe_type: type1-ieee802.3af
+ - name: eth1
type: 1000base-t
- name: wlan0
type: ieee802.11n
diff --git a/device-types/Ubiquiti/UAP-FlexHD.yaml b/device-types/Ubiquiti/UAP-FlexHD.yaml
index 7e3923b5b19cc0950dce9f10a3f793a242a456eb..d531c342ac321828e18055f7d67e428ba7951b1f 100644
--- a/device-types/Ubiquiti/UAP-FlexHD.yaml
+++ b/device-types/Ubiquiti/UAP-FlexHD.yaml
@@ -1,10 +1,21 @@
---
manufacturer: Ubiquiti
-model: UAP-FlexHD
+model: FlexHD
+part_number: 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)'
+comments: |
+ [UniFi Access Point FlexHD](https://store.ui.com/collections/wireless/products/unifi-flexhd)
+airflow: passive
+weight: 315
+weight_unit: g
interfaces:
- - name: lan0
+ - name: eth0
type: 1000base-t
+ poe_mode: pd
+ poe_type: type1-ieee802.3af
+ - name: wlan0
+ type: ieee802.11n
+ - name: wlan1
+ type: ieee802.11ac
diff --git a/device-types/Ubiquiti/UAP-IW-HD.yaml b/device-types/Ubiquiti/UAP-IW-HD.yaml
index 3e61c3d0fd781a354d9fe9a608b7087d2e45a077..8d8744b392824aa301e3732cd43206c8cd6ab586 100644
--- a/device-types/Ubiquiti/UAP-IW-HD.yaml
+++ b/device-types/Ubiquiti/UAP-IW-HD.yaml
@@ -1,27 +1,35 @@
---
manufacturer: Ubiquiti
-model: UniFi UAP InWall HD
-slug: ubiquiti-uap-iw-hd
+model: In-Wall HD
part_number: UAP-IW-HD
+slug: ubiquiti-uap-iw-hd
u_height: 0
is_full_depth: false
+airflow: passive
+comments: |
+ [Access Point In-Wall HD](https://store.ui.com/collections/wireless/products/unifi-in-wall-hd)
+weight: 210.0
+weight_unit: g
interfaces:
- - name: Port 1
+ - name: eth0
type: 1000base-t
- poe_mode: pse
+ poe_mode: pd
poe_type: type2-ieee802.3at
- - name: Port 2
+ - name: eth1
+ label: '1'
type: 1000base-t
- - name: Port 3
+ poe_mode: pse
+ poe_type: type2-ieee802.3at
+ - name: eth2
+ label: '2'
type: 1000base-t
- - name: Port 4
+ - name: eth3
+ label: '3'
type: 1000base-t
- - name: Port 5
+ - name: eth4
+ label: '4'
type: 1000base-t
- poe_mode: pd
- poe_type: type2-ieee802.3at
- mgmt_only: true
- - name: Wlan 0
+ - name: wlan0
type: ieee802.11n
- - name: Wlan 1
+ - name: wlan1
type: ieee802.11ac
diff --git a/device-types/Ubiquiti/UAP-Pro.yaml b/device-types/Ubiquiti/UAP-Pro.yaml
index 0c0291f1f1eb5250beeb1839a2944efce96512a4..838368cc65683e43f99bff66798a1b549aa42f4a 100644
--- a/device-types/Ubiquiti/UAP-Pro.yaml
+++ b/device-types/Ubiquiti/UAP-Pro.yaml
@@ -1,10 +1,19 @@
---
manufacturer: Ubiquiti
-model: UAP pro
-slug: ubiquiti-uap-pro
+model: UniFi AP-PRO
part_number: UAP-Pro
+slug: ubiquiti-uap-pro
u_height: 0
is_full_depth: false
+airflow: passive
+weight: 298
+weight_unit: g
interfaces:
- name: eth0
type: 1000base-t
+ poe_mode: pd
+ poe_type: type1-ieee802.3af
+ - name: wlan0
+ type: ieee802.11n
+ - name: wlan1
+ type: ieee802.11n