diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ce8c4e8e..4e175a1c 100644
--- 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 b/data/layouts/wacom-bamboo-0fg-s-p-alt.svg
similarity index 100%
rename from data/layouts/bamboo-0fg-s-p-alt.svg
rename to data/layouts/wacom-bamboo-0fg-s-p-alt.svg
diff --git a/data/layouts/bamboo-0fg-s-p.svg b/data/layouts/wacom-bamboo-0fg-s-p.svg
similarity index 100%
rename from data/layouts/bamboo-0fg-s-p.svg
rename to data/layouts/wacom-bamboo-0fg-s-p.svg
diff --git a/data/layouts/bamboo-16fg-m-pt.svg b/data/layouts/wacom-bamboo-16fg-m-pt.svg
similarity index 100%
rename from data/layouts/bamboo-16fg-m-pt.svg
rename to data/layouts/wacom-bamboo-16fg-m-pt.svg
diff --git a/data/layouts/bamboo-16fg-s-pt.svg b/data/layouts/wacom-bamboo-16fg-s-pt.svg
similarity index 100%
rename from data/layouts/bamboo-16fg-s-pt.svg
rename to data/layouts/wacom-bamboo-16fg-s-pt.svg
diff --git a/data/layouts/bamboo-16fg-s-t.svg b/data/layouts/wacom-bamboo-16fg-s-t.svg
similarity index 100%
rename from data/layouts/bamboo-16fg-s-t.svg
rename to data/layouts/wacom-bamboo-16fg-s-t.svg
diff --git a/data/layouts/bamboo-2fg-fun-m-pt.svg b/data/layouts/wacom-bamboo-2fg-fun-m-pt.svg
similarity index 100%
rename from data/layouts/bamboo-2fg-fun-m-pt.svg
rename to data/layouts/wacom-bamboo-2fg-fun-m-pt.svg
diff --git a/data/layouts/bamboo-2fg-fun-s-pt.svg b/data/layouts/wacom-bamboo-2fg-fun-s-pt.svg
similarity index 100%
rename from data/layouts/bamboo-2fg-fun-s-pt.svg
rename to data/layouts/wacom-bamboo-2fg-fun-s-pt.svg
diff --git a/data/layouts/bamboo-2fg-s-pt.svg b/data/layouts/wacom-bamboo-2fg-s-pt.svg
similarity index 100%
rename from data/layouts/bamboo-2fg-s-pt.svg
rename to data/layouts/wacom-bamboo-2fg-s-pt.svg
diff --git a/data/layouts/bamboo-2fg-s-t.svg b/data/layouts/wacom-bamboo-2fg-s-t.svg
similarity index 100%
rename from data/layouts/bamboo-2fg-s-t.svg
rename to data/layouts/wacom-bamboo-2fg-s-t.svg
diff --git a/data/layouts/bamboo-4fg-fun-m-pt.svg b/data/layouts/wacom-bamboo-4fg-fun-m-pt.svg
similarity index 100%
rename from data/layouts/bamboo-4fg-fun-m-pt.svg
rename to data/layouts/wacom-bamboo-4fg-fun-m-pt.svg
diff --git a/data/layouts/bamboo-4fg-fun-s-pt.svg b/data/layouts/wacom-bamboo-4fg-fun-s-pt.svg
similarity index 100%
rename from data/layouts/bamboo-4fg-fun-s-pt.svg
rename to data/layouts/wacom-bamboo-4fg-fun-s-pt.svg
diff --git a/data/layouts/bamboo-4fg-s-pt.svg b/data/layouts/wacom-bamboo-4fg-s-pt.svg
similarity index 100%
rename from data/layouts/bamboo-4fg-s-pt.svg
rename to data/layouts/wacom-bamboo-4fg-s-pt.svg
diff --git a/data/layouts/bamboo-4fg-s-t.svg b/data/layouts/wacom-bamboo-4fg-s-t.svg
similarity index 100%
rename from data/layouts/bamboo-4fg-s-t.svg
rename to data/layouts/wacom-bamboo-4fg-s-t.svg
diff --git a/data/layouts/bamboo-4fg-se-m-pt.svg b/data/layouts/wacom-bamboo-4fg-se-m-pt.svg
similarity index 100%
rename from data/layouts/bamboo-4fg-se-m-pt.svg
rename to data/layouts/wacom-bamboo-4fg-se-m-pt.svg
diff --git a/data/layouts/bamboo-4fg-se-s-pt.svg b/data/layouts/wacom-bamboo-4fg-se-s-pt.svg
similarity index 100%
rename from data/layouts/bamboo-4fg-se-s-pt.svg
rename to data/layouts/wacom-bamboo-4fg-se-s-pt.svg
diff --git a/data/layouts/bamboo-pad.svg b/data/layouts/wacom-bamboo-pad.svg
similarity index 100%
rename from data/layouts/bamboo-pad.svg
rename to data/layouts/wacom-bamboo-pad.svg
diff --git a/data/layouts/cintiq-12wx.svg b/data/layouts/wacom-cintiq-12wx.svg
similarity index 100%
rename from data/layouts/cintiq-12wx.svg
rename to data/layouts/wacom-cintiq-12wx.svg
diff --git a/data/layouts/cintiq-13hd.svg b/data/layouts/wacom-cintiq-13hd.svg
similarity index 100%
rename from data/layouts/cintiq-13hd.svg
rename to data/layouts/wacom-cintiq-13hd.svg
diff --git a/data/layouts/cintiq-20wsx.svg b/data/layouts/wacom-cintiq-20wsx.svg
similarity index 100%
rename from data/layouts/cintiq-20wsx.svg
rename to data/layouts/wacom-cintiq-20wsx.svg
diff --git a/data/layouts/cintiq-21ux.svg b/data/layouts/wacom-cintiq-21ux.svg
similarity index 100%
rename from data/layouts/cintiq-21ux.svg
rename to data/layouts/wacom-cintiq-21ux.svg
diff --git a/data/layouts/cintiq-21ux2.svg b/data/layouts/wacom-cintiq-21ux2.svg
similarity index 100%
rename from data/layouts/cintiq-21ux2.svg
rename to data/layouts/wacom-cintiq-21ux2.svg
diff --git a/data/layouts/cintiq-22hd.svg b/data/layouts/wacom-cintiq-22hd.svg
similarity index 100%
rename from data/layouts/cintiq-22hd.svg
rename to data/layouts/wacom-cintiq-22hd.svg
diff --git a/data/layouts/cintiq-24hd.svg b/data/layouts/wacom-cintiq-24hd.svg
similarity index 100%
rename from data/layouts/cintiq-24hd.svg
rename to data/layouts/wacom-cintiq-24hd.svg
diff --git a/data/layouts/cintiq-companion-2.svg b/data/layouts/wacom-cintiq-companion-2.svg
similarity index 100%
rename from data/layouts/cintiq-companion-2.svg
rename to data/layouts/wacom-cintiq-companion-2.svg
diff --git a/data/layouts/cintiq-companion-hybrid.svg b/data/layouts/wacom-cintiq-companion-hybrid.svg
similarity index 100%
rename from data/layouts/cintiq-companion-hybrid.svg
rename to data/layouts/wacom-cintiq-companion-hybrid.svg
diff --git a/data/layouts/cintiq-companion.svg b/data/layouts/wacom-cintiq-companion.svg
similarity index 100%
rename from data/layouts/cintiq-companion.svg
rename to data/layouts/wacom-cintiq-companion.svg
diff --git a/data/layouts/cintiq-pro-16-2.svg b/data/layouts/wacom-cintiq-pro-16-2.svg
similarity index 100%
rename from data/layouts/cintiq-pro-16-2.svg
rename to data/layouts/wacom-cintiq-pro-16-2.svg
diff --git a/data/layouts/cintiq-pro-17.svg b/data/layouts/wacom-cintiq-pro-17.svg
similarity index 100%
rename from data/layouts/cintiq-pro-17.svg
rename to data/layouts/wacom-cintiq-pro-17.svg
diff --git a/data/layouts/cintiq-pro-22.svg b/data/layouts/wacom-cintiq-pro-22.svg
similarity index 100%
rename from data/layouts/cintiq-pro-22.svg
rename to data/layouts/wacom-cintiq-pro-22.svg
diff --git a/data/layouts/cintiq-pro-27.svg b/data/layouts/wacom-cintiq-pro-27.svg
similarity index 100%
rename from data/layouts/cintiq-pro-27.svg
rename to data/layouts/wacom-cintiq-pro-27.svg
diff --git a/data/layouts/dth-2242.svg b/data/layouts/wacom-dth-2242.svg
similarity index 100%
rename from data/layouts/dth-2242.svg
rename to data/layouts/wacom-dth-2242.svg
diff --git a/data/layouts/dth-2452.svg b/data/layouts/wacom-dth-2452.svg
similarity index 100%
rename from data/layouts/dth-2452.svg
rename to data/layouts/wacom-dth-2452.svg
diff --git a/data/layouts/dti-520.svg b/data/layouts/wacom-dti-520.svg
similarity index 100%
rename from data/layouts/dti-520.svg
rename to data/layouts/wacom-dti-520.svg
diff --git a/data/layouts/dtk-1651.svg b/data/layouts/wacom-dtk-1651.svg
similarity index 100%
rename from data/layouts/dtk-1651.svg
rename to data/layouts/wacom-dtk-1651.svg
diff --git a/data/layouts/dtk-2451.svg b/data/layouts/wacom-dtk-2451.svg
similarity index 100%
rename from data/layouts/dtk-2451.svg
rename to data/layouts/wacom-dtk-2451.svg
diff --git a/data/layouts/dtu-1031.svg b/data/layouts/wacom-dtu-1031.svg
similarity index 100%
rename from data/layouts/dtu-1031.svg
rename to data/layouts/wacom-dtu-1031.svg
diff --git a/data/layouts/dtu-1141.svg b/data/layouts/wacom-dtu-1141.svg
similarity index 100%
rename from data/layouts/dtu-1141.svg
rename to data/layouts/wacom-dtu-1141.svg
diff --git a/data/layouts/dtu-1141b.svg b/data/layouts/wacom-dtu-1141b.svg
similarity index 100%
rename from data/layouts/dtu-1141b.svg
rename to data/layouts/wacom-dtu-1141b.svg
diff --git a/data/layouts/graphire-wireless-8x6.svg b/data/layouts/wacom-graphire-wireless-8x6.svg
similarity index 100%
rename from data/layouts/graphire-wireless-8x6.svg
rename to data/layouts/wacom-graphire-wireless-8x6.svg
diff --git a/data/layouts/graphire4-4x5.svg b/data/layouts/wacom-graphire4-4x5.svg
similarity index 100%
rename from data/layouts/graphire4-4x5.svg
rename to data/layouts/wacom-graphire4-4x5.svg
diff --git a/data/layouts/graphire4-6x8.svg b/data/layouts/wacom-graphire4-6x8.svg
similarity index 100%
rename from data/layouts/graphire4-6x8.svg
rename to data/layouts/wacom-graphire4-6x8.svg
diff --git a/data/layouts/intuos-m-p.svg b/data/layouts/wacom-intuos-m-p.svg
similarity index 100%
rename from data/layouts/intuos-m-p.svg
rename to data/layouts/wacom-intuos-m-p.svg
diff --git a/data/layouts/intuos-m-p2.svg b/data/layouts/wacom-intuos-m-p2.svg
similarity index 100%
rename from data/layouts/intuos-m-p2.svg
rename to data/layouts/wacom-intuos-m-p2.svg
diff --git a/data/layouts/intuos-m-p3.svg b/data/layouts/wacom-intuos-m-p3.svg
similarity index 100%
rename from data/layouts/intuos-m-p3.svg
rename to data/layouts/wacom-intuos-m-p3.svg
diff --git a/data/layouts/intuos-m-pt.svg b/data/layouts/wacom-intuos-m-pt.svg
similarity index 100%
rename from data/layouts/intuos-m-pt.svg
rename to data/layouts/wacom-intuos-m-pt.svg
diff --git a/data/layouts/intuos-m-pt2.svg b/data/layouts/wacom-intuos-m-pt2.svg
similarity index 100%
rename from data/layouts/intuos-m-pt2.svg
rename to data/layouts/wacom-intuos-m-pt2.svg
diff --git a/data/layouts/intuos-pro-2-l.svg b/data/layouts/wacom-intuos-pro-2-l.svg
similarity index 100%
rename from data/layouts/intuos-pro-2-l.svg
rename to data/layouts/wacom-intuos-pro-2-l.svg
diff --git a/data/layouts/intuos-pro-2-m.svg b/data/layouts/wacom-intuos-pro-2-m.svg
similarity index 100%
rename from data/layouts/intuos-pro-2-m.svg
rename to data/layouts/wacom-intuos-pro-2-m.svg
diff --git a/data/layouts/intuos-pro-2-s.svg b/data/layouts/wacom-intuos-pro-2-s.svg
similarity index 100%
rename from data/layouts/intuos-pro-2-s.svg
rename to data/layouts/wacom-intuos-pro-2-s.svg
diff --git a/data/layouts/intuos-pro-l.svg b/data/layouts/wacom-intuos-pro-l.svg
similarity index 100%
rename from data/layouts/intuos-pro-l.svg
rename to data/layouts/wacom-intuos-pro-l.svg
diff --git a/data/layouts/intuos-pro-m.svg b/data/layouts/wacom-intuos-pro-m.svg
similarity index 100%
rename from data/layouts/intuos-pro-m.svg
rename to data/layouts/wacom-intuos-pro-m.svg
diff --git a/data/layouts/intuos-pro-s.svg b/data/layouts/wacom-intuos-pro-s.svg
similarity index 100%
rename from data/layouts/intuos-pro-s.svg
rename to data/layouts/wacom-intuos-pro-s.svg
diff --git a/data/layouts/intuos-s-p.svg b/data/layouts/wacom-intuos-s-p.svg
similarity index 100%
rename from data/layouts/intuos-s-p.svg
rename to data/layouts/wacom-intuos-s-p.svg
diff --git a/data/layouts/intuos-s-p2.svg b/data/layouts/wacom-intuos-s-p2.svg
similarity index 100%
rename from data/layouts/intuos-s-p2.svg
rename to data/layouts/wacom-intuos-s-p2.svg
diff --git a/data/layouts/intuos-s-p3.svg b/data/layouts/wacom-intuos-s-p3.svg
similarity index 100%
rename from data/layouts/intuos-s-p3.svg
rename to data/layouts/wacom-intuos-s-p3.svg
diff --git a/data/layouts/intuos-s-pt.svg b/data/layouts/wacom-intuos-s-pt.svg
similarity index 100%
rename from data/layouts/intuos-s-pt.svg
rename to data/layouts/wacom-intuos-s-pt.svg
diff --git a/data/layouts/intuos-s-pt2.svg b/data/layouts/wacom-intuos-s-pt2.svg
similarity index 100%
rename from data/layouts/intuos-s-pt2.svg
rename to data/layouts/wacom-intuos-s-pt2.svg
diff --git a/data/layouts/intuos3-12x12.svg b/data/layouts/wacom-intuos3-12x12.svg
similarity index 100%
rename from data/layouts/intuos3-12x12.svg
rename to data/layouts/wacom-intuos3-12x12.svg
diff --git a/data/layouts/intuos3-12x19.svg b/data/layouts/wacom-intuos3-12x19.svg
similarity index 100%
rename from data/layouts/intuos3-12x19.svg
rename to data/layouts/wacom-intuos3-12x19.svg
diff --git a/data/layouts/intuos3-4x5.svg b/data/layouts/wacom-intuos3-4x5.svg
similarity index 100%
rename from data/layouts/intuos3-4x5.svg
rename to data/layouts/wacom-intuos3-4x5.svg
diff --git a/data/layouts/intuos3-4x6.svg b/data/layouts/wacom-intuos3-4x6.svg
similarity index 100%
rename from data/layouts/intuos3-4x6.svg
rename to data/layouts/wacom-intuos3-4x6.svg
diff --git a/data/layouts/intuos3-6x11.svg b/data/layouts/wacom-intuos3-6x11.svg
similarity index 100%
rename from data/layouts/intuos3-6x11.svg
rename to data/layouts/wacom-intuos3-6x11.svg
diff --git a/data/layouts/intuos3-6x8.svg b/data/layouts/wacom-intuos3-6x8.svg
similarity index 100%
rename from data/layouts/intuos3-6x8.svg
rename to data/layouts/wacom-intuos3-6x8.svg
diff --git a/data/layouts/intuos3-9x12.svg b/data/layouts/wacom-intuos3-9x12.svg
similarity index 100%
rename from data/layouts/intuos3-9x12.svg
rename to data/layouts/wacom-intuos3-9x12.svg
diff --git a/data/layouts/intuos4-12x19.svg b/data/layouts/wacom-intuos4-12x19.svg
similarity index 100%
rename from data/layouts/intuos4-12x19.svg
rename to data/layouts/wacom-intuos4-12x19.svg
diff --git a/data/layouts/intuos4-4x6.svg b/data/layouts/wacom-intuos4-4x6.svg
similarity index 100%
rename from data/layouts/intuos4-4x6.svg
rename to data/layouts/wacom-intuos4-4x6.svg
diff --git a/data/layouts/intuos4-6x9-wl.svg b/data/layouts/wacom-intuos4-6x9-wl.svg
similarity index 100%
rename from data/layouts/intuos4-6x9-wl.svg
rename to data/layouts/wacom-intuos4-6x9-wl.svg
diff --git a/data/layouts/intuos4-6x9.svg b/data/layouts/wacom-intuos4-6x9.svg
similarity index 100%
rename from data/layouts/intuos4-6x9.svg
rename to data/layouts/wacom-intuos4-6x9.svg
diff --git a/data/layouts/intuos4-8x13.svg b/data/layouts/wacom-intuos4-8x13.svg
similarity index 100%
rename from data/layouts/intuos4-8x13.svg
rename to data/layouts/wacom-intuos4-8x13.svg
diff --git a/data/layouts/intuos5-l.svg b/data/layouts/wacom-intuos5-l.svg
similarity index 100%
rename from data/layouts/intuos5-l.svg
rename to data/layouts/wacom-intuos5-l.svg
diff --git a/data/layouts/intuos5-m.svg b/data/layouts/wacom-intuos5-m.svg
similarity index 100%
rename from data/layouts/intuos5-m.svg
rename to data/layouts/wacom-intuos5-m.svg
diff --git a/data/layouts/intuos5-s.svg b/data/layouts/wacom-intuos5-s.svg
similarity index 100%
rename from data/layouts/intuos5-s.svg
rename to data/layouts/wacom-intuos5-s.svg
diff --git a/data/layouts/mobilestudio-pro-13.svg b/data/layouts/wacom-mobilestudio-pro-13.svg
similarity index 100%
rename from data/layouts/mobilestudio-pro-13.svg
rename to data/layouts/wacom-mobilestudio-pro-13.svg
diff --git a/data/layouts/mobilestudio-pro-16.svg b/data/layouts/wacom-mobilestudio-pro-16.svg
similarity index 100%
rename from data/layouts/mobilestudio-pro-16.svg
rename to data/layouts/wacom-mobilestudio-pro-16.svg
diff --git a/data/layouts/movink.svg b/data/layouts/wacom-movink.svg
similarity index 100%
rename from data/layouts/movink.svg
rename to data/layouts/wacom-movink.svg
diff --git a/data/bamboo-0fg-m-p-alt.tablet b/data/wacom-bamboo-0fg-m-p-alt.tablet
similarity index 96%
rename from data/bamboo-0fg-m-p-alt.tablet
rename to data/wacom-bamboo-0fg-m-p-alt.tablet
index 9247b519..4ff7d874 100644
--- a/data/bamboo-0fg-m-p-alt.tablet
+++ b/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 b/data/wacom-bamboo-0fg-s-p-alt.tablet
similarity index 96%
rename from data/bamboo-0fg-s-p-alt.tablet
rename to data/wacom-bamboo-0fg-s-p-alt.tablet
index 6bb5c22c..d7b0bf6c 100644
--- a/data/bamboo-0fg-s-p-alt.tablet
+++ b/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 b/data/wacom-bamboo-0fg-s-p.tablet
similarity index 97%
rename from data/bamboo-0fg-s-p.tablet
rename to data/wacom-bamboo-0fg-s-p.tablet
index 8f777c43..885335cd 100644
--- a/data/bamboo-0fg-s-p.tablet
+++ b/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 b/data/wacom-bamboo-16fg-m-pt.tablet
similarity index 92%
rename from data/bamboo-16fg-m-pt.tablet
rename to data/wacom-bamboo-16fg-m-pt.tablet
index 518730fb..524dbdb0 100644
--- a/data/bamboo-16fg-m-pt.tablet
+++ b/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 b/data/wacom-bamboo-16fg-s-p.tablet
similarity index 100%
rename from data/bamboo-16fg-s-p.tablet
rename to data/wacom-bamboo-16fg-s-p.tablet
diff --git a/data/bamboo-16fg-s-pt.tablet b/data/wacom-bamboo-16fg-s-pt.tablet
similarity index 92%
rename from data/bamboo-16fg-s-pt.tablet
rename to data/wacom-bamboo-16fg-s-pt.tablet
index 25dc1e51..404929e7 100644
--- a/data/bamboo-16fg-s-pt.tablet
+++ b/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 b/data/wacom-bamboo-16fg-s-t.tablet
similarity index 91%
rename from data/bamboo-16fg-s-t.tablet
rename to data/wacom-bamboo-16fg-s-t.tablet
index 07868c36..6bff8661 100644
--- a/data/bamboo-16fg-s-t.tablet
+++ b/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 b/data/wacom-bamboo-2fg-fun-m-pt.tablet
similarity index 95%
rename from data/bamboo-2fg-fun-m-pt.tablet
rename to data/wacom-bamboo-2fg-fun-m-pt.tablet
index be98f37d..1384086a 100644
--- a/data/bamboo-2fg-fun-m-pt.tablet
+++ b/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 b/data/wacom-bamboo-2fg-fun-s-pt.tablet
similarity index 95%
rename from data/bamboo-2fg-fun-s-pt.tablet
rename to data/wacom-bamboo-2fg-fun-s-pt.tablet
index eb47bfc6..066dbe6a 100644
--- a/data/bamboo-2fg-fun-s-pt.tablet
+++ b/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 b/data/wacom-bamboo-2fg-m-p.tablet
similarity index 100%
rename from data/bamboo-2fg-m-p.tablet
rename to data/wacom-bamboo-2fg-m-p.tablet
diff --git a/data/bamboo-2fg-s-p.tablet b/data/wacom-bamboo-2fg-s-p.tablet
similarity index 100%
rename from data/bamboo-2fg-s-p.tablet
rename to data/wacom-bamboo-2fg-s-p.tablet
diff --git a/data/bamboo-2fg-s-pt.tablet b/data/wacom-bamboo-2fg-s-pt.tablet
similarity index 95%
rename from data/bamboo-2fg-s-pt.tablet
rename to data/wacom-bamboo-2fg-s-pt.tablet
index a262eb31..81b08def 100644
--- a/data/bamboo-2fg-s-pt.tablet
+++ b/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 b/data/wacom-bamboo-2fg-s-t.tablet
similarity index 95%
rename from data/bamboo-2fg-s-t.tablet
rename to data/wacom-bamboo-2fg-s-t.tablet
index 134bb1ee..d308ba54 100644
--- a/data/bamboo-2fg-s-t.tablet
+++ b/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 b/data/wacom-bamboo-4fg-fun-m.tablet
similarity index 93%
rename from data/bamboo-4fg-fun-m.tablet
rename to data/wacom-bamboo-4fg-fun-m.tablet
index 50284212..4749416d 100644
--- a/data/bamboo-4fg-fun-m.tablet
+++ b/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 b/data/wacom-bamboo-4fg-fun-s.tablet
similarity index 92%
rename from data/bamboo-4fg-fun-s.tablet
rename to data/wacom-bamboo-4fg-fun-s.tablet
index 9d89db7d..bda0d4f3 100644
--- a/data/bamboo-4fg-fun-s.tablet
+++ b/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 b/data/wacom-bamboo-4fg-s-pt.tablet
similarity index 93%
rename from data/bamboo-4fg-s-pt.tablet
rename to data/wacom-bamboo-4fg-s-pt.tablet
index 5638652f..0bbee714 100644
--- a/data/bamboo-4fg-s-pt.tablet
+++ b/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 b/data/wacom-bamboo-4fg-s-t.tablet
similarity index 92%
rename from data/bamboo-4fg-s-t.tablet
rename to data/wacom-bamboo-4fg-s-t.tablet
index d6413f45..a018594c 100644
--- a/data/bamboo-4fg-s-t.tablet
+++ b/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 b/data/wacom-bamboo-4fg-se-m-pt.tablet
similarity index 93%
rename from data/bamboo-4fg-se-m-pt.tablet
rename to data/wacom-bamboo-4fg-se-m-pt.tablet
index 39f38b09..b4d7c5cf 100644
--- a/data/bamboo-4fg-se-m-pt.tablet
+++ b/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 b/data/wacom-bamboo-4fg-se-s-pt.tablet
similarity index 93%
rename from data/bamboo-4fg-se-s-pt.tablet
rename to data/wacom-bamboo-4fg-se-s-pt.tablet
index 5bfcc4e1..efea7f7c 100644
--- a/data/bamboo-4fg-se-s-pt.tablet
+++ b/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 b/data/wacom-bamboo-one-m-p.tablet
similarity index 100%
rename from data/bamboo-one-m-p.tablet
rename to data/wacom-bamboo-one-m-p.tablet
diff --git a/data/bamboo-one.tablet b/data/wacom-bamboo-one.tablet
similarity index 100%
rename from data/bamboo-one.tablet
rename to data/wacom-bamboo-one.tablet
diff --git a/data/bamboo-pad-wireless.tablet b/data/wacom-bamboo-pad-wireless.tablet
similarity index 91%
rename from data/bamboo-pad-wireless.tablet
rename to data/wacom-bamboo-pad-wireless.tablet
index 9aa4529b..cc9ab852 100644
--- a/data/bamboo-pad-wireless.tablet
+++ b/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 b/data/wacom-bamboo-pad.tablet
similarity index 91%
rename from data/bamboo-pad.tablet
rename to data/wacom-bamboo-pad.tablet
index fbc8dce6..faf346d5 100644
--- a/data/bamboo-pad.tablet
+++ b/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 b/data/wacom-cintiq-12wx.tablet
similarity index 97%
rename from data/cintiq-12wx.tablet
rename to data/wacom-cintiq-12wx.tablet
index cd2f8d93..21ce9bf6 100644
--- a/data/cintiq-12wx.tablet
+++ b/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 b/data/wacom-cintiq-13hd.tablet
similarity index 96%
rename from data/cintiq-13hd.tablet
rename to data/wacom-cintiq-13hd.tablet
index ae9bab4f..1057d2fb 100644
--- a/data/cintiq-13hd.tablet
+++ b/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 b/data/wacom-cintiq-13hdt.tablet
similarity index 97%
rename from data/cintiq-13hdt.tablet
rename to data/wacom-cintiq-13hdt.tablet
index 619eb9e4..cf89e769 100644
--- a/data/cintiq-13hdt.tablet
+++ b/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 b/data/wacom-cintiq-16-2.tablet
similarity index 100%
rename from data/cintiq-16-2.tablet
rename to data/wacom-cintiq-16-2.tablet
diff --git a/data/cintiq-16.tablet b/data/wacom-cintiq-16.tablet
similarity index 100%
rename from data/cintiq-16.tablet
rename to data/wacom-cintiq-16.tablet
diff --git a/data/cintiq-20wsx.tablet b/data/wacom-cintiq-20wsx.tablet
similarity index 97%
rename from data/cintiq-20wsx.tablet
rename to data/wacom-cintiq-20wsx.tablet
index d884b484..3ab3559a 100644
--- a/data/cintiq-20wsx.tablet
+++ b/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 b/data/wacom-cintiq-21ux.tablet
similarity index 96%
rename from data/cintiq-21ux.tablet
rename to data/wacom-cintiq-21ux.tablet
index 0721ea66..df8fa14a 100644
--- a/data/cintiq-21ux.tablet
+++ b/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 b/data/wacom-cintiq-21ux2.tablet
similarity index 97%
rename from data/cintiq-21ux2.tablet
rename to data/wacom-cintiq-21ux2.tablet
index 2a4e9eea..780f50ee 100644
--- a/data/cintiq-21ux2.tablet
+++ b/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 b/data/wacom-cintiq-22.tablet
similarity index 100%
rename from data/cintiq-22.tablet
rename to data/wacom-cintiq-22.tablet
diff --git a/data/cintiq-22hd.tablet b/data/wacom-cintiq-22hd.tablet
similarity index 97%
rename from data/cintiq-22hd.tablet
rename to data/wacom-cintiq-22hd.tablet
index 8c71721d..a6774d81 100644
--- a/data/cintiq-22hd.tablet
+++ b/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 b/data/wacom-cintiq-22hdt.tablet
similarity index 97%
rename from data/cintiq-22hdt.tablet
rename to data/wacom-cintiq-22hdt.tablet
index 22bb6d67..7ddb5777 100644
--- a/data/cintiq-22hdt.tablet
+++ b/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 b/data/wacom-cintiq-24hd-touch.tablet
similarity index 97%
rename from data/cintiq-24hd-touch.tablet
rename to data/wacom-cintiq-24hd-touch.tablet
index a8b13a1a..8f44ea2d 100644
--- a/data/cintiq-24hd-touch.tablet
+++ b/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 b/data/wacom-cintiq-24hd.tablet
similarity index 97%
rename from data/cintiq-24hd.tablet
rename to data/wacom-cintiq-24hd.tablet
index 9ce8244a..e1b4dbb3 100644
--- a/data/cintiq-24hd.tablet
+++ b/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 b/data/wacom-cintiq-27hd.tablet
similarity index 100%
rename from data/cintiq-27hd.tablet
rename to data/wacom-cintiq-27hd.tablet
diff --git a/data/cintiq-27hdt.tablet b/data/wacom-cintiq-27hdt.tablet
similarity index 100%
rename from data/cintiq-27hdt.tablet
rename to data/wacom-cintiq-27hdt.tablet
diff --git a/data/cintiq-companion-2.tablet b/data/wacom-cintiq-companion-2.tablet
similarity index 96%
rename from data/cintiq-companion-2.tablet
rename to data/wacom-cintiq-companion-2.tablet
index 312d7746..e44ceb60 100644
--- a/data/cintiq-companion-2.tablet
+++ b/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 b/data/wacom-cintiq-companion-hybrid.tablet
similarity index 95%
rename from data/cintiq-companion-hybrid.tablet
rename to data/wacom-cintiq-companion-hybrid.tablet
index 6249f79b..74bb8275 100644
--- a/data/cintiq-companion-hybrid.tablet
+++ b/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 b/data/wacom-cintiq-companion.tablet
similarity index 96%
rename from data/cintiq-companion.tablet
rename to data/wacom-cintiq-companion.tablet
index 7b8f1bdc..4ffc5a19 100644
--- a/data/cintiq-companion.tablet
+++ b/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 b/data/wacom-cintiq-pro-13.tablet
similarity index 100%
rename from data/cintiq-pro-13.tablet
rename to data/wacom-cintiq-pro-13.tablet
diff --git a/data/cintiq-pro-16-2.tablet b/data/wacom-cintiq-pro-16-2.tablet
similarity index 96%
rename from data/cintiq-pro-16-2.tablet
rename to data/wacom-cintiq-pro-16-2.tablet
index b10c3651..15fcf7d3 100644
--- a/data/cintiq-pro-16-2.tablet
+++ b/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 b/data/wacom-cintiq-pro-16.tablet
similarity index 100%
rename from data/cintiq-pro-16.tablet
rename to data/wacom-cintiq-pro-16.tablet
diff --git a/data/cintiq-pro-17.tablet b/data/wacom-cintiq-pro-17.tablet
similarity index 97%
rename from data/cintiq-pro-17.tablet
rename to data/wacom-cintiq-pro-17.tablet
index df4c7171..e33a709a 100644
--- a/data/cintiq-pro-17.tablet
+++ b/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 b/data/wacom-cintiq-pro-22.tablet
similarity index 97%
rename from data/cintiq-pro-22.tablet
rename to data/wacom-cintiq-pro-22.tablet
index f9b73ada..ce3b5cf7 100644
--- a/data/cintiq-pro-22.tablet
+++ b/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 b/data/wacom-cintiq-pro-24-p.tablet
similarity index 100%
rename from data/cintiq-pro-24-p.tablet
rename to data/wacom-cintiq-pro-24-p.tablet
diff --git a/data/cintiq-pro-24-pt.tablet b/data/wacom-cintiq-pro-24-pt.tablet
similarity index 100%
rename from data/cintiq-pro-24-pt.tablet
rename to data/wacom-cintiq-pro-24-pt.tablet
diff --git a/data/cintiq-pro-27.tablet b/data/wacom-cintiq-pro-27.tablet
similarity index 97%
rename from data/cintiq-pro-27.tablet
rename to data/wacom-cintiq-pro-27.tablet
index bed09ad0..5066c006 100644
--- a/data/cintiq-pro-27.tablet
+++ b/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 b/data/wacom-cintiq-pro-32.tablet
similarity index 100%
rename from data/cintiq-pro-32.tablet
rename to data/wacom-cintiq-pro-32.tablet
diff --git a/data/dtc-121.tablet b/data/wacom-dtc-121.tablet
similarity index 100%
rename from data/dtc-121.tablet
rename to data/wacom-dtc-121.tablet
diff --git a/data/dtf-720.tablet b/data/wacom-dtf-720.tablet
similarity index 100%
rename from data/dtf-720.tablet
rename to data/wacom-dtf-720.tablet
diff --git a/data/dth-1152.tablet b/data/wacom-dth-1152.tablet
similarity index 100%
rename from data/dth-1152.tablet
rename to data/wacom-dth-1152.tablet
diff --git a/data/dth-134.tablet b/data/wacom-dth-134.tablet
similarity index 100%
rename from data/dth-134.tablet
rename to data/wacom-dth-134.tablet
diff --git a/data/dth-2242.tablet b/data/wacom-dth-2242.tablet
similarity index 96%
rename from data/dth-2242.tablet
rename to data/wacom-dth-2242.tablet
index b0347706..3d1ff244 100644
--- a/data/dth-2242.tablet
+++ b/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 b/data/wacom-dth-2452.tablet
similarity index 95%
rename from data/dth-2452.tablet
rename to data/wacom-dth-2452.tablet
index c76cdcc8..8ddb27d3 100644
--- a/data/dth-2452.tablet
+++ b/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 b/data/wacom-dti-520.tablet
similarity index 96%
rename from data/dti-520.tablet
rename to data/wacom-dti-520.tablet
index 921de627..92e44daa 100644
--- a/data/dti-520.tablet
+++ b/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 b/data/wacom-dtk-1651.tablet
similarity index 95%
rename from data/dtk-1651.tablet
rename to data/wacom-dtk-1651.tablet
index 6b18e37e..180d9a3e 100644
--- a/data/dtk-1651.tablet
+++ b/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 b/data/wacom-dtk-1660e-2.tablet
similarity index 100%
rename from data/dtk-1660e-2.tablet
rename to data/wacom-dtk-1660e-2.tablet
diff --git a/data/dtk-1660e.tablet b/data/wacom-dtk-1660e.tablet
similarity index 100%
rename from data/dtk-1660e.tablet
rename to data/wacom-dtk-1660e.tablet
diff --git a/data/dtk-2241.tablet b/data/wacom-dtk-2241.tablet
similarity index 96%
rename from data/dtk-2241.tablet
rename to data/wacom-dtk-2241.tablet
index 0838c053..1ff45470 100644
--- a/data/dtk-2241.tablet
+++ b/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 b/data/wacom-dtk-2451.tablet
similarity index 95%
rename from data/dtk-2451.tablet
rename to data/wacom-dtk-2451.tablet
index a207d767..72633f88 100644
--- a/data/dtk-2451.tablet
+++ b/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 b/data/wacom-dtu-1031.tablet
similarity index 95%
rename from data/dtu-1031.tablet
rename to data/wacom-dtu-1031.tablet
index 6867a42d..e8070617 100644
--- a/data/dtu-1031.tablet
+++ b/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 b/data/wacom-dtu-1031x.tablet
similarity index 100%
rename from data/dtu-1031x.tablet
rename to data/wacom-dtu-1031x.tablet
diff --git a/data/dtu-1141.tablet b/data/wacom-dtu-1141.tablet
similarity index 95%
rename from data/dtu-1141.tablet
rename to data/wacom-dtu-1141.tablet
index 4ca19ae0..30cd4b5a 100644
--- a/data/dtu-1141.tablet
+++ b/data/wacom-dtu-1141.tablet
@@ -20,7 +20,7 @@ DeviceMatch=usb|056a|0336
 Class=PenDisplay
 Width=9
 Height=5
