diff --git a/doc/user/clickpad-with-right-button.rst b/doc/user/clickpad-with-right-button.rst
index 18fa40b1..6b00fb9a 100644
--- a/doc/user/clickpad-with-right-button.rst
+++ b/doc/user/clickpad-with-right-button.rst
@@ -29,7 +29,7 @@ MyVendor OEM::
     [MyVendor MyModel Touchpad]
     MatchName=Foo Bar Touchpad
     MatchUdevtype=touchpad
-    MatchDMIModAlias=dmi:*svnMyVendor:pnMyModel:*
+    MatchDMIModAlias=dmi:*:svnMyVendor:pnMyModel:*
     AttrEventCode=-BTN_RIGHT
 
 The name of the device can be obtained using :ref:`libinput record <libinput-record>`,
diff --git a/doc/user/touchpad-pressure-debugging.rst b/doc/user/touchpad-pressure-debugging.rst
index 9cfacfc6..36f448e4 100644
--- a/doc/user/touchpad-pressure-debugging.rst
+++ b/doc/user/touchpad-pressure-debugging.rst
@@ -107,7 +107,7 @@ Once the thresholds are decided on (e.g. 10 and 8), they can be enabled with
      [Touchpad pressure override]
      MatchUdevType=touchpad
      MatchName=*SynPS/2 Synaptics TouchPad
-     MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadX230*
+     MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadX230:*
      AttrPressureRange=10:8
      AttrPalmPressureThreshold=150
      AttrThumbPressureThreshold=100
@@ -206,7 +206,7 @@ Once the thresholds are decided on (e.g. 10 and 8), they can be enabled with
      [Touchpad touch size override]
      MatchUdevType=touchpad
      MatchName=*SynPS/2 Synaptics TouchPad
-     MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadX230*
+     MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadX230:*
      AttrTouchSizeRange=10:8
 
 The first line is the match line and should be adjusted for the device name
diff --git a/doc/user/trackpoint-configuration.rst b/doc/user/trackpoint-configuration.rst
index a1f8b1d5..fdfa7906 100644
--- a/doc/user/trackpoint-configuration.rst
+++ b/doc/user/trackpoint-configuration.rst
@@ -131,7 +131,7 @@ variation of the following is sufficient:
      [Trackpoint Override]
      MatchUdevType=pointingstick
      MatchName=*TPPS/2 IBM TrackPoint*
-     MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT440p*
+     MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadT440p:*
      AttrTrackpointMultiplier=1.0
 
 
diff --git a/quirks/30-vendor-microsoft.quirks b/quirks/30-vendor-microsoft.quirks
index 5a0be059..dc3a1382 100644
--- a/quirks/30-vendor-microsoft.quirks
+++ b/quirks/30-vendor-microsoft.quirks
@@ -2,7 +2,7 @@
 
 [Microsoft Surface 3 Lid Switch]
 MatchName=*Lid Switch*
-MatchDMIModalias=dmi:*svnMicrosoftCorporation:pnSurface3:*
+MatchDMIModalias=dmi:*:svnMicrosoftCorporation:pnSurface3:*
 AttrLidSwitchReliability=write_open
 
 # Matches both Surface Laptop keyboards as well as type covers.
@@ -12,12 +12,12 @@ AttrLidSwitchReliability=write_open
 # - Surface Book 2: Microsoft Surface Keyboard
 [Microsoft Surface Keyboard]
 MatchName=*Microsoft Surface *Keyboard*
-MatchDMIModalias=dmi:*svnMicrosoftCorporation:*
+MatchDMIModalias=dmi:*:svnMicrosoftCorporation:*
 AttrKeyboardIntegration=internal
 
 [Microsoft Surface Cover]
 MatchName=*Microsoft Surface *Cover*
-MatchDMIModalias=dmi:*svnMicrosoftCorporation:*
+MatchDMIModalias=dmi:*:svnMicrosoftCorporation:*
 AttrKeyboardIntegration=internal
 AttrEventCode=-BTN_0;
 
diff --git a/quirks/30-vendor-razer.quirks b/quirks/30-vendor-razer.quirks
index 82c3b4dc..40f81557 100644
--- a/quirks/30-vendor-razer.quirks
+++ b/quirks/30-vendor-razer.quirks
@@ -2,7 +2,7 @@
 
 [Razer Blade Lid Switch]
 MatchName=*Lid Switch*
-MatchDMIModalias=dmi:*svnRazer:pnBlade*
+MatchDMIModalias=dmi:*:svnRazer:pnBlade*:*
 AttrLidSwitchReliability=write_open
 
 # Manually added entries must go above this line.
diff --git a/quirks/50-system-asus.quirks b/quirks/50-system-asus.quirks
index 24e7051e..7e73d9e5 100644
--- a/quirks/50-system-asus.quirks
+++ b/quirks/50-system-asus.quirks
@@ -2,12 +2,12 @@
 
 [Asus X555LAB]
 MatchName=*ETPS/2 Elantech Touchpad*
