diff --git a/Casks/adobe-illustrator-cc-de.rb b/Casks/adobe-illustrator-cc-de.rb
index 89377db93..0e3d10374 100644
--- a/Casks/adobe-illustrator-cc-de.rb
+++ b/Casks/adobe-illustrator-cc-de.rb
@@ -8,7 +8,6 @@ cask 'adobe-illustrator-cc-de' do
   name 'Adobe Illustrator CC 2015'
   homepage 'https://www.adobe.com/products/illustrator.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"
diff --git a/Casks/adobe-illustrator-cc-es.rb b/Casks/adobe-illustrator-cc-es.rb
index 05b701f3e..966f01fed 100644
--- a/Casks/adobe-illustrator-cc-es.rb
+++ b/Casks/adobe-illustrator-cc-es.rb
@@ -8,7 +8,6 @@ cask 'adobe-illustrator-cc-es' do
   name 'Adobe Illustrator CC 2015'
   homepage 'https://www.adobe.com/products/illustrator.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"
diff --git a/Casks/adobe-illustrator-cc-fr.rb b/Casks/adobe-illustrator-cc-fr.rb
index c0ee03933..02686788f 100644
--- a/Casks/adobe-illustrator-cc-fr.rb
+++ b/Casks/adobe-illustrator-cc-fr.rb
@@ -8,7 +8,6 @@ cask 'adobe-illustrator-cc-fr' do
   name 'Adobe Illustrator CC 2015'
   homepage 'https://www.adobe.com/products/illustrator.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"
diff --git a/Casks/adobe-illustrator-cc-it.rb b/Casks/adobe-illustrator-cc-it.rb
index 44684d9fa..d8aed171a 100644
--- a/Casks/adobe-illustrator-cc-it.rb
+++ b/Casks/adobe-illustrator-cc-it.rb
@@ -8,7 +8,6 @@ cask 'adobe-illustrator-cc-it' do
   name 'Adobe Illustrator CC 2015'
   homepage 'https://www.adobe.com/products/illustrator.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"
diff --git a/Casks/adobe-illustrator-cc-ja.rb b/Casks/adobe-illustrator-cc-ja.rb
index d9378e9ee..6fad161dc 100644
--- a/Casks/adobe-illustrator-cc-ja.rb
+++ b/Casks/adobe-illustrator-cc-ja.rb
@@ -8,7 +8,6 @@ cask 'adobe-illustrator-cc-ja' do
   name 'Adobe Illustrator CC 2015'
   homepage 'https://www.adobe.com/products/illustrator.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"
diff --git a/Casks/adobe-illustrator-cc-nl.rb b/Casks/adobe-illustrator-cc-nl.rb
index fea1a6ffd..dcbe33679 100644
--- a/Casks/adobe-illustrator-cc-nl.rb
+++ b/Casks/adobe-illustrator-cc-nl.rb
@@ -8,7 +8,6 @@ cask 'adobe-illustrator-cc-nl' do
   name 'Adobe Illustrator CC 2015'
   homepage 'https://www.adobe.com/products/illustrator.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"
diff --git a/Casks/adobe-indesign-cc-de.rb b/Casks/adobe-indesign-cc-de.rb
index aefbdc3a2..bb94f4e83 100644
--- a/Casks/adobe-indesign-cc-de.rb
+++ b/Casks/adobe-indesign-cc-de.rb
@@ -8,7 +8,6 @@ cask 'adobe-indesign-cc-de' do
   name 'Adobe InDesign CC 2015'
   homepage 'https://www.adobe.com/products/indesign.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"
diff --git a/Casks/adobe-indesign-cc-es.rb b/Casks/adobe-indesign-cc-es.rb
index e1aa2e88e..66a382457 100644
--- a/Casks/adobe-indesign-cc-es.rb
+++ b/Casks/adobe-indesign-cc-es.rb
@@ -8,7 +8,6 @@ cask 'adobe-indesign-cc-es' do
   name 'Adobe InDesign CC 2015'
   homepage 'https://www.adobe.com/products/indesign.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"
diff --git a/Casks/adobe-indesign-cc-fr.rb b/Casks/adobe-indesign-cc-fr.rb
index 6994b07eb..c9656f4a3 100644
--- a/Casks/adobe-indesign-cc-fr.rb
+++ b/Casks/adobe-indesign-cc-fr.rb
@@ -8,7 +8,6 @@ cask 'adobe-indesign-cc-fr' do
   name 'Adobe InDesign CC 2015'
   homepage 'https://www.adobe.com/products/indesign.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"
diff --git a/Casks/adobe-indesign-cc-it.rb b/Casks/adobe-indesign-cc-it.rb
index fca8ff923..bbb2d5b81 100644
--- a/Casks/adobe-indesign-cc-it.rb
+++ b/Casks/adobe-indesign-cc-it.rb
@@ -8,7 +8,6 @@ cask 'adobe-indesign-cc-it' do
   name 'Adobe InDesign CC 2015'
   homepage 'https://www.adobe.com/products/indesign.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"
diff --git a/Casks/adobe-indesign-cc-ja.rb b/Casks/adobe-indesign-cc-ja.rb
index 59069961e..f0bd00bcf 100644
--- a/Casks/adobe-indesign-cc-ja.rb
+++ b/Casks/adobe-indesign-cc-ja.rb
@@ -8,7 +8,6 @@ cask 'adobe-indesign-cc-ja' do
   name 'Adobe InDesign CC 2015'
   homepage 'https://www.adobe.com/products/indesign.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"