-Layout=dtu-1141.svg
+Layout=wacom-dtu-1141.svg
 IntegratedIn=Display
 
 [Features]
diff --git a/data/dtu-1141b.tablet b/data/wacom-dtu-1141b.tablet
similarity index 95%
rename from data/dtu-1141b.tablet
rename to data/wacom-dtu-1141b.tablet
index 123e76fc..5e1c7e74 100644
--- a/data/dtu-1141b.tablet
+++ b/data/wacom-dtu-1141b.tablet
@@ -20,7 +20,7 @@ DeviceMatch=usb|056a|0359
 Class=PenDisplay
 Width=9
 Height=5
-Layout=dtu-1141b.svg
+Layout=wacom-dtu-1141b.svg
 IntegratedIn=Display
 
 [Features]
diff --git a/data/dtu-1631.tablet b/data/wacom-dtu-1631.tablet
similarity index 100%
rename from data/dtu-1631.tablet
rename to data/wacom-dtu-1631.tablet
diff --git a/data/dtu-1931.tablet b/data/wacom-dtu-1931.tablet
similarity index 100%
rename from data/dtu-1931.tablet
rename to data/wacom-dtu-1931.tablet
diff --git a/data/dtu-2231.tablet b/data/wacom-dtu-2231.tablet
similarity index 100%
rename from data/dtu-2231.tablet
rename to data/wacom-dtu-2231.tablet
diff --git a/data/graphire-usb.tablet b/data/wacom-graphire-usb.tablet
similarity index 100%
rename from data/graphire-usb.tablet
rename to data/wacom-graphire-usb.tablet
diff --git a/data/graphire-wireless-8x6.tablet b/data/wacom-graphire-wireless-8x6.tablet
similarity index 92%
rename from data/graphire-wireless-8x6.tablet
rename to data/wacom-graphire-wireless-8x6.tablet
index 68f5e666..46233625 100644
--- a/data/graphire-wireless-8x6.tablet
+++ b/data/wacom-graphire-wireless-8x6.tablet
@@ -21,7 +21,7 @@ DeviceMatch=bluetooth|056a|0081
 Class=Graphire
 Width=8
 Height=6