-MatchDMIModalias=dmi:*svnASUSTeKCOMPUTERINC.:pnX555LAB:*
+MatchDMIModalias=dmi:*:svnASUSTeKCOMPUTERINC.:pnX555LAB:*
 ModelTouchpadVisibleMarker=1
 
 [Asus UX21E]
 MatchName=*ETPS/2 Elantech Touchpad*
-MatchDMIModalias=dmi:*svnASUSTeKComputerInc.:pnUX21E:*
+MatchDMIModalias=dmi:*:svnASUSTeKComputerInc.:pnUX21E:*
 AttrPressureRange=24:10
 
 # Asus UX302LA touchpad doesn't update the pressure values once two
@@ -15,14 +15,14 @@ AttrPressureRange=24:10
 # at all. https://gitlab.freedesktop.org/libinput/libinput/issues/145
 [Asus UX302LA]
 MatchName=*ETPS/2 Elantech Touchpad*
-MatchDMIModalias=dmi:*svnASUSTeKCOMPUTERINC.:pnUX302LA:*
+MatchDMIModalias=dmi:*:svnASUSTeKCOMPUTERINC.:pnUX302LA:*
 AttrEventCode=-ABS_MT_PRESSURE;-ABS_PRESSURE;
 
 # Asus VivoBook Flip 14 TP412UA tablet switch seems misbehaving, always
 # indicating tablet position
 [Asus TP412UA Tablet Mode Switch]
 MatchName=*Intel Virtual Button*
-MatchDMIModalias=dmi:*svnASUSTeKCOMPUTERINC.:pnVivoBookFlip14_ASUSFlipTP412UA:*
+MatchDMIModalias=dmi:*:svnASUSTeKCOMPUTERINC.:pnVivoBookFlip14_ASUSFlipTP412UA:*
 ModelTabletModeSwitchUnreliable=1
 
 # keyboard has a different vid/pid to the touchpad
diff --git a/quirks/50-system-dell.quirks b/quirks/50-system-dell.quirks
index b1e6c086..0fe645b7 100644
--- a/quirks/50-system-dell.quirks
+++ b/quirks/50-system-dell.quirks
@@ -2,103 +2,104 @@
 
 [Dell Touchpads]
 MatchName=* Touchpad
-MatchDMIModalias=dmi:*svnDellInc.:*
+MatchDMIModalias=dmi:*:svnDellInc.:*
 ModelTouchpadVisibleMarker=1
 
 [Dell i2c Touchpads]
 MatchBus=i2c
 MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnDellInc.:*
+MatchDMIModalias=dmi:*:svnDellInc.:*
 AttrMscTimestamp=watch
 
 [Dell Inspiron 15R N5110 Touchpad]
 MatchUdevType=touchpad
 MatchName=*AlpsPS/2 ALPS GlidePoint
 MatchVersion=0x0300
-MatchDMIModalias=dmi:*svnDellInc.:*pnInspironN5110*
+MatchDMIModalias=dmi:*:svnDellInc.:pnInspironN5110:*
 AttrPressureRange=100:95
 
 [Dell Latitude E5510 Touchpad]
 MatchUdevType=touchpad
 MatchName=*AlpsPS/2 ALPS GlidePoint
-MatchDMIModalias=dmi:*svnDellInc.:pnLatitudeE5510:*
+MatchDMIModalias=dmi:*:svnDellInc.:pnLatitudeE5510:*
 AttrPressureRange=100:90
 
 [Dell Latitude E6220 Touchpad]
 MatchName=*AlpsPS/2 ALPS GlidePoint
-MatchDMIModalias=dmi:*svnDellInc.:pnLatitudeE6220:*
+MatchDMIModalias=dmi:*:svnDellInc.:pnLatitudeE6220:*
 AttrPressureRange=100:90
 
 [Dell XPS L322X Touchpad]
 MatchName=*CyPS/2 Cypress Trackpad
-MatchDMIModalias=dmi:*svnDell*:*XPSL322X*
+# pn can be "XPS L322X" and "Dell System XPS L322X", match both :pn*XPSL322X:.
+MatchDMIModalias=dmi:*:svnDellInc.:pn*XPSL322X:*
 AttrPressureRange=30:20
 AttrPalmPressureThreshold=254
 
 [Dell XPS13 9333 Touchpad]
 MatchName=*Synaptics s3203
-MatchDMIModalias=dmi:*svnDellInc.:*pnXPS139333*
+MatchDMIModalias=dmi:*:svnDellInc.:pnXPS139333:*
 AttrPressureRange=15:10
 AttrPalmPressureThreshold=150
 
 [Dell XPS 15 9500 Touchpad]
 MatchName=* Touchpad
