diff --git a/data/devices/logitech-g502-HERO-over-USB.device b/data/devices/logitech-g502-HERO-over-USB.device
deleted file mode 100644
index 706df800..00000000
--- a/data/devices/logitech-g502-HERO-over-USB.device
+++ /dev/null
@@ -1,5 +0,0 @@
-# Logitech G502 HERO over USB
-[Device]
-Name=Logitech G502 HERO
-DeviceMatch=usb:046d:c08b
-Driver=hidpp20
diff --git a/data/devices/logitech-g502-hero.device b/data/devices/logitech-g502-hero.device
new file mode 100644
index 00000000..b98008c7
--- /dev/null
+++ b/data/devices/logitech-g502-hero.device
@@ -0,0 +1,4 @@
+[Device]
+Name=Logitech G502 Hero
+DeviceMatch=usb:046d:c08b
+Driver=hidpp20
diff --git a/data/devices/logitech-g502-Proteus-Core-over-USB.device b/data/devices/logitech-g502-proteus-core.device
similarity index 68%
rename from data/devices/logitech-g502-Proteus-Core-over-USB.device
rename to data/devices/logitech-g502-proteus-core.device
index e7afd3b9..86e8e190 100644
--- a/data/devices/logitech-g502-Proteus-Core-over-USB.device
+++ b/data/devices/logitech-g502-proteus-core.device
@@ -1,4 +1,3 @@
-# Logitech G502 Proteus Core over USB
 [Device]
 Name=Logitech G502 Proteus Core
 DeviceMatch=usb:046d:c07d
diff --git a/data/devices/logitech-g502-Proteus-Spectrum-over-USB.device b/data/devices/logitech-g502-proteus-spectrum.device
similarity index 67%
rename from data/devices/logitech-g502-Proteus-Spectrum-over-USB.device
rename to data/devices/logitech-g502-proteus-spectrum.device
index de33be16..c0fd28c8 100644
--- a/data/devices/logitech-g502-Proteus-Spectrum-over-USB.device
+++ b/data/devices/logitech-g502-proteus-spectrum.device
@@ -1,4 +1,3 @@
-# Logitech G502 Proteus Spectrum over USB
 [Device]
 Name=Logitech G502 Proteus Spectrum
 DeviceMatch=usb:046d:c332
diff --git a/meson.build b/meson.build
index b2099805..0d66ef92 100644
--- a/meson.build
+++ b/meson.build
@@ -288,9 +288,9 @@ data_files = files(
 	'data/devices/logitech-g5.device',
 	'data/devices/logitech-g500.device',
 	'data/devices/logitech-g500s.device',
-	'data/devices/logitech-g502-HERO-over-USB.device',
-	'data/devices/logitech-g502-Proteus-Core-over-USB.device',
-	'data/devices/logitech-g502-Proteus-Spectrum-over-USB.device',
+	'data/devices/logitech-g502-hero.device',
+	'data/devices/logitech-g502-proteus-core.device',
+	'data/devices/logitech-g502-proteus-spectrum.device',
 	'data/devices/logitech-g600.device',
 	'data/devices/logitech-g602.device',
 	'data/devices/logitech-g603.device',