diff --git a/Casks/balsamiq-mockups.rb b/Casks/balsamiq-mockups.rb
index 30ba7ea5e6..b080cb5600 100644
--- a/Casks/balsamiq-mockups.rb
+++ b/Casks/balsamiq-mockups.rb
@@ -7,7 +7,14 @@ cask 'balsamiq-mockups' do
   homepage 'https://balsamiq.com/'
   license :commercial
 
-  app "Balsamiq Mockups #{version.to_i}.app"
+  app "Balsamiq Mockups #{version.major}.app"
 
-  zap :delete => '~/Library/Preferences/BalsamiqMockups3'
+  zap :delete => [
+                   # TODO: expand/glob for '~/Library/Caches/BalsamiqMockups#{version.major}.*',
+                   # TODO: expand/glob for '~/Library/Saved Application State/BalsamiqMockups#{version.major}.*',
+                 ],
+      :trash  => [
+                   '~/Library/Preferences/BalsamiqMockups#{version.major}',
+                   # TODO: expand/glob for '~/Library/Preferences/BalsamiqMockups#{version.major}.*',
+                 ]
 end