-MatchDMIModalias=dmi:*svnDellInc.:pnXPS159500:*
+MatchDMIModalias=dmi:*:svnDellInc.:pnXPS159500:*
 ModelTouchpadVisibleMarker=0
 ModelTouchpadPhantomClicks=1
 
 [Dell Latitude D620 Trackpoint]
 MatchName=*DualPoint Stick
-MatchDMIModalias=dmi:*svnDellInc.:pnLatitudeD620*
+MatchDMIModalias=dmi:*:svnDellInc.:pnLatitudeD620:*
 AttrTrackpointMultiplier=0.5
 
 [Latitude E5480 Trackpoint]
 MatchName=*DualPoint Stick
 MatchUdevType=pointingstick
-MatchDMIModalias=dmi:**bvnDellInc.:*:pnLatitude5480*
+MatchDMIModalias=dmi:*:svnDellInc.:pnLatitude5480:*
 AttrTrackpointMultiplier=0.5
 
 [Latitude 5580 Trackpoint]
 MatchName=*DualPoint Stick
 MatchUdevType=pointingstick
-MatchDMIModalias=dmi:**bvnDellInc.:*:pnLatitude5580*
+MatchDMIModalias=dmi:*:svnDellInc.:pnLatitude5580:*
 AttrTrackpointMultiplier=0.5
 
 [Latitude E5570 Trackpoint]
 MatchName=*DualPoint Stick
-MatchDMIModalias=dmi:*svnDellInc.:pnLatitudeE5570*
+MatchDMIModalias=dmi:*:svnDellInc.:pnLatitudeE5570:*
 AttrTrackpointMultiplier=0.1
 
 [Latitude E6320 Trackpoint]
 MatchName=*DualPoint Stick
-MatchDMIModalias=dmi:*svnDellInc.:pnLatitudeE6320*
+MatchDMIModalias=dmi:*:svnDellInc.:pnLatitudeE6320:*
 AttrTrackpointMultiplier=2.0
 
 [Latitude E6400 Trackpoint]
 MatchName=*DualPoint Stick
-MatchDMIModalias=dmi:*svnDellInc.:pnLatitudeE6400*
+MatchDMIModalias=dmi:*:svnDellInc.:pnLatitudeE6400:*
 AttrTrackpointMultiplier=1.5
 
 [Latitude E7470 Trackpoint]
 MatchName=*DualPoint Stick
-MatchDMIModalias=dmi:*svnDellInc.:pnLatitudeE7470*
+MatchDMIModalias=dmi:*:svnDellInc.:pnLatitudeE7470:*
 AttrTrackpointMultiplier=0.125
 
 [Latitude 7480 Touchpad]
 MatchName=DLL07A0*
-MatchDMIModalias=dmi:**bvnDellInc.:*:pnLatitude7480*
+MatchDMIModalias=dmi:*:svnDellInc.:pnLatitude7480:*
 AttrPressureRange=35:34
 
 [Latitude 7490 Trackpoint]
 MatchName=*Mouse
 MatchUdevType=pointingstick
-MatchDMIModalias=dmi:**bvnDellInc.:*:pnLatitude7490*
+MatchDMIModalias=dmi:*:svnDellInc.:pnLatitude7490:*
 AttrTrackpointMultiplier=0.3
 
 [Precision 7x50 Touchpad]
 MatchBus=i2c
 MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnDellInc.:pnPrecision7?50*
+MatchDMIModalias=dmi:*:svnDellInc.:pnPrecision7?50:*
 AttrInputProp=-INPUT_PROP_BUTTONPAD
 
 # The touch device has the same vid/pid as the totem, the MatchName
@@ -139,7 +140,7 @@ MatchBus=i2c
 MatchVendor=0x0488
 MatchProduct=0x1063
 MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnDellInc.:pnPrecision5480*
+MatchDMIModalias=dmi:*:svnDellInc.:pnPrecision5480:*
 ModelTouchpadVisibleMarker=0
 
 [Dell laptop 14 Synaptics touchpad]
diff --git a/quirks/50-system-framework.quirks b/quirks/50-system-framework.quirks
index 48dc2bcc..67d30cb7 100644
--- a/quirks/50-system-framework.quirks
+++ b/quirks/50-system-framework.quirks
@@ -3,5 +3,5 @@
 [Framework Laptop 16 Keyboard Module]
 MatchName=Framework Laptop 16 Keyboard Module*
 MatchUdevType=keyboard
-MatchDMIModalias=dmi:*svnFramework:pnLaptop16*
+MatchDMIModalias=dmi:*:svnFramework:pnLaptop16*:*
 AttrKeyboardIntegration=internal
diff --git a/quirks/50-system-gigabyte.quirks b/quirks/50-system-gigabyte.quirks
index b30f9603..e2e7e9c1 100644
--- a/quirks/50-system-gigabyte.quirks
+++ b/quirks/50-system-gigabyte.quirks
@@ -1,5 +1,5 @@
 [Gigabyte Aero 15 touchpad]
 MatchUdevType=touchpad
 MatchName=ETPS/2 Elantech Touchpad