diff --git a/Casks/adobe-indesign-cc-nl.rb b/Casks/adobe-indesign-cc-nl.rb
index d638a125f..83a7075ed 100644
--- a/Casks/adobe-indesign-cc-nl.rb
+++ b/Casks/adobe-indesign-cc-nl.rb
@@ -8,7 +8,6 @@ cask 'adobe-indesign-cc-nl' do
   name 'Adobe InDesign CC 2015'
   homepage 'https://www.adobe.com/products/indesign.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"
diff --git a/Casks/adobe-photoshop-cc-de.rb b/Casks/adobe-photoshop-cc-de.rb
index 4ef879454..7a1080129 100644
--- a/Casks/adobe-photoshop-cc-de.rb
+++ b/Casks/adobe-photoshop-cc-de.rb
@@ -8,7 +8,6 @@ cask 'adobe-photoshop-cc-de' do
   name 'Adobe Photoshop CC 2015'
   homepage 'https://www.adobe.com/products/photoshop.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     file = File.open "#{staged_path}/uninstall.xml", 'w'
diff --git a/Casks/adobe-photoshop-cc-es.rb b/Casks/adobe-photoshop-cc-es.rb
index 9a444aafa..757c760af 100644
--- a/Casks/adobe-photoshop-cc-es.rb
+++ b/Casks/adobe-photoshop-cc-es.rb
@@ -8,7 +8,6 @@ cask 'adobe-photoshop-cc-es' do
   name 'Adobe Photoshop CC 2015'
   homepage 'https://www.adobe.com/products/photoshop.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     file = File.open "#{staged_path}/uninstall.xml", 'w'
diff --git a/Casks/adobe-photoshop-cc-fr.rb b/Casks/adobe-photoshop-cc-fr.rb
index 1803c0eca..62bb0d716 100644
--- a/Casks/adobe-photoshop-cc-fr.rb
+++ b/Casks/adobe-photoshop-cc-fr.rb
@@ -8,7 +8,6 @@ cask 'adobe-photoshop-cc-fr' do
   name 'Adobe Photoshop CC 2015'
   homepage 'https://www.adobe.com/products/photoshop.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     file = File.open "#{staged_path}/uninstall.xml", 'w'
diff --git a/Casks/adobe-photoshop-cc-it.rb b/Casks/adobe-photoshop-cc-it.rb
index d2f0a9811..67f3d6fa2 100644
--- a/Casks/adobe-photoshop-cc-it.rb
+++ b/Casks/adobe-photoshop-cc-it.rb
@@ -8,7 +8,6 @@ cask 'adobe-photoshop-cc-it' do
   name 'Adobe Photoshop CC 2015'
   homepage 'https://www.adobe.com/products/photoshop.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     file = File.open "#{staged_path}/uninstall.xml", 'w'
diff --git a/Casks/adobe-photoshop-cc-ja.rb b/Casks/adobe-photoshop-cc-ja.rb
index a1bf10031..be0ffa1a6 100644
--- a/Casks/adobe-photoshop-cc-ja.rb
+++ b/Casks/adobe-photoshop-cc-ja.rb
@@ -8,7 +8,6 @@ cask 'adobe-photoshop-cc-ja' do
   name 'Adobe Photoshop CC 2015'
   homepage 'https://www.adobe.com/products/photoshop.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     file = File.open "#{staged_path}/uninstall.xml", 'w'
diff --git a/Casks/adobe-photoshop-cc-nl.rb b/Casks/adobe-photoshop-cc-nl.rb
index f6035a688..81d646d4b 100644
--- a/Casks/adobe-photoshop-cc-nl.rb
+++ b/Casks/adobe-photoshop-cc-nl.rb
@@ -8,7 +8,6 @@ cask 'adobe-photoshop-cc-nl' do
   name 'Adobe Photoshop CC 2015'
   homepage 'https://www.adobe.com/products/photoshop.html'
   license :commercial
-  tags :vendor => 'Adobe'
 
   preflight do
     file = File.open "#{staged_path}/uninstall.xml", 'w'
diff --git a/Casks/adobe-reader-pl.rb b/Casks/adobe-reader-pl.rb
index 90e294b7a..7271e74f9 100644
--- a/Casks/adobe-reader-pl.rb
+++ b/Casks/adobe-reader-pl.rb
@@ -6,7 +6,6 @@ cask 'adobe-reader-pl' do
   name 'Adobe Reader'
   homepage 'http://www.adobe.com/pl/products/reader.html'
   license :gratis
-  tags :vendor => 'Adobe'
 
   pkg 'Adobe Reader XI Installer.pkg'
 
diff --git a/Casks/adobe-reader-pt.rb b/Casks/adobe-reader-pt.rb
index 758e3d962..1fb35d8e4 100644
--- a/Casks/adobe-reader-pt.rb
+++ b/Casks/adobe-reader-pt.rb
@@ -6,7 +6,6 @@ cask 'adobe-reader-pt' do
   name 'Adobe Reader'
   homepage 'http://www.adobe.com/br/products/reader.html'
   license :gratis
-  tags :vendor => 'Adobe'
 
   pkg 'Adobe Reader XI Installer.pkg'
   uninstall :pkgutil => "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*",