-Layout=graphire-wireless-8x6.svg
+Layout=wacom-graphire-wireless-8x6.svg
 IntegratedIn=
 
 [Features]
diff --git a/data/graphire2-4x5.tablet b/data/wacom-graphire2-4x5.tablet
similarity index 100%
rename from data/graphire2-4x5.tablet
rename to data/wacom-graphire2-4x5.tablet
diff --git a/data/graphire2-5x7.tablet b/data/wacom-graphire2-5x7.tablet
similarity index 100%
rename from data/graphire2-5x7.tablet
rename to data/wacom-graphire2-5x7.tablet
diff --git a/data/graphire3-4x5.tablet b/data/wacom-graphire3-4x5.tablet
similarity index 100%
rename from data/graphire3-4x5.tablet
rename to data/wacom-graphire3-4x5.tablet
diff --git a/data/graphire3-6x8.tablet b/data/wacom-graphire3-6x8.tablet
similarity index 100%
rename from data/graphire3-6x8.tablet
rename to data/wacom-graphire3-6x8.tablet
diff --git a/data/graphire4-4x5.tablet b/data/wacom-graphire4-4x5.tablet
similarity index 94%
rename from data/graphire4-4x5.tablet
rename to data/wacom-graphire4-4x5.tablet
index cef2f8b7..a8b16ad7 100644
--- a/data/graphire4-4x5.tablet
+++ b/data/wacom-graphire4-4x5.tablet
@@ -23,7 +23,7 @@ DeviceMatch=usb|056a|0015
 Class=Graphire
 Width=5
 Height=4
-Layout=graphire4-4x5.svg
+Layout=wacom-graphire4-4x5.svg
 
 [Features]
 Stylus=true
diff --git a/data/graphire4-6x8.tablet b/data/wacom-graphire4-6x8.tablet
similarity index 94%
rename from data/graphire4-6x8.tablet
rename to data/wacom-graphire4-6x8.tablet
index a351c89b..4abce096 100644
--- a/data/graphire4-6x8.tablet
+++ b/data/wacom-graphire4-6x8.tablet
@@ -23,7 +23,7 @@ DeviceMatch=usb|056a|0016
 Class=Graphire
 Width=8
 Height=6
-Layout=graphire4-6x8.svg
+Layout=wacom-graphire4-6x8.svg
 
 [Features]
 Stylus=true
diff --git a/data/intuos-12x12.tablet b/data/wacom-intuos-12x12.tablet
similarity index 100%
rename from data/intuos-12x12.tablet
rename to data/wacom-intuos-12x12.tablet
diff --git a/data/intuos-12x18.tablet b/data/wacom-intuos-12x18.tablet
similarity index 100%
rename from data/intuos-12x18.tablet
rename to data/wacom-intuos-12x18.tablet
diff --git a/data/intuos-4x5.tablet b/data/wacom-intuos-4x5.tablet
similarity index 100%
rename from data/intuos-4x5.tablet
rename to data/wacom-intuos-4x5.tablet
diff --git a/data/intuos-6x8.tablet b/data/wacom-intuos-6x8.tablet
similarity index 100%
rename from data/intuos-6x8.tablet
rename to data/wacom-intuos-6x8.tablet
diff --git a/data/intuos-9x12.tablet b/data/wacom-intuos-9x12.tablet
similarity index 100%
rename from data/intuos-9x12.tablet
rename to data/wacom-intuos-9x12.tablet
diff --git a/data/intuos-m-p.tablet b/data/wacom-intuos-m-p.tablet
similarity index 95%
rename from data/intuos-m-p.tablet
rename to data/wacom-intuos-m-p.tablet
index f7ec4cba..f1ac4f47 100644
--- a/data/intuos-m-p.tablet
+++ b/data/wacom-intuos-m-p.tablet
@@ -27,7 +27,7 @@ DeviceMatch=usb|056a|0323
 Class=Bamboo
 Width=9
 Height=5
-Layout=intuos-m-p.svg
+Layout=wacom-intuos-m-p.svg
 IntegratedIn=
 
 [Features]