-MatchDMIModalias=dmi:*svnGIGABYTE:pnAERO15-XA*
+MatchDMIModalias=dmi:*:svnGIGABYTE:pnAERO15-XA:*
 AttrPalmSizeThreshold=800
diff --git a/quirks/50-system-gpd.quirks b/quirks/50-system-gpd.quirks
index 87e8aa4e..5cbbb74b 100644
--- a/quirks/50-system-gpd.quirks
+++ b/quirks/50-system-gpd.quirks
@@ -3,5 +3,5 @@
 [GPD MicroPC 2 Touchpad]
 MatchName=ALPS0001:00 36B6:C001 Touchpad
 MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnGPD:pnG1688-08:*
+MatchDMIModalias=dmi:*:svnGPD:pnG1688-08:*
 AttrInputProp=-INPUT_PROP_BUTTONPAD
diff --git a/quirks/50-system-graviton.quirks b/quirks/50-system-graviton.quirks
index 68bf5347..e0aa0b97 100644
--- a/quirks/50-system-graviton.quirks
+++ b/quirks/50-system-graviton.quirks
@@ -2,13 +2,13 @@
 [Synaptics ALPS0001:00 0911:5288 Touchpad]
 MatchUdevType=touchpad
 MatchName=ALPS0001:00 0911:5288 Touchpad
-MatchDMIModalias=dmi:*svn3LogicGroup:*:pnGravitonN15i-K2*:*
+MatchDMIModalias=dmi:*:svn3LogicGroup:pnGravitonN15i-K2:*
 AttrInputProp=-INPUT_PROP_BUTTONPAD
 AttrEventCode=+BTN_RIGHT
 
 [PCTel PCT2342:00 0911:5288 Touchpad]
 MatchUdevType=touchpad
 MatchName=PCT2342:00 0911:5288 Touchpad
-MatchDMIModalias=dmi:*svn3LogicGroup:pnGravitonN15i:*
+MatchDMIModalias=dmi:*:svn3LogicGroup:pnGravitonN15i:*
 AttrInputProp=-INPUT_PROP_BUTTONPAD
 AttrEventCode=+BTN_RIGHT
diff --git a/quirks/50-system-honor.quirks b/quirks/50-system-honor.quirks
index 28b94d9c..6f1ca34f 100644
--- a/quirks/50-system-honor.quirks
+++ b/quirks/50-system-honor.quirks
@@ -2,7 +2,7 @@
 # requires AttrInputProp=+INPUT_PROP_PRESSUREPAD
 [HONOR MagicBook Art 14]
 MatchName=*TOPS0102*
-MatchDMIModalias=dmi:*svnHONOR:*pnMRA-XXX*
+MatchDMIModalias=dmi:*:svnHONOR:pnMRA-XXX:*
 MatchUdevType=touchpad
 AttrEventCode=-BTN_RIGHT
 AttrInputProp=+INPUT_PROP_PRESSUREPAD
diff --git a/quirks/50-system-hp.quirks b/quirks/50-system-hp.quirks
index e15a1da7..2f8c473a 100644
--- a/quirks/50-system-hp.quirks
+++ b/quirks/50-system-hp.quirks
@@ -2,32 +2,32 @@
 
 [HP Chromebook 14]
 MatchName=*Cypress APA Trackpad *cyapa*
-MatchDMIModalias=dmi:*svnHewlett-Packard*:pnFalco*
+MatchDMIModalias=dmi:*:svnHewlett-Packard:pnFalco:*
 AttrPressureRange=12:8
 
 # Claims to have double/tripletap but doesn't actually send it
 # https://bugs.freedesktop.org/show_bug.cgi?id=98538
 [HP Compaq 6910p]
 MatchName=*SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnHewlett-Packard:*pnHPCompaq6910p*
+MatchDMIModalias=dmi:*:svnHewlett-Packard:pnHPCompaq6910p*:*
 AttrEventCode=-BTN_TOOL_DOUBLETAP;-BTN_TOOL_TRIPLETAP;
 
 # Claims to have double/tripletap but doesn't actually send it
 # https://bugzilla.redhat.com/show_bug.cgi?id=1351285 and
 [HP Compaq 8510w]
 MatchName=*SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnHewlett-Packard:*pnHPCompaq8510w*
+MatchDMIModalias=dmi:*:svnHewlett-Packard:pnHPCompaq8510w*:*
 AttrEventCode=-BTN_TOOL_DOUBLETAP;-BTN_TOOL_TRIPLETAP;
 
 [HP Elite x2 1013 G3 Keyboard]
 MatchUdevType=keyboard
 MatchBus=ps2
-MatchDMIModalias=dmi:*svnHP:pnHPElitex21013G3:*
+MatchDMIModalias=dmi:*:svnHP:pnHPElitex21013G3:*
 AttrKeyboardIntegration=external
 
 [HP Elite x2 1013 G3 Tablet Mode Switch]
 MatchName=*Intel Virtual Button*