diff --git a/Casks/affinity-designer-beta.rb b/Casks/affinity-designer-beta.rb
index c9cf4af2e..dbefacee3 100644
--- a/Casks/affinity-designer-beta.rb
+++ b/Casks/affinity-designer-beta.rb
@@ -4,10 +4,9 @@ cask 'affinity-designer-beta' do
 
   # amazonaws.com is the official download host per the vendor homepage
   url 'https://s3.amazonaws.com/affinity-beta/download/Affinity+Designer+Customer+Beta.dmg'
-  name 'Affinity Designer'
+  name 'Serif Affinity Designer'
   homepage 'https://affinity.serif.com/en-us/'
   license :commercial
-  tags :vendor => 'Serif'
 
   app 'Affinity Designer Beta.app'
 end
diff --git a/Casks/affinity-photo-beta.rb b/Casks/affinity-photo-beta.rb
index eff585650..127395779 100644
--- a/Casks/affinity-photo-beta.rb
+++ b/Casks/affinity-photo-beta.rb
@@ -4,10 +4,9 @@ cask 'affinity-photo-beta' do
 
   # amazonaws.com is the official download host per the vendor homepage
   url 'http://s3.amazonaws.com/affinity-beta/download/Affinity+Photo+Customer+Beta.dmg'
-  name 'Affinity Photo'
+  name 'Serif Affinity Photo'
   homepage 'https://affinity.serif.com/en-us/photo/'
   license :commercial
-  tags :vendor => 'Serif'
 
   app 'Affinity Photo Beta.app'
 end
diff --git a/Casks/anaconda2.rb b/Casks/anaconda2.rb
index f30fa19a6..8897670af 100644
--- a/Casks/anaconda2.rb
+++ b/Casks/anaconda2.rb
@@ -3,10 +3,9 @@ cask 'anaconda2' do
   sha256 'f4bd45a21e0dff106e36d11cfd532f2b5050d3b792cc0627ab231089341d2040'
 
   url "https://repo.continuum.io/archive/Anaconda2-#{version}-MacOSX-x86_64.sh"
-  name 'Anaconda2'
+  name 'Continuum Analytics Anaconda2'
   homepage 'https://www.continuum.io/why-anaconda'
   license :gratis
-  tags :vendor => 'Continuum Analytics'
 
   container :type => :naked
 
diff --git a/Casks/atom-beta.rb b/Casks/atom-beta.rb
index 1c0ebba3f..c525abe6a 100644
--- a/Casks/atom-beta.rb
+++ b/Casks/atom-beta.rb
@@ -5,10 +5,9 @@ cask 'atom-beta' do
   # github.com is the official download host per the vendor homepage
   url "https://github.com/atom/atom/releases/download/v#{version}/atom-mac.zip"
   appcast 'https://github.com/atom/atom/releases.atom'
-  name 'Atom Beta'
+  name 'Github Atom Beta'
   homepage 'https://atom.io/beta'
   license :mit
-  tags :vendor => 'Github'
 
   depends_on :macos => '>= :mountain_lion'
 
diff --git a/Casks/battle-net-cn.rb b/Casks/battle-net-cn.rb
index 03d519c27..5c0543be5 100644
--- a/Casks/battle-net-cn.rb
+++ b/Casks/battle-net-cn.rb
@@ -4,10 +4,9 @@ cask 'battle-net-cn' do
 
   # blizzard.com is the official download host per the vendor homepage
   url 'http://www.battlenet.com.cn/download/getInstaller?os=mac&installer=Battle.net-Setup-zhCN.zip'
-  name 'Battle.net'
+  name 'Blizzard Battle.net'
   homepage 'http://www.battlenet.com.cn/zh/'
   license :commercial
-  tags :vendor => 'Blizzard'
 
   installer :manual => 'Battle.net-Setup-zhCN.app'
 
diff --git a/Casks/cycling74-max6.rb b/Casks/cycling74-max6.rb
index e05992cc2..68fc42de4 100644
--- a/Casks/cycling74-max6.rb
+++ b/Casks/cycling74-max6.rb
@@ -4,10 +4,9 @@ cask 'cycling74-max6' do
 
   # amazonaws.com is the official download host per the vendor homepage
   url "https://akiaj5esl75o5wbdcv2a-maxmspjitter.s3.amazonaws.com/Max#{version.sub('-','_').gsub('.','')}.dmg"
-  name 'Max'
+  name 'Cycling ‘74 Max'
   homepage 'https://cycling74.com'
   license :commercial
-  tags :vendor => 'Cycling ‘74'
 
   pkg "Max #{version.sub(%r{^(\d+\.\d+).*},'\1')} Installer.pkg"
 
diff --git a/Casks/earlybird.rb b/Casks/earlybird.rb
index 71295eabf..90c6d4967 100644
--- a/Casks/earlybird.rb
+++ b/Casks/earlybird.rb
@@ -7,7 +7,6 @@ cask 'earlybird' do
   name 'Thunderbird Nightly'
   homepage 'https://www.mozilla.org/en-US/thunderbird/channel/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Earlybird.app'
 end
diff --git a/Casks/firefox-beta-cn.rb b/Casks/firefox-beta-cn.rb
index 6be8f7b9e..211a13f75 100644
--- a/Casks/firefox-beta-cn.rb
+++ b/Casks/firefox-beta-cn.rb
@@ -7,7 +7,6 @@ cask 'firefox-beta-cn' do
   name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/zh-CN/firefox/beta/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-beta-de.rb b/Casks/firefox-beta-de.rb