diff --git a/data/intuos-m-p2.tablet b/data/wacom-intuos-m-p2.tablet
similarity index 96%
rename from data/intuos-m-p2.tablet
rename to data/wacom-intuos-m-p2.tablet
index 2c31403d..c0d780e9 100644
--- a/data/intuos-m-p2.tablet
+++ b/data/wacom-intuos-m-p2.tablet
@@ -28,7 +28,7 @@ DeviceMatch=usb|056a|033d
 Class=Bamboo
 Width=9
 Height=5
-Layout=intuos-m-p2.svg
+Layout=wacom-intuos-m-p2.svg
 IntegratedIn=
 Styli=@intuospt;
 
diff --git a/data/intuos-m-p3-android.tablet b/data/wacom-intuos-m-p3-android.tablet
similarity index 97%
rename from data/intuos-m-p3-android.tablet
rename to data/wacom-intuos-m-p3-android.tablet
index 61b62b54..34195db6 100644
--- a/data/intuos-m-p3-android.tablet
+++ b/data/wacom-intuos-m-p3-android.tablet
@@ -29,7 +29,7 @@ DeviceMatch=usb|2d1f|0375
 Class=Bamboo
 Width=3
 Height=5
-Layout=intuos-m-p3.svg
+Layout=wacom-intuos-m-p3.svg
 IntegratedIn=
 Styli=@intuospt3;
 
diff --git a/data/intuos-m-p3-wl-android.tablet b/data/wacom-intuos-m-p3-wl-android.tablet
similarity index 97%
rename from data/intuos-m-p3-wl-android.tablet
rename to data/wacom-intuos-m-p3-wl-android.tablet
index e27cedfe..8f7f96fb 100644
--- a/data/intuos-m-p3-wl-android.tablet
+++ b/data/wacom-intuos-m-p3-wl-android.tablet
@@ -29,7 +29,7 @@ DeviceMatch=usb|2d1f|0378;usb|2d1f|03c7
 Class=Bamboo
 Width=3
 Height=5
-Layout=intuos-m-p3.svg
+Layout=wacom-intuos-m-p3.svg
 IntegratedIn=
 Styli=@intuospt3;
 
diff --git a/data/intuos-m-p3-wl.tablet b/data/wacom-intuos-m-p3-wl.tablet
similarity index 96%
rename from data/intuos-m-p3-wl.tablet
rename to data/wacom-intuos-m-p3-wl.tablet
index b0a6d549..97a6bca0 100644
--- a/data/intuos-m-p3-wl.tablet
+++ b/data/wacom-intuos-m-p3-wl.tablet
@@ -24,7 +24,7 @@ DeviceMatch=usb|056a|0378;bluetooth|056a|0379;usb|056a|03c7;bluetooth|056a|03c8
 Class=Bamboo
 Width=9
 Height=5
-Layout=intuos-m-p3.svg
+Layout=wacom-intuos-m-p3.svg
 IntegratedIn=
 Styli=@intuospt3;
 
diff --git a/data/intuos-m-p3.tablet b/data/wacom-intuos-m-p3.tablet
similarity index 96%
rename from data/intuos-m-p3.tablet
rename to data/wacom-intuos-m-p3.tablet
index e0bd6f0d..3a8ff923 100644
--- a/data/intuos-m-p3.tablet
+++ b/data/wacom-intuos-m-p3.tablet
@@ -24,7 +24,7 @@ DeviceMatch=usb|056a|0375
 Class=Bamboo
 Width=9
 Height=5
-Layout=intuos-m-p3.svg
+Layout=wacom-intuos-m-p3.svg
 IntegratedIn=
 Styli=@intuospt3;
 
diff --git a/data/intuos-m-pt.tablet b/data/wacom-intuos-m-pt.tablet
similarity index 97%
rename from data/intuos-m-pt.tablet
rename to data/wacom-intuos-m-pt.tablet
index 39ab9f2a..cfad143b 100644
--- a/data/intuos-m-pt.tablet
+++ b/data/wacom-intuos-m-pt.tablet
@@ -40,7 +40,7 @@ DeviceMatch=usb|056a|0303
 Class=Bamboo
 Width=9
 Height=5
-Layout=intuos-m-pt.svg
+Layout=wacom-intuos-m-pt.svg
 IntegratedIn=
 
 [Features]
diff --git a/data/intuos-m-pt2.tablet b/data/wacom-intuos-m-pt2.tablet
similarity index 97%
rename from data/intuos-m-pt2.tablet
rename to data/wacom-intuos-m-pt2.tablet
index b3263512..39bc6301 100644
--- a/data/intuos-m-pt2.tablet
+++ b/data/wacom-intuos-m-pt2.tablet
@@ -41,7 +41,7 @@ DeviceMatch=usb|056a|033e
 Class=Bamboo
 Width=9
 Height=5
-Layout=intuos-m-pt2.svg
+Layout=wacom-intuos-m-pt2.svg
 IntegratedIn=
 Styli=@intuospt;
 
diff --git a/data/intuos-pro-2-l.tablet b/data/wacom-intuos-pro-2-l.tablet
similarity index 97%
rename from data/intuos-pro-2-l.tablet
rename to data/wacom-intuos-pro-2-l.tablet
index 396b3952..2d5be7a1 100644
--- a/data/intuos-pro-2-l.tablet
+++ b/data/wacom-intuos-pro-2-l.tablet
@@ -49,7 +49,7 @@ DeviceMatch=usb|056a|0358;bluetooth|056a|0361;
 Class=Intuos5
 Width=12
 Height=8
-Layout=intuos-pro-2-l.svg
+Layout=wacom-intuos-pro-2-l.svg
 IntegratedIn=
 Styli=@intuos4;@intuos5;@mobilestudio;@propengen2;
 
diff --git a/data/intuos-pro-2-m.tablet b/data/wacom-intuos-pro-2-m.tablet
similarity index 97%
rename from data/intuos-pro-2-m.tablet
rename to data/wacom-intuos-pro-2-m.tablet
index 2423b7ad..ddfd569b 100644
--- a/data/intuos-pro-2-m.tablet
+++ b/data/wacom-intuos-pro-2-m.tablet
@@ -49,7 +49,7 @@ DeviceMatch=usb|056a|0357;bluetooth|056a|0360;
 Class=Intuos5
 Width=9
 Height=6
-Layout=intuos-pro-2-m.svg
+Layout=wacom-intuos-pro-2-m.svg
 IntegratedIn=
 Styli=@intuos4;@intuos5;@mobilestudio;@propengen2;
 
diff --git a/data/intuos-pro-2-s.tablet b/data/wacom-intuos-pro-2-s.tablet
similarity index 97%
rename from data/intuos-pro-2-s.tablet
rename to data/wacom-intuos-pro-2-s.tablet
index 3163d5b4..0a29fcb4 100644
--- a/data/intuos-pro-2-s.tablet
+++ b/data/wacom-intuos-pro-2-s.tablet
@@ -36,7 +36,7 @@ DeviceMatch=usb|056a|0392;bluetooth|056a|0393;usb|056a|03dc;bluetooth|056a|03dd;
 Class=Intuos5
 Width=6
 Height=4
-Layout=intuos-pro-2-s.svg
+Layout=wacom-intuos-pro-2-s.svg
 IntegratedIn=
 Styli=@intuos4;@intuos5;@mobilestudio;@propengen2;
 
diff --git a/data/intuos-pro-l.tablet b/data/wacom-intuos-pro-l.tablet
similarity index 97%
rename from data/intuos-pro-l.tablet
rename to data/wacom-intuos-pro-l.tablet
index 7e236721..be5f1695 100644
--- a/data/intuos-pro-l.tablet
+++ b/data/wacom-intuos-pro-l.tablet
@@ -49,7 +49,7 @@ DeviceMatch=usb|056a|0317
 Class=Intuos5
 Width=13
 Height=8
-Layout=intuos-pro-l.svg
+Layout=wacom-intuos-pro-l.svg
 IntegratedIn=
 Styli=@intuos4-lens;@intuos4-puck;@intuos5;@intuos4;@propengen2;
 
diff --git a/data/intuos-pro-m.tablet b/data/wacom-intuos-pro-m.tablet
similarity index 97%
rename from data/intuos-pro-m.tablet
rename to data/wacom-intuos-pro-m.tablet
index 03f9bf1e..21e598a3 100644
--- a/data/intuos-pro-m.tablet
+++ b/data/wacom-intuos-pro-m.tablet
@@ -49,7 +49,7 @@ DeviceMatch=usb|056a|0315
 Class=Intuos5
 Width=9
 Height=6
-Layout=intuos-pro-m.svg
+Layout=wacom-intuos-pro-m.svg
 IntegratedIn=
 Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2;
 
diff --git a/data/intuos-pro-s.tablet b/data/wacom-intuos-pro-s.tablet
similarity index 97%
rename from data/intuos-pro-s.tablet
rename to data/wacom-intuos-pro-s.tablet
index 0adc10b1..a939174f 100644
--- a/data/intuos-pro-s.tablet
+++ b/data/wacom-intuos-pro-s.tablet
@@ -47,7 +47,7 @@ DeviceMatch=usb|056a|0314
 Class=Intuos5
 Width=6
 Height=4
-Layout=intuos-pro-s.svg
+Layout=wacom-intuos-pro-s.svg
 IntegratedIn=
 Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2;
 
diff --git a/data/intuos-s-p.tablet b/data/wacom-intuos-s-p.tablet
similarity index 95%
rename from data/intuos-s-p.tablet
rename to data/wacom-intuos-s-p.tablet
index 252aea4c..7105f6b7 100644
--- a/data/intuos-s-p.tablet
+++ b/data/wacom-intuos-s-p.tablet
@@ -25,7 +25,7 @@ DeviceMatch=usb|056a|030e
 Class=Bamboo
 Width=6
 Height=4
-Layout=intuos-s-p.svg
+Layout=wacom-intuos-s-p.svg
 IntegratedIn=
 
 [Features]
diff --git a/data/intuos-s-p2.tablet b/data/wacom-intuos-s-p2.tablet
similarity index 95%
rename from data/intuos-s-p2.tablet
rename to data/wacom-intuos-s-p2.tablet
index 48a09880..b8ba0a80 100644
--- a/data/intuos-s-p2.tablet
+++ b/data/wacom-intuos-s-p2.tablet
@@ -26,7 +26,7 @@ DeviceMatch=usb|056a|033b
 Class=Bamboo
 Width=6
 Height=4
-Layout=intuos-s-p2.svg
+Layout=wacom-intuos-s-p2.svg
 IntegratedIn=
 Styli=@intuospt;
 
diff --git a/data/intuos-s-p3-android.tablet b/data/wacom-intuos-s-p3-android.tablet
similarity index 97%
rename from data/intuos-s-p3-android.tablet
rename to data/wacom-intuos-s-p3-android.tablet
index fb052af2..cac11855 100644
--- a/data/intuos-s-p3-android.tablet
+++ b/data/wacom-intuos-s-p3-android.tablet
@@ -29,7 +29,7 @@ DeviceMatch=usb|2d1f|0374
 Class=Bamboo
 Width=2
 Height=4
-Layout=intuos-s-p3.svg
+Layout=wacom-intuos-s-p3.svg
 IntegratedIn=
 Styli=@intuospt3;
 
diff --git a/data/intuos-s-p3-wl-android.tablet b/data/wacom-intuos-s-p3-wl-android.tablet
similarity index 97%
rename from data/intuos-s-p3-wl-android.tablet
rename to data/wacom-intuos-s-p3-wl-android.tablet
index 08146ed7..9de06c41 100644
--- a/data/intuos-s-p3-wl-android.tablet
+++ b/data/wacom-intuos-s-p3-wl-android.tablet
@@ -29,7 +29,7 @@ DeviceMatch=usb|2d1f|0376;usb|2d1f|03c5
 Class=Bamboo
 Width=2
 Height=4
-Layout=intuos-s-p3.svg
+Layout=wacom-intuos-s-p3.svg
 IntegratedIn=
 Styli=@intuospt3;
 
diff --git a/data/intuos-s-p3-wl.tablet b/data/wacom-intuos-s-p3-wl.tablet
similarity index 96%
rename from data/intuos-s-p3-wl.tablet
rename to data/wacom-intuos-s-p3-wl.tablet
index 89fcab02..aee5b10c 100644
--- a/data/intuos-s-p3-wl.tablet
+++ b/data/wacom-intuos-s-p3-wl.tablet
@@ -24,7 +24,7 @@ DeviceMatch=usb|056a|0376;bluetooth|056a|0377;usb|056a|03c5;bluetooth|056a|03c6
 Class=Bamboo
 Width=6
 Height=4
-Layout=intuos-s-p3.svg
+Layout=wacom-intuos-s-p3.svg
 IntegratedIn=
 Styli=@intuospt3;
 
diff --git a/data/intuos-s-p3.tablet b/data/wacom-intuos-s-p3.tablet
similarity index 96%
rename from data/intuos-s-p3.tablet
rename to data/wacom-intuos-s-p3.tablet
index 29780672..48e9721c 100644
--- a/data/intuos-s-p3.tablet
+++ b/data/wacom-intuos-s-p3.tablet
@@ -24,7 +24,7 @@ DeviceMatch=usb|056a|0374
 Class=Bamboo
 Width=6
 Height=4
-Layout=intuos-s-p3.svg
+Layout=wacom-intuos-s-p3.svg
 IntegratedIn=
 Styli=@intuospt3;
 
diff --git a/data/intuos-s-pt.tablet b/data/wacom-intuos-s-pt.tablet
similarity index 97%
rename from data/intuos-s-pt.tablet
rename to data/wacom-intuos-s-pt.tablet
index 8634df9c..7353f063 100644
--- a/data/intuos-s-pt.tablet
+++ b/data/wacom-intuos-s-pt.tablet
@@ -40,7 +40,7 @@ DeviceMatch=usb|056a|0302
 Class=Bamboo
 Width=6
 Height=4
-Layout=intuos-s-pt.svg
+Layout=wacom-intuos-s-pt.svg
 IntegratedIn=
 
 [Features]
diff --git a/data/intuos-s-pt2.tablet b/data/wacom-intuos-s-pt2.tablet
similarity index 97%
rename from data/intuos-s-pt2.tablet
rename to data/wacom-intuos-s-pt2.tablet
index e8c0651a..f3632c9f 100644
--- a/data/intuos-s-pt2.tablet
+++ b/data/wacom-intuos-s-pt2.tablet
@@ -40,7 +40,7 @@ DeviceMatch=usb|056a|033c
 Class=Bamboo
 Width=6
 Height=4