-MatchDMIModalias=dmi:*svnHP:pnHPElitex21013G3:*
+MatchDMIModalias=dmi:*:svnHP:pnHPElitex21013G3:*
 ModelTabletModeSwitchUnreliable=1
 
 [HP Elite x2 1013 G3 Touchpad]
@@ -60,9 +60,9 @@ MatchUdevType=touchpad
 MatchDMIModalias=dmi:*:svnHP:pnHPOmniBookUltraFlipLaptop14-fh0xxx:*
 ModelTabletModeNoSuspend=1
 
-[HP Pavilion dmi4]
+[HP Pavilion dm4]
 MatchName=*SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnHewlett-Packard:*pnHPPaviliondm4NotebookPC*
+MatchDMIModalias=dmi:*:svnHewlett-Packard:pnHPPaviliondm4NotebookPC:*
 ModelHPPavilionDM4Touchpad=1
 
 [HP Spectre x360 Convertible 15-bl000]
@@ -73,7 +73,7 @@ ModelTabletModeNoSuspend=1
 [HP Spectre x360 Convertible 15-bl1xx]
 MatchUdevType=touchpad
 MatchName=*SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnHP:pnHPSpectrex360Convertible15-bl1XX:*
+MatchDMIModalias=dmi:*:svnHP:pnHPSpectrex360Convertible15-bl1XX:*
 AttrPressureRange=55:40
 AttrThumbPressureThreshold=90
 AttrPalmPressureThreshold=100
@@ -81,7 +81,7 @@ AttrPalmPressureThreshold=100
 [HP Spectre x360 Convertible 15-ch0xx]
 MatchUdevType=touchpad
 MatchName=*SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnHP:pnHPSpectrex360Convertible15-ch0xx:*
+MatchDMIModalias=dmi:*:svnHP:pnHPSpectrex360Convertible15-ch0xx:*
 AttrThumbPressureThreshold=90
 AttrPalmPressureThreshold=100
 
@@ -91,14 +91,14 @@ AttrPalmPressureThreshold=100
 # button keeps working when in tablet-mode.
 [HP Spectre x360 Convertible 15-ch0xx Tablet Mode Switch]
 MatchName=AT Translated Set 2 keyboard
-MatchDMIModalias=dmi:*svnHP:pnHPSpectrex360Convertible15-ch0xx:*
+MatchDMIModalias=dmi:*:svnHP:pnHPSpectrex360Convertible15-ch0xx:*
 ModelTabletModeNoSuspend=1
 
 # Touchpad is a clickpad but INPUT_PROP_BUTTONPAD is not set, see
 # https://bugs.freedesktop.org/show_bug.cgi?id=97147
 [HP Stream 11]
 MatchName=SYN1EDE:00 06CB:7442*
-MatchDMIModalias=dmi:*svnHewlett-Packard:pnHPStreamNotebookPC11*
+MatchDMIModalias=dmi:*:svnHewlett-Packard:pnHPStreamNotebookPC11:*
 AttrInputProp=+INPUT_PROP_BUTTONPAD
 
 # The HP stream x360's embedded-controller filters out events form its builtin
@@ -113,5 +113,5 @@ ModelTabletModeNoSuspend=1
 
 [HP ZBook Studio G3]
 MatchName=AlpsPS/2 ALPS GlidePoint
-MatchDMIModalias=dmi:*svnHP:pnHPZBookStudioG3:*
+MatchDMIModalias=dmi:*:svnHP:pnHPZBookStudioG3:*
 ModelHPZBookStudioG3=1
diff --git a/quirks/50-system-huawei.quirks b/quirks/50-system-huawei.quirks
index 51bdbe9d..116dc856 100644
--- a/quirks/50-system-huawei.quirks
+++ b/quirks/50-system-huawei.quirks
@@ -3,19 +3,19 @@
 [Huawei MateBook 2020 Touchpad]
 MatchName=ELAN2604:00 04F3:3114 Touchpad
 MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnHUAWEI:*pvrM1010*
+MatchDMIModalias=dmi:*:svnHUAWEI:*:pvrM1010:*
 AttrEventCode=-BTN_RIGHT
 
 [Huawei MateBook X Pro 2022 Touchpad]
 MatchName=GXTP7863:00 27C6:01E0 Touchpad
 MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnHUAWEI:*pnMRGF-XX*
+MatchDMIModalias=dmi:*:svnHUAWEI:pnMRGF-XX:*
 AttrEventCode=-BTN_RIGHT
 
 # 2024 model requires AttrInputProp=+INPUT_PROP_PRESSUREPAD
 [Huawei MateBook X Pro 2024 Touchpad]
 MatchName=GXTP7863:00 27C6:01E0 Touchpad
 MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnHUAWEI:*pnVGHH-XX*
+MatchDMIModalias=dmi:*:svnHUAWEI:pnVGHH-XX:*
 AttrEventCode=-BTN_RIGHT
 AttrInputProp=+INPUT_PROP_PRESSUREPAD