index 906d94078..7d0265b6c 100644
--- a/Casks/firefox-beta-de.rb
+++ b/Casks/firefox-beta-de.rb
@@ -3,10 +3,9 @@ cask 'firefox-beta-de' do
   sha256 '2465a89e18fedb31c0678caa3e5111989e75bd45754d95c8192bdc9d6e19ef19'
 
   url "https://download.mozilla.org/?product=firefox-#{version}-SSL&os=osx&lang=de"
-  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/de/firefox/beta/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-beta-gb.rb b/Casks/firefox-beta-gb.rb
index aeddf6935..8704f2ea0 100644
--- a/Casks/firefox-beta-gb.rb
+++ b/Casks/firefox-beta-gb.rb
@@ -3,10 +3,9 @@ cask 'firefox-beta-gb' do
   sha256 'c42be78190af7fb4fa6c59d8427cb8c5c58c47b92555e175eb2b0824615c0c63'
 
   url "https://download.mozilla.org/?product=firefox-#{version}-SSL&os=osx&lang=en-GB"
-  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/en-GB/firefox/beta/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-beta-ja.rb b/Casks/firefox-beta-ja.rb
index 08e2a0af5..8f0e95120 100644
--- a/Casks/firefox-beta-ja.rb
+++ b/Casks/firefox-beta-ja.rb
@@ -3,10 +3,9 @@ cask 'firefox-beta-ja' do
   sha256 '74367fb868b6f9441a8af29c4c0909e0ba01c63bf4940bc1eaa96f0014d7a7e6'
 
   url "https://download.mozilla.org/?product=firefox-#{version}-SSL&os=osx&lang=ja-JP-mac"
-  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/ja/firefox/channel/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-beta-ru.rb b/Casks/firefox-beta-ru.rb
index 2c32c078b..48ae6bf00 100644
--- a/Casks/firefox-beta-ru.rb
+++ b/Casks/firefox-beta-ru.rb
@@ -3,10 +3,9 @@ cask 'firefox-beta-ru' do
   sha256 '86e76ecdf0965b17dd222456095abd0f42f74f0e57deccb8c1c7981e0b763f6f'
 
   url "https://download.mozilla.org/?product=firefox-#{version}-SSL&os=osx&lang=ru"
-  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/ru/firefox/channel/#beta'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-beta-uk.rb b/Casks/firefox-beta-uk.rb
index c37a8bb01..a413221d3 100644
--- a/Casks/firefox-beta-uk.rb
+++ b/Casks/firefox-beta-uk.rb
@@ -3,10 +3,9 @@ cask 'firefox-beta-uk' do
   sha256 '4b5e5f6f24328b5b575c604462071ae007b9017ad0ed1e7bcca2ac4ef6d068dd'
 
   url "https://download.mozilla.org/?product=firefox-#{version}-SSL&os=osx&lang=uk"
-  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/uk/firefox/channel/#beta'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-beta.rb b/Casks/firefox-beta.rb
index 62fb848c0..caa91a633 100644
--- a/Casks/firefox-beta.rb
+++ b/Casks/firefox-beta.rb
@@ -7,7 +7,6 @@ cask 'firefox-beta' do
   name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/en-US/firefox/channel/#beta'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-cn.rb b/Casks/firefox-cn.rb
index 855aeda5b..f131b3baf 100644
--- a/Casks/firefox-cn.rb
+++ b/Casks/firefox-cn.rb
@@ -3,10 +3,9 @@ cask 'firefox-cn' do
   sha256 '8ada0b7847b9582ed3f2166cc98dc187bfc39d7c98d6f49a168b7342e56c124d'
 
   url "https://download.mozilla.org/?product=firefox-#{version}-SSL&os=osx&lang=zh-CN"
-  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/zh-CN/firefox/desktop/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-de.rb b/Casks/firefox-de.rb
index 25dd1b604..b17acc4b8 100644
--- a/Casks/firefox-de.rb
+++ b/Casks/firefox-de.rb
@@ -3,10 +3,9 @@ cask 'firefox-de' do
   sha256 'e0dc98b9abf56200c7ffa6dffe7f3a56cd277778048e8169025b6a37d6c221a1'
 
   url "https://download.mozilla.org/?product=firefox-#{version}-SSL&os=osx&lang=de"
-  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/de/firefox/desktop'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-esr-cn.rb b/Casks/firefox-esr-cn.rb
index 60f7eee6e..6259ee58d 100644
--- a/Casks/firefox-esr-cn.rb
+++ b/Casks/firefox-esr-cn.rb
@@ -7,7 +7,6 @@ cask 'firefox-esr-cn' do
   name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/zh-CN/firefox/organizations/'
   license :mpl
-  tags :vendor => 'Mozilla'
   
   app 'Firefox.app'
   
diff --git a/Casks/firefox-esr-ru.rb b/Casks/firefox-esr-ru.rb
index 4afe99211..96fbcc4bd 100644
--- a/Casks/firefox-esr-ru.rb
+++ b/Casks/firefox-esr-ru.rb
@@ -7,7 +7,6 @@ cask 'firefox-esr-ru' do
   name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/ru/firefox/organizations/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
   