-Layout=intuos-s-pt2.svg
+Layout=wacom-intuos-s-pt2.svg
 IntegratedIn=
 Styli=@intuospt;
 
diff --git a/data/intuos2-12x12.tablet b/data/wacom-intuos2-12x12.tablet
similarity index 100%
rename from data/intuos2-12x12.tablet
rename to data/wacom-intuos2-12x12.tablet
diff --git a/data/intuos2-12x18.tablet b/data/wacom-intuos2-12x18.tablet
similarity index 100%
rename from data/intuos2-12x18.tablet
rename to data/wacom-intuos2-12x18.tablet
diff --git a/data/intuos2-4x5.tablet b/data/wacom-intuos2-4x5.tablet
similarity index 100%
rename from data/intuos2-4x5.tablet
rename to data/wacom-intuos2-4x5.tablet
diff --git a/data/intuos2-6x8.tablet b/data/wacom-intuos2-6x8.tablet
similarity index 100%
rename from data/intuos2-6x8.tablet
rename to data/wacom-intuos2-6x8.tablet
diff --git a/data/intuos2-9x12.tablet b/data/wacom-intuos2-9x12.tablet
similarity index 100%
rename from data/intuos2-9x12.tablet
rename to data/wacom-intuos2-9x12.tablet
diff --git a/data/intuos3-12x12.tablet b/data/wacom-intuos3-12x12.tablet
similarity index 96%
rename from data/intuos3-12x12.tablet
rename to data/wacom-intuos3-12x12.tablet
index e61c74d4..1b56e9c4 100644
--- a/data/intuos3-12x12.tablet
+++ b/data/wacom-intuos3-12x12.tablet
@@ -36,7 +36,7 @@ DeviceMatch=usb|056a|00b3
 Class=Intuos3
 Width=12
 Height=12
-Layout=intuos3-12x12.svg
+Layout=wacom-intuos3-12x12.svg
 Styli=@intuos3-pucks;@intuos3;
 
 [Features]
diff --git a/data/intuos3-12x19.tablet b/data/wacom-intuos3-12x19.tablet
similarity index 96%
rename from data/intuos3-12x19.tablet
rename to data/wacom-intuos3-12x19.tablet
index dc8a8444..8c113b37 100644
--- a/data/intuos3-12x19.tablet
+++ b/data/wacom-intuos3-12x19.tablet
@@ -36,7 +36,7 @@ DeviceMatch=usb|056a|00b4
 Class=Intuos3
 Width=19
 Height=12
-Layout=intuos3-12x19.svg
+Layout=wacom-intuos3-12x19.svg
 Styli=@intuos3-pucks;@intuos3;
 
 [Features]
diff --git a/data/intuos3-4x5.tablet b/data/wacom-intuos3-4x5.tablet
similarity index 97%
rename from data/intuos3-4x5.tablet
rename to data/wacom-intuos3-4x5.tablet
index f9057455..fae0e74e 100644
--- a/data/intuos3-4x5.tablet
+++ b/data/wacom-intuos3-4x5.tablet
@@ -36,7 +36,7 @@ DeviceMatch=usb|056a|00b0
 Class=Intuos3
 Width=5
 Height=4
-Layout=intuos3-4x5.svg
+Layout=wacom-intuos3-4x5.svg
 Styli=@intuos3-pucks;@intuos3;
 
 [Features]
diff --git a/data/intuos3-4x6.tablet b/data/wacom-intuos3-4x6.tablet
similarity index 97%
rename from data/intuos3-4x6.tablet
rename to data/wacom-intuos3-4x6.tablet
index f65727ec..cb34d633 100644
--- a/data/intuos3-4x6.tablet
+++ b/data/wacom-intuos3-4x6.tablet
@@ -35,7 +35,7 @@ DeviceMatch=usb|056a|00b7
 Class=Intuos3
 Width=6
 Height=4
-Layout=intuos3-4x6.svg
+Layout=wacom-intuos3-4x6.svg
 Styli=@intuos3-pucks;@intuos3;
 
 [Features]
diff --git a/data/intuos3-6x11.tablet b/data/wacom-intuos3-6x11.tablet
similarity index 97%
rename from data/intuos3-6x11.tablet
rename to data/wacom-intuos3-6x11.tablet
index 16cf0a00..57142524 100644
--- a/data/intuos3-6x11.tablet
+++ b/data/wacom-intuos3-6x11.tablet
@@ -35,7 +35,7 @@ DeviceMatch=usb|056a|00b5
 Class=Intuos3
 Width=11
 Height=6
-Layout=intuos3-6x11.svg
+Layout=wacom-intuos3-6x11.svg
 Styli=@intuos3-pucks;@intuos3;
 
 [Features]
diff --git a/data/intuos3-6x8.tablet b/data/wacom-intuos3-6x8.tablet
similarity index 97%
rename from data/intuos3-6x8.tablet
rename to data/wacom-intuos3-6x8.tablet
index 5b3b8e03..8ca91425 100644
--- a/data/intuos3-6x8.tablet
+++ b/data/wacom-intuos3-6x8.tablet
@@ -35,7 +35,7 @@ DeviceMatch=usb|056a|00b1
 Class=Intuos3
 Width=8
 Height=6
-Layout=intuos3-6x8.svg
+Layout=wacom-intuos3-6x8.svg
 Styli=@intuos3-pucks;@intuos3;
 
 [Features]
diff --git a/data/intuos3-9x12.tablet b/data/wacom-intuos3-9x12.tablet
similarity index 97%
rename from data/intuos3-9x12.tablet
rename to data/wacom-intuos3-9x12.tablet
index d2b4466b..1a0519e4 100644
--- a/data/intuos3-9x12.tablet
+++ b/data/wacom-intuos3-9x12.tablet
@@ -35,7 +35,7 @@ DeviceMatch=usb|056a|00b2
 Class=Intuos3
 Width=12
 Height=9
-Layout=intuos3-9x12.svg
+Layout=wacom-intuos3-9x12.svg
 Styli=@intuos3-pucks;@intuos3;
 
 [Features]
diff --git a/data/intuos4-12x19.tablet b/data/wacom-intuos4-12x19.tablet
similarity index 97%
rename from data/intuos4-12x19.tablet
rename to data/wacom-intuos4-12x19.tablet
index 87aef010..38602634 100644
--- a/data/intuos4-12x19.tablet
+++ b/data/wacom-intuos4-12x19.tablet
@@ -39,7 +39,7 @@ DeviceMatch=usb|056a|00bb
 Class=Intuos4
 Width=19
 Height=12
-Layout=intuos4-12x19.svg
+Layout=wacom-intuos4-12x19.svg
 IntegratedIn=
 Styli=@intuos4-lens;@intuos4-puck;@intuos5;@intuos4;@propengen2;
 
diff --git a/data/intuos4-4x6.tablet b/data/wacom-intuos4-4x6.tablet
similarity index 97%
rename from data/intuos4-4x6.tablet
rename to data/wacom-intuos4-4x6.tablet
index 732191c0..eef01db0 100644
--- a/data/intuos4-4x6.tablet
+++ b/data/wacom-intuos4-4x6.tablet
@@ -40,7 +40,7 @@ DeviceMatch=usb|056a|00b8
 Class=Intuos4
 Width=6
 Height=4
-Layout=intuos4-4x6.svg
+Layout=wacom-intuos4-4x6.svg
 IntegratedIn=
 Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2;
 
diff --git a/data/intuos4-6x9-wl.tablet b/data/wacom-intuos4-6x9-wl.tablet
similarity index 97%
rename from data/intuos4-6x9-wl.tablet
rename to data/wacom-intuos4-6x9-wl.tablet
index 54b0aba2..46309cea 100644
--- a/data/intuos4-6x9-wl.tablet
+++ b/data/wacom-intuos4-6x9-wl.tablet
@@ -40,7 +40,7 @@ Class=Intuos4
 Width=8
 Height=5
 IntegratedIn=
-Layout=intuos4-6x9-wl.svg
+Layout=wacom-intuos4-6x9-wl.svg
 Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2;
 
 [Features]
diff --git a/data/intuos4-6x9.tablet b/data/wacom-intuos4-6x9.tablet
similarity index 97%
rename from data/intuos4-6x9.tablet
rename to data/wacom-intuos4-6x9.tablet
index 587cc954..f35cbea1 100644
--- a/data/intuos4-6x9.tablet
+++ b/data/wacom-intuos4-6x9.tablet
@@ -39,7 +39,7 @@ DeviceMatch=usb|056a|00b9
 Class=Intuos4
 Width=9
 Height=6
-Layout=intuos4-6x9.svg
+Layout=wacom-intuos4-6x9.svg
 IntegratedIn=
 Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2;
 
diff --git a/data/intuos4-8x13.tablet b/data/wacom-intuos4-8x13.tablet
similarity index 97%
rename from data/intuos4-8x13.tablet
rename to data/wacom-intuos4-8x13.tablet
index 37501703..3bfddc9d 100644
--- a/data/intuos4-8x13.tablet
+++ b/data/wacom-intuos4-8x13.tablet
@@ -39,7 +39,7 @@ DeviceMatch=usb|056a|00ba
 Class=Intuos4
 Width=13
 Height=8
-Layout=intuos4-8x13.svg
+Layout=wacom-intuos4-8x13.svg
 IntegratedIn=
 Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2;
 
diff --git a/data/intuos5-m.tablet b/data/wacom-intuos5-m.tablet
similarity index 98%
rename from data/intuos5-m.tablet
rename to data/wacom-intuos5-m.tablet
index 4833fc7e..1e113859 100644
--- a/data/intuos5-m.tablet
+++ b/data/wacom-intuos5-m.tablet
@@ -49,7 +49,7 @@ DeviceMatch=usb|056a|002a
 Class=Intuos5
 Width=9
 Height=6
-Layout=intuos5-m.svg
+Layout=wacom-intuos5-m.svg
 IntegratedIn=
 Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2;
 
diff --git a/data/intuos5-s.tablet b/data/wacom-intuos5-s.tablet
similarity index 97%
rename from data/intuos5-s.tablet
rename to data/wacom-intuos5-s.tablet
index 56b42519..b05ba049 100644
--- a/data/intuos5-s.tablet
+++ b/data/wacom-intuos5-s.tablet
@@ -47,7 +47,7 @@ DeviceMatch=usb|056a|0029
 Class=Intuos5
 Width=6
 Height=4
-Layout=intuos5-s.svg
+Layout=wacom-intuos5-s.svg
 IntegratedIn=
 Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2;
 
diff --git a/data/intuos5-touch-l.tablet b/data/wacom-intuos5-touch-l.tablet
similarity index 98%
rename from data/intuos5-touch-l.tablet
rename to data/wacom-intuos5-touch-l.tablet
index 768e9530..99008455 100644
--- a/data/intuos5-touch-l.tablet
+++ b/data/wacom-intuos5-touch-l.tablet
@@ -49,7 +49,7 @@ DeviceMatch=usb|056a|0028
 Class=Intuos5
 Width=13
 Height=8
-Layout=intuos5-l.svg
+Layout=wacom-intuos5-l.svg
 IntegratedIn=
 Styli=@intuos4-lens;@intuos4-puck;@intuos5;@intuos4;@propengen2;
 
diff --git a/data/intuos5-touch-m.tablet b/data/wacom-intuos5-touch-m.tablet
similarity index 98%
rename from data/intuos5-touch-m.tablet
rename to data/wacom-intuos5-touch-m.tablet
index 2f6f831d..84a7ca57 100644
--- a/data/intuos5-touch-m.tablet
+++ b/data/wacom-intuos5-touch-m.tablet
@@ -49,7 +49,7 @@ DeviceMatch=usb|056a|0027
 Class=Intuos5
 Width=9
 Height=6
-Layout=intuos5-m.svg
+Layout=wacom-intuos5-m.svg
 IntegratedIn=
 Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2;
 
diff --git a/data/intuos5-touch-s.tablet b/data/wacom-intuos5-touch-s.tablet
similarity index 97%
rename from data/intuos5-touch-s.tablet
rename to data/wacom-intuos5-touch-s.tablet
index 7ba3a6cf..287eec9d 100644
--- a/data/intuos5-touch-s.tablet
+++ b/data/wacom-intuos5-touch-s.tablet
@@ -47,7 +47,7 @@ DeviceMatch=usb|056a|0026
 Class=Intuos5
 Width=6
 Height=4
-Layout=intuos5-s.svg
+Layout=wacom-intuos5-s.svg
 IntegratedIn=
 Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2;
 