diff --git a/quirks/50-system-icl.quirks b/quirks/50-system-icl.quirks
index 130ac530..18a63cd4 100644
--- a/quirks/50-system-icl.quirks
+++ b/quirks/50-system-icl.quirks
@@ -2,6 +2,6 @@
 [Synaptics ALPS0001:00 0911:5288 Touchpad]
 MatchUdevType=touchpad
 MatchName=ALPS0001:00 0911:5288 Touchpad
-MatchDMIModalias=dmi:*svnICL:*:rvnICL:rnSi16:*
+MatchDMIModalias=dmi:*:svnICL:*:rnSi16:*
 AttrInputProp=-INPUT_PROP_BUTTONPAD
 AttrEventCode=+BTN_RIGHT
diff --git a/quirks/50-system-lenovo.quirks b/quirks/50-system-lenovo.quirks
index d92cfd91..00365321 100644
--- a/quirks/50-system-lenovo.quirks
+++ b/quirks/50-system-lenovo.quirks
@@ -2,130 +2,132 @@
 
 [Lenovo Thinkpad Touchpad]
 MatchName=*Synaptics*
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPad*:*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPad*:*
 AttrThumbPressureThreshold=100
 
 [Lenovo x230 Touchpad]
 MatchName=*SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadX230*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadX230*:*
 ModelLenovoX230=1
 
 [Lenovo T440p Touchpad PS/2]
 MatchName=SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT440p*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadT440p:*
 ModelLenovoT450Touchpad=1
 
 [Lenovo T440p Touchpad RMI4]
 MatchName=Synaptics tm2964-001
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT440p*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadT440p:*
 ModelLenovoT450Touchpad=1
 
 [Lenovo T470 Trackpoint]
 MatchName=*TPPS/2 IBM TrackPoint
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT470:*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadT470:*
 AttrTrackpointMultiplier=0.75
 
 [Lenovo T480 Trackpoint]
 MatchName=*TPPS/2 IBM TrackPoint
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT480:*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadT480:*
 AttrTrackpointMultiplier=0.75
 
 [Lenovo A485 Trackpoint]
 MatchName=*TPPS/2 IBM TrackPoint
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadA485:*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadA485:*
 AttrTrackpointMultiplier=0.75
 
 # Touchpad is a clickpad but INPUT_PROP_BUTTONPAD is not set, see
 # https://gitlab.freedesktop.org/libinput/libinput/issues/177
 [Lenovo T480s Touchpad]
 MatchName=Elan Touchpad
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT480s*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadT480s:*
 AttrInputProp=+INPUT_PROP_BUTTONPAD
 
 # Touchpad is a clickpad but INPUT_PROP_BUTTONPAD is not set, see
 # https://gitlab.freedesktop.org/libinput/libinput/issues/177
 [Lenovo T490s Touchpad]
 MatchName=Elan Touchpad
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT490s*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadT490s:*
 AttrInputProp=+INPUT_PROP_BUTTONPAD
 
 [Lenovo T490s Trackpoint]
 MatchName=*TPPS/2 IBM TrackPoint
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT490s:*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadT490s:*
 AttrTrackpointMultiplier=0.4
 
 [Lenovo P14s Gen 1 AMD Trackpoint]
 MatchUdevType=pointingstick
 MatchName=*TPPS/2 Elan TrackPoint*
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadP14sGen1*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadP14sGen1:*
 AttrTrackpointMultiplier=0.4
 
 # Touchpad is a clickpad but INPUT_PROP_BUTTONPAD is not set, see
 # https://gitlab.freedesktop.org/libinput/libinput/issues/234
-[Lenovo L380 Touchpad]
+# NOTE: This was intended for L380 Yoga but was applied before also for normal
+# L380. Is needed also for non covertible model?
+[Lenovo L380 Yoga Touchpad]
 MatchName=Elan Touchpad
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadL380*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadL380Yoga:*
 AttrInputProp=+INPUT_PROP_BUTTONPAD
 
 [Lenovo X200/201 Trackpoint]
 MatchName=*TPPS/2 IBM TrackPoint
-MatchDMIModalias=dmi:*svnLENOVO:*pvrThinkPadX20?:*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadX20?:*
 AttrTrackpointMultiplier=0.25
 
 [Lenovo X200s/201s Trackpoint]
 MatchName=*TPPS/2 IBM TrackPoint
-MatchDMIModalias=dmi:*svnLENOVO:*pvrThinkPadX20??:*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadX20??:*
 AttrTrackpointMultiplier=0.25
 
 [Lenovo X230 Trackpoint]
 MatchName=*TPPS/2 IBM TrackPoint
-MatchDMIModalias=dmi:*svnLENOVO:*pvrThinkPadX230:*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadX230:*
 AttrTrackpointMultiplier=0.25
 
 [Lenovo X280 Trackpoint]
 MatchName=*TPPS/2 Elan TrackPoint