diff --git a/Casks/firefox-esr-uk.rb b/Casks/firefox-esr-uk.rb
index 06301e6a3..3889756d6 100644
--- a/Casks/firefox-esr-uk.rb
+++ b/Casks/firefox-esr-uk.rb
@@ -7,7 +7,6 @@ cask 'firefox-esr-uk' do
   name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/uk/firefox/organizations/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
   
diff --git a/Casks/firefox-esr.rb b/Casks/firefox-esr.rb
index ef6b98ce0..5a8f5b627 100644
--- a/Casks/firefox-esr.rb
+++ b/Casks/firefox-esr.rb
@@ -7,7 +7,6 @@ cask 'firefox-esr' do
   name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/en-US/firefox/organizations/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-fr.rb b/Casks/firefox-fr.rb
index 74dc2c24a..ff67ee6c9 100644
--- a/Casks/firefox-fr.rb
+++ b/Casks/firefox-fr.rb
@@ -3,10 +3,9 @@ cask 'firefox-fr' do
   sha256 '359b4ffbbf8d56e429c5961500056de781ffcadd84fd3898e503d8ba55f0c6bc'
 
   url "https://download.mozilla.org/?product=firefox-#{version}-SSL&os=osx&lang=fr"
-  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/fr/firefox/new'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-gl.rb b/Casks/firefox-gl.rb
index abb162b2d..2442548d2 100644
--- a/Casks/firefox-gl.rb
+++ b/Casks/firefox-gl.rb
@@ -3,10 +3,9 @@ cask 'firefox-gl' do
   sha256 '417fa915dbe47c8970e88fe2f60913a4775406f055276aac7dbfae5dc1aac4e7'
 
   url "https://download.mozilla.org/?product=firefox-#{version}-SSL&os=osx&lang=gl"
-  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/gl/firefox/new'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-it.rb b/Casks/firefox-it.rb
index 0ceb61775..0e7538f4b 100644
--- a/Casks/firefox-it.rb
+++ b/Casks/firefox-it.rb
@@ -3,10 +3,9 @@ cask 'firefox-it' do
   sha256 '90451b7ee9240bae2e74b9dc78bec5fb390ed1d52f6c7c464824ce7ec3c6929d'
 
   url "https://download.mozilla.org/?product=firefox-#{version}-SSL&os=osx&lang=it"
-  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/it/firefox/desktop'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-ja.rb b/Casks/firefox-ja.rb
index 7949e7464..7e2bf7e60 100644
--- a/Casks/firefox-ja.rb
+++ b/Casks/firefox-ja.rb
@@ -3,10 +3,9 @@ cask 'firefox-ja' do
   sha256 '24b96b9f77f6c8dd6ad142f3beec5bc4014125d57d2302766329126cfa9f246e'
 
   url "https://download.mozilla.org/?product=firefox-#{version}-SSL&os=osx&lang=ja-JP-mac"
-  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/ja/firefox/desktop/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-nightly-ja.rb b/Casks/firefox-nightly-ja.rb
index a5b5fd548..cf0abf393 100644
--- a/Casks/firefox-nightly-ja.rb
+++ b/Casks/firefox-nightly-ja.rb
@@ -7,7 +7,6 @@ cask 'firefox-nightly-ja' do
   name 'Mozilla Firefox'
   homepage 'https://nightly.mozilla.org/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'FirefoxNightly.app'
 
diff --git a/Casks/firefox-nightly.rb b/Casks/firefox-nightly.rb
index 5d01111c7..4f2d6957d 100644
--- a/Casks/firefox-nightly.rb
+++ b/Casks/firefox-nightly.rb
@@ -7,7 +7,6 @@ cask 'firefox-nightly' do
   name 'Mozilla Firefox'
   homepage 'https://nightly.mozilla.org/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'FirefoxNightly.app'
 
diff --git a/Casks/firefox-nl.rb b/Casks/firefox-nl.rb
index 39320b857..24727eb1b 100644
--- a/Casks/firefox-nl.rb
+++ b/Casks/firefox-nl.rb
@@ -7,7 +7,6 @@ cask 'firefox-nl' do
   name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/nl/firefox/desktop'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-pl.rb b/Casks/firefox-pl.rb
index 17297d89f..481474a13 100644
--- a/Casks/firefox-pl.rb
+++ b/Casks/firefox-pl.rb
@@ -3,10 +3,9 @@ cask 'firefox-pl' do
   sha256 'afce57831a222f9ee722b6cc7a825461ad4ec7170588e755fd8a021efce99bde'
 
   url "https://download.mozilla.org/?product=firefox-#{version}-SSL&os=osx&lang=pl"
-  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/pl/firefox/desktop'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-pt.rb b/Casks/firefox-pt.rb
index a275dc77e..cb42d1c5e 100644
--- a/Casks/firefox-pt.rb
+++ b/Casks/firefox-pt.rb
@@ -3,10 +3,9 @@ cask 'firefox-pt' do
   sha256 '7f14555a63fe2b9aeb4f28a670135de8572b8a5f0460fdc9e2d7532661f4e95a'
 
   url "https://download.mozilla.org/?product=firefox-#{version}-SSL&os=osx&lang=pt-BR"