diff --git a/data/isdv4-016c.tablet b/data/wacom-isdv4-016c.tablet
similarity index 100%
rename from data/isdv4-016c.tablet
rename to data/wacom-isdv4-016c.tablet
diff --git a/data/isdv4-100.tablet b/data/wacom-isdv4-100.tablet
similarity index 100%
rename from data/isdv4-100.tablet
rename to data/wacom-isdv4-100.tablet
diff --git a/data/isdv4-101.tablet b/data/wacom-isdv4-101.tablet
similarity index 100%
rename from data/isdv4-101.tablet
rename to data/wacom-isdv4-101.tablet
diff --git a/data/isdv4-104.tablet b/data/wacom-isdv4-104.tablet
similarity index 100%
rename from data/isdv4-104.tablet
rename to data/wacom-isdv4-104.tablet
diff --git a/data/isdv4-10d.tablet b/data/wacom-isdv4-10d.tablet
similarity index 100%
rename from data/isdv4-10d.tablet
rename to data/wacom-isdv4-10d.tablet
diff --git a/data/isdv4-10e.tablet b/data/wacom-isdv4-10e.tablet
similarity index 100%
rename from data/isdv4-10e.tablet
rename to data/wacom-isdv4-10e.tablet
diff --git a/data/isdv4-10f.tablet b/data/wacom-isdv4-10f.tablet
similarity index 100%
rename from data/isdv4-10f.tablet
rename to data/wacom-isdv4-10f.tablet
diff --git a/data/isdv4-114.tablet b/data/wacom-isdv4-114.tablet
similarity index 100%
rename from data/isdv4-114.tablet
rename to data/wacom-isdv4-114.tablet
diff --git a/data/isdv4-116.tablet b/data/wacom-isdv4-116.tablet
similarity index 100%
rename from data/isdv4-116.tablet
rename to data/wacom-isdv4-116.tablet
diff --git a/data/isdv4-117.tablet b/data/wacom-isdv4-117.tablet
similarity index 100%
rename from data/isdv4-117.tablet
rename to data/wacom-isdv4-117.tablet
diff --git a/data/isdv4-121a.tablet b/data/wacom-isdv4-121a.tablet
similarity index 100%
rename from data/isdv4-121a.tablet
rename to data/wacom-isdv4-121a.tablet
diff --git a/data/isdv4-124.tablet b/data/wacom-isdv4-124.tablet
similarity index 100%
rename from data/isdv4-124.tablet
rename to data/wacom-isdv4-124.tablet
diff --git a/data/isdv4-12c.tablet b/data/wacom-isdv4-12c.tablet
similarity index 100%
rename from data/isdv4-12c.tablet
rename to data/wacom-isdv4-12c.tablet
diff --git a/data/isdv4-149.tablet b/data/wacom-isdv4-149.tablet
similarity index 100%
rename from data/isdv4-149.tablet
rename to data/wacom-isdv4-149.tablet
diff --git a/data/isdv4-2d1f-001e.tablet b/data/wacom-isdv4-2d1f-001e.tablet
similarity index 100%
rename from data/isdv4-2d1f-001e.tablet
rename to data/wacom-isdv4-2d1f-001e.tablet
diff --git a/data/isdv4-2d1f-002c.tablet b/data/wacom-isdv4-2d1f-002c.tablet
similarity index 100%
rename from data/isdv4-2d1f-002c.tablet
rename to data/wacom-isdv4-2d1f-002c.tablet
diff --git a/data/isdv4-2d1f-002e.tablet b/data/wacom-isdv4-2d1f-002e.tablet
similarity index 100%
rename from data/isdv4-2d1f-002e.tablet
rename to data/wacom-isdv4-2d1f-002e.tablet
diff --git a/data/isdv4-2d1f-0040.tablet b/data/wacom-isdv4-2d1f-0040.tablet
similarity index 100%
rename from data/isdv4-2d1f-0040.tablet
rename to data/wacom-isdv4-2d1f-0040.tablet
diff --git a/data/isdv4-2d1f-0066.tablet b/data/wacom-isdv4-2d1f-0066.tablet
similarity index 100%
rename from data/isdv4-2d1f-0066.tablet
rename to data/wacom-isdv4-2d1f-0066.tablet
diff --git a/data/isdv4-2d1f-0095.tablet b/data/wacom-isdv4-2d1f-0095.tablet
similarity index 100%
rename from data/isdv4-2d1f-0095.tablet
rename to data/wacom-isdv4-2d1f-0095.tablet
diff --git a/data/isdv4-2d1f-0114.tablet b/data/wacom-isdv4-2d1f-0114.tablet
similarity index 100%
rename from data/isdv4-2d1f-0114.tablet
rename to data/wacom-isdv4-2d1f-0114.tablet
diff --git a/data/isdv4-2d1f-0136.tablet b/data/wacom-isdv4-2d1f-0136.tablet
similarity index 100%
rename from data/isdv4-2d1f-0136.tablet
rename to data/wacom-isdv4-2d1f-0136.tablet
diff --git a/data/isdv4-2d1f-0163.tablet b/data/wacom-isdv4-2d1f-0163.tablet
similarity index 100%
rename from data/isdv4-2d1f-0163.tablet
rename to data/wacom-isdv4-2d1f-0163.tablet
diff --git a/data/isdv4-2d1f-524c.tablet b/data/wacom-isdv4-2d1f-524c.tablet
similarity index 100%
rename from data/isdv4-2d1f-524c.tablet
rename to data/wacom-isdv4-2d1f-524c.tablet
diff --git a/data/isdv4-4004.tablet b/data/wacom-isdv4-4004.tablet
similarity index 100%
rename from data/isdv4-4004.tablet
rename to data/wacom-isdv4-4004.tablet
diff --git a/data/isdv4-4800.tablet b/data/wacom-isdv4-4800.tablet
similarity index 100%
rename from data/isdv4-4800.tablet
rename to data/wacom-isdv4-4800.tablet
diff --git a/data/isdv4-4804.tablet b/data/wacom-isdv4-4804.tablet
similarity index 100%
rename from data/isdv4-4804.tablet
rename to data/wacom-isdv4-4804.tablet
diff --git a/data/isdv4-4806.tablet b/data/wacom-isdv4-4806.tablet
similarity index 100%
rename from data/isdv4-4806.tablet
rename to data/wacom-isdv4-4806.tablet
diff --git a/data/isdv4-4807.tablet b/data/wacom-isdv4-4807.tablet
similarity index 100%
rename from data/isdv4-4807.tablet
rename to data/wacom-isdv4-4807.tablet
diff --git a/data/isdv4-4809.tablet b/data/wacom-isdv4-4809.tablet
similarity index 100%
rename from data/isdv4-4809.tablet
rename to data/wacom-isdv4-4809.tablet
diff --git a/data/isdv4-4814.tablet b/data/wacom-isdv4-4814.tablet
similarity index 100%
rename from data/isdv4-4814.tablet
rename to data/wacom-isdv4-4814.tablet
diff --git a/data/isdv4-481a.tablet b/data/wacom-isdv4-481a.tablet
similarity index 100%
rename from data/isdv4-481a.tablet
rename to data/wacom-isdv4-481a.tablet
diff --git a/data/isdv4-4822.tablet b/data/wacom-isdv4-4822.tablet
similarity index 100%
rename from data/isdv4-4822.tablet
rename to data/wacom-isdv4-4822.tablet
diff --git a/data/isdv4-4824.tablet b/data/wacom-isdv4-4824.tablet
similarity index 100%
rename from data/isdv4-4824.tablet
rename to data/wacom-isdv4-4824.tablet
diff --git a/data/isdv4-4831.tablet b/data/wacom-isdv4-4831.tablet
similarity index 100%
rename from data/isdv4-4831.tablet
rename to data/wacom-isdv4-4831.tablet
diff --git a/data/isdv4-4834.tablet b/data/wacom-isdv4-4834.tablet
similarity index 100%
rename from data/isdv4-4834.tablet
rename to data/wacom-isdv4-4834.tablet
diff --git a/data/isdv4-4838.tablet b/data/wacom-isdv4-4838.tablet
similarity index 100%
rename from data/isdv4-4838.tablet
rename to data/wacom-isdv4-4838.tablet
diff --git a/data/isdv4-4841.tablet b/data/wacom-isdv4-4841.tablet
similarity index 100%
rename from data/isdv4-4841.tablet
rename to data/wacom-isdv4-4841.tablet
diff --git a/data/isdv4-484c.tablet b/data/wacom-isdv4-484c.tablet
similarity index 100%
rename from data/isdv4-484c.tablet
rename to data/wacom-isdv4-484c.tablet
diff --git a/data/isdv4-484d.tablet b/data/wacom-isdv4-484d.tablet
similarity index 100%
rename from data/isdv4-484d.tablet
rename to data/wacom-isdv4-484d.tablet
diff --git a/data/isdv4-484e.tablet b/data/wacom-isdv4-484e.tablet
similarity index 100%
rename from data/isdv4-484e.tablet
rename to data/wacom-isdv4-484e.tablet
diff --git a/data/isdv4-4851.tablet b/data/wacom-isdv4-4851.tablet
similarity index 100%
rename from data/isdv4-4851.tablet
rename to data/wacom-isdv4-4851.tablet
diff --git a/data/isdv4-485e.tablet b/data/wacom-isdv4-485e.tablet
similarity index 100%
rename from data/isdv4-485e.tablet
rename to data/wacom-isdv4-485e.tablet
diff --git a/data/isdv4-4865.tablet b/data/wacom-isdv4-4865.tablet
similarity index 100%
rename from data/isdv4-4865.tablet
rename to data/wacom-isdv4-4865.tablet
diff --git a/data/isdv4-486a.tablet b/data/wacom-isdv4-486a.tablet
similarity index 100%
rename from data/isdv4-486a.tablet
rename to data/wacom-isdv4-486a.tablet
diff --git a/data/isdv4-4870.tablet b/data/wacom-isdv4-4870.tablet
similarity index 100%
rename from data/isdv4-4870.tablet
rename to data/wacom-isdv4-4870.tablet
diff --git a/data/isdv4-4875.tablet b/data/wacom-isdv4-4875.tablet
similarity index 100%
rename from data/isdv4-4875.tablet
rename to data/wacom-isdv4-4875.tablet
diff --git a/data/isdv4-488f.tablet b/data/wacom-isdv4-488f.tablet
similarity index 100%
rename from data/isdv4-488f.tablet
rename to data/wacom-isdv4-488f.tablet
diff --git a/data/isdv4-4898.tablet b/data/wacom-isdv4-4898.tablet
similarity index 100%
rename from data/isdv4-4898.tablet
rename to data/wacom-isdv4-4898.tablet
diff --git a/data/isdv4-48b7.tablet b/data/wacom-isdv4-48b7.tablet
similarity index 100%
rename from data/isdv4-48b7.tablet
rename to data/wacom-isdv4-48b7.tablet
diff --git a/data/isdv4-48c9.tablet b/data/wacom-isdv4-48c9.tablet
similarity index 100%
rename from data/isdv4-48c9.tablet
rename to data/wacom-isdv4-48c9.tablet
diff --git a/data/isdv4-48ca.tablet b/data/wacom-isdv4-48ca.tablet
similarity index 100%
rename from data/isdv4-48ca.tablet
rename to data/wacom-isdv4-48ca.tablet
diff --git a/data/isdv4-48ce.tablet b/data/wacom-isdv4-48ce.tablet
similarity index 100%
rename from data/isdv4-48ce.tablet
rename to data/wacom-isdv4-48ce.tablet
diff --git a/data/isdv4-48d6.tablet b/data/wacom-isdv4-48d6.tablet
similarity index 100%
rename from data/isdv4-48d6.tablet
rename to data/wacom-isdv4-48d6.tablet
diff --git a/data/isdv4-48eb.tablet b/data/wacom-isdv4-48eb.tablet
similarity index 100%
rename from data/isdv4-48eb.tablet
rename to data/wacom-isdv4-48eb.tablet
diff --git a/data/isdv4-48ec.tablet b/data/wacom-isdv4-48ec.tablet
similarity index 100%
rename from data/isdv4-48ec.tablet
rename to data/wacom-isdv4-48ec.tablet
diff --git a/data/isdv4-48ed.tablet b/data/wacom-isdv4-48ed.tablet
similarity index 100%
rename from data/isdv4-48ed.tablet
rename to data/wacom-isdv4-48ed.tablet
diff --git a/data/isdv4-48ee.tablet b/data/wacom-isdv4-48ee.tablet
similarity index 100%
rename from data/isdv4-48ee.tablet
rename to data/wacom-isdv4-48ee.tablet
diff --git a/data/isdv4-48f6.tablet b/data/wacom-isdv4-48f6.tablet
similarity index 100%
rename from data/isdv4-48f6.tablet
rename to data/wacom-isdv4-48f6.tablet
diff --git a/data/isdv4-490a.tablet b/data/wacom-isdv4-490a.tablet
similarity index 100%
rename from data/isdv4-490a.tablet
rename to data/wacom-isdv4-490a.tablet
diff --git a/data/isdv4-490b.tablet b/data/wacom-isdv4-490b.tablet
similarity index 100%
rename from data/isdv4-490b.tablet
rename to data/wacom-isdv4-490b.tablet
diff --git a/data/isdv4-4957.tablet b/data/wacom-isdv4-4957.tablet
similarity index 100%
rename from data/isdv4-4957.tablet
rename to data/wacom-isdv4-4957.tablet
diff --git a/data/isdv4-495f.tablet b/data/wacom-isdv4-495f.tablet
similarity index 100%
rename from data/isdv4-495f.tablet
rename to data/wacom-isdv4-495f.tablet
diff --git a/data/isdv4-496c.tablet b/data/wacom-isdv4-496c.tablet
similarity index 100%
rename from data/isdv4-496c.tablet
rename to data/wacom-isdv4-496c.tablet
diff --git a/data/isdv4-4988.tablet b/data/wacom-isdv4-4988.tablet
similarity index 100%
rename from data/isdv4-4988.tablet
rename to data/wacom-isdv4-4988.tablet
diff --git a/data/isdv4-4995.tablet b/data/wacom-isdv4-4995.tablet
similarity index 100%
rename from data/isdv4-4995.tablet
rename to data/wacom-isdv4-4995.tablet
diff --git a/data/isdv4-49a3.tablet b/data/wacom-isdv4-49a3.tablet
similarity index 100%
rename from data/isdv4-49a3.tablet
rename to data/wacom-isdv4-49a3.tablet
diff --git a/data/isdv4-49c8.tablet b/data/wacom-isdv4-49c8.tablet
similarity index 100%
rename from data/isdv4-49c8.tablet
rename to data/wacom-isdv4-49c8.tablet
diff --git a/data/isdv4-5000.tablet b/data/wacom-isdv4-5000.tablet
similarity index 100%
rename from data/isdv4-5000.tablet
rename to data/wacom-isdv4-5000.tablet
diff --git a/data/isdv4-5002.tablet b/data/wacom-isdv4-5002.tablet
similarity index 100%
rename from data/isdv4-5002.tablet
rename to data/wacom-isdv4-5002.tablet
diff --git a/data/isdv4-5010.tablet b/data/wacom-isdv4-5010.tablet
similarity index 100%
rename from data/isdv4-5010.tablet
rename to data/wacom-isdv4-5010.tablet
diff --git a/data/isdv4-5013.tablet b/data/wacom-isdv4-5013.tablet
similarity index 100%
rename from data/isdv4-5013.tablet
rename to data/wacom-isdv4-5013.tablet
diff --git a/data/isdv4-5014.tablet b/data/wacom-isdv4-5014.tablet
similarity index 100%
rename from data/isdv4-5014.tablet
rename to data/wacom-isdv4-5014.tablet
diff --git a/data/isdv4-5019.tablet b/data/wacom-isdv4-5019.tablet
similarity index 100%
rename from data/isdv4-5019.tablet
rename to data/wacom-isdv4-5019.tablet
diff --git a/data/isdv4-502a.tablet b/data/wacom-isdv4-502a.tablet
similarity index 100%
rename from data/isdv4-502a.tablet
rename to data/wacom-isdv4-502a.tablet
diff --git a/data/isdv4-503e.tablet b/data/wacom-isdv4-503e.tablet
similarity index 100%
rename from data/isdv4-503e.tablet
rename to data/wacom-isdv4-503e.tablet
diff --git a/data/isdv4-503f.tablet b/data/wacom-isdv4-503f.tablet
similarity index 100%
rename from data/isdv4-503f.tablet
rename to data/wacom-isdv4-503f.tablet
diff --git a/data/isdv4-5040.tablet b/data/wacom-isdv4-5040.tablet
similarity index 100%
rename from data/isdv4-5040.tablet
rename to data/wacom-isdv4-5040.tablet
diff --git a/data/isdv4-5044.tablet b/data/wacom-isdv4-5044.tablet
similarity index 100%
rename from data/isdv4-5044.tablet
rename to data/wacom-isdv4-5044.tablet
diff --git a/data/isdv4-5048.tablet b/data/wacom-isdv4-5048.tablet
similarity index 100%
rename from data/isdv4-5048.tablet
rename to data/wacom-isdv4-5048.tablet
diff --git a/data/isdv4-504a.tablet b/data/wacom-isdv4-504a.tablet
similarity index 100%
rename from data/isdv4-504a.tablet
rename to data/wacom-isdv4-504a.tablet
diff --git a/data/isdv4-504c.tablet b/data/wacom-isdv4-504c.tablet
similarity index 100%
rename from data/isdv4-504c.tablet
rename to data/wacom-isdv4-504c.tablet
diff --git a/data/isdv4-5072.tablet b/data/wacom-isdv4-5072.tablet
similarity index 100%
rename from data/isdv4-5072.tablet
rename to data/wacom-isdv4-5072.tablet
diff --git a/data/isdv4-5090.tablet b/data/wacom-isdv4-5090.tablet
similarity index 100%
rename from data/isdv4-5090.tablet
rename to data/wacom-isdv4-5090.tablet
diff --git a/data/isdv4-5093.tablet b/data/wacom-isdv4-5093.tablet
similarity index 100%
rename from data/isdv4-5093.tablet
rename to data/wacom-isdv4-5093.tablet
diff --git a/data/isdv4-5099.tablet b/data/wacom-isdv4-5099.tablet
similarity index 100%
rename from data/isdv4-5099.tablet
rename to data/wacom-isdv4-5099.tablet
diff --git a/data/isdv4-509d.tablet b/data/wacom-isdv4-509d.tablet
similarity index 100%
rename from data/isdv4-509d.tablet
rename to data/wacom-isdv4-509d.tablet
diff --git a/data/isdv4-509f.tablet b/data/wacom-isdv4-509f.tablet
similarity index 100%
rename from data/isdv4-509f.tablet
rename to data/wacom-isdv4-509f.tablet
diff --git a/data/isdv4-50a0.tablet b/data/wacom-isdv4-50a0.tablet
similarity index 100%
rename from data/isdv4-50a0.tablet
rename to data/wacom-isdv4-50a0.tablet
diff --git a/data/isdv4-50a9.tablet b/data/wacom-isdv4-50a9.tablet
similarity index 100%
rename from data/isdv4-50a9.tablet
rename to data/wacom-isdv4-50a9.tablet
diff --git a/data/isdv4-50b4.tablet b/data/wacom-isdv4-50b4.tablet
similarity index 100%
rename from data/isdv4-50b4.tablet
rename to data/wacom-isdv4-50b4.tablet
diff --git a/data/isdv4-50b6.tablet b/data/wacom-isdv4-50b6.tablet
similarity index 100%
rename from data/isdv4-50b6.tablet
rename to data/wacom-isdv4-50b6.tablet
diff --git a/data/isdv4-50b8.tablet b/data/wacom-isdv4-50b8.tablet
similarity index 100%
rename from data/isdv4-50b8.tablet
rename to data/wacom-isdv4-50b8.tablet
diff --git a/data/isdv4-50db.tablet b/data/wacom-isdv4-50db.tablet
similarity index 100%
rename from data/isdv4-50db.tablet
rename to data/wacom-isdv4-50db.tablet
diff --git a/data/isdv4-50e9.tablet b/data/wacom-isdv4-50e9.tablet
similarity index 100%
rename from data/isdv4-50e9.tablet
rename to data/wacom-isdv4-50e9.tablet
diff --git a/data/isdv4-50ef.tablet b/data/wacom-isdv4-50ef.tablet
similarity index 100%
rename from data/isdv4-50ef.tablet
rename to data/wacom-isdv4-50ef.tablet
diff --git a/data/isdv4-50f1.tablet b/data/wacom-isdv4-50f1.tablet
similarity index 100%
rename from data/isdv4-50f1.tablet
rename to data/wacom-isdv4-50f1.tablet
diff --git a/data/isdv4-50f8.tablet b/data/wacom-isdv4-50f8.tablet
similarity index 100%
rename from data/isdv4-50f8.tablet
rename to data/wacom-isdv4-50f8.tablet
diff --git a/data/isdv4-50fd.tablet b/data/wacom-isdv4-50fd.tablet
similarity index 100%
rename from data/isdv4-50fd.tablet
rename to data/wacom-isdv4-50fd.tablet
diff --git a/data/isdv4-50fe.tablet b/data/wacom-isdv4-50fe.tablet
similarity index 100%
rename from data/isdv4-50fe.tablet
rename to data/wacom-isdv4-50fe.tablet
diff --git a/data/isdv4-5110.tablet b/data/wacom-isdv4-5110.tablet
similarity index 100%
rename from data/isdv4-5110.tablet
rename to data/wacom-isdv4-5110.tablet
diff --git a/data/isdv4-5115.tablet b/data/wacom-isdv4-5115.tablet
similarity index 100%
rename from data/isdv4-5115.tablet
rename to data/wacom-isdv4-5115.tablet
diff --git a/data/isdv4-511a.tablet b/data/wacom-isdv4-511a.tablet
similarity index 100%
rename from data/isdv4-511a.tablet
rename to data/wacom-isdv4-511a.tablet
diff --git a/data/isdv4-5122.tablet b/data/wacom-isdv4-5122.tablet
similarity index 100%
rename from data/isdv4-5122.tablet
rename to data/wacom-isdv4-5122.tablet
diff --git a/data/isdv4-5128.tablet b/data/wacom-isdv4-5128.tablet
similarity index 100%
rename from data/isdv4-5128.tablet
rename to data/wacom-isdv4-5128.tablet
diff --git a/data/isdv4-513b.tablet b/data/wacom-isdv4-513b.tablet
similarity index 100%
rename from data/isdv4-513b.tablet
rename to data/wacom-isdv4-513b.tablet
diff --git a/data/isdv4-5144.tablet b/data/wacom-isdv4-5144.tablet
similarity index 100%
rename from data/isdv4-5144.tablet
rename to data/wacom-isdv4-5144.tablet
diff --git a/data/isdv4-5146.tablet b/data/wacom-isdv4-5146.tablet
similarity index 100%
rename from data/isdv4-5146.tablet
rename to data/wacom-isdv4-5146.tablet
diff --git a/data/isdv4-5147.tablet b/data/wacom-isdv4-5147.tablet
similarity index 100%
rename from data/isdv4-5147.tablet
rename to data/wacom-isdv4-5147.tablet
diff --git a/data/isdv4-5148.tablet b/data/wacom-isdv4-5148.tablet
similarity index 100%
rename from data/isdv4-5148.tablet
rename to data/wacom-isdv4-5148.tablet
diff --git a/data/isdv4-5150.tablet b/data/wacom-isdv4-5150.tablet
similarity index 100%
rename from data/isdv4-5150.tablet
rename to data/wacom-isdv4-5150.tablet
diff --git a/data/isdv4-5155.tablet b/data/wacom-isdv4-5155.tablet
similarity index 100%
rename from data/isdv4-5155.tablet
rename to data/wacom-isdv4-5155.tablet
diff --git a/data/isdv4-5157.tablet b/data/wacom-isdv4-5157.tablet
similarity index 100%
rename from data/isdv4-5157.tablet
rename to data/wacom-isdv4-5157.tablet
diff --git a/data/isdv4-5158.tablet b/data/wacom-isdv4-5158.tablet
similarity index 100%
rename from data/isdv4-5158.tablet
rename to data/wacom-isdv4-5158.tablet
diff --git a/data/isdv4-5159.tablet b/data/wacom-isdv4-5159.tablet
similarity index 100%
rename from data/isdv4-5159.tablet
rename to data/wacom-isdv4-5159.tablet
diff --git a/data/isdv4-515a.tablet b/data/wacom-isdv4-515a.tablet
similarity index 100%
rename from data/isdv4-515a.tablet
rename to data/wacom-isdv4-515a.tablet
diff --git a/data/isdv4-5169.tablet b/data/wacom-isdv4-5169.tablet
similarity index 100%
rename from data/isdv4-5169.tablet
rename to data/wacom-isdv4-5169.tablet
diff --git a/data/isdv4-516b.tablet b/data/wacom-isdv4-516b.tablet
similarity index 100%
rename from data/isdv4-516b.tablet
rename to data/wacom-isdv4-516b.tablet
diff --git a/data/isdv4-517d.tablet b/data/wacom-isdv4-517d.tablet
similarity index 100%
rename from data/isdv4-517d.tablet
rename to data/wacom-isdv4-517d.tablet
diff --git a/data/isdv4-5196.tablet b/data/wacom-isdv4-5196.tablet
similarity index 100%
rename from data/isdv4-5196.tablet
rename to data/wacom-isdv4-5196.tablet
diff --git a/data/isdv4-51a0.tablet b/data/wacom-isdv4-51a0.tablet
similarity index 100%
rename from data/isdv4-51a0.tablet
rename to data/wacom-isdv4-51a0.tablet
diff --git a/data/isdv4-51af.tablet b/data/wacom-isdv4-51af.tablet
similarity index 100%
rename from data/isdv4-51af.tablet
rename to data/wacom-isdv4-51af.tablet
diff --git a/data/isdv4-51b0.tablet b/data/wacom-isdv4-51b0.tablet
similarity index 100%
rename from data/isdv4-51b0.tablet
rename to data/wacom-isdv4-51b0.tablet
diff --git a/data/isdv4-51b1.tablet b/data/wacom-isdv4-51b1.tablet
similarity index 100%
rename from data/isdv4-51b1.tablet
rename to data/wacom-isdv4-51b1.tablet
diff --git a/data/isdv4-51b2.tablet b/data/wacom-isdv4-51b2.tablet
similarity index 100%
rename from data/isdv4-51b2.tablet
rename to data/wacom-isdv4-51b2.tablet
diff --git a/data/isdv4-51b3.tablet b/data/wacom-isdv4-51b3.tablet
similarity index 100%
rename from data/isdv4-51b3.tablet
rename to data/wacom-isdv4-51b3.tablet
diff --git a/data/isdv4-51b6.tablet b/data/wacom-isdv4-51b6.tablet
similarity index 100%
rename from data/isdv4-51b6.tablet
rename to data/wacom-isdv4-51b6.tablet
diff --git a/data/isdv4-51b7.tablet b/data/wacom-isdv4-51b7.tablet
similarity index 100%
rename from data/isdv4-51b7.tablet
rename to data/wacom-isdv4-51b7.tablet
diff --git a/data/isdv4-51b8.tablet b/data/wacom-isdv4-51b8.tablet
similarity index 100%
rename from data/isdv4-51b8.tablet
rename to data/wacom-isdv4-51b8.tablet
diff --git a/data/isdv4-51b9.tablet b/data/wacom-isdv4-51b9.tablet
similarity index 100%
rename from data/isdv4-51b9.tablet
rename to data/wacom-isdv4-51b9.tablet
diff --git a/data/isdv4-51ba.tablet b/data/wacom-isdv4-51ba.tablet
similarity index 100%
rename from data/isdv4-51ba.tablet
rename to data/wacom-isdv4-51ba.tablet
diff --git a/data/isdv4-51bb.tablet b/data/wacom-isdv4-51bb.tablet
similarity index 100%
rename from data/isdv4-51bb.tablet
rename to data/wacom-isdv4-51bb.tablet
diff --git a/data/isdv4-51bc.tablet b/data/wacom-isdv4-51bc.tablet
similarity index 100%
rename from data/isdv4-51bc.tablet
rename to data/wacom-isdv4-51bc.tablet
diff --git a/data/isdv4-51bd.tablet b/data/wacom-isdv4-51bd.tablet
similarity index 100%
rename from data/isdv4-51bd.tablet
rename to data/wacom-isdv4-51bd.tablet
diff --git a/data/isdv4-51be.tablet b/data/wacom-isdv4-51be.tablet
similarity index 100%
rename from data/isdv4-51be.tablet
rename to data/wacom-isdv4-51be.tablet
diff --git a/data/isdv4-51bf.tablet b/data/wacom-isdv4-51bf.tablet
similarity index 100%
rename from data/isdv4-51bf.tablet
rename to data/wacom-isdv4-51bf.tablet
diff --git a/data/isdv4-51c4.tablet b/data/wacom-isdv4-51c4.tablet
similarity index 100%
rename from data/isdv4-51c4.tablet
rename to data/wacom-isdv4-51c4.tablet
diff --git a/data/isdv4-51c7.tablet b/data/wacom-isdv4-51c7.tablet
similarity index 100%
rename from data/isdv4-51c7.tablet
rename to data/wacom-isdv4-51c7.tablet
diff --git a/data/isdv4-51d0.tablet b/data/wacom-isdv4-51d0.tablet
similarity index 100%
rename from data/isdv4-51d0.tablet
rename to data/wacom-isdv4-51d0.tablet
diff --git a/data/isdv4-51e2.tablet b/data/wacom-isdv4-51e2.tablet
similarity index 100%
rename from data/isdv4-51e2.tablet
rename to data/wacom-isdv4-51e2.tablet
diff --git a/data/isdv4-51e9.tablet b/data/wacom-isdv4-51e9.tablet
similarity index 100%
rename from data/isdv4-51e9.tablet
rename to data/wacom-isdv4-51e9.tablet
diff --git a/data/isdv4-51ef.tablet b/data/wacom-isdv4-51ef.tablet
similarity index 100%
rename from data/isdv4-51ef.tablet
rename to data/wacom-isdv4-51ef.tablet
diff --git a/data/isdv4-51f5.tablet b/data/wacom-isdv4-51f5.tablet
similarity index 100%
rename from data/isdv4-51f5.tablet
rename to data/wacom-isdv4-51f5.tablet
diff --git a/data/isdv4-51f6.tablet b/data/wacom-isdv4-51f6.tablet
similarity index 100%
rename from data/isdv4-51f6.tablet
rename to data/wacom-isdv4-51f6.tablet
diff --git a/data/isdv4-51f9.tablet b/data/wacom-isdv4-51f9.tablet
similarity index 100%
rename from data/isdv4-51f9.tablet
rename to data/wacom-isdv4-51f9.tablet
diff --git a/data/isdv4-5202.tablet b/data/wacom-isdv4-5202.tablet
similarity index 100%
rename from data/isdv4-5202.tablet
rename to data/wacom-isdv4-5202.tablet
diff --git a/data/isdv4-5204.tablet b/data/wacom-isdv4-5204.tablet
similarity index 100%
rename from data/isdv4-5204.tablet
rename to data/wacom-isdv4-5204.tablet
diff --git a/data/isdv4-5215.tablet b/data/wacom-isdv4-5215.tablet
similarity index 100%
rename from data/isdv4-5215.tablet
rename to data/wacom-isdv4-5215.tablet
diff --git a/data/isdv4-5216.tablet b/data/wacom-isdv4-5216.tablet
similarity index 100%
rename from data/isdv4-5216.tablet
rename to data/wacom-isdv4-5216.tablet
diff --git a/data/isdv4-5218.tablet b/data/wacom-isdv4-5218.tablet
similarity index 100%
rename from data/isdv4-5218.tablet
rename to data/wacom-isdv4-5218.tablet
diff --git a/data/isdv4-521c.tablet b/data/wacom-isdv4-521c.tablet
similarity index 100%
rename from data/isdv4-521c.tablet
rename to data/wacom-isdv4-521c.tablet
diff --git a/data/isdv4-521f.tablet b/data/wacom-isdv4-521f.tablet
similarity index 100%
rename from data/isdv4-521f.tablet
rename to data/wacom-isdv4-521f.tablet
diff --git a/data/isdv4-5220.tablet b/data/wacom-isdv4-5220.tablet
similarity index 100%
rename from data/isdv4-5220.tablet
rename to data/wacom-isdv4-5220.tablet
diff --git a/data/isdv4-5221.tablet b/data/wacom-isdv4-5221.tablet
similarity index 100%
rename from data/isdv4-5221.tablet
rename to data/wacom-isdv4-5221.tablet
diff --git a/data/isdv4-5222.tablet b/data/wacom-isdv4-5222.tablet
similarity index 100%
rename from data/isdv4-5222.tablet
rename to data/wacom-isdv4-5222.tablet
diff --git a/data/isdv4-5229.tablet b/data/wacom-isdv4-5229.tablet
similarity index 100%
rename from data/isdv4-5229.tablet
rename to data/wacom-isdv4-5229.tablet
diff --git a/data/isdv4-523a.tablet b/data/wacom-isdv4-523a.tablet
similarity index 100%
rename from data/isdv4-523a.tablet
rename to data/wacom-isdv4-523a.tablet
diff --git a/data/isdv4-523e.tablet b/data/wacom-isdv4-523e.tablet
similarity index 100%
rename from data/isdv4-523e.tablet
rename to data/wacom-isdv4-523e.tablet
diff --git a/data/isdv4-5256.tablet b/data/wacom-isdv4-5256.tablet
similarity index 100%
rename from data/isdv4-5256.tablet
rename to data/wacom-isdv4-5256.tablet
diff --git a/data/isdv4-526c.tablet b/data/wacom-isdv4-526c.tablet
similarity index 100%
rename from data/isdv4-526c.tablet
rename to data/wacom-isdv4-526c.tablet
diff --git a/data/isdv4-5276.tablet b/data/wacom-isdv4-5276.tablet
similarity index 100%
rename from data/isdv4-5276.tablet
rename to data/wacom-isdv4-5276.tablet
diff --git a/data/isdv4-5277.tablet b/data/wacom-isdv4-5277.tablet
similarity index 100%
rename from data/isdv4-5277.tablet
rename to data/wacom-isdv4-5277.tablet
diff --git a/data/isdv4-5278.tablet b/data/wacom-isdv4-5278.tablet
similarity index 100%
rename from data/isdv4-5278.tablet
rename to data/wacom-isdv4-5278.tablet
diff --git a/data/isdv4-5279.tablet b/data/wacom-isdv4-5279.tablet
similarity index 100%
rename from data/isdv4-5279.tablet
rename to data/wacom-isdv4-5279.tablet
diff --git a/data/isdv4-527a.tablet b/data/wacom-isdv4-527a.tablet
similarity index 100%
rename from data/isdv4-527a.tablet
rename to data/wacom-isdv4-527a.tablet
diff --git a/data/isdv4-527e.tablet b/data/wacom-isdv4-527e.tablet
similarity index 100%
rename from data/isdv4-527e.tablet
rename to data/wacom-isdv4-527e.tablet
diff --git a/data/isdv4-527f.tablet b/data/wacom-isdv4-527f.tablet
similarity index 100%
rename from data/isdv4-527f.tablet
rename to data/wacom-isdv4-527f.tablet
diff --git a/data/isdv4-5285.tablet b/data/wacom-isdv4-5285.tablet
similarity index 100%
rename from data/isdv4-5285.tablet
rename to data/wacom-isdv4-5285.tablet
diff --git a/data/isdv4-5286.tablet b/data/wacom-isdv4-5286.tablet
similarity index 100%
rename from data/isdv4-5286.tablet
rename to data/wacom-isdv4-5286.tablet
diff --git a/data/isdv4-528e.tablet b/data/wacom-isdv4-528e.tablet
similarity index 100%
rename from data/isdv4-528e.tablet
rename to data/wacom-isdv4-528e.tablet
diff --git a/data/isdv4-52a2.tablet b/data/wacom-isdv4-52a2.tablet
similarity index 100%
rename from data/isdv4-52a2.tablet
rename to data/wacom-isdv4-52a2.tablet
diff --git a/data/isdv4-52b0.tablet b/data/wacom-isdv4-52b0.tablet
similarity index 100%
rename from data/isdv4-52b0.tablet
rename to data/wacom-isdv4-52b0.tablet
diff --git a/data/isdv4-52d3.tablet b/data/wacom-isdv4-52d3.tablet
similarity index 100%
rename from data/isdv4-52d3.tablet
rename to data/wacom-isdv4-52d3.tablet
diff --git a/data/isdv4-52d5.tablet b/data/wacom-isdv4-52d5.tablet
similarity index 100%
rename from data/isdv4-52d5.tablet
rename to data/wacom-isdv4-52d5.tablet
diff --git a/data/isdv4-5309.tablet b/data/wacom-isdv4-5309.tablet
similarity index 100%
rename from data/isdv4-5309.tablet
rename to data/wacom-isdv4-5309.tablet
diff --git a/data/isdv4-90.tablet b/data/wacom-isdv4-90.tablet
similarity index 100%
rename from data/isdv4-90.tablet
rename to data/wacom-isdv4-90.tablet
diff --git a/data/isdv4-93.tablet b/data/wacom-isdv4-93.tablet
similarity index 100%
rename from data/isdv4-93.tablet
rename to data/wacom-isdv4-93.tablet
diff --git a/data/isdv4-e2.tablet b/data/wacom-isdv4-e2.tablet
similarity index 100%
rename from data/isdv4-e2.tablet
rename to data/wacom-isdv4-e2.tablet
diff --git a/data/isdv4-e3.tablet b/data/wacom-isdv4-e3.tablet
similarity index 100%
rename from data/isdv4-e3.tablet
rename to data/wacom-isdv4-e3.tablet
diff --git a/data/isdv4-e5.tablet b/data/wacom-isdv4-e5.tablet
similarity index 100%
rename from data/isdv4-e5.tablet
rename to data/wacom-isdv4-e5.tablet
diff --git a/data/isdv4-e6.tablet b/data/wacom-isdv4-e6.tablet
similarity index 100%
rename from data/isdv4-e6.tablet
rename to data/wacom-isdv4-e6.tablet
diff --git a/data/isdv4-ec.tablet b/data/wacom-isdv4-ec.tablet
similarity index 100%
rename from data/isdv4-ec.tablet
rename to data/wacom-isdv4-ec.tablet
diff --git a/data/isdv4-ed.tablet b/data/wacom-isdv4-ed.tablet
similarity index 100%
rename from data/isdv4-ed.tablet
rename to data/wacom-isdv4-ed.tablet
diff --git a/data/isdv4-ef.tablet b/data/wacom-isdv4-ef.tablet
similarity index 100%
rename from data/isdv4-ef.tablet
rename to data/wacom-isdv4-ef.tablet
diff --git a/data/mobilestudio-pro-13-2.tablet b/data/wacom-mobilestudio-pro-13-2.tablet
similarity index 97%
rename from data/mobilestudio-pro-13-2.tablet
rename to data/wacom-mobilestudio-pro-13-2.tablet
index 20c72cae..bfd62b2a 100644
--- a/data/mobilestudio-pro-13-2.tablet
+++ b/data/wacom-mobilestudio-pro-13-2.tablet
@@ -41,7 +41,7 @@ DeviceMatch=usb|056a|0398
 PairedID=usb|056a|039a
 Width=12
 Height=7
