diff --git a/wacom_bamboo_configure.sh b/wacom_bamboo_configure.sh
index bc68f2f855dc26746a38329752609c2e8249f7c2..f315a140372f58708c3692f2fa726b10a8cedbcc 100644
--- a/wacom_bamboo_configure.sh
+++ b/wacom_bamboo_configure.sh
@@ -28,7 +28,8 @@ lsusb | grep 'Wacom'
 xsetwacom --list devices
 
 # Nome da mesa digitalizadora.
-WACOM=$(xsetwacom --list devices | grep "STYLUS" | awk '{print gensub(/(.+) stylus.*/, "\\1", "g")}')
+# WACOM=$(xsetwacom --list devices | grep "STYLUS" | awk '{print gensub(/(.+) stylus.*/, "\\1", "g")}')
+WACOM="Wacom Bamboo Connect"
 echo $WACOM
 
 # Monitores disponíveis.
@@ -59,24 +60,24 @@ echo $MAINMONITOR
 # xsetwacom --set "Wacom Bamboo Connect Pen eraser" MapToOutput $MAINMONITOR
 
 # Mapeia a Wacom para o monitor principal.
-if xsetwacom --list devices | grep -q "STYLUS"; then
-    xsetwacom --set "$WACOM stylus" MapToOutput $MAINMONITOR
+if xsetwacom --list devices | grep -q "Wacom Bamboo Connect .* STYLUS"; then
+    xsetwacom --set "$WACOM Pen stylus" MapToOutput $MAINMONITOR
 fi
-if xsetwacom --list devices | grep -q "ERASER"; then
-    xsetwacom --set "$WACOM eraser" MapToOutput $MAINMONITOR
+if xsetwacom --list devices | grep -q "Wacom Bamboo Connect .* ERASER"; then
+    xsetwacom --set "$WACOM Pen eraser" MapToOutput $MAINMONITOR
 fi
-if xsetwacom --list devices | grep -q "PAD"; then
-    xsetwacom --set "$WACOM pad" MapToOutput $MAINMONITOR
+if xsetwacom --list devices | grep -q "Wacom Bamboo Connect .* PAD"; then
+    xsetwacom --set "$WACOM Pad pad" MapToOutput $MAINMONITOR
 fi
 
 # Configura para manter mapeamento isométrico. -------------------------
 
-if xsetwacom --list devices | grep -q "STYLUS"; then
+if xsetwacom --list devices | grep -q "Wacom Bamboo Connect .* STYLUS"; then
     # Determina a área do tablet.
     AREALEFT=0
     AREATOP=0
     $(
-        xinput list-props "$WACOM stylus" | \
+        xinput list-props "$WACOM Pen stylus" | \
             grep 'Wacom Tablet Area' | \
             awk '{print gensub(/.*0, 0, ([0-9]+), ([0-9]+)/, "export AREARIGHT=\\1\nexport AREABOTTOM=\\2", "g")}'
     )
@@ -117,7 +118,7 @@ if xsetwacom --list devices | grep -q "STYLUS"; then
     # xsetwacom set "$WACOM" MapToOutput $MAINMONITOR
     # Define a área de trabalho para ter escala 1:1.
     echo "Define área de trabalho para escala isométrica."
-    xsetwacom set "$WACOM stylus" \
+    xsetwacom set "$WACOM Pen stylus" \
               Area $AREALEFT $AREATOP $RESULTRIGHT $RESULTBOTTOM
 fi