-  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/pt/firefox/new'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-ru.rb b/Casks/firefox-ru.rb
index ddec7da1d..bb9843951 100644
--- a/Casks/firefox-ru.rb
+++ b/Casks/firefox-ru.rb
@@ -3,10 +3,9 @@ cask 'firefox-ru' do
   sha256 '060b74fd90dafbb4dcfac34a10613ad0ace410c2a1696180c12691fd432ad048'
 
   url "https://download.mozilla.org/?product=firefox-#{version}-SSL&os=osx&lang=ru"
-  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/ru/firefox/desktop'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefox-tw.rb b/Casks/firefox-tw.rb
index 057d3838a..84b27f707 100644
--- a/Casks/firefox-tw.rb
+++ b/Casks/firefox-tw.rb
@@ -3,10 +3,9 @@ cask 'firefox-tw' do
   sha256 'd71e77f7cff1d940cd6b93d685f906f0c7b98c58e210dbd525d07938722830ea'
 
   url "https://download.mozilla.org/?product=firefox-#{version}-SSL&os=osx&lang=zh-TW"
-  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'http://mozilla.com.tw/firefox/new/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
   
diff --git a/Casks/firefox-uk.rb b/Casks/firefox-uk.rb
index 1fa9a3142..69960da5b 100644
--- a/Casks/firefox-uk.rb
+++ b/Casks/firefox-uk.rb
@@ -3,10 +3,9 @@ cask 'firefox-uk' do
   sha256 '4e3d06df05c14499f344faa58130f62117b303a27d84764d50e6e697068fb597'
 
   url "https://download.mozilla.org/?product=firefox-#{version}-SSL&os=osx&lang=uk"
-  name 'Firefox'
+  name 'Mozilla Firefox'
   homepage 'https://www.mozilla.org/uk/firefox/new'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Firefox.app'
 
diff --git a/Casks/firefoxdeveloperedition-ja.rb b/Casks/firefoxdeveloperedition-ja.rb
index 3559a7121..e680bfa60 100644
--- a/Casks/firefoxdeveloperedition-ja.rb
+++ b/Casks/firefoxdeveloperedition-ja.rb
@@ -3,9 +3,9 @@ cask 'firefoxdeveloperedition-ja' do
   sha256 :no_check
 
   url "https://download.mozilla.org/?product=firefox-aurora-latest-l10n&os=osx&lang=ja-JP-mac"
+  name 'Mozilla Firefox Developer Edition'
   homepage 'https://www.mozilla.org/ja/firefox/developer/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'FirefoxDeveloperEdition.app'
 end
diff --git a/Casks/firefoxdeveloperedition.rb b/Casks/firefoxdeveloperedition.rb
index 26ef5299a..861b9d256 100644
--- a/Casks/firefoxdeveloperedition.rb
+++ b/Casks/firefoxdeveloperedition.rb
@@ -3,9 +3,9 @@ cask 'firefoxdeveloperedition' do
   sha256 :no_check
 
   url "https://download.mozilla.org/?product=firefox-aurora-latest-ssl&os=osx&lang=en-US"
+  name 'Mozilla Firefox Developer Edition'
   homepage 'https://www.mozilla.org/en-US/firefox/developer/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'FirefoxDeveloperEdition.app'
 end
diff --git a/Casks/google-chrome-beta.rb b/Casks/google-chrome-beta.rb
index 9a11dc185..96a7017e8 100644
--- a/Casks/google-chrome-beta.rb
+++ b/Casks/google-chrome-beta.rb
@@ -6,7 +6,6 @@ cask 'google-chrome-beta' do
   name 'Google Chrome'
   homepage 'https://www.google.com/chrome/browser/beta.html?platform=mac&extra=betachannel'
   license :gratis
-  tags :vendor => 'Google'
 
   app 'Google Chrome.app'
 
diff --git a/Casks/google-chrome-canary.rb b/Casks/google-chrome-canary.rb
index 92e65d4d1..b4be4d070 100644
--- a/Casks/google-chrome-canary.rb
+++ b/Casks/google-chrome-canary.rb
@@ -3,9 +3,9 @@ cask 'google-chrome-canary' do
   sha256 :no_check
 
   url 'https://storage.googleapis.com/chrome-canary/GoogleChromeCanary.dmg'
+  name 'Google Chrome Canary'
   homepage 'https://www.google.com/chrome/browser/canary.html?platform=mac'
   license :gratis
-  tags :vendor => 'Google'
 
   app 'Google Chrome Canary.app'
 
diff --git a/Casks/google-chrome-dev.rb b/Casks/google-chrome-dev.rb
index ec0643dc2..5f9a3c4a0 100644
--- a/Casks/google-chrome-dev.rb
+++ b/Casks/google-chrome-dev.rb
@@ -6,7 +6,6 @@ cask 'google-chrome-dev' do
   name 'Google Chrome'
   homepage 'https://www.google.com/chrome/browser/desktop/index.html?extra=devchannel'
   license :gratis
-  tags :vendor => 'Google'
 
   app 'Google Chrome.app'
 
diff --git a/Casks/google-japanese-ime-dev.rb b/Casks/google-japanese-ime-dev.rb
index efbfac0cd..3a5976869 100644
--- a/Casks/google-japanese-ime-dev.rb
+++ b/Casks/google-japanese-ime-dev.rb
@@ -7,7 +7,6 @@ cask 'google-japanese-ime-dev' do
   name 'Google Japanese Input Method Editor'
   homepage 'https://www.google.co.jp/ime/'
   license :gratis
-  tags :vendor => 'Google'
 
   pkg 'GoogleJapaneseInput.pkg'
   