-Layout=mobilestudio-pro-13.svg
+Layout=wacom-mobilestudio-pro-13.svg
 Styli=@intuos5;@mobilestudio;@propengen2;
 IntegratedIn=Display;System
 
diff --git a/data/mobilestudio-pro-13.tablet b/data/wacom-mobilestudio-pro-13.tablet
similarity index 97%
rename from data/mobilestudio-pro-13.tablet
rename to data/wacom-mobilestudio-pro-13.tablet
index 3d7d7c86..3a8459d6 100644
--- a/data/mobilestudio-pro-13.tablet
+++ b/data/wacom-mobilestudio-pro-13.tablet
@@ -41,7 +41,7 @@ DeviceMatch=usb|056a|034d
 PairedID=usb|056a|034a
 Width=12
 Height=7
-Layout=mobilestudio-pro-13.svg
+Layout=wacom-mobilestudio-pro-13.svg
 Styli=@intuos5;@mobilestudio;@propengen2;
 IntegratedIn=Display;System
 
diff --git a/data/mobilestudio-pro-16-2.tablet b/data/wacom-mobilestudio-pro-16-2.tablet
similarity index 97%
rename from data/mobilestudio-pro-16-2.tablet
rename to data/wacom-mobilestudio-pro-16-2.tablet
index 9fe96011..de19c570 100644
--- a/data/mobilestudio-pro-16-2.tablet
+++ b/data/wacom-mobilestudio-pro-16-2.tablet
@@ -43,7 +43,7 @@ DeviceMatch=usb|056a|0399
 PairedID=usb|056a|039b
 Width=14
 Height=8