-MatchDMIModalias=dmi:*svnLENOVO:*pvrThinkPadX280:*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadX280:*
 AttrTrackpointMultiplier=0.5
 
 [Lenovo X280 Touchpad]
 MatchName=Synaptics TM3381-002
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadX280*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadX280:*
 AttrPalmSizeThreshold=6
 
 [Lenovo P50 Touchpad]
 MatchName=SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadP50*:
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadP50*:*
 ModelLenovoT450Touchpad=1
 AttrPalmPressureThreshold=150
 
 [Lenovo *50 Touchpad]
 MatchName=SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPad??50*:
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPad??50*:*
 ModelLenovoT450Touchpad=1
 AttrPalmPressureThreshold=150
 
 [Lenovo *60 Touchpad]
 MatchName=SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPad??60*:
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPad??60*:*
 ModelLenovoT450Touchpad=1
 AttrPalmPressureThreshold=150
 
 [Lenovo X1 Carbon 3rd Touchpad]
 MatchName=SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadX1Carbon3rd:*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadX1Carbon3rd:*
 ModelLenovoT450Touchpad=1
 AttrPalmPressureThreshold=150
 
 [Lenovo X1 Carbon 4th Trackpoint]
 MatchUdevType=pointingstick
 MatchName=*TPPS/2 IBM TrackPoint*
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadX1Carbon4th*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadX1Carbon4th:*
 AttrTrackpointMultiplier=0.5
 
 [Lenovo X1 Carbon 6th Trackpoint]
 MatchUdevType=pointingstick
 MatchName=*TPPS/2 Elan TrackPoint*
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadX1Carbon6th*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadX1Carbon6th:*
 AttrTrackpointMultiplier=0.4
 
 # Lenovo Thinkpad Yoga (not the consumer versions) disables the keyboard
@@ -134,12 +136,12 @@ AttrTrackpointMultiplier=0.4
 # Initially #103749 and extended by #106799 comment 7
 [Lenovo Thinkpad Yoga]
 MatchName=AT Translated Set 2 keyboard
-MatchDMIModalias=dmi:*svnLENOVO:*pvrThinkPad*Yoga*:*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPad*Yoga*:*
 ModelTabletModeNoSuspend=1
 
 [Lenovo X1 Yoga Trackpoint 1st gen]
 MatchName=*TPPS/2 IBM TrackPoint
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadX1Yoga1st:*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadX1Yoga1st:*
 AttrTrackpointMultiplier=1.25
 
 [Lenovo Yoga C930 Tablet]
@@ -152,7 +154,7 @@ AttrTabletSmoothing=1
 # sends bogus ABS_MT_TOOL_TYPE events for MT_TOOL_PALM
 [Lenovo Carbon X1 6th gen]
 MatchName=Synaptics TM3288-011
-MatchDMIModalias=dmi:*svnLENOVO:*pvrThinkPadX1Carbon6th:*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadX1Carbon6th:*
 AttrEventCode=-ABS_MT_TOOL_TYPE
 ModelLenovoX1Gen6Touchpad=1
 
@@ -162,7 +164,7 @@ ModelLenovoX1Gen6Touchpad=1
 [IBM ThinkPad X41 Tablet Buttons]
 MatchUdevType=keyboard
 MatchBus=ps2
-MatchDMIModalias=dmi:*svnIBM:*:pvrThinkPadX41Tablet:*
+MatchDMIModalias=dmi:*:svnIBM:*:pvrThinkPadX41Tablet:*
 ModelTabletModeNoSuspend=1
 
 # Lenovo ThinkPad X60 X61 X200 X201 X220 X230 Tablets identify themselves as
@@ -172,7 +174,7 @@ ModelTabletModeNoSuspend=1
 [Lenovo ThinkPad X Tablet Series Buttons]
 MatchUdevType=keyboard
 MatchBus=ps2
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadX*Tablet:*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadX*Tablet:*
 ModelTabletModeNoSuspend=1
 
 # Modifies pressure range to avoid random jumps.
@@ -180,32 +182,32 @@ ModelTabletModeNoSuspend=1
 [Lenovo Yoga 2 Pro touchpad]
 MatchUdevType=touchpad
 MatchName=*SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrLenovoYoga2Pro*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrLenovoYoga2Pro:*
 AttrPressureRange=50:45
 
-[Lenovo ThinkPad E14 v2]
+[Lenovo ThinkPad E14 Gen 2]
 MatchUdevType=touchpad
 MatchName=*Elan Touchpad
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadE14Gen2*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadE14Gen2:*
 AttrPalmPressureThreshold=300
 AttrPressureRange=10:8
 
 [Lenovo ThinkPad E16 Gen 3]
 MatchUdevType=pointingstick
 MatchName=*TPPS/2 Elan TrackPoint*
-MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadE16Gen3*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadE16Gen3:*
 AttrTrackpointMultiplier=0.5
 
 [Lenovo Thinkpad Yoga X390]
 MatchUdevType=pointingstick
 MatchName=*TPPS/2 Elan TrackPoint*
-MatchDMIModalias=dmi:*svnLENOVO:*pvrThinkPadX390Yoga*:*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrThinkPadX390Yoga*:*
 AttrTrackpointMultiplier=0.4
 
 # Lenovo Yoga Slim 7i Carbon sends bogus ABS_MT_TOOL_TYPE MT_TOOL_PALM events
 [Lenovo Yoga Slim 7i Carbon]
 MatchName=* Touchpad
-MatchDMIModalias=dmi:*:svnLENOVO:*pvrYogaSlim7Carbon13IAP7:*
+MatchDMIModalias=dmi:*:svnLENOVO:*:pvrYogaSlim7Carbon13IAP7:*
 AttrEventCode=-ABS_MT_TOOL_TYPE
 
 # Lenovo detachable devices prior to SMBIOS 3.0.0 specficiation (2015-02-12)
diff --git a/quirks/50-system-lg.quirks b/quirks/50-system-lg.quirks
index 11be8823..4b081931 100644
--- a/quirks/50-system-lg.quirks
+++ b/quirks/50-system-lg.quirks
@@ -2,5 +2,5 @@
 
 [LG gram 14 2023 Touchpad]
 MatchName=* Touchpad
-MatchDMIModalias=dmi:*svnLGElectronics:pn14Z90R-G.AA79G:*
+MatchDMIModalias=dmi:*:svnLGElectronics:pn14Z90R-G.AA79G:*
 ModelTouchpadPhantomClicks=1
diff --git a/quirks/50-system-sony.quirks b/quirks/50-system-sony.quirks
index 502fa14a..0495c86f 100644
--- a/quirks/50-system-sony.quirks
+++ b/quirks/50-system-sony.quirks
@@ -3,5 +3,5 @@
 [Sony Vaio VPCEG Series Touchpad Pressure Override]
 MatchUdevType=touchpad
 MatchName=*SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnSonyCorporation:pnVPCEG*
+MatchDMIModalias=dmi:*:svnSonyCorporation:pnVPCEG*:*
 AttrPressureRange=45:40
diff --git a/quirks/50-system-starlabs.quirks b/quirks/50-system-starlabs.quirks
index 794f4173..0cb4e8ef 100644
--- a/quirks/50-system-starlabs.quirks
+++ b/quirks/50-system-starlabs.quirks
@@ -1,6 +1,6 @@
 [Star Labs Touchpad]
 MatchName=*Touchpad
 MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnStarLabs:*
+MatchDMIModalias=dmi:*:svnStarLabs:*
 AttrEventCode=-BTN_RIGHT
 AttrInputProp=+INPUT_PROP_BUTTONPAD
diff --git a/quirks/50-system-system76.quirks b/quirks/50-system-system76.quirks
index 2e8eb800..801e675f 100644
--- a/quirks/50-system-system76.quirks
+++ b/quirks/50-system-system76.quirks
@@ -1,21 +1,21 @@
 # Do not edit this file, it will be overwritten on update
 
-[System76  Bonobo Professional]
+[System76 Bonobo Professional]
 MatchName=SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnSystem76*pvrbonp5*
+MatchDMIModalias=dmi:*:svnSystem76:*:pvrbonp5:*
 ModelSystem76Bonobo=1
 
-[System76  Clevo]
+[System76 Clevo]
 MatchName=SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*pnW740SU*rnW740SU*
+MatchDMIModalias=dmi:*:pnW740SU:*:rnW740SU:*
 ModelClevoW740SU=1
 
-[System76  Galago Ultra Pro]
+[System76 Galago Ultra Pro]
 MatchName=SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnSystem76*pvrgalu1*
+MatchDMIModalias=dmi:*:svnSystem76:*:pvrgalu1:*
 ModelSystem76Galago=1
 
-[System76  Kudu Professional]
+[System76 Kudu Professional]
 MatchName=SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnSystem76*pvrkudp1*
+MatchDMIModalias=dmi:*:svnSystem76:*:pvrkudp1:*
 ModelSystem76Kudu=1
diff --git a/quirks/50-system-toshiba.quirks b/quirks/50-system-toshiba.quirks
index 713b3e67..f9d28b9c 100644
--- a/quirks/50-system-toshiba.quirks
+++ b/quirks/50-system-toshiba.quirks
@@ -1,4 +1,5 @@
+# Can't find no Satellite with all uppercase in DMI.
 [Toshiba Satellite L855-14E Touchpad]
 MatchName=*SynPS/2 Synaptics TouchPad
-MatchDMIModalias=dmi:*svnTOSHIBA:pnSATELLITEL855*
+MatchDMIModalias=dmi:*:svnTOSHIBA:pnSATELLITEL855:*
 AttrPressureRange=45:44