diff --git a/Casks/openoffice-fr.rb b/Casks/openoffice-fr.rb
index b9efa7b92..5fd129168 100644
--- a/Casks/openoffice-fr.rb
+++ b/Casks/openoffice-fr.rb
@@ -4,10 +4,9 @@ cask 'openoffice-fr' do
 
   # sourceforge.net is the official download host per the vendor homepage
   url "http://downloads.sourceforge.net/project/openofficeorg.mirror/#{version}/binaries/fr/Apache_OpenOffice_#{version}_MacOS_x86-64_install_fr.dmg"
-  name 'OpenOffice'
+  name 'Apache OpenOffice'
   homepage 'https://www.openoffice.org/fr/Telecharger/'
   license :apache
-  tags :vendor => 'Apache'
 
   app 'OpenOffice.app'
 
diff --git a/Casks/openoffice-gl.rb b/Casks/openoffice-gl.rb
index 99fd19b20..8463159d2 100644
--- a/Casks/openoffice-gl.rb
+++ b/Casks/openoffice-gl.rb
@@ -4,10 +4,9 @@ cask 'openoffice-gl' do
 
   # sourceforge.net is the official download host per the vendor homepage
   url "http://downloads.sourceforge.net/project/openofficeorg.mirror/#{version}/binaries/gl/Apache_OpenOffice_#{version}_MacOS_x86-64_install_gl.dmg"
-  name 'OpenOffice'
+  name 'Apache OpenOffice'
   homepage 'http://www.openoffice.org/gl/Descargar/'
   license :apache
-  tags :vendor => 'Apache'
 
   app 'OpenOffice.app'
 end
diff --git a/Casks/openoffice-pt.rb b/Casks/openoffice-pt.rb
index 95710fd26..7b4838226 100644
--- a/Casks/openoffice-pt.rb
+++ b/Casks/openoffice-pt.rb
@@ -4,10 +4,9 @@ cask 'openoffice-pt' do
 
   # sourceforge.net is the official download host per the vendor homepage
   url "http://downloads.sourceforge.net/project/openofficeorg.mirror/#{version}/binaries/pt/Apache_OpenOffice_#{version}_MacOS_x86-64_install_pt.dmg"
-  name 'OpenOffice'
+  name 'Apache OpenOffice'
   homepage 'http://www.openoffice.org/pt/download/'
   license :apache
-  tags :vendor => 'Apache'
 
   app 'OpenOffice.app'
 end
diff --git a/Casks/thunderbird-beta-ru.rb b/Casks/thunderbird-beta-ru.rb
index e7ad22823..79b3c89ec 100644
--- a/Casks/thunderbird-beta-ru.rb
+++ b/Casks/thunderbird-beta-ru.rb
@@ -6,7 +6,6 @@ cask 'thunderbird-beta-ru' do
   name 'Mozilla Thunderbird'
   homepage 'https://www.mozilla.org/en-US/thunderbird/all-beta.html'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-beta-uk.rb b/Casks/thunderbird-beta-uk.rb
index 2db926a31..aaa071ec2 100644
--- a/Casks/thunderbird-beta-uk.rb
+++ b/Casks/thunderbird-beta-uk.rb
@@ -6,7 +6,6 @@ cask 'thunderbird-beta-uk' do
   name 'Mozilla Thunderbird'
   homepage 'https://www.mozilla.org/en-US/thunderbird/all-beta.html'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-beta.rb b/Casks/thunderbird-beta.rb
index 079365880..3e8f1dd9c 100644
--- a/Casks/thunderbird-beta.rb
+++ b/Casks/thunderbird-beta.rb
@@ -6,7 +6,6 @@ cask 'thunderbird-beta' do
   name 'Mozilla Thunderbird'
   homepage 'https://www.mozilla.org/en-US/thunderbird/all-beta.html'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-cn.rb b/Casks/thunderbird-cn.rb
index ad7743dd0..3f8de0988 100644
--- a/Casks/thunderbird-cn.rb
+++ b/Casks/thunderbird-cn.rb
@@ -6,7 +6,6 @@ cask 'thunderbird-cn' do
   name 'Mozilla Thunderbird'
   homepage 'https://www.mozilla.org/zh-CN/thunderbird/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-de.rb b/Casks/thunderbird-de.rb
index d4c0d6ebe..a00150d48 100644
--- a/Casks/thunderbird-de.rb
+++ b/Casks/thunderbird-de.rb
@@ -6,7 +6,6 @@ cask 'thunderbird-de' do
   name 'Mozilla Thunderbird'
   homepage 'http://www.mozilla.org/de/thunderbird/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-fr.rb b/Casks/thunderbird-fr.rb
index 5561d38d6..0a27f048c 100644
--- a/Casks/thunderbird-fr.rb
+++ b/Casks/thunderbird-fr.rb
@@ -6,7 +6,6 @@ cask 'thunderbird-fr' do
   name 'Mozilla Thunderbird'
   homepage 'https://www.mozilla.org/fr/thunderbird/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-gl.rb b/Casks/thunderbird-gl.rb
index e0df6135f..b01737b39 100644
--- a/Casks/thunderbird-gl.rb
+++ b/Casks/thunderbird-gl.rb
@@ -6,7 +6,6 @@ cask 'thunderbird-gl' do
   name 'Mozilla Thunderbird'
   homepage 'https://www.mozilla.org/gl/thunderbird/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-it.rb b/Casks/thunderbird-it.rb
