diff --git a/Casks/firefox-nightly.rb b/Casks/firefox-nightly.rb
index 9546c617c..a57bd1dca 100644
--- a/Casks/firefox-nightly.rb
+++ b/Casks/firefox-nightly.rb
@@ -3,9 +3,16 @@ cask :v1 => 'firefox-nightly' do
   sha256 :no_check # required as upstream package is updated in-place
 
   url "https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-#{version}.en-US.mac.dmg"
+  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'https://nightly.mozilla.org/'
   license :mpl
   tags :vendor => 'Mozilla'
 
   app 'FirefoxNightly.app'
+
+  zap :delete => [
+                  '~/Library/Application Support/Firefox',
+                  '~/Library/Caches/Firefox',
+                 ]
 end