-Layout=mobilestudio-pro-16.svg
+Layout=wacom-mobilestudio-pro-16.svg
 Styli=@intuos5;@mobilestudio;@propengen2;
 IntegratedIn=Display;System
 
diff --git a/data/mobilestudio-pro-16-3.tablet b/data/wacom-mobilestudio-pro-16-3.tablet
similarity index 97%
rename from data/mobilestudio-pro-16-3.tablet
rename to data/wacom-mobilestudio-pro-16-3.tablet
index 81941f9c..bd7e1762 100644
--- a/data/mobilestudio-pro-16-3.tablet
+++ b/data/wacom-mobilestudio-pro-16-3.tablet
@@ -43,7 +43,7 @@ DeviceMatch=usb|056a|03aa
 PairedID=usb|056a|03ac
 Width=14
 Height=8
-Layout=mobilestudio-pro-16.svg
+Layout=wacom-mobilestudio-pro-16.svg
 Styli=@intuos5;@mobilestudio;@propengen2;
 IntegratedIn=Display;System
 
diff --git a/data/mobilestudio-pro-16.tablet b/data/wacom-mobilestudio-pro-16.tablet
similarity index 97%
rename from data/mobilestudio-pro-16.tablet
rename to data/wacom-mobilestudio-pro-16.tablet
index 2340300e..3e67cedf 100644
--- a/data/mobilestudio-pro-16.tablet
+++ b/data/wacom-mobilestudio-pro-16.tablet
@@ -43,7 +43,7 @@ DeviceMatch=usb|056a|034e
 PairedID=usb|056a|034b
 Width=14
 Height=8
-Layout=mobilestudio-pro-16.svg
+Layout=wacom-mobilestudio-pro-16.svg
 Styli=@intuos5;@mobilestudio;@propengen2;
 IntegratedIn=Display;System
 
diff --git a/data/movink.tablet b/data/wacom-movink.tablet
similarity index 98%
rename from data/movink.tablet
rename to data/wacom-movink.tablet
index 4e504adb..188eca45 100644
--- a/data/movink.tablet
+++ b/data/wacom-movink.tablet
@@ -37,7 +37,7 @@ Width=11
 Height=8
 Styli=@udpen;
 IntegratedIn=Display
-Layout=movink.svg
+Layout=wacom-movink.svg
 
 [Features]
 Stylus=true
diff --git a/data/one-by-wacom-m-p.tablet b/data/wacom-one-by-wacom-m-p.tablet
similarity index 100%
rename from data/one-by-wacom-m-p.tablet
rename to data/wacom-one-by-wacom-m-p.tablet
diff --git a/data/one-by-wacom-m-p2.tablet b/data/wacom-one-by-wacom-m-p2.tablet
similarity index 100%
rename from data/one-by-wacom-m-p2.tablet
rename to data/wacom-one-by-wacom-m-p2.tablet
diff --git a/data/one-by-wacom-s-p.tablet b/data/wacom-one-by-wacom-s-p.tablet
similarity index 100%
rename from data/one-by-wacom-s-p.tablet
rename to data/wacom-one-by-wacom-s-p.tablet
diff --git a/data/one-by-wacom-s-p2.tablet b/data/wacom-one-by-wacom-s-p2.tablet
similarity index 100%
rename from data/one-by-wacom-s-p2.tablet
rename to data/wacom-one-by-wacom-s-p2.tablet
diff --git a/data/volito-4x5.tablet b/data/wacom-volito-4x5.tablet
similarity index 100%
rename from data/volito-4x5.tablet
rename to data/wacom-volito-4x5.tablet
diff --git a/data/wacom.example b/data/wacom.example
index 70cc076e..be574f31 100644
--- a/data/wacom.example
+++ b/data/wacom.example
@@ -116,7 +116,7 @@ IntegratedIn=Display;System
 
 # Filename of the SVG representing this tablet. Only needed for tablets with
 # pad buttons.
-Layout=bamboo-16fg-m-pt.svg
+Layout=wacom-bamboo-16fg-m-pt.svg
 # Styli
 #
 # This is a list of stylus IDs supported by the tablet. Non-Wacom devices