index 0238b7297..2ec2efbed 100644
--- a/Casks/thunderbird-it.rb
+++ b/Casks/thunderbird-it.rb
@@ -6,7 +6,6 @@ cask 'thunderbird-it' do
   name 'Mozilla Thunderbird'
   homepage 'https://www.mozilla.org/it/thunderbird/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-ja.rb b/Casks/thunderbird-ja.rb
index dda1b4e99..454700b51 100644
--- a/Casks/thunderbird-ja.rb
+++ b/Casks/thunderbird-ja.rb
@@ -6,7 +6,6 @@ cask 'thunderbird-ja' do
   name 'Mozilla Thunderbird'
   homepage 'https://www.mozilla.jp/thunderbird/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-nl.rb b/Casks/thunderbird-nl.rb
index 0fd17aa99..e598f71cd 100644
--- a/Casks/thunderbird-nl.rb
+++ b/Casks/thunderbird-nl.rb
@@ -3,10 +3,9 @@ cask 'thunderbird-nl' do
   sha256 '3c4b131893e64d86446b7f0ee9545ecac85a92cf988c65566eb780e68f23a95d'
 
   url "https://download.mozilla.org/?product=thunderbird-#{version}&os=osx&lang=nl"
-  name 'Mozilla Thunderbird'
+  name 'Mozilla Mozilla Thunderbird'
   homepage 'http://www.mozilla.org/nl/thunderbird/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-pt.rb b/Casks/thunderbird-pt.rb
index 3245b1bb0..2bdb32057 100644
--- a/Casks/thunderbird-pt.rb
+++ b/Casks/thunderbird-pt.rb
@@ -6,7 +6,6 @@ cask 'thunderbird-pt' do
   name 'Mozilla Thunderbird'
   homepage 'https://www.mozilla.org/pt/thunderbird/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-ru.rb b/Casks/thunderbird-ru.rb
index 4f31f463b..6d6f7360f 100644
--- a/Casks/thunderbird-ru.rb
+++ b/Casks/thunderbird-ru.rb
@@ -6,7 +6,6 @@ cask 'thunderbird-ru' do
   name 'Mozilla Thunderbird'
   homepage 'http://www.mozilla.org/ru/thunderbird/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-uk.rb b/Casks/thunderbird-uk.rb
index 7537949bf..92c43c9cc 100644
--- a/Casks/thunderbird-uk.rb
+++ b/Casks/thunderbird-uk.rb
@@ -6,7 +6,6 @@ cask 'thunderbird-uk' do
   name 'Mozilla Thunderbird'
   homepage 'http://www.mozilla.org/uk/thunderbird/'
   license :mpl
-  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/virtualbox-beta.rb b/Casks/virtualbox-beta.rb
index a1002b4a4..79d26c17b 100644
--- a/Casks/virtualbox-beta.rb
+++ b/Casks/virtualbox-beta.rb
@@ -3,10 +3,9 @@ cask 'virtualbox-beta' do
   sha256 'c190f66421211b6f0ccbfc67740bf442f5e9ed2c95202846a8873a8f6f8e7af5'
 
   url "http://download.virtualbox.org/virtualbox/#{version.split('-')[0]}/VirtualBox-#{version}-OSX.dmg"
-  name 'VirtualBox'
+  name 'Oracle VirtualBox'
   homepage 'https://www.virtualbox.org/wiki/Testbuilds'
   license :gpl
-  tags :vendor => 'Oracle'
 
   pkg 'VirtualBox.pkg'
   binary '/Applications/VirtualBox.app/Contents/MacOS/VBoxManage'
diff --git a/Casks/vmware-fusion6.rb b/Casks/vmware-fusion6.rb
index 38a89a5a1..754f0ad95 100644
--- a/Casks/vmware-fusion6.rb
+++ b/Casks/vmware-fusion6.rb
@@ -6,7 +6,6 @@ cask 'vmware-fusion6' do
   name 'VMware Fusion'
   homepage 'https://www.vmware.com/products/fusion/'
   license :commercial
-  tags :vendor => 'VMware'
 
   binary 'VMware Fusion.app/Contents/Library/vmrun'
   app 'VMware Fusion.app'
diff --git a/Casks/vmware-fusion7.rb b/Casks/vmware-fusion7.rb
index 8614297c7..cc0a00243 100644
--- a/Casks/vmware-fusion7.rb
+++ b/Casks/vmware-fusion7.rb
@@ -6,7 +6,6 @@ cask 'vmware-fusion7' do
   name 'VMware Fusion'
   homepage 'https://www.vmware.com/products/fusion/'
   license :commercial
-  tags :vendor => 'VMware'
 
   binary 'VMware Fusion.app/Contents/Library/vmnet-cfgcli'
   binary 'VMware Fusion.app/Contents/Library/vmnet-cli'
diff --git a/Casks/yandex-beta.rb b/Casks/yandex-beta.rb
index 016bdd18c..6e2cf93ba 100644
--- a/Casks/yandex-beta.rb
+++ b/Casks/yandex-beta.rb
@@ -7,7 +7,6 @@ cask 'yandex-beta' do
   name 'Custo'
   homepage 'https://browser.yandex.ru/beta/'
   license :commercial
-  tags :vendor => 'Yandex'
 
   app 'Yandex.app'
 end