data: prefix all wacom tablet and layout files with "wacom-" (#728)

We now have enough non-wacom tablet files that finding wacom files with a puny human eyeball gets hard because they're interspersed with all other vendors. Let's prefix them so they're nicely grouped.
linuxwacom · Jun 24, 2024 · f19a833 · f19a833
1 parent ef77a22
commit f19a833
Show file tree

Hide file tree

Showing 398 changed files with 96 additions and 96 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -108,7 +108,7 @@ jobs:
         command:
           # A variety of ways to split the database across the two locations
           # we load from.
-          - sudo mv /usr/share/libwacom/intuos*.tablet /etc/libwacom
+          - sudo mv /usr/share/libwacom/wacom-intuos*.tablet /etc/libwacom
           - sudo mv /usr/share/libwacom/*.tablet /etc/libwacom
           - sudo mv /usr/share/libwacom/*.stylus /etc/libwacom
           # split the libwacom.stylus file into to two files to check for
@@ -175,8 +175,8 @@ jobs:
         # the multiple matches of the Intuos Pro L.
       - name: copy and modify tablet files to override another one
         run: |
-          sed -e 's/27QHD/27QHD MODIFIED/' data/cintiq-27hd.tablet | sudo tee /etc/libwacom/modified-cintiq.tablet
-          sed -e 's/Pro L/Pro L MODIFIED/' -e 's/usb|056a|0358;//' data/intuos-pro-2-l.tablet | sudo tee /etc/libwacom/modified-intuos.tablet
+          sed -e 's/27QHD/27QHD MODIFIED/' data/wacom-cintiq-27hd.tablet | sudo tee /etc/libwacom/modified-cintiq.tablet
+          sed -e 's/Pro L/Pro L MODIFIED/' -e 's/usb|056a|0358;//' data/wacom-intuos-pro-2-l.tablet | sudo tee /etc/libwacom/modified-intuos.tablet
       - name: list all devices for debugging
         run: libwacom-list-devices --format=yaml
 

diff --git a/data/layouts/bamboo-0fg-s-p-alt.svg → data/layouts/wacom-bamboo-0fg-s-p-alt.svg b/data/layouts/bamboo-0fg-s-p-alt.svg → data/layouts/wacom-bamboo-0fg-s-p-alt.svg
diff --git a/data/layouts/bamboo-0fg-s-p.svg → data/layouts/wacom-bamboo-0fg-s-p.svg b/data/layouts/bamboo-0fg-s-p.svg → data/layouts/wacom-bamboo-0fg-s-p.svg
diff --git a/data/layouts/bamboo-16fg-m-pt.svg → data/layouts/wacom-bamboo-16fg-m-pt.svg b/data/layouts/bamboo-16fg-m-pt.svg → data/layouts/wacom-bamboo-16fg-m-pt.svg
diff --git a/data/layouts/bamboo-16fg-s-pt.svg → data/layouts/wacom-bamboo-16fg-s-pt.svg b/data/layouts/bamboo-16fg-s-pt.svg → data/layouts/wacom-bamboo-16fg-s-pt.svg
diff --git a/data/layouts/bamboo-16fg-s-t.svg → data/layouts/wacom-bamboo-16fg-s-t.svg b/data/layouts/bamboo-16fg-s-t.svg → data/layouts/wacom-bamboo-16fg-s-t.svg
diff --git a/data/layouts/bamboo-2fg-fun-m-pt.svg → data/layouts/wacom-bamboo-2fg-fun-m-pt.svg b/data/layouts/bamboo-2fg-fun-m-pt.svg → data/layouts/wacom-bamboo-2fg-fun-m-pt.svg
diff --git a/data/layouts/bamboo-2fg-fun-s-pt.svg → data/layouts/wacom-bamboo-2fg-fun-s-pt.svg b/data/layouts/bamboo-2fg-fun-s-pt.svg → data/layouts/wacom-bamboo-2fg-fun-s-pt.svg
diff --git a/data/layouts/bamboo-2fg-s-pt.svg → data/layouts/wacom-bamboo-2fg-s-pt.svg b/data/layouts/bamboo-2fg-s-pt.svg → data/layouts/wacom-bamboo-2fg-s-pt.svg
diff --git a/data/layouts/bamboo-2fg-s-t.svg → data/layouts/wacom-bamboo-2fg-s-t.svg b/data/layouts/bamboo-2fg-s-t.svg → data/layouts/wacom-bamboo-2fg-s-t.svg
diff --git a/data/layouts/bamboo-4fg-fun-m-pt.svg → data/layouts/wacom-bamboo-4fg-fun-m-pt.svg b/data/layouts/bamboo-4fg-fun-m-pt.svg → data/layouts/wacom-bamboo-4fg-fun-m-pt.svg
diff --git a/data/layouts/bamboo-4fg-fun-s-pt.svg → data/layouts/wacom-bamboo-4fg-fun-s-pt.svg b/data/layouts/bamboo-4fg-fun-s-pt.svg → data/layouts/wacom-bamboo-4fg-fun-s-pt.svg
diff --git a/data/layouts/bamboo-4fg-s-pt.svg → data/layouts/wacom-bamboo-4fg-s-pt.svg b/data/layouts/bamboo-4fg-s-pt.svg → data/layouts/wacom-bamboo-4fg-s-pt.svg
diff --git a/data/layouts/bamboo-4fg-s-t.svg → data/layouts/wacom-bamboo-4fg-s-t.svg b/data/layouts/bamboo-4fg-s-t.svg → data/layouts/wacom-bamboo-4fg-s-t.svg
diff --git a/data/layouts/bamboo-4fg-se-m-pt.svg → data/layouts/wacom-bamboo-4fg-se-m-pt.svg b/data/layouts/bamboo-4fg-se-m-pt.svg → data/layouts/wacom-bamboo-4fg-se-m-pt.svg
diff --git a/data/layouts/bamboo-4fg-se-s-pt.svg → data/layouts/wacom-bamboo-4fg-se-s-pt.svg b/data/layouts/bamboo-4fg-se-s-pt.svg → data/layouts/wacom-bamboo-4fg-se-s-pt.svg
diff --git a/data/layouts/bamboo-pad.svg → data/layouts/wacom-bamboo-pad.svg b/data/layouts/bamboo-pad.svg → data/layouts/wacom-bamboo-pad.svg
diff --git a/data/layouts/cintiq-12wx.svg → data/layouts/wacom-cintiq-12wx.svg b/data/layouts/cintiq-12wx.svg → data/layouts/wacom-cintiq-12wx.svg
diff --git a/data/layouts/cintiq-13hd.svg → data/layouts/wacom-cintiq-13hd.svg b/data/layouts/cintiq-13hd.svg → data/layouts/wacom-cintiq-13hd.svg
diff --git a/data/layouts/cintiq-20wsx.svg → data/layouts/wacom-cintiq-20wsx.svg b/data/layouts/cintiq-20wsx.svg → data/layouts/wacom-cintiq-20wsx.svg
diff --git a/data/layouts/cintiq-21ux.svg → data/layouts/wacom-cintiq-21ux.svg b/data/layouts/cintiq-21ux.svg → data/layouts/wacom-cintiq-21ux.svg
diff --git a/data/layouts/cintiq-21ux2.svg → data/layouts/wacom-cintiq-21ux2.svg b/data/layouts/cintiq-21ux2.svg → data/layouts/wacom-cintiq-21ux2.svg
diff --git a/data/layouts/cintiq-22hd.svg → data/layouts/wacom-cintiq-22hd.svg b/data/layouts/cintiq-22hd.svg → data/layouts/wacom-cintiq-22hd.svg
diff --git a/data/layouts/cintiq-24hd.svg → data/layouts/wacom-cintiq-24hd.svg b/data/layouts/cintiq-24hd.svg → data/layouts/wacom-cintiq-24hd.svg
diff --git a/data/layouts/cintiq-companion-2.svg → data/layouts/wacom-cintiq-companion-2.svg b/data/layouts/cintiq-companion-2.svg → data/layouts/wacom-cintiq-companion-2.svg
diff --git a/data/layouts/cintiq-companion-hybrid.svg → ...layouts/wacom-cintiq-companion-hybrid.svg b/data/layouts/cintiq-companion-hybrid.svg → ...layouts/wacom-cintiq-companion-hybrid.svg
diff --git a/data/layouts/cintiq-companion.svg → data/layouts/wacom-cintiq-companion.svg b/data/layouts/cintiq-companion.svg → data/layouts/wacom-cintiq-companion.svg
diff --git a/data/layouts/cintiq-pro-16-2.svg → data/layouts/wacom-cintiq-pro-16-2.svg b/data/layouts/cintiq-pro-16-2.svg → data/layouts/wacom-cintiq-pro-16-2.svg
diff --git a/data/layouts/cintiq-pro-17.svg → data/layouts/wacom-cintiq-pro-17.svg b/data/layouts/cintiq-pro-17.svg → data/layouts/wacom-cintiq-pro-17.svg
diff --git a/data/layouts/cintiq-pro-22.svg → data/layouts/wacom-cintiq-pro-22.svg b/data/layouts/cintiq-pro-22.svg → data/layouts/wacom-cintiq-pro-22.svg
diff --git a/data/layouts/cintiq-pro-27.svg → data/layouts/wacom-cintiq-pro-27.svg b/data/layouts/cintiq-pro-27.svg → data/layouts/wacom-cintiq-pro-27.svg
diff --git a/data/layouts/dth-2242.svg → data/layouts/wacom-dth-2242.svg b/data/layouts/dth-2242.svg → data/layouts/wacom-dth-2242.svg
diff --git a/data/layouts/dth-2452.svg → data/layouts/wacom-dth-2452.svg b/data/layouts/dth-2452.svg → data/layouts/wacom-dth-2452.svg
diff --git a/data/layouts/dti-520.svg → data/layouts/wacom-dti-520.svg b/data/layouts/dti-520.svg → data/layouts/wacom-dti-520.svg
diff --git a/data/layouts/dtk-1651.svg → data/layouts/wacom-dtk-1651.svg b/data/layouts/dtk-1651.svg → data/layouts/wacom-dtk-1651.svg
diff --git a/data/layouts/dtk-2451.svg → data/layouts/wacom-dtk-2451.svg b/data/layouts/dtk-2451.svg → data/layouts/wacom-dtk-2451.svg
diff --git a/data/layouts/dtu-1031.svg → data/layouts/wacom-dtu-1031.svg b/data/layouts/dtu-1031.svg → data/layouts/wacom-dtu-1031.svg
diff --git a/data/layouts/dtu-1141.svg → data/layouts/wacom-dtu-1141.svg b/data/layouts/dtu-1141.svg → data/layouts/wacom-dtu-1141.svg
diff --git a/data/layouts/dtu-1141b.svg → data/layouts/wacom-dtu-1141b.svg b/data/layouts/dtu-1141b.svg → data/layouts/wacom-dtu-1141b.svg
diff --git a/data/layouts/graphire-wireless-8x6.svg → data/layouts/wacom-graphire-wireless-8x6.svg b/data/layouts/graphire-wireless-8x6.svg → data/layouts/wacom-graphire-wireless-8x6.svg
diff --git a/data/layouts/graphire4-4x5.svg → data/layouts/wacom-graphire4-4x5.svg b/data/layouts/graphire4-4x5.svg → data/layouts/wacom-graphire4-4x5.svg
diff --git a/data/layouts/graphire4-6x8.svg → data/layouts/wacom-graphire4-6x8.svg b/data/layouts/graphire4-6x8.svg → data/layouts/wacom-graphire4-6x8.svg
diff --git a/data/layouts/intuos-m-p.svg → data/layouts/wacom-intuos-m-p.svg b/data/layouts/intuos-m-p.svg → data/layouts/wacom-intuos-m-p.svg
diff --git a/data/layouts/intuos-m-p2.svg → data/layouts/wacom-intuos-m-p2.svg b/data/layouts/intuos-m-p2.svg → data/layouts/wacom-intuos-m-p2.svg
diff --git a/data/layouts/intuos-m-p3.svg → data/layouts/wacom-intuos-m-p3.svg b/data/layouts/intuos-m-p3.svg → data/layouts/wacom-intuos-m-p3.svg
diff --git a/data/layouts/intuos-m-pt.svg → data/layouts/wacom-intuos-m-pt.svg b/data/layouts/intuos-m-pt.svg → data/layouts/wacom-intuos-m-pt.svg
diff --git a/data/layouts/intuos-m-pt2.svg → data/layouts/wacom-intuos-m-pt2.svg b/data/layouts/intuos-m-pt2.svg → data/layouts/wacom-intuos-m-pt2.svg
diff --git a/data/layouts/intuos-pro-2-l.svg → data/layouts/wacom-intuos-pro-2-l.svg b/data/layouts/intuos-pro-2-l.svg → data/layouts/wacom-intuos-pro-2-l.svg
diff --git a/data/layouts/intuos-pro-2-m.svg → data/layouts/wacom-intuos-pro-2-m.svg b/data/layouts/intuos-pro-2-m.svg → data/layouts/wacom-intuos-pro-2-m.svg
diff --git a/data/layouts/intuos-pro-2-s.svg → data/layouts/wacom-intuos-pro-2-s.svg b/data/layouts/intuos-pro-2-s.svg → data/layouts/wacom-intuos-pro-2-s.svg
diff --git a/data/layouts/intuos-pro-l.svg → data/layouts/wacom-intuos-pro-l.svg b/data/layouts/intuos-pro-l.svg → data/layouts/wacom-intuos-pro-l.svg
diff --git a/data/layouts/intuos-pro-m.svg → data/layouts/wacom-intuos-pro-m.svg b/data/layouts/intuos-pro-m.svg → data/layouts/wacom-intuos-pro-m.svg
diff --git a/data/layouts/intuos-pro-s.svg → data/layouts/wacom-intuos-pro-s.svg b/data/layouts/intuos-pro-s.svg → data/layouts/wacom-intuos-pro-s.svg
diff --git a/data/layouts/intuos-s-p.svg → data/layouts/wacom-intuos-s-p.svg b/data/layouts/intuos-s-p.svg → data/layouts/wacom-intuos-s-p.svg
diff --git a/data/layouts/intuos-s-p2.svg → data/layouts/wacom-intuos-s-p2.svg b/data/layouts/intuos-s-p2.svg → data/layouts/wacom-intuos-s-p2.svg
diff --git a/data/layouts/intuos-s-p3.svg → data/layouts/wacom-intuos-s-p3.svg b/data/layouts/intuos-s-p3.svg → data/layouts/wacom-intuos-s-p3.svg
diff --git a/data/layouts/intuos-s-pt.svg → data/layouts/wacom-intuos-s-pt.svg b/data/layouts/intuos-s-pt.svg → data/layouts/wacom-intuos-s-pt.svg
diff --git a/data/layouts/intuos-s-pt2.svg → data/layouts/wacom-intuos-s-pt2.svg b/data/layouts/intuos-s-pt2.svg → data/layouts/wacom-intuos-s-pt2.svg
diff --git a/data/layouts/intuos3-12x12.svg → data/layouts/wacom-intuos3-12x12.svg b/data/layouts/intuos3-12x12.svg → data/layouts/wacom-intuos3-12x12.svg
diff --git a/data/layouts/intuos3-12x19.svg → data/layouts/wacom-intuos3-12x19.svg b/data/layouts/intuos3-12x19.svg → data/layouts/wacom-intuos3-12x19.svg
diff --git a/data/layouts/intuos3-4x5.svg → data/layouts/wacom-intuos3-4x5.svg b/data/layouts/intuos3-4x5.svg → data/layouts/wacom-intuos3-4x5.svg
diff --git a/data/layouts/intuos3-4x6.svg → data/layouts/wacom-intuos3-4x6.svg b/data/layouts/intuos3-4x6.svg → data/layouts/wacom-intuos3-4x6.svg
diff --git a/data/layouts/intuos3-6x11.svg → data/layouts/wacom-intuos3-6x11.svg b/data/layouts/intuos3-6x11.svg → data/layouts/wacom-intuos3-6x11.svg
diff --git a/data/layouts/intuos3-6x8.svg → data/layouts/wacom-intuos3-6x8.svg b/data/layouts/intuos3-6x8.svg → data/layouts/wacom-intuos3-6x8.svg
diff --git a/data/layouts/intuos3-9x12.svg → data/layouts/wacom-intuos3-9x12.svg b/data/layouts/intuos3-9x12.svg → data/layouts/wacom-intuos3-9x12.svg
diff --git a/data/layouts/intuos4-12x19.svg → data/layouts/wacom-intuos4-12x19.svg b/data/layouts/intuos4-12x19.svg → data/layouts/wacom-intuos4-12x19.svg
diff --git a/data/layouts/intuos4-4x6.svg → data/layouts/wacom-intuos4-4x6.svg b/data/layouts/intuos4-4x6.svg → data/layouts/wacom-intuos4-4x6.svg
diff --git a/data/layouts/intuos4-6x9-wl.svg → data/layouts/wacom-intuos4-6x9-wl.svg b/data/layouts/intuos4-6x9-wl.svg → data/layouts/wacom-intuos4-6x9-wl.svg
diff --git a/data/layouts/intuos4-6x9.svg → data/layouts/wacom-intuos4-6x9.svg b/data/layouts/intuos4-6x9.svg → data/layouts/wacom-intuos4-6x9.svg
diff --git a/data/layouts/intuos4-8x13.svg → data/layouts/wacom-intuos4-8x13.svg b/data/layouts/intuos4-8x13.svg → data/layouts/wacom-intuos4-8x13.svg
diff --git a/data/layouts/intuos5-l.svg → data/layouts/wacom-intuos5-l.svg b/data/layouts/intuos5-l.svg → data/layouts/wacom-intuos5-l.svg
diff --git a/data/layouts/intuos5-m.svg → data/layouts/wacom-intuos5-m.svg b/data/layouts/intuos5-m.svg → data/layouts/wacom-intuos5-m.svg
diff --git a/data/layouts/intuos5-s.svg → data/layouts/wacom-intuos5-s.svg b/data/layouts/intuos5-s.svg → data/layouts/wacom-intuos5-s.svg
diff --git a/data/layouts/mobilestudio-pro-13.svg → data/layouts/wacom-mobilestudio-pro-13.svg b/data/layouts/mobilestudio-pro-13.svg → data/layouts/wacom-mobilestudio-pro-13.svg
diff --git a/data/layouts/mobilestudio-pro-16.svg → data/layouts/wacom-mobilestudio-pro-16.svg b/data/layouts/mobilestudio-pro-16.svg → data/layouts/wacom-mobilestudio-pro-16.svg
diff --git a/data/layouts/movink.svg → data/layouts/wacom-movink.svg b/data/layouts/movink.svg → data/layouts/wacom-movink.svg
diff --git a/data/bamboo-0fg-m-p-alt.tablet → data/wacom-bamboo-0fg-m-p-alt.tablet b/data/bamboo-0fg-m-p-alt.tablet → data/wacom-bamboo-0fg-m-p-alt.tablet
@@ -46,7 +46,7 @@ Class=Bamboo
 Width=9
 Height=5
 IntegratedIn=
-Layout=bamboo-0fg-s-p-alt.svg
+Layout=wacom-bamboo-0fg-s-p-alt.svg
 
 [Features]
 Stylus=true

diff --git a/data/bamboo-0fg-s-p-alt.tablet → data/wacom-bamboo-0fg-s-p-alt.tablet b/data/bamboo-0fg-s-p-alt.tablet → data/wacom-bamboo-0fg-s-p-alt.tablet
@@ -47,7 +47,7 @@ Class=Bamboo
 Width=6
 Height=4
 IntegratedIn=
-Layout=bamboo-0fg-s-p-alt.svg
+Layout=wacom-bamboo-0fg-s-p-alt.svg
 
 [Features]
 Stylus=true

diff --git a/data/bamboo-0fg-s-p.tablet → data/wacom-bamboo-0fg-s-p.tablet b/data/bamboo-0fg-s-p.tablet → data/wacom-bamboo-0fg-s-p.tablet
@@ -47,7 +47,7 @@ Class=Bamboo
 Width=6
 Height=4
 IntegratedIn=
-Layout=bamboo-0fg-s-p.svg
+Layout=wacom-bamboo-0fg-s-p.svg
 
 [Features]
 Stylus=true

diff --git a/data/bamboo-16fg-m-pt.tablet → data/wacom-bamboo-16fg-m-pt.tablet b/data/bamboo-16fg-m-pt.tablet → data/wacom-bamboo-16fg-m-pt.tablet
@@ -15,7 +15,7 @@ DeviceMatch=usb|056a|00df
 Class=Bamboo
 Width=6
 Height=4
-Layout=bamboo-16fg-m-pt.svg
+Layout=wacom-bamboo-16fg-m-pt.svg
 IntegratedIn=
 
 [Features]

diff --git a/data/bamboo-16fg-s-p.tablet → data/wacom-bamboo-16fg-s-p.tablet b/data/bamboo-16fg-s-p.tablet → data/wacom-bamboo-16fg-s-p.tablet
diff --git a/data/bamboo-16fg-s-pt.tablet → data/wacom-bamboo-16fg-s-pt.tablet b/data/bamboo-16fg-s-pt.tablet → data/wacom-bamboo-16fg-s-pt.tablet
@@ -15,7 +15,7 @@ DeviceMatch=usb|056a|00de
 Class=Bamboo
 Width=6
 Height=4
-Layout=bamboo-16fg-s-pt.svg
+Layout=wacom-bamboo-16fg-s-pt.svg
 IntegratedIn=
 
 [Features]

diff --git a/data/bamboo-16fg-s-t.tablet → data/wacom-bamboo-16fg-s-t.tablet b/data/bamboo-16fg-s-t.tablet → data/wacom-bamboo-16fg-s-t.tablet
@@ -14,7 +14,7 @@ DeviceMatch=usb|056a|00dc
 Class=Bamboo
 Width=6
 Height=4
-Layout=bamboo-16fg-s-t.svg
+Layout=wacom-bamboo-16fg-s-t.svg
 IntegratedIn=
 
 [Features]

diff --git a/data/bamboo-2fg-fun-m-pt.tablet → data/wacom-bamboo-2fg-fun-m-pt.tablet b/data/bamboo-2fg-fun-m-pt.tablet → data/wacom-bamboo-2fg-fun-m-pt.tablet
@@ -27,7 +27,7 @@ DeviceMatch=usb|056a|00d3
 Class=Bamboo
 Width=9
 Height=5
-Layout=bamboo-2fg-fun-m-pt.svg
+Layout=wacom-bamboo-2fg-fun-m-pt.svg
 IntegratedIn=
 
 [Features]

diff --git a/data/bamboo-2fg-fun-s-pt.tablet → data/wacom-bamboo-2fg-fun-s-pt.tablet b/data/bamboo-2fg-fun-s-pt.tablet → data/wacom-bamboo-2fg-fun-s-pt.tablet
@@ -27,7 +27,7 @@ DeviceMatch=usb|056a|00d2
 Class=Bamboo
 Width=6
 Height=4
-Layout=bamboo-2fg-fun-s-pt.svg
+Layout=wacom-bamboo-2fg-fun-s-pt.svg
 IntegratedIn=
 
 [Features]

diff --git a/data/bamboo-2fg-m-p.tablet → data/wacom-bamboo-2fg-m-p.tablet b/data/bamboo-2fg-m-p.tablet → data/wacom-bamboo-2fg-m-p.tablet
diff --git a/data/bamboo-2fg-s-p.tablet → data/wacom-bamboo-2fg-s-p.tablet b/data/bamboo-2fg-s-p.tablet → data/wacom-bamboo-2fg-s-p.tablet
diff --git a/data/bamboo-2fg-s-pt.tablet → data/wacom-bamboo-2fg-s-pt.tablet b/data/bamboo-2fg-s-pt.tablet → data/wacom-bamboo-2fg-s-pt.tablet
@@ -27,7 +27,7 @@ DeviceMatch=usb|056a|00d1
 Class=Bamboo
 Width=6
 Height=4
-Layout=bamboo-2fg-s-pt.svg
+Layout=wacom-bamboo-2fg-s-pt.svg
 IntegratedIn=
 
 [Features]

diff --git a/data/bamboo-2fg-s-t.tablet → data/wacom-bamboo-2fg-s-t.tablet b/data/bamboo-2fg-s-t.tablet → data/wacom-bamboo-2fg-s-t.tablet
@@ -26,7 +26,7 @@ DeviceMatch=usb|056a|00d0
 Class=Bamboo
 Width=5
 Height=3
-Layout=bamboo-2fg-s-t.svg
+Layout=wacom-bamboo-2fg-s-t.svg
 IntegratedIn=
 
 [Features]

diff --git a/data/bamboo-4fg-fun-m.tablet → data/wacom-bamboo-4fg-fun-m.tablet b/data/bamboo-4fg-fun-m.tablet → data/wacom-bamboo-4fg-fun-m.tablet
@@ -15,7 +15,7 @@ DeviceMatch=usb|056a|00d8
 Class=Bamboo
 Width=9
 Height=5
-Layout=bamboo-4fg-fun-m-pt.svg
+Layout=wacom-bamboo-4fg-fun-m-pt.svg
 IntegratedIn=
 
 [Features]

diff --git a/data/bamboo-4fg-fun-s.tablet → data/wacom-bamboo-4fg-fun-s.tablet b/data/bamboo-4fg-fun-s.tablet → data/wacom-bamboo-4fg-fun-s.tablet
@@ -15,7 +15,7 @@ DeviceMatch=usb|056a|00d7
 Class=Bamboo
 Width=6
 Height=4
-Layout=bamboo-4fg-fun-s-pt.svg
+Layout=wacom-bamboo-4fg-fun-s-pt.svg
 IntegratedIn=
 
 [Features]

diff --git a/data/bamboo-4fg-s-pt.tablet → data/wacom-bamboo-4fg-s-pt.tablet b/data/bamboo-4fg-s-pt.tablet → data/wacom-bamboo-4fg-s-pt.tablet
@@ -15,7 +15,7 @@ DeviceMatch=usb|056a|00d6
 Class=Bamboo
 Width=6
 Height=4
-Layout=bamboo-4fg-s-pt.svg
+Layout=wacom-bamboo-4fg-s-pt.svg
 IntegratedIn=
 
 [Features]

diff --git a/data/bamboo-4fg-s-t.tablet → data/wacom-bamboo-4fg-s-t.tablet b/data/bamboo-4fg-s-t.tablet → data/wacom-bamboo-4fg-s-t.tablet
@@ -14,7 +14,7 @@ DeviceMatch=usb|056a|00d9
 Class=Bamboo
 Width=5
 Height=3
-Layout=bamboo-4fg-s-t.svg
+Layout=wacom-bamboo-4fg-s-t.svg
 IntegratedIn=
 
 [Features]

diff --git a/data/bamboo-4fg-se-m-pt.tablet → data/wacom-bamboo-4fg-se-m-pt.tablet b/data/bamboo-4fg-se-m-pt.tablet → data/wacom-bamboo-4fg-se-m-pt.tablet
@@ -15,7 +15,7 @@ DeviceMatch=usb|056a|00db
 Class=Bamboo
 Width=9
 Height=5
-Layout=bamboo-4fg-se-m-pt.svg
+Layout=wacom-bamboo-4fg-se-m-pt.svg
 IntegratedIn=
 
 [Features]

diff --git a/data/bamboo-4fg-se-s-pt.tablet → data/wacom-bamboo-4fg-se-s-pt.tablet b/data/bamboo-4fg-se-s-pt.tablet → data/wacom-bamboo-4fg-se-s-pt.tablet
@@ -15,7 +15,7 @@ DeviceMatch=usb|056a|00da
 Class=Bamboo
 Width=6
 Height=4
-Layout=bamboo-4fg-se-s-pt.svg
+Layout=wacom-bamboo-4fg-se-s-pt.svg
 IntegratedIn=
 
 [Features]

diff --git a/data/bamboo-one-m-p.tablet → data/wacom-bamboo-one-m-p.tablet b/data/bamboo-one-m-p.tablet → data/wacom-bamboo-one-m-p.tablet
diff --git a/data/bamboo-one.tablet → data/wacom-bamboo-one.tablet b/data/bamboo-one.tablet → data/wacom-bamboo-one.tablet
diff --git a/data/bamboo-pad-wireless.tablet → data/wacom-bamboo-pad-wireless.tablet b/data/bamboo-pad-wireless.tablet → data/wacom-bamboo-pad-wireless.tablet
@@ -11,7 +11,7 @@ DeviceMatch=usb|056a|0319
 Class=Bamboo
 Width=4
 Height=3
-Layout=bamboo-pad.svg
+Layout=wacom-bamboo-pad.svg
 
 [Features]
 Stylus=true

diff --git a/data/bamboo-pad.tablet → data/wacom-bamboo-pad.tablet b/data/bamboo-pad.tablet → data/wacom-bamboo-pad.tablet
@@ -11,7 +11,7 @@ DeviceMatch=usb|056a|0318
 Class=Bamboo
 Width=4
 Height=3
-Layout=bamboo-pad.svg
+Layout=wacom-bamboo-pad.svg
 
 [Features]
 Stylus=true

diff --git a/data/cintiq-12wx.tablet → data/wacom-cintiq-12wx.tablet b/data/cintiq-12wx.tablet → data/wacom-cintiq-12wx.tablet
@@ -37,7 +37,7 @@ Class=Cintiq
 DeviceMatch=usb|056a|00c6
 Width=10
 Height=7
-Layout=cintiq-12wx.svg
+Layout=wacom-cintiq-12wx.svg
 Styli=@intuos3;
 IntegratedIn=Display
 

diff --git a/data/cintiq-13hd.tablet → data/wacom-cintiq-13hd.tablet b/data/cintiq-13hd.tablet → data/wacom-cintiq-13hd.tablet
@@ -28,7 +28,7 @@ Class=Cintiq
 DeviceMatch=usb|056a|0304
 Width=12
 Height=7
-Layout=cintiq-13hd.svg
+Layout=wacom-cintiq-13hd.svg
 Styli=@intuos5;@intuos4;@propengen2;
 IntegratedIn=Display
 

diff --git a/data/cintiq-13hdt.tablet → data/wacom-cintiq-13hdt.tablet b/data/cintiq-13hdt.tablet → data/wacom-cintiq-13hdt.tablet
@@ -30,7 +30,7 @@ DeviceMatch=usb|056a|0333
 PairedID=usb|056a|0335
 Width=12
 Height=7
-Layout=cintiq-13hd.svg
+Layout=wacom-cintiq-13hd.svg
 Styli=@intuos5;@intuos4;@propengen2;
 IntegratedIn=Display
 

diff --git a/data/cintiq-16-2.tablet → data/wacom-cintiq-16-2.tablet b/data/cintiq-16-2.tablet → data/wacom-cintiq-16-2.tablet
diff --git a/data/cintiq-16.tablet → data/wacom-cintiq-16.tablet b/data/cintiq-16.tablet → data/wacom-cintiq-16.tablet
diff --git a/data/cintiq-20wsx.tablet → data/wacom-cintiq-20wsx.tablet b/data/cintiq-20wsx.tablet → data/wacom-cintiq-20wsx.tablet
@@ -40,7 +40,7 @@ DeviceMatch=usb|056a|00c5
 Class=Cintiq
 Width=17
 Height=11
-Layout=cintiq-20wsx.svg
+Layout=wacom-cintiq-20wsx.svg
 Styli=@intuos3;
 IntegratedIn=Display
 

diff --git a/data/cintiq-21ux.tablet → data/wacom-cintiq-21ux.tablet b/data/cintiq-21ux.tablet → data/wacom-cintiq-21ux.tablet
@@ -33,7 +33,7 @@ DeviceMatch=usb|056a|003f
 Class=Cintiq
 Width=17
 Height=13
-Layout=cintiq-21ux.svg
+Layout=wacom-cintiq-21ux.svg
 Styli=@intuos3;
 IntegratedIn=Display
 

diff --git a/data/cintiq-21ux2.tablet → data/wacom-cintiq-21ux2.tablet b/data/cintiq-21ux2.tablet → data/wacom-cintiq-21ux2.tablet
@@ -49,7 +49,7 @@ DeviceMatch=usb|056a|00cc
 Class=Cintiq
 Width=17
 Height=13
-Layout=cintiq-21ux2.svg
+Layout=wacom-cintiq-21ux2.svg
 Styli=@intuos5;@intuos4;@propengen2;
 IntegratedIn=Display
 

diff --git a/data/cintiq-22.tablet → data/wacom-cintiq-22.tablet b/data/cintiq-22.tablet → data/wacom-cintiq-22.tablet
diff --git a/data/cintiq-22hd.tablet → data/wacom-cintiq-22hd.tablet b/data/cintiq-22hd.tablet → data/wacom-cintiq-22hd.tablet
@@ -37,7 +37,7 @@ DeviceMatch=usb|056a|00fa
 Class=Cintiq
 Width=19
 Height=11
-Layout=cintiq-22hd.svg
+Layout=wacom-cintiq-22hd.svg
 Styli=@intuos5;@intuos4;@propengen2;
 IntegratedIn=Display
 

diff --git a/data/cintiq-22hdt.tablet → data/wacom-cintiq-22hdt.tablet b/data/cintiq-22hdt.tablet → data/wacom-cintiq-22hdt.tablet
@@ -39,7 +39,7 @@ PairedID=usb|056a|005e
 Class=Cintiq
 Width=19
 Height=11
-Layout=cintiq-22hd.svg
+Layout=wacom-cintiq-22hd.svg
 Styli=@intuos5;@intuos4;@propengen2;
 IntegratedIn=Display
 

diff --git a/data/cintiq-24hd-touch.tablet → data/wacom-cintiq-24hd-touch.tablet b/data/cintiq-24hd-touch.tablet → data/wacom-cintiq-24hd-touch.tablet
@@ -47,7 +47,7 @@ PairedID=usb|056a|00f6
 Class=Cintiq
 Width=21
 Height=13
-Layout=cintiq-24hd.svg
+Layout=wacom-cintiq-24hd.svg
 Styli=@intuos5;@intuos4;@propengen2;
 IntegratedIn=Display
 

diff --git a/data/cintiq-24hd.tablet → data/wacom-cintiq-24hd.tablet b/data/cintiq-24hd.tablet → data/wacom-cintiq-24hd.tablet
@@ -45,7 +45,7 @@ DeviceMatch=usb|056a|00f4
 Class=Cintiq
 Width=21
 Height=13
-Layout=cintiq-24hd.svg
+Layout=wacom-cintiq-24hd.svg
 Styli=@intuos5;@intuos4;@propengen2;
 IntegratedIn=Display
 

diff --git a/data/cintiq-27hd.tablet → data/wacom-cintiq-27hd.tablet b/data/cintiq-27hd.tablet → data/wacom-cintiq-27hd.tablet
diff --git a/data/cintiq-27hdt.tablet → data/wacom-cintiq-27hdt.tablet b/data/cintiq-27hdt.tablet → data/wacom-cintiq-27hdt.tablet
diff --git a/data/cintiq-companion-2.tablet → data/wacom-cintiq-companion-2.tablet b/data/cintiq-companion-2.tablet → data/wacom-cintiq-companion-2.tablet
@@ -34,7 +34,7 @@ DeviceMatch=usb|056a|0325
 PairedID=usb|056a|0326
 Width=12
 Height=7
-Layout=cintiq-companion-2.svg
+Layout=wacom-cintiq-companion-2.svg
 Styli=@intuos5;@intuos4;@propengen2;
 IntegratedIn=Display;System
 

diff --git a/data/cintiq-companion-hybrid.tablet → data/wacom-cintiq-companion-hybrid.tablet b/data/cintiq-companion-hybrid.tablet → data/wacom-cintiq-companion-hybrid.tablet
@@ -32,7 +32,7 @@ DeviceMatch=usb|056a|0307
 PairedID=usb|056a|0309
 Width=12
 Height=7
-Layout=cintiq-companion-hybrid.svg
+Layout=wacom-cintiq-companion-hybrid.svg
 Styli=@intuos5;@intuos4;@propengen2;
 IntegratedIn=Display
 

diff --git a/data/cintiq-companion.tablet → data/wacom-cintiq-companion.tablet b/data/cintiq-companion.tablet → data/wacom-cintiq-companion.tablet
@@ -32,7 +32,7 @@ DeviceMatch=usb|056a|030a
 PairedID=usb|056a|030c
 Width=12
 Height=7
-Layout=cintiq-companion.svg
+Layout=wacom-cintiq-companion.svg
 Styli=@intuos5;@intuos4;@propengen2;
 IntegratedIn=Display;System
 

diff --git a/data/cintiq-pro-13.tablet → data/wacom-cintiq-pro-13.tablet b/data/cintiq-pro-13.tablet → data/wacom-cintiq-pro-13.tablet
diff --git a/data/cintiq-pro-16-2.tablet → data/wacom-cintiq-pro-16-2.tablet b/data/cintiq-pro-16-2.tablet → data/wacom-cintiq-pro-16-2.tablet
@@ -31,7 +31,7 @@ DeviceMatch=usb|056a|03b2
 PairedID=usb|056a|03b3
 Width=14
 Height=8
-Layout=cintiq-pro-16-2.svg
+Layout=wacom-cintiq-pro-16-2.svg
 Styli=@intuos5;@mobilestudio;@propengen2;
 IntegratedIn=Display
 

diff --git a/data/cintiq-pro-16.tablet → data/wacom-cintiq-pro-16.tablet b/data/cintiq-pro-16.tablet → data/wacom-cintiq-pro-16.tablet
diff --git a/data/cintiq-pro-17.tablet → data/wacom-cintiq-pro-17.tablet b/data/cintiq-pro-17.tablet → data/wacom-cintiq-pro-17.tablet
@@ -32,7 +32,7 @@ Class=Cintiq
 DeviceMatch=usb|056a|03c4
 Width=15
 Height=8
-Layout=cintiq-pro-17.svg
+Layout=wacom-cintiq-pro-17.svg
 Styli=@cintiqpro2022;@mobilestudio;@propengen2;
 IntegratedIn=Display
 

diff --git a/data/cintiq-pro-22.tablet → data/wacom-cintiq-pro-22.tablet b/data/cintiq-pro-22.tablet → data/wacom-cintiq-pro-22.tablet
@@ -32,7 +32,7 @@ Class=Cintiq
 DeviceMatch=usb|056a|03d0
 Width=18
 Height=10
-Layout=cintiq-pro-22.svg
+Layout=wacom-cintiq-pro-22.svg
 Styli=@cintiqpro2022;@mobilestudio;@propengen2;
 IntegratedIn=Display
 

diff --git a/data/cintiq-pro-24-p.tablet → data/wacom-cintiq-pro-24-p.tablet b/data/cintiq-pro-24-p.tablet → data/wacom-cintiq-pro-24-p.tablet
diff --git a/data/cintiq-pro-24-pt.tablet → data/wacom-cintiq-pro-24-pt.tablet b/data/cintiq-pro-24-pt.tablet → data/wacom-cintiq-pro-24-pt.tablet
diff --git a/data/cintiq-pro-27.tablet → data/wacom-cintiq-pro-27.tablet b/data/cintiq-pro-27.tablet → data/wacom-cintiq-pro-27.tablet
@@ -32,7 +32,7 @@ Class=Cintiq
 DeviceMatch=usb|056a|03c0
 Width=24
 Height=13
-Layout=cintiq-pro-27.svg
+Layout=wacom-cintiq-pro-27.svg
 Styli=@cintiqpro2022;@mobilestudio;@propengen2;
 IntegratedIn=Display
 

diff --git a/data/cintiq-pro-32.tablet → data/wacom-cintiq-pro-32.tablet b/data/cintiq-pro-32.tablet → data/wacom-cintiq-pro-32.tablet
diff --git a/data/dtc-121.tablet → data/wacom-dtc-121.tablet b/data/dtc-121.tablet → data/wacom-dtc-121.tablet
diff --git a/data/dtf-720.tablet → data/wacom-dtf-720.tablet b/data/dtf-720.tablet → data/wacom-dtf-720.tablet
diff --git a/data/dth-1152.tablet → data/wacom-dth-1152.tablet b/data/dth-1152.tablet → data/wacom-dth-1152.tablet
diff --git a/data/dth-134.tablet → data/wacom-dth-134.tablet b/data/dth-134.tablet → data/wacom-dth-134.tablet
diff --git a/data/dth-2242.tablet → data/wacom-dth-2242.tablet b/data/dth-2242.tablet → data/wacom-dth-2242.tablet
@@ -21,7 +21,7 @@ PairedID=usb|056a|005d
 Class=PenDisplay
 Width=19
 Height=11
-Layout=dth-2242.svg
+Layout=wacom-dth-2242.svg
 Styli=@dth2242;
 IntegratedIn=Display
 

diff --git a/data/dth-2452.tablet → data/wacom-dth-2452.tablet b/data/dth-2452.tablet → data/wacom-dth-2452.tablet
@@ -21,7 +21,7 @@ PairedID=usb|056a|037e
 Class=PenDisplay
 Width=20
 Height=12
-Layout=dth-2452.svg
+Layout=wacom-dth-2452.svg
 IntegratedIn=Display
 
 [Features]

diff --git a/data/dti-520.tablet → data/wacom-dti-520.tablet b/data/dti-520.tablet → data/wacom-dti-520.tablet
@@ -21,7 +21,7 @@ DeviceMatch=usb|056a|003a
 Class=PenDisplay
 Width=14
 Height=12
-Layout=dti-520.svg
+Layout=wacom-dti-520.svg
 # FIXME does the stylus have an eraser?
 # Styli=0xfffff;
 IntegratedIn=Display

diff --git a/data/dtk-1651.tablet → data/wacom-dtk-1651.tablet b/data/dtk-1651.tablet → data/wacom-dtk-1651.tablet
@@ -19,7 +19,7 @@ DeviceMatch=usb|056a|0343
 Class=PenDisplay
 Width=14
 Height=8
-Layout=dtk-1651.svg
+Layout=wacom-dtk-1651.svg
 IntegratedIn=Display
 
 [Features]

diff --git a/data/dtk-1660e-2.tablet → data/wacom-dtk-1660e-2.tablet b/data/dtk-1660e-2.tablet → data/wacom-dtk-1660e-2.tablet
diff --git a/data/dtk-1660e.tablet → data/wacom-dtk-1660e.tablet b/data/dtk-1660e.tablet → data/wacom-dtk-1660e.tablet
diff --git a/data/dtk-2241.tablet → data/wacom-dtk-2241.tablet b/data/dtk-2241.tablet → data/wacom-dtk-2241.tablet
@@ -19,7 +19,7 @@ DeviceMatch=usb|056a|0057
 Class=PenDisplay
 Width=19
 Height=11
-Layout=dth-2242.svg
+Layout=wacom-dth-2242.svg
 Styli=@dth2242;
 IntegratedIn=Display
 

diff --git a/data/dtk-2451.tablet → data/wacom-dtk-2451.tablet b/data/dtk-2451.tablet → data/wacom-dtk-2451.tablet
@@ -20,7 +20,7 @@ DeviceMatch=usb|056a|0382
 Class=PenDisplay
 Width=20
 Height=12
-Layout=dtk-2451.svg
+Layout=wacom-dtk-2451.svg
 IntegratedIn=Display
 
 [Features]

diff --git a/data/dtu-1031.tablet → data/wacom-dtu-1031.tablet b/data/dtu-1031.tablet → data/wacom-dtu-1031.tablet
@@ -20,7 +20,7 @@ DeviceMatch=usb|056a|00fb
 Class=PenDisplay
 Width=9
 Height=5
-Layout=dtu-1031.svg
+Layout=wacom-dtu-1031.svg
 IntegratedIn=Display
 
 [Features]

diff --git a/data/dtu-1031x.tablet → data/wacom-dtu-1031x.tablet b/data/dtu-1031x.tablet → data/wacom-dtu-1031x.tablet