diff --git a/Casks/a-better-finder-attributes.rb b/Casks/a-better-finder-attributes.rb
index 61191e16136d..274e5a01a747 100644
--- a/Casks/a-better-finder-attributes.rb
+++ b/Casks/a-better-finder-attributes.rb
@@ -1,4 +1,4 @@
-class ABetterFinderAttributes < Cask
+cask :v1 => 'a-better-finder-attributes' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/a-better-finder-rename.rb b/Casks/a-better-finder-rename.rb
index c7e69d7117da..d1181048b5db 100644
--- a/Casks/a-better-finder-rename.rb
+++ b/Casks/a-better-finder-rename.rb
@@ -1,4 +1,4 @@
-class ABetterFinderRename < Cask
+cask :v1 => 'a-better-finder-rename' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/a-slower-speed-of-light.rb b/Casks/a-slower-speed-of-light.rb
index 802cc5d0bb9b..328af9617e56 100644
--- a/Casks/a-slower-speed-of-light.rb
+++ b/Casks/a-slower-speed-of-light.rb
@@ -1,4 +1,4 @@
-class ASlowerSpeedOfLight < Cask
+cask :v1 => 'a-slower-speed-of-light' do
   version 'summer-12'
   sha256 'ab5a66a9857b979211d0506a005d678f185705bb848bd42ac91d9628e0945a39'
 
diff --git a/Casks/abgx360.rb b/Casks/abgx360.rb
index fe1083d0532a..0c07e8af792a 100644
--- a/Casks/abgx360.rb
+++ b/Casks/abgx360.rb
@@ -1,4 +1,4 @@
-class Abgx360 < Cask
+cask :v1 => 'abgx360' do
   version '1.0.6'
   sha256 'b2b066d1500e6c6a64d103b2c1a9e1760be0a4e16df314b4868024c19df8c741'
 
diff --git a/Casks/abscissa.rb b/Casks/abscissa.rb
index 8caa47711342..530f253da343 100644
--- a/Casks/abscissa.rb
+++ b/Casks/abscissa.rb
@@ -1,4 +1,4 @@
-class Abscissa < Cask
+cask :v1 => 'abscissa' do
   version '3.4.3'
   sha256 '4ef1744451548aed19665cf71102e3ca8bb2af4ee02e45c6a18721a7b3c91a76'
 
diff --git a/Casks/accessmenubarapps.rb b/Casks/accessmenubarapps.rb
index 4d84c2f1d7fc..99629f6cac62 100644
--- a/Casks/accessmenubarapps.rb
+++ b/Casks/accessmenubarapps.rb
@@ -1,4 +1,4 @@
-class Accessmenubarapps < Cask
+cask :v1 => 'accessmenubarapps' do
   version '2.4'
   sha256 '1065fbb4ca009758d4f303ed2106bd82a5ae21233b478f50fea3ddaa318473ce'
 
diff --git a/Casks/acorn.rb b/Casks/acorn.rb
index 9a454d933d10..716c020f8657 100644
--- a/Casks/acorn.rb
+++ b/Casks/acorn.rb
@@ -1,4 +1,4 @@
-class Acorn < Cask
+cask :v1 => 'acorn' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/acslogo.rb b/Casks/acslogo.rb
index f4efc37a7731..62d5bbf401b8 100644
--- a/Casks/acslogo.rb
+++ b/Casks/acslogo.rb
@@ -1,4 +1,4 @@
-class Acslogo < Cask
+cask :v1 => 'acslogo' do
   version '1.5.1'
   sha256 'fcdab9679a9cc783d4b7912d611442faa1fe1293497c4cb649f6808a58d27082'
 
diff --git a/Casks/actions-server.rb b/Casks/actions-server.rb
index cfd433cf862d..e20e8620e32f 100644
--- a/Casks/actions-server.rb
+++ b/Casks/actions-server.rb
@@ -1,4 +1,4 @@
-class ActionsServer < Cask
+cask :v1 => 'actions-server' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/actiontastic.rb b/Casks/actiontastic.rb
index 22a4bbd6f623..033402717b89 100644
--- a/Casks/actiontastic.rb
+++ b/Casks/actiontastic.rb
@@ -1,4 +1,4 @@
-class Actiontastic < Cask
+cask :v1 => 'actiontastic' do
   version 'Beta8'
   sha256 'f6536cd0cb477dd3867ccf359469b7a4377fb307a0307b27566c1f4219b79c44'
 
diff --git a/Casks/activity-audit.rb b/Casks/activity-audit.rb
index 83f09f292064..b996a254b8fd 100644
--- a/Casks/activity-audit.rb
+++ b/Casks/activity-audit.rb
@@ -1,4 +1,4 @@
-class ActivityAudit < Cask
+cask :v1 => 'activity-audit' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/actotracker.rb b/Casks/actotracker.rb
index c53d7faf3a40..1f29bc334954 100644
--- a/Casks/actotracker.rb
+++ b/Casks/actotracker.rb
@@ -1,4 +1,4 @@
-class Actotracker < Cask
+cask :v1 => 'actotracker' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/actprinter.rb b/Casks/actprinter.rb
index 2b083442112a..dd69642ab8e4 100644
--- a/Casks/actprinter.rb
+++ b/Casks/actprinter.rb
@@ -1,4 +1,4 @@
-class Actprinter < Cask
+cask :v1 => 'actprinter' do
   version '3.1.4'
   sha256 '7f92b093be3ddc08f5ce00cd19b3edb13c01a4c4626948b204c484123d3e25e8'
 
diff --git a/Casks/actual-odbc-pack.rb b/Casks/actual-odbc-pack.rb
index ad253bbfc5dd..642d2c293843 100644
--- a/Casks/actual-odbc-pack.rb
+++ b/Casks/actual-odbc-pack.rb
@@ -1,4 +1,4 @@
-class ActualOdbcPack < Cask
+cask :v1 => 'actual-odbc-pack' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/adafruit-arduino.rb b/Casks/adafruit-arduino.rb
index e7ee61aac01c..49c0e35cf856 100644
--- a/Casks/adafruit-arduino.rb
+++ b/Casks/adafruit-arduino.rb
@@ -1,4 +1,4 @@
-class AdafruitArduino < Cask
+cask :v1 => 'adafruit-arduino' do
   version '1.0.5'
   sha256 'de1c64233c8a2c6b039f9eddd4c417e594afee51558cd9f2f335a831580e2d42'
 
diff --git a/Casks/adapter.rb b/Casks/adapter.rb
index 0b441000e5c5..19eb4d6fd9ae 100644
--- a/Casks/adapter.rb
+++ b/Casks/adapter.rb
@@ -1,4 +1,4 @@
-class Adapter < Cask
+cask :v1 => 'adapter' do
   version '2.1.2'
   sha256 '3996193eb2b228ca04969a3a527c37ed3f9b811796926ac7cc177ae41188812a'
 
diff --git a/Casks/adium.rb b/Casks/adium.rb
index 0cffe7c9721e..0bf5315778a3 100644
--- a/Casks/adium.rb
+++ b/Casks/adium.rb
@@ -1,4 +1,4 @@
-class Adium < Cask
+cask :v1 => 'adium' do
   version '1.5.10'
   sha256 'bca3ac81d33265b71c95a3984be80715fbd98f38d7c463d0441d43a335ed399a'
 
diff --git a/Casks/adobe-air.rb b/Casks/adobe-air.rb
index 38fdfa259741..5b91dcba91fe 100644
--- a/Casks/adobe-air.rb
+++ b/Casks/adobe-air.rb
@@ -1,4 +1,4 @@
-class AdobeAir < Cask
+cask :v1 => 'adobe-air' do
   version '15.0'
   sha256 '0fd04ae2ecb839a70b148a8194db1143fb3c2a8a2000d42e579c08aca65c0691'
 
diff --git a/Casks/adobe-arh.rb b/Casks/adobe-arh.rb
index 4b1f833e4c36..b6f564523cf0 100644
--- a/Casks/adobe-arh.rb
+++ b/Casks/adobe-arh.rb
@@ -1,4 +1,4 @@
-class AdobeArh < Cask
+cask :v1 => 'adobe-arh' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/adobe-creative-cloud.rb b/Casks/adobe-creative-cloud.rb
index ff58990095c2..5bcd3bed5114 100644
--- a/Casks/adobe-creative-cloud.rb
+++ b/Casks/adobe-creative-cloud.rb
@@ -1,4 +1,4 @@
-class AdobeCreativeCloud < Cask
+cask :v1 => 'adobe-creative-cloud' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/adobe-digital-editions.rb b/Casks/adobe-digital-editions.rb
index fe4b92aea54f..89d4e10d4553 100644
--- a/Casks/adobe-digital-editions.rb
+++ b/Casks/adobe-digital-editions.rb
@@ -1,4 +1,4 @@
-class AdobeDigitalEditions < Cask
+cask :v1 => 'adobe-digital-editions' do
   version '4.0'
   sha256 '359f62e8fc2d89d6aa411fc4ed69a5be9e19d433226640b3ddbaec35e66f646c'
 
diff --git a/Casks/adobe-dng-converter.rb b/Casks/adobe-dng-converter.rb
index 1b12a6602c70..5901a5f999a1 100644
--- a/Casks/adobe-dng-converter.rb
+++ b/Casks/adobe-dng-converter.rb
@@ -1,4 +1,4 @@
-class AdobeDngConverter < Cask
+cask :v1 => 'adobe-dng-converter' do
   version '8.6'
   sha256 '3bb43ca608b7e62727512c813b395ea46aad545f68f9323cc78c9c5f47145650'
 
diff --git a/Casks/adobe-photoshop-lightroom.rb b/Casks/adobe-photoshop-lightroom.rb
index 34a446465198..1c1e71d3c066 100644
--- a/Casks/adobe-photoshop-lightroom.rb
+++ b/Casks/adobe-photoshop-lightroom.rb
@@ -1,4 +1,4 @@
-class AdobePhotoshopLightroom < Cask
+cask :v1 => 'adobe-photoshop-lightroom' do
   version '5.6'
   sha256 '794fa6b364985a6e3c830f78c9ad9c52c46208676bf01576976cbcfc818aa61a'
 
diff --git a/Casks/adobe-reader.rb b/Casks/adobe-reader.rb
index 5ff4d19c0c2a..c4e5e4668685 100644
--- a/Casks/adobe-reader.rb
+++ b/Casks/adobe-reader.rb
@@ -1,4 +1,4 @@
-class AdobeReader < Cask
+cask :v1 => 'adobe-reader' do
   version '11.0.09'
   sha256 '259957f1434bcdf47dc6a7c12affc40dd3c17288009dc229aa51f20ec4e8b1c5'
 
diff --git a/Casks/adventure.rb b/Casks/adventure.rb
index 6c9857ad6001..9360b76b5ed7 100644
--- a/Casks/adventure.rb
+++ b/Casks/adventure.rb
@@ -1,4 +1,4 @@
-class Adventure < Cask
+cask :v1 => 'adventure' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/aegisub.rb b/Casks/aegisub.rb
index 98a68081515e..67766f9228c7 100644
--- a/Casks/aegisub.rb
+++ b/Casks/aegisub.rb
@@ -1,4 +1,4 @@
-class Aegisub < Cask
+cask :v1 => 'aegisub' do
   version '3.0.4'
   sha256 '37d8aca8a30619f09b66bcd1d6d4a925388c74b8a06287045e76ba84ca116e70'
 
diff --git a/Casks/aerofs.rb b/Casks/aerofs.rb
index 17d102ac02b8..79d99d1125e6 100644
--- a/Casks/aerofs.rb
+++ b/Casks/aerofs.rb
@@ -1,4 +1,4 @@
-class Aerofs < Cask
+cask :v1 => 'aerofs' do
   version '0.8.67'
   sha256 'abb05bfdea788520f02ec5f526d10ab336d183a96598007cc98e29c088b8b567'
 
diff --git a/Casks/aether.rb b/Casks/aether.rb
index cb490ef1c0d9..bfb518307866 100644
--- a/Casks/aether.rb
+++ b/Casks/aether.rb
@@ -1,4 +1,4 @@
-class Aether < Cask
+cask :v1 => 'aether' do
   version '1.2.3'
   sha256 '04ca7fbd693bda438436b46315616660ff123ec9d817d802c8c14dcb13711338'
 
diff --git a/Casks/aimersoft-video-converter-ultimate.rb b/Casks/aimersoft-video-converter-ultimate.rb
index 8d8adb370626..a4919fe916a6 100644
--- a/Casks/aimersoft-video-converter-ultimate.rb
+++ b/Casks/aimersoft-video-converter-ultimate.rb
@@ -1,4 +1,4 @@
-class AimersoftVideoConverterUltimate < Cask
+cask :v1 => 'aimersoft-video-converter-ultimate' do
   version '4.4.2'
   sha256 '1435b2196a5ea0ae1f52ae5d16e41ee7b1ee2ed9126d3399fc381b1c7181a957'
 
diff --git a/Casks/air-connect.rb b/Casks/air-connect.rb
index 101152a1cd6d..cad856df675c 100644
--- a/Casks/air-connect.rb
+++ b/Casks/air-connect.rb
@@ -1,4 +1,4 @@
-class AirConnect < Cask
+cask :v1 => 'air-connect' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/air-video-server-hd.rb b/Casks/air-video-server-hd.rb
index 186c5b78b99a..e0c66cb55b79 100644
--- a/Casks/air-video-server-hd.rb
+++ b/Casks/air-video-server-hd.rb
@@ -1,4 +1,4 @@
-class AirVideoServerHd < Cask
+cask :v1 => 'air-video-server-hd' do
   version '2.0.2'
   sha256 'b0a0ef30fcb19de24051fe32e5de0eb601d65664fe71a8cfb4e3243d49c1e1d5'
 
diff --git a/Casks/air-video-server.rb b/Casks/air-video-server.rb
index be1516d85e27..ab93b49c8407 100644
--- a/Casks/air-video-server.rb
+++ b/Casks/air-video-server.rb
@@ -1,4 +1,4 @@
-class AirVideoServer < Cask
+cask :v1 => 'air-video-server' do
   version '2.4.6-beta3u2'
   sha256 '479af913987a4cc8414969a8d4a4c164a4bd0a22d156829a983b4c58e9dd3f6e'
 
diff --git a/Casks/airdisplay.rb b/Casks/airdisplay.rb
index ee78f98763b3..9922a7ac0109 100644
--- a/Casks/airdisplay.rb
+++ b/Casks/airdisplay.rb
@@ -1,4 +1,4 @@
-class Airdisplay < Cask
+cask :v1 => 'airdisplay' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/airfile.rb b/Casks/airfile.rb
index 84e5642e3d83..fe83d35a46aa 100644
--- a/Casks/airfile.rb
+++ b/Casks/airfile.rb
@@ -1,4 +1,4 @@
-class Airfile < Cask
+cask :v1 => 'airfile' do
   version '2.2.0'
   sha256 '49328695c65ce15e034956dc556c3c4770436ede86ad1dff1fd1da3d216b08a3'
 
diff --git a/Casks/airflick.rb b/Casks/airflick.rb
index c3bff3626489..8840cfa1dc1c 100644
--- a/Casks/airflick.rb
+++ b/Casks/airflick.rb
@@ -1,4 +1,4 @@
-class Airflick < Cask
+cask :v1 => 'airflick' do
   version '0.51'
   sha256 'f84984a120211b8c34314de48b41feaacf119c7a222d90ffb9a7e5fd98ddeb76'
 
diff --git a/Casks/airfoil.rb b/Casks/airfoil.rb
index 9c53e1fea598..d3a88ead468e 100644
--- a/Casks/airfoil.rb
+++ b/Casks/airfoil.rb
@@ -1,4 +1,4 @@
-class Airfoil < Cask
+cask :v1 => 'airfoil' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/airmail-amt.rb b/Casks/airmail-amt.rb
index cb0d79e45c45..517edb4a7d42 100644
--- a/Casks/airmail-amt.rb
+++ b/Casks/airmail-amt.rb
@@ -1,4 +1,4 @@
-class AirmailAmt < Cask
+cask :v1 => 'airmail-amt' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/airparrot.rb b/Casks/airparrot.rb
index cd511fd5dc35..f85256c97eda 100644
--- a/Casks/airparrot.rb
+++ b/Casks/airparrot.rb
@@ -1,4 +1,4 @@
-class Airparrot < Cask
+cask :v1 => 'airparrot' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/airserver.rb b/Casks/airserver.rb
index 3cd9ad9dea61..d55d9ec4de45 100644
--- a/Casks/airserver.rb
+++ b/Casks/airserver.rb
@@ -1,4 +1,4 @@
-class Airserver < Cask
+cask :v1 => 'airserver' do
   version '5.1.0'
   sha256 'b3b4749bef4978718b9bd915ac1e3a529813eafc8ea0f1ec99f06dffea7016fa'
 
diff --git a/Casks/airstream.rb b/Casks/airstream.rb
index 938b181e9eb6..94a7eca0db8f 100644
--- a/Casks/airstream.rb
+++ b/Casks/airstream.rb
@@ -1,4 +1,4 @@
-class Airstream < Cask
+cask :v1 => 'airstream' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/alarm-clock.rb b/Casks/alarm-clock.rb
index ffb89347a4d6..6782f8a3c7d3 100644
--- a/Casks/alarm-clock.rb
+++ b/Casks/alarm-clock.rb
@@ -1,4 +1,4 @@
-class AlarmClock < Cask
+cask :v1 => 'alarm-clock' do
   version '2.4.5'
   sha256 '285d277572be83c632c696d565a8413c2d5149a460392177e9e1b601ffce8778'
 
diff --git a/Casks/alfred.rb b/Casks/alfred.rb
index 4d6db750a6b4..63d24efc6fd2 100644
--- a/Casks/alfred.rb
+++ b/Casks/alfred.rb
@@ -1,4 +1,4 @@
-class Alfred < Cask
+cask :v1 => 'alfred' do
   version '2.5.1_308'
   sha256 '06e55eed65c3e09bffd385a11a695ebd7df79a5303690e9cb197a0b72782e2dc'
 
diff --git a/Casks/alib1.rb b/Casks/alib1.rb
index 5f7fc04b1f06..1d9c24126c21 100644
--- a/Casks/alib1.rb
+++ b/Casks/alib1.rb
@@ -1,4 +1,4 @@
-class Alib1 < Cask
+cask :v1 => 'alib1' do
   # note: "1" is not a version number, but an intrinsic part of the product name
   version :latest
   sha256 :no_check
diff --git a/Casks/alice.rb b/Casks/alice.rb
index 2c675e42f1e9..3400224f36f2 100644
--- a/Casks/alice.rb
+++ b/Casks/alice.rb
@@ -1,4 +1,4 @@
-class Alice < Cask
+cask :v1 => 'alice' do
   version '1.4'
   sha256 '0d6259bdff7fd0309b532188445d0dd4f7ea4d50f5570e9b46d282fbade74ce1'
 
diff --git a/Casks/alinof-timer.rb b/Casks/alinof-timer.rb
index 8797293659e2..bb46813d92a9 100644
--- a/Casks/alinof-timer.rb
+++ b/Casks/alinof-timer.rb
@@ -1,4 +1,4 @@
-class AlinofTimer < Cask
+cask :v1 => 'alinof-timer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/aliwangwang.rb b/Casks/aliwangwang.rb
index d18054abbb5d..b5a34eda0f26 100644
--- a/Casks/aliwangwang.rb
+++ b/Casks/aliwangwang.rb
@@ -1,4 +1,4 @@
-class Aliwangwang < Cask
+cask :v1 => 'aliwangwang' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/all-the-gifs.rb b/Casks/all-the-gifs.rb
index 694aa26daed3..e7e89772d6c2 100644
--- a/Casks/all-the-gifs.rb
+++ b/Casks/all-the-gifs.rb
@@ -1,4 +1,4 @@
-class AllTheGifs < Cask
+cask :v1 => 'all-the-gifs' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/all2mp3.rb b/Casks/all2mp3.rb
index 43c844170b5e..25c22914901d 100644
--- a/Casks/all2mp3.rb
+++ b/Casks/all2mp3.rb
@@ -1,4 +1,4 @@
-class All2mp3 < Cask
+cask :v1 => 'all2mp3' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/amadeus-pro.rb b/Casks/amadeus-pro.rb
index 67f85ebdb3e6..f3ec97901a04 100644
--- a/Casks/amadeus-pro.rb
+++ b/Casks/amadeus-pro.rb
@@ -1,4 +1,4 @@
-class AmadeusPro < Cask
+cask :v1 => 'amadeus-pro' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/amazon-cloud-drive.rb b/Casks/amazon-cloud-drive.rb
index faf227a42ff6..6cee62884ebd 100644
--- a/Casks/amazon-cloud-drive.rb
+++ b/Casks/amazon-cloud-drive.rb
@@ -1,4 +1,4 @@
-class AmazonCloudDrive < Cask
+cask :v1 => 'amazon-cloud-drive' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/amazon-music.rb b/Casks/amazon-music.rb
index b64a6e3f5d9d..98e9ddba6e1a 100644
--- a/Casks/amazon-music.rb
+++ b/Casks/amazon-music.rb
@@ -1,4 +1,4 @@
-class AmazonMusic < Cask
+cask :v1 => 'amazon-music' do
   version '3.4'
   sha256 '7b9a8285abd83c0ed6e01db93b620c3d4cce5ade152ecbf30347b91055d83849'
 
diff --git a/Casks/amazon-zocalo.rb b/Casks/amazon-zocalo.rb
index 3290db5dce5b..2e457d663a07 100644
--- a/Casks/amazon-zocalo.rb
+++ b/Casks/amazon-zocalo.rb
@@ -1,4 +1,4 @@
-class AmazonZocalo < Cask
+cask :v1 => 'amazon-zocalo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/amethyst.rb b/Casks/amethyst.rb
index 6bf2cbee2589..e23bf6bbe8b5 100644
--- a/Casks/amethyst.rb
+++ b/Casks/amethyst.rb
@@ -1,4 +1,4 @@
-class Amethyst < Cask
+cask :v1 => 'amethyst' do
   version '0.9.4'
   sha256 'c9fb397dffdc77422ee8da363a6f1dee25562d9c1186b10260255f6a7ad50a23'
 
diff --git a/Casks/ammonite.rb b/Casks/ammonite.rb
index e4c7b1feda03..8d0417c8ab2d 100644
--- a/Casks/ammonite.rb
+++ b/Casks/ammonite.rb
@@ -1,4 +1,4 @@
-class Ammonite < Cask
+cask :v1 => 'ammonite' do
   version '1.12'
   sha256 '4bc4dd3c77efea03c324d7e671549ca9a7b23946f421c8bcbca5269c76d692be'
 
diff --git a/Casks/ampps.rb b/Casks/ampps.rb
index 52d3f409420c..6d10df32d52c 100644
--- a/Casks/ampps.rb
+++ b/Casks/ampps.rb
@@ -1,4 +1,4 @@
-class Ampps < Cask
+cask :v1 => 'ampps' do
   version '2.3'
   sha256 'ce7a1a7e71f0314edbc994e10fe4f6a80303c1999904ca1fb14d98c7477ae8e0'
 
diff --git a/Casks/android-file-transfer.rb b/Casks/android-file-transfer.rb
index 5c3059989864..4a5c32fc3cb2 100644
--- a/Casks/android-file-transfer.rb
+++ b/Casks/android-file-transfer.rb
@@ -1,4 +1,4 @@
-class AndroidFileTransfer < Cask
+cask :v1 => 'android-file-transfer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/android-studio-bundle.rb b/Casks/android-studio-bundle.rb
index 060c9badd62d..8ffaa7656b5e 100644
--- a/Casks/android-studio-bundle.rb
+++ b/Casks/android-studio-bundle.rb
@@ -1,4 +1,4 @@
-class AndroidStudioBundle < Cask
+cask :v1 => 'android-studio-bundle' do
   version '0.8.6 build-135.1339820'
   sha256 '3a9f65434a2381019f4487481331f539a69b09b8ea81a8b4dfff9c6a126423f0'
 
diff --git a/Casks/android-studio.rb b/Casks/android-studio.rb
index bc224c881190..ddb4c115c0eb 100644
--- a/Casks/android-studio.rb
+++ b/Casks/android-studio.rb
@@ -1,4 +1,4 @@
-class AndroidStudio < Cask
+cask :v1 => 'android-studio' do
   version '0.8.14'
   sha256 '05eb79f0c4025f510ff02d7205157eb94d42074a2d89c8a5ba4cbead1187948f'
 
diff --git a/Casks/angry-ip-scanner.rb b/Casks/angry-ip-scanner.rb
index 5d7eef69125c..5dd518ee5aa5 100644
--- a/Casks/angry-ip-scanner.rb
+++ b/Casks/angry-ip-scanner.rb
@@ -1,4 +1,4 @@
-class AngryIpScanner < Cask
+cask :v1 => 'angry-ip-scanner' do
   version '3.3.1'
   sha256 '5e3df2bbf690bb6e9c58ac2ca4a1ae825d5242159846e5b712c89afd839f6f0c'
 
diff --git a/Casks/anki.rb b/Casks/anki.rb
index f36c9612333b..a12987c9147d 100644
--- a/Casks/anki.rb
+++ b/Casks/anki.rb
@@ -1,4 +1,4 @@
-class Anki < Cask
+cask :v1 => 'anki' do
   version '2.0.31'
   sha256 '7afccba7d7998c187156702afb943e0be2b9d14729c8147b9a6fd20e40530fe2'
 
diff --git a/Casks/anonym.rb b/Casks/anonym.rb
index 265cd3a4584f..7dac2c0ed45f 100644
--- a/Casks/anonym.rb
+++ b/Casks/anonym.rb
@@ -1,4 +1,4 @@
-class Anonym < Cask
+cask :v1 => 'anonym' do
   version '2.3'
   sha256 '696ac1cf173976b26e2fdd8f8f087df16437e237cf271fae6dcbcc403148a0d4'
 
diff --git a/Casks/antetype.rb b/Casks/antetype.rb
index 2b08227f7142..a3c901fb4cb4 100644
--- a/Casks/antetype.rb
+++ b/Casks/antetype.rb
@@ -1,4 +1,4 @@
-class Antetype < Cask
+cask :v1 => 'antetype' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/antirsi.rb b/Casks/antirsi.rb
index c29fc2b3bf5b..dd53fac5a640 100644
--- a/Casks/antirsi.rb
+++ b/Casks/antirsi.rb
@@ -1,4 +1,4 @@
-class Antirsi < Cask
+cask :v1 => 'antirsi' do
   version '1.4njr4'
   sha256 'b8c36cac71fe0b097b9435ab869b2a11e97e0f99b3227929cb333d14d5e88552'
 
diff --git a/Casks/anvil.rb b/Casks/anvil.rb
index e279f67e460e..0c44a9129eed 100644
--- a/Casks/anvil.rb
+++ b/Casks/anvil.rb
@@ -1,4 +1,4 @@
-class Anvil < Cask
+cask :v1 => 'anvil' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/anxiety.rb b/Casks/anxiety.rb
index a51e0bf14fbb..903751366951 100644
--- a/Casks/anxiety.rb
+++ b/Casks/anxiety.rb
@@ -1,4 +1,4 @@
-class Anxiety < Cask
+cask :v1 => 'anxiety' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/anypass.rb b/Casks/anypass.rb
index 13658c623d56..d3759c9aa34f 100644
--- a/Casks/anypass.rb
+++ b/Casks/anypass.rb
@@ -1,4 +1,4 @@
-class Anypass < Cask
+cask :v1 => 'anypass' do
   version '1.0.0'
   sha256 '364d108736eddfdb6e7db56430806d790b79e9f8561aedc544fc78d7e41bac54'
 
diff --git a/Casks/ap-grapher.rb b/Casks/ap-grapher.rb
index 5802690550f2..059a7b4fb53c 100644
--- a/Casks/ap-grapher.rb
+++ b/Casks/ap-grapher.rb
@@ -1,4 +1,4 @@
-class ApGrapher < Cask
+cask :v1 => 'ap-grapher' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/apache-directory-studio.rb b/Casks/apache-directory-studio.rb
index e0e3c55c4d99..77ad9697d0b6 100644
--- a/Casks/apache-directory-studio.rb
+++ b/Casks/apache-directory-studio.rb
@@ -1,4 +1,4 @@
-class ApacheDirectoryStudio < Cask
+cask :v1 => 'apache-directory-studio' do
   version '2.0.0.v20130628'
   sha256 '60914cc67f893afdc8bf537fa67a48cb7cd96357e7d28595a2c22a74a19f02e3'
 
diff --git a/Casks/apikitchen.rb b/Casks/apikitchen.rb
index 9dc14474ec84..96afec0d727d 100644
--- a/Casks/apikitchen.rb
+++ b/Casks/apikitchen.rb
@@ -1,4 +1,4 @@
-class Apikitchen < Cask
+cask :v1 => 'apikitchen' do
   version '0.1'
   sha256 '98a8bbd80442bc8af50f2fca456e4357db27093133a421b29fe51c22b2e53e53'
 
diff --git a/Casks/apimac-timer.rb b/Casks/apimac-timer.rb
index 3c0bf2c4a3df..479d4279d8eb 100644
--- a/Casks/apimac-timer.rb
+++ b/Casks/apimac-timer.rb
@@ -1,4 +1,4 @@
-class ApimacTimer < Cask
+cask :v1 => 'apimac-timer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/apns-pusher.rb b/Casks/apns-pusher.rb
index 49ac1cea9439..160e529b1a77 100644
--- a/Casks/apns-pusher.rb
+++ b/Casks/apns-pusher.rb
@@ -1,4 +1,4 @@
-class ApnsPusher < Cask
+cask :v1 => 'apns-pusher' do
   version '2.3'
   sha256 '6aa54050bea8603b45e6737bf2cc6997180b1a58f1d02095f5141176a1335205'
 
diff --git a/Casks/appcleaner.rb b/Casks/appcleaner.rb
index 88e1b247d7e7..528dc73df7a8 100644
--- a/Casks/appcleaner.rb
+++ b/Casks/appcleaner.rb
@@ -1,4 +1,4 @@
-class Appcleaner < Cask
+cask :v1 => 'appcleaner' do
   version '2.2.3'
   sha256 '90b3d8e3c32388035e5154594222d66d48d5cad263a5387f77f9ea77315af84d'
 
diff --git a/Casks/appcode.rb b/Casks/appcode.rb
index 37f4d95d301a..f4c45b8dfcfb 100644
--- a/Casks/appcode.rb
+++ b/Casks/appcode.rb
@@ -1,4 +1,4 @@
-class Appcode < Cask
+cask :v1 => 'appcode' do
   version '3.0.6'
   sha256 'cd706fc97572f2d0784aca3504e286a1cd5a14e9c39abf1e3beaaa10610ea089'
 
diff --git a/Casks/appdelete.rb b/Casks/appdelete.rb
index 3449f2445d3b..59a3001f6cff 100644
--- a/Casks/appdelete.rb
+++ b/Casks/appdelete.rb
@@ -1,4 +1,4 @@
-class Appdelete < Cask
+cask :v1 => 'appdelete' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/appfresh.rb b/Casks/appfresh.rb
index 3c56dcb254a5..d117fa7853f5 100644
--- a/Casks/appfresh.rb
+++ b/Casks/appfresh.rb
@@ -1,4 +1,4 @@
-class Appfresh < Cask
+cask :v1 => 'appfresh' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/appium.rb b/Casks/appium.rb
index 0632010bcff5..3d6bcad76fd1 100644
--- a/Casks/appium.rb
+++ b/Casks/appium.rb
@@ -1,4 +1,4 @@
-class Appium < Cask
+cask :v1 => 'appium' do
   version '1.2.2'
   sha256 'fb7b96244e6dbcdf4d580eae0262b2dec38c008e39ddee4654bb488037f24971'
 
diff --git a/Casks/appmenuboy.rb b/Casks/appmenuboy.rb
index ab2dd17d36ac..53aa4a39e3db 100644
--- a/Casks/appmenuboy.rb
+++ b/Casks/appmenuboy.rb
@@ -1,4 +1,4 @@
-class Appmenuboy < Cask
+cask :v1 => 'appmenuboy' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/appstore-quickview.rb b/Casks/appstore-quickview.rb
index f9e96a7767fd..201166be93e3 100644
--- a/Casks/appstore-quickview.rb
+++ b/Casks/appstore-quickview.rb
@@ -1,4 +1,4 @@
-class AppstoreQuickview < Cask
+cask :v1 => 'appstore-quickview' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/apptivate.rb b/Casks/apptivate.rb
index 190d92132570..51d6077f7d6e 100644
--- a/Casks/apptivate.rb
+++ b/Casks/apptivate.rb
@@ -1,4 +1,4 @@
-class Apptivate < Cask
+cask :v1 => 'apptivate' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/apptrap.rb b/Casks/apptrap.rb
index 76bd66d1abba..a2d783a6636f 100644
--- a/Casks/apptrap.rb
+++ b/Casks/apptrap.rb
@@ -1,4 +1,4 @@
-class Apptrap < Cask
+cask :v1 => 'apptrap' do
   version '1.2.2'
   sha256 'e7d36e24121d732a06d5dbb7fed27e18e470231544e8e0aec309eb2afb9d75be'
 
diff --git a/Casks/appzapper.rb b/Casks/appzapper.rb
index afce8d52adb7..825f8bbbd502 100644
--- a/Casks/appzapper.rb
+++ b/Casks/appzapper.rb
@@ -1,4 +1,4 @@
-class Appzapper < Cask
+cask :v1 => 'appzapper' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/aptanastudio.rb b/Casks/aptanastudio.rb
index 0f6ad5a82119..0f8133fa9150 100644
--- a/Casks/aptanastudio.rb
+++ b/Casks/aptanastudio.rb
@@ -1,4 +1,4 @@
-class Aptanastudio < Cask
+cask :v1 => 'aptanastudio' do
   version '3.6.0'
   sha256 'd2207934d485cca10d6ad624a67d9f21c1bef46e0a9d58a9db334cec7fb55948'
 
diff --git a/Casks/aquamacs.rb b/Casks/aquamacs.rb
index 50d30da92f1b..4642a3b69496 100644
--- a/Casks/aquamacs.rb
+++ b/Casks/aquamacs.rb
@@ -1,4 +1,4 @@
-class Aquamacs < Cask
+cask :v1 => 'aquamacs' do
 
   if Hardware::CPU.is_32_bit?
     version '2.5'
diff --git a/Casks/aquaterm.rb b/Casks/aquaterm.rb
index f5dd7f1df615..2ba1b4a9e9e8 100644
--- a/Casks/aquaterm.rb
+++ b/Casks/aquaterm.rb
@@ -1,4 +1,4 @@
-class Aquaterm < Cask
+cask :v1 => 'aquaterm' do
   version '1.1.1'
   sha256 '94b33efea2ec037e6c06beef54b4b3cc48595453c874de863f25c26b3a7ffdb2'
 
diff --git a/Casks/araxis-merge.rb b/Casks/araxis-merge.rb
index cae901f265fe..48476175b78d 100644
--- a/Casks/araxis-merge.rb
+++ b/Casks/araxis-merge.rb
@@ -1,4 +1,4 @@
-class AraxisMerge < Cask
+cask :v1 => 'araxis-merge' do
   version '2014.4459'
   sha256 '281b2df877b5808efff7f1df6ba4a4d036d04ccdaa3a19ca87e61838dcb118fc'
 
diff --git a/Casks/archiver.rb b/Casks/archiver.rb
index 2824aecb3bfa..8e3cd0700b49 100644
--- a/Casks/archiver.rb
+++ b/Casks/archiver.rb
@@ -1,4 +1,4 @@
-class Archiver < Cask
+cask :v1 => 'archiver' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/arduino-galileo.rb b/Casks/arduino-galileo.rb
index 127997ff9465..4e70b9c3e1a9 100644
--- a/Casks/arduino-galileo.rb
+++ b/Casks/arduino-galileo.rb
@@ -1,4 +1,4 @@
-class ArduinoGalileo < Cask
+cask :v1 => 'arduino-galileo' do
   version '1.5.3'
   sha256 '8fafc626fb7d0918d7f4ddb98d59823c0fcc9b3aeb8e1d252ae9688b4095c153'
 
diff --git a/Casks/arduino.rb b/Casks/arduino.rb
index 98ceadc0ad93..b2ea7df9f633 100644
--- a/Casks/arduino.rb
+++ b/Casks/arduino.rb
@@ -1,4 +1,4 @@
-class Arduino < Cask
+cask :v1 => 'arduino' do
   version '1.0.6'
   sha256 '11838fe58cd366561cb1868378269da959bf67518cc2b88eee3f010c9c1c072d'
 
diff --git a/Casks/aria-maestosa.rb b/Casks/aria-maestosa.rb
index 0f35218b7d99..4cd5f8d276f7 100644
--- a/Casks/aria-maestosa.rb
+++ b/Casks/aria-maestosa.rb
@@ -1,4 +1,4 @@
-class AriaMaestosa < Cask
+cask :v1 => 'aria-maestosa' do
   version '1.4.9'
   sha256 '3a8d8bc625a6e27b2312ff1c008e78b64c94faa5ef263c85c6005e72a98ec1bf'
 
diff --git a/Casks/armitage.rb b/Casks/armitage.rb
index c7a5ce49931d..cf5c53bd8e81 100644
--- a/Casks/armitage.rb
+++ b/Casks/armitage.rb
@@ -1,4 +1,4 @@
-class Armitage < Cask
+cask :v1 => 'armitage' do
   version '11.21.13'
   sha256 'b9ce03f8276d148158a7a9116e0a7012f7b5d3370375071d76326acea89d240a'
 
diff --git a/Casks/armory.rb b/Casks/armory.rb
index d82355de89f5..2ccc4e47e046 100644
--- a/Casks/armory.rb
+++ b/Casks/armory.rb
@@ -1,4 +1,4 @@
-class Armory < Cask
+cask :v1 => 'armory' do
   version '0.92.3'
   sha256 '25aac165bcdfc326ca36e630e9676dd1b116b246209e7bc9b646001977deb947'
 
diff --git a/Casks/arora.rb b/Casks/arora.rb
index 8077ca697d59..39e2d411cd1b 100644
--- a/Casks/arora.rb
+++ b/Casks/arora.rb
@@ -1,4 +1,4 @@
-class Arora < Cask
+cask :v1 => 'arora' do
   version '0.10.1'
   sha256 '7cd9d54beb326dbb1a3eebaee1f5252a2df611d738f90d1398e857812ffc49ac'
 
diff --git a/Casks/arq.rb b/Casks/arq.rb
index 43c7587c0ec8..d590c30fdb9c 100644
--- a/Casks/arq.rb
+++ b/Casks/arq.rb
@@ -1,4 +1,4 @@
-class Arq < Cask
+cask :v1 => 'arq' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/arranger.rb b/Casks/arranger.rb
index 8f62bc90a09d..b6b0898fb70c 100644
--- a/Casks/arranger.rb
+++ b/Casks/arranger.rb
@@ -1,4 +1,4 @@
-class Arranger < Cask
+cask :v1 => 'arranger' do
   version '1.5'
   sha256 'dff93bacfa3f0a00ecde23c55abd7124efe7bcf7f5980bb347f87b9c9f6b62b6'
 
diff --git a/Casks/arrsync.rb b/Casks/arrsync.rb
index d3ed299f2de0..7a1acc004ab2 100644
--- a/Casks/arrsync.rb
+++ b/Casks/arrsync.rb
@@ -1,4 +1,4 @@
-class Arrsync < Cask
+cask :v1 => 'arrsync' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/aseprite.rb b/Casks/aseprite.rb
index 03fb06d8e97d..87ed21310af3 100644
--- a/Casks/aseprite.rb
+++ b/Casks/aseprite.rb
@@ -1,4 +1,4 @@
-class Aseprite < Cask
+cask :v1 => 'aseprite' do
   version '0.9.5'
   sha256 '299eda3e5f11ae60d58bccdd26156169db6ebc01be8e806d7909f0b8f22e2928'
 
diff --git a/Casks/asepsis.rb b/Casks/asepsis.rb
index 437ead848181..8cd9cd8f8aa1 100644
--- a/Casks/asepsis.rb
+++ b/Casks/asepsis.rb
@@ -1,4 +1,4 @@
-class Asepsis < Cask
+cask :v1 => 'asepsis' do
   version '1.5'
   sha256 'b7bf18dfe58612de89f744e11e25f6eb6bb708a48941fc975d55a614716e1436'
 
diff --git a/Casks/astah-community.rb b/Casks/astah-community.rb
index e4b1d956f8a1..ca69bfa92d3d 100644
--- a/Casks/astah-community.rb
+++ b/Casks/astah-community.rb
@@ -1,4 +1,4 @@
-class AstahCommunity < Cask
+cask :v1 => 'astah-community' do
   version '6.9.0'
   sha256 '6e3119f2a723a4a8975583d6693bae975e95fd3339666c07cfb16dd4138e7ceb'
 
diff --git a/Casks/asteroid.rb b/Casks/asteroid.rb
index 2232873a0d06..1f8e7d6c8237 100644
--- a/Casks/asteroid.rb
+++ b/Casks/asteroid.rb
@@ -1,4 +1,4 @@
-class Asteroid < Cask
+cask :v1 => 'asteroid' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/astrill.rb b/Casks/astrill.rb
index 15762087ec12..3c9b5ca72c88 100644
--- a/Casks/astrill.rb
+++ b/Casks/astrill.rb
@@ -1,4 +1,4 @@
-class Astrill < Cask
+cask :v1 => 'astrill' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/atext.rb b/Casks/atext.rb
index a7aadfda3ee7..06992e412dd5 100644
--- a/Casks/atext.rb
+++ b/Casks/atext.rb
@@ -1,4 +1,4 @@
-class Atext < Cask
+cask :v1 => 'atext' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/atlantis.rb b/Casks/atlantis.rb
index 7afa5eb7f96b..142e47dad1e4 100644
--- a/Casks/atlantis.rb
+++ b/Casks/atlantis.rb
@@ -1,4 +1,4 @@
-class Atlantis < Cask
+cask :v1 => 'atlantis' do
   version '0.9.9.4'
   sha256 '52957a5b92b1fd3612aa7a3a07f5238236dad4397a6a256a03355c331433e540'
 
diff --git a/Casks/atom-shell.rb b/Casks/atom-shell.rb
index e88d04b1e461..2cb3b462b94c 100644
--- a/Casks/atom-shell.rb
+++ b/Casks/atom-shell.rb
@@ -1,4 +1,4 @@
-class AtomShell < Cask
+cask :v1 => 'atom-shell' do
   version '0.19.0'
   sha256 'e14ecea827ce78cedb1ed9f4f4aa7d42912a31f69cbbf72588b2d9307f583c41'
 
diff --git a/Casks/atom.rb b/Casks/atom.rb
index 12cf34aa4841..1baf7684d54f 100644
--- a/Casks/atom.rb
+++ b/Casks/atom.rb
@@ -1,4 +1,4 @@
-class Atom < Cask
+cask :v1 => 'atom' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/atraci.rb b/Casks/atraci.rb
index 19f408807d93..b9e9cfe54f0c 100644
--- a/Casks/atraci.rb
+++ b/Casks/atraci.rb
@@ -1,4 +1,4 @@
-class Atraci < Cask
+cask :v1 => 'atraci' do
   version '0.6.5'
   sha256 '838e95c57f76c4990288bd9227ef032efd267df3333dac06c65a095d493ce086'
 
diff --git a/Casks/au-lab.rb b/Casks/au-lab.rb
index fd316c5efb16..7bbea87d9f3b 100644
--- a/Casks/au-lab.rb
+++ b/Casks/au-lab.rb
@@ -1,4 +1,4 @@
-class AuLab < Cask
+cask :v1 => 'au-lab' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/audacity.rb b/Casks/audacity.rb
index 63237d67be41..05873ba7d555 100644
--- a/Casks/audacity.rb
+++ b/Casks/audacity.rb
@@ -1,4 +1,4 @@
-class Audacity < Cask
+cask :v1 => 'audacity' do
   version '2.0.6'
   sha256 'e51ff7c41b23e707bb8efac9965fe8ac27338792dc2b149138be30a3760c0067'
 
diff --git a/Casks/audio-editor.rb b/Casks/audio-editor.rb
index 530ff8c69eff..a4ed9072bad6 100644
--- a/Casks/audio-editor.rb
+++ b/Casks/audio-editor.rb
@@ -1,4 +1,4 @@
-class AudioEditor < Cask
+cask :v1 => 'audio-editor' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/audio-hijack-pro.rb b/Casks/audio-hijack-pro.rb
index ecefe63f25e6..6c928ead6a18 100644
--- a/Casks/audio-hijack-pro.rb
+++ b/Casks/audio-hijack-pro.rb
@@ -1,4 +1,4 @@
-class AudioHijackPro < Cask
+cask :v1 => 'audio-hijack-pro' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/audio-mate.rb b/Casks/audio-mate.rb
index 7b31a87663b1..247eb4fc8132 100644
--- a/Casks/audio-mate.rb
+++ b/Casks/audio-mate.rb
@@ -1,4 +1,4 @@
-class AudioMate < Cask
+cask :v1 => 'audio-mate' do
   version '2.1.2'
   sha256 'c9cbd426d2d8f011f99250eac1bb76651f4c53c58a009edceca946b6179f1771'
 
diff --git a/Casks/audio-notetaker.rb b/Casks/audio-notetaker.rb
index 91f306787481..fbb69c6b9e8d 100644
--- a/Casks/audio-notetaker.rb
+++ b/Casks/audio-notetaker.rb
@@ -1,4 +1,4 @@
-class AudioNotetaker < Cask
+cask :v1 => 'audio-notetaker' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/audiobook-builder.rb b/Casks/audiobook-builder.rb
index f56cf763159d..ace2073b006b 100644
--- a/Casks/audiobook-builder.rb
+++ b/Casks/audiobook-builder.rb
@@ -1,4 +1,4 @@
-class AudiobookBuilder < Cask
+cask :v1 => 'audiobook-builder' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/audiobookbinder.rb b/Casks/audiobookbinder.rb
index 0fc33c46b70c..89462c9e53d7 100644
--- a/Casks/audiobookbinder.rb
+++ b/Casks/audiobookbinder.rb
@@ -1,4 +1,4 @@
-class Audiobookbinder < Cask
+cask :v1 => 'audiobookbinder' do
   version '2.0'
   sha256 '7f66fab2041666b2b4d2f4547035804ee9fa7cc5487d6a428f5354e0a793064b'
 
diff --git a/Casks/audioscrobbler.rb b/Casks/audioscrobbler.rb
index 4a6ec029e495..ac9a82d790ce 100644
--- a/Casks/audioscrobbler.rb
+++ b/Casks/audioscrobbler.rb
@@ -1,4 +1,4 @@
-class Audioscrobbler < Cask
+cask :v1 => 'audioscrobbler' do
   version '0.9.14'
   sha256 'e7b37abcdb01f0e888a7135395b9369ed47edb37ab669f778dc96d674e83ed1c'
 
diff --git a/Casks/audioslicer.rb b/Casks/audioslicer.rb
index fcb551c9897f..37bc013eaf93 100644
--- a/Casks/audioslicer.rb
+++ b/Casks/audioslicer.rb
@@ -1,4 +1,4 @@
-class Audioslicer < Cask
+cask :v1 => 'audioslicer' do
   version '1.1.1'
   sha256 'c0ef4d9b1690943def00ce4c7bb2838ff08cfe0d3ff85d39ca1e4ddc97593d01'
 
diff --git a/Casks/aurora.rb b/Casks/aurora.rb
index b245f4a3930d..cb862b82a090 100644
--- a/Casks/aurora.rb
+++ b/Casks/aurora.rb
@@ -1,4 +1,4 @@
-class Aurora < Cask
+cask :v1 => 'aurora' do
   version '5.0.3'
   sha256 '4293c5ffdf6eb8e5d7031f02b1c83238472f486fe8a964f2f62ac71c72c22eb2'
 
diff --git a/Casks/authbuddy.rb b/Casks/authbuddy.rb
index 546e4c804754..f630bbf5186a 100644
--- a/Casks/authbuddy.rb
+++ b/Casks/authbuddy.rb
@@ -1,4 +1,4 @@
-class Authbuddy < Cask
+cask :v1 => 'authbuddy' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/authoxy.rb b/Casks/authoxy.rb
index f9b3f5ffe8cd..12d4815017c3 100644
--- a/Casks/authoxy.rb
+++ b/Casks/authoxy.rb
@@ -1,4 +1,4 @@
-class Authoxy < Cask
+cask :v1 => 'authoxy' do
   version '3.6'
   sha256 '921720e5bd1d7cd9f08e29bee928ea667662ba704f59340280194c8b4649b632'
 
diff --git a/Casks/authy-bluetooth.rb b/Casks/authy-bluetooth.rb
index ab7938d4ae78..f0bfba29fc59 100644
--- a/Casks/authy-bluetooth.rb
+++ b/Casks/authy-bluetooth.rb
@@ -1,4 +1,4 @@
-class AuthyBluetooth < Cask
+cask :v1 => 'authy-bluetooth' do
   version '1.3'
   sha256 '0f0b78ef607f3bdc0cf6de903078981ebee5f8e551880e718322a85ecbcdd8af'
 
diff --git a/Casks/autodmg.rb b/Casks/autodmg.rb
index b25c13406414..857fa245cbba 100644
--- a/Casks/autodmg.rb
+++ b/Casks/autodmg.rb
@@ -1,4 +1,4 @@
-class Autodmg < Cask
+cask :v1 => 'autodmg' do
   version '1.5.1'
   sha256 '574bbc8811ed39bf6751c76cba15cac789061f0032aadf205a906334e8970109'
 
diff --git a/Casks/automatic.rb b/Casks/automatic.rb
index 0f9855a49b04..0d9fc5d24394 100644
--- a/Casks/automatic.rb
+++ b/Casks/automatic.rb
@@ -1,4 +1,4 @@
-class Automatic < Cask
+cask :v1 => 'automatic' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/autopano-pro.rb b/Casks/autopano-pro.rb
index 893be1207c14..e61214b57225 100644
--- a/Casks/autopano-pro.rb
+++ b/Casks/autopano-pro.rb
@@ -1,4 +1,4 @@
-class AutopanoPro < Cask
+cask :v1 => 'autopano-pro' do
   version '3.6'
   sha256 '8bf8840b9d3126c3f64dcef6a9ccf4115c6f23779f563b6cfa4c7a8f663cc088'
 
diff --git a/Casks/aviator.rb b/Casks/aviator.rb
index a3ff9f7216a5..e85b3063bd50 100644
--- a/Casks/aviator.rb
+++ b/Casks/aviator.rb
@@ -1,4 +1,4 @@
-class Aviator < Cask
+cask :v1 => 'aviator' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/avidcodecsle.rb b/Casks/avidcodecsle.rb
index 1aedd050fabd..b64c04fca413 100644
--- a/Casks/avidcodecsle.rb
+++ b/Casks/avidcodecsle.rb
@@ -1,4 +1,4 @@
-class Avidcodecsle < Cask
+cask :v1 => 'avidcodecsle' do
   version '2.3.7'
   sha256 '0a3e9b24e1af3ea0e01167a944c08b086a6818eacb38bb637bd0dbe85486323b'
 
diff --git a/Casks/avidemux.rb b/Casks/avidemux.rb
index 7f1b8880f67b..bd3c215eb418 100644
--- a/Casks/avidemux.rb
+++ b/Casks/avidemux.rb
@@ -1,4 +1,4 @@
-class Avidemux < Cask
+cask :v1 => 'avidemux' do
   version '2.6.8'
   sha256 '2478fbdf6e7bfc32dd98a53bb95e6a7d217d294d446910942c4904bf2094b90a'
 
diff --git a/Casks/avogadro.rb b/Casks/avogadro.rb
index 305243b71020..d1272f34ae92 100644
--- a/Casks/avogadro.rb
+++ b/Casks/avogadro.rb
@@ -1,4 +1,4 @@
-class Avogadro < Cask
+cask :v1 => 'avogadro' do
   version '1.1.1'
   sha256 '8e63b7ec07555fd30ea2c22ed7f070e1b692fd2c9fbb60a3c8e0ddd411bb6477'
 
diff --git a/Casks/awareness.rb b/Casks/awareness.rb
index 5aca1b9a27e2..5ca43e0a738e 100644
--- a/Casks/awareness.rb
+++ b/Casks/awareness.rb
@@ -1,4 +1,4 @@
-class Awareness < Cask
+cask :v1 => 'awareness' do
   version '1.1'
   sha256 'a5ce31fef63aeabde3c8cabac367fb44868de318800b4fcd9032f05b17f74cdf'
 
diff --git a/Casks/ax88179.rb b/Casks/ax88179.rb
index e74bef0f322e..e25b1dd62fc8 100644
--- a/Casks/ax88179.rb
+++ b/Casks/ax88179.rb
@@ -1,4 +1,4 @@
-class Ax88179 < Cask
+cask :v1 => 'ax88179' do
   version '2.2.0_20140724'
   sha256 '075cdf5cb5a6ed0e8a4d59ff470a32f5e869f3b2f2b08f268120cbae30c61329'
 
diff --git a/Casks/ax88772.rb b/Casks/ax88772.rb
index 48330b99428c..543db9268d01 100644
--- a/Casks/ax88772.rb
+++ b/Casks/ax88772.rb
@@ -1,4 +1,4 @@
-class Ax88772 < Cask
+cask :v1 => 'ax88772' do
   version '2.3.0'
   sha256 '94d3916c4ad0c06bce827cb2fbcc17e09168530a475db6e2b1d857fc289fcc1b'
 
diff --git a/Casks/axure-rp-pro.rb b/Casks/axure-rp-pro.rb
index fb7d96b5df73..e7967ce5fe84 100644
--- a/Casks/axure-rp-pro.rb
+++ b/Casks/axure-rp-pro.rb
@@ -1,4 +1,4 @@
-class AxureRpPro < Cask
+cask :v1 => 'axure-rp-pro' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/back-in-time.rb b/Casks/back-in-time.rb
index 7335c5b922e3..e3dede67bcf4 100644
--- a/Casks/back-in-time.rb
+++ b/Casks/back-in-time.rb
@@ -1,4 +1,4 @@
-class BackInTime < Cask
+cask :v1 => 'back-in-time' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/backblaze-downloader.rb b/Casks/backblaze-downloader.rb
index 74033f817307..50ca3f4ee79a 100644
--- a/Casks/backblaze-downloader.rb
+++ b/Casks/backblaze-downloader.rb
@@ -1,4 +1,4 @@
-class BackblazeDownloader < Cask
+cask :v1 => 'backblaze-downloader' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/backblaze.rb b/Casks/backblaze.rb
index bdc15067b62b..9e86b11b7fee 100644
--- a/Casks/backblaze.rb
+++ b/Casks/backblaze.rb
@@ -1,4 +1,4 @@
-class Backblaze < Cask
+cask :v1 => 'backblaze' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/backtobed.rb b/Casks/backtobed.rb
index a7cc7c94cdc2..9a18905b1b11 100644
--- a/Casks/backtobed.rb
+++ b/Casks/backtobed.rb
@@ -1,4 +1,4 @@
-class Backtobed < Cask
+cask :v1 => 'backtobed' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/backuploupe.rb b/Casks/backuploupe.rb
index e7054a04eb76..f7e3129ee6ca 100644
--- a/Casks/backuploupe.rb
+++ b/Casks/backuploupe.rb
@@ -1,4 +1,4 @@
-class Backuploupe < Cask
+cask :v1 => 'backuploupe' do
   version '2.6'
   sha256 '48e758d7d28dbacfbdba9ae6800888d513917a2138593efc1d6db407b993208b'
 
diff --git a/Casks/bahamut.rb b/Casks/bahamut.rb
index b7061e41dc19..3b5ad0153e63 100644
--- a/Casks/bahamut.rb
+++ b/Casks/bahamut.rb
@@ -1,4 +1,4 @@
-class Bahamut < Cask
+cask :v1 => 'bahamut' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/baiducloud.rb b/Casks/baiducloud.rb
index 4556182e519c..caa246271564 100644
--- a/Casks/baiducloud.rb
+++ b/Casks/baiducloud.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-class Baiducloud < Cask
+cask :v1 => 'baiducloud' do
   version '2.4.3'
   sha256 'f8e1f5afa3e1cbdac4d3d859f2f8da41093e37afbb51959ab6ee6b2dc91fc069'
 
diff --git a/Casks/baiduinput.rb b/Casks/baiduinput.rb
index 1c7597485a5b..ffbc866f7150 100644
--- a/Casks/baiduinput.rb
+++ b/Casks/baiduinput.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-class Baiduinput < Cask
+cask :v1 => 'baiduinput' do
   version '3.3_1000e'
   sha256 '7fbfd7270ce5c8d3a7e801ce67b4e858089299ef3ba96b3c0feb110d87da24e2'
 
diff --git a/Casks/baidumusic.rb b/Casks/baidumusic.rb
index f53f872ba5d7..5f71933841ce 100644
--- a/Casks/baidumusic.rb
+++ b/Casks/baidumusic.rb
@@ -1,4 +1,4 @@
-class Baidumusic < Cask
+cask :v1 => 'baidumusic' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/balsamiq-mockups.rb b/Casks/balsamiq-mockups.rb
index 880bc0f0ebc7..6cb9262df325 100644
--- a/Casks/balsamiq-mockups.rb
+++ b/Casks/balsamiq-mockups.rb
@@ -1,4 +1,4 @@
-class BalsamiqMockups < Cask
+cask :v1 => 'balsamiq-mockups' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/bankid.rb b/Casks/bankid.rb
index a552e8b5ebd5..cb3f16a83bca 100644
--- a/Casks/bankid.rb
+++ b/Casks/bankid.rb
@@ -1,4 +1,4 @@
-class Bankid < Cask
+cask :v1 => 'bankid' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/banshee.rb b/Casks/banshee.rb
index 7db3db6a3025..bb0c1a96526d 100644
--- a/Casks/banshee.rb
+++ b/Casks/banshee.rb
@@ -1,4 +1,4 @@
-class Banshee < Cask
+cask :v1 => 'banshee' do
   version '2.6.1'
   sha256 '26fc3c77a72860fc2dfaee0741c88e9b8d7b8dac6ece2943e42917112e55c933'
 
diff --git a/Casks/bar-magnet.rb b/Casks/bar-magnet.rb
index 1cdc269c7896..3fdf239f6566 100644
--- a/Casks/bar-magnet.rb
+++ b/Casks/bar-magnet.rb
@@ -1,4 +1,4 @@
-class BarMagnet < Cask
+cask :v1 => 'bar-magnet' do
   version '1.0'
   sha256 'b8242cbef4ecf537770e53ae3e7a750e6241f4185898476b021f356d9328567c'
 
diff --git a/Casks/baretorrent.rb b/Casks/baretorrent.rb
index 094727f43523..3ac4d404b523 100644
--- a/Casks/baretorrent.rb
+++ b/Casks/baretorrent.rb
@@ -1,4 +1,4 @@
-class Baretorrent < Cask
+cask :v1 => 'baretorrent' do
   version '0.4.4'
   sha256 'dea7c210e9b57b74fc44b498d8f5d238458ffffff3c66b2a91bd77f5cec5238d'
 
diff --git a/Casks/bartender.rb b/Casks/bartender.rb
index 4a82d8244a4c..1d5abaf5bb49 100644
--- a/Casks/bartender.rb
+++ b/Casks/bartender.rb
@@ -1,4 +1,4 @@
-class Bartender < Cask
+cask :v1 => 'bartender' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/base.rb b/Casks/base.rb
index e6be6f612143..e7f4c75dd39e 100644
--- a/Casks/base.rb
+++ b/Casks/base.rb
@@ -1,4 +1,4 @@
-class Base < Cask
+cask :v1 => 'base' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/basecamp.rb b/Casks/basecamp.rb
index 542d7033803a..09a8e3122bfc 100644
--- a/Casks/basecamp.rb
+++ b/Casks/basecamp.rb
@@ -1,4 +1,4 @@
-class Basecamp < Cask
+cask :v1 => 'basecamp' do
   version '4.3.4'
   sha256 'bccb1e3277ccf784a55ae56e2d21c46f6a15997a25820dfe7c79a5cab6d89f75'
 
diff --git a/Casks/basex.rb b/Casks/basex.rb
index ef2f629a43ea..e5acef26baa8 100644
--- a/Casks/basex.rb
+++ b/Casks/basex.rb
@@ -1,4 +1,4 @@
-class Basex < Cask
+cask :v1 => 'basex' do
   version '7.8.1'
   sha256 '495b4c32cb916c02543a5f19b702c01516b1b8f452be537259dd6d1ad040ca87'
 
diff --git a/Casks/basictex.rb b/Casks/basictex.rb
index 35922205a1ec..29e571bf5735 100644
--- a/Casks/basictex.rb
+++ b/Casks/basictex.rb
@@ -1,4 +1,4 @@
-class Basictex < Cask
+cask :v1 => 'basictex' do
   version '20140807'
   sha256 '02b2c0160ddd7a74f25b2ea58d1a79deec9b2230ff41d0c45c1c3157fa607afc'
 
diff --git a/Casks/basis-sync.rb b/Casks/basis-sync.rb
index 089199509229..c365d459651f 100644
--- a/Casks/basis-sync.rb
+++ b/Casks/basis-sync.rb
@@ -1,4 +1,4 @@
-class BasisSync < Cask
+cask :v1 => 'basis-sync' do
   version '1.7.3'
   sha256 '9d2434cbd8bf49a42df236bc9b4a4b999a28a2ce2e990237ac908199638328b5'
 
diff --git a/Casks/bassjump.rb b/Casks/bassjump.rb
index 148643399037..a5d2f65e6636 100644
--- a/Casks/bassjump.rb
+++ b/Casks/bassjump.rb
@@ -1,4 +1,4 @@
-class Bassjump < Cask
+cask :v1 => 'bassjump' do
 
   if MacOS.version < :mavericks
     version '2.0.3'
diff --git a/Casks/bassshapes.rb b/Casks/bassshapes.rb
index 7d71f40f116c..31f9a729f27d 100644
--- a/Casks/bassshapes.rb
+++ b/Casks/bassshapes.rb
@@ -1,4 +1,4 @@
-class Bassshapes < Cask
+cask :v1 => 'bassshapes' do
   version '0.1'
   sha256 'fd704e0f89e1cbd4c4ef6678c3721533840f9045d027d640df291491523fa66b'
 
diff --git a/Casks/bathyscaphe.rb b/Casks/bathyscaphe.rb
index 5aa98ad485fc..1d9706353c22 100644
--- a/Casks/bathyscaphe.rb
+++ b/Casks/bathyscaphe.rb
@@ -1,4 +1,4 @@
-class Bathyscaphe < Cask
+cask :v1 => 'bathyscaphe' do
   version '2.4.2'
   sha256 'fe7b8deed01a75b09cce9d4bd1f06a60106adfd831dfbe07782bf19fb1a67bd1'
 
diff --git a/Casks/battery-guardian.rb b/Casks/battery-guardian.rb
index 0baddea926c1..b610de3a92b2 100644
--- a/Casks/battery-guardian.rb
+++ b/Casks/battery-guardian.rb
@@ -1,4 +1,4 @@
-class BatteryGuardian < Cask
+cask :v1 => 'battery-guardian' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/battery-report.rb b/Casks/battery-report.rb
index f263739ef93a..dc037fd8cc22 100644
--- a/Casks/battery-report.rb
+++ b/Casks/battery-report.rb
@@ -1,4 +1,4 @@
-class BatteryReport < Cask
+cask :v1 => 'battery-report' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/battery-time-remaining.rb b/Casks/battery-time-remaining.rb
index a7ec491d72c3..acd852c524ed 100644
--- a/Casks/battery-time-remaining.rb
+++ b/Casks/battery-time-remaining.rb
@@ -1,4 +1,4 @@
-class BatteryTimeRemaining < Cask
+cask :v1 => 'battery-time-remaining' do
   version '2.0.2'
   sha256 '4975e8e293e4e6b2114cdbbf64d046b3255c62d981e25f0044229348c4f92a87'
 
diff --git a/Casks/baudline.rb b/Casks/baudline.rb
index 3fb1563e871c..23328dcd6c6a 100644
--- a/Casks/baudline.rb
+++ b/Casks/baudline.rb
@@ -1,4 +1,4 @@
-class Baudline < Cask
+cask :v1 => 'baudline' do
   version '1.08'
   sha256 'f47201069812333c36715beaacb17de93bc8fa5f7e68952fe51296f04df69f83'
 
diff --git a/Casks/baygenie.rb b/Casks/baygenie.rb
index 4342daeebfd5..6cdf1c43b8d6 100644
--- a/Casks/baygenie.rb
+++ b/Casks/baygenie.rb
@@ -1,4 +1,4 @@
-class Baygenie < Cask
+cask :v1 => 'baygenie' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/bbc-iplayer-downloads.rb b/Casks/bbc-iplayer-downloads.rb
index cd0bfda17746..56a9548825da 100644
--- a/Casks/bbc-iplayer-downloads.rb
+++ b/Casks/bbc-iplayer-downloads.rb
@@ -1,4 +1,4 @@
-class BbcIplayerDownloads < Cask
+cask :v1 => 'bbc-iplayer-downloads' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/bbedit.rb b/Casks/bbedit.rb
index 071f7470fc70..11553f158ba4 100644
--- a/Casks/bbedit.rb
+++ b/Casks/bbedit.rb
@@ -1,4 +1,4 @@
-class Bbedit < Cask
+cask :v1 => 'bbedit' do
   version '11.0'
   sha256 '3c15fef50245e93073e73136bb7097faf1f03a061559eed84a17cb8678fdf033'
 
diff --git a/Casks/beacon-scanner.rb b/Casks/beacon-scanner.rb
index 7b3659f7cc27..c0aef7f0d099 100644
--- a/Casks/beacon-scanner.rb
+++ b/Casks/beacon-scanner.rb
@@ -1,4 +1,4 @@
-class BeaconScanner < Cask
+cask :v1 => 'beacon-scanner' do
   version '1.1.5'
   sha256 '1c7662420ab616004e0f76320b76bf9ee5c3c75292c553bc891ac4986208bbb4'
 
diff --git a/Casks/beaker.rb b/Casks/beaker.rb
index 7d68f9ebf61d..07e5ac2d17f9 100644
--- a/Casks/beaker.rb
+++ b/Casks/beaker.rb
@@ -1,4 +1,4 @@
-class Beaker < Cask
+cask :v1 => 'beaker' do
   version '1.0'
   sha256 '52218c170816587eb1264b80b4bbdd6a2eb5c5f074fba89afc7aa0e591fa838a'
 
diff --git a/Casks/beamer.rb b/Casks/beamer.rb
index 76f05e48f08b..ae98b941f412 100644
--- a/Casks/beamer.rb
+++ b/Casks/beamer.rb
@@ -1,4 +1,4 @@
-class Beamer < Cask
+cask :v1 => 'beamer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/bean.rb b/Casks/bean.rb
index b4238ed0b60c..d212afa79f40 100644
--- a/Casks/bean.rb
+++ b/Casks/bean.rb
@@ -1,4 +1,4 @@
-class Bean < Cask
+cask :v1 => 'bean' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/beardedspice.rb b/Casks/beardedspice.rb
index 2e5c0d293e18..63aa9bd73673 100644
--- a/Casks/beardedspice.rb
+++ b/Casks/beardedspice.rb
@@ -1,4 +1,4 @@
-class Beardedspice < Cask
+cask :v1 => 'beardedspice' do
   version '0.2.1'
   sha256 '28233946d266a95c390f2393fd80fdd1a82c89499ebae7014d797c75cb28c110'
 
diff --git a/Casks/beatport-pro.rb b/Casks/beatport-pro.rb
index 43fdf1c261fe..cb80d13fc53d 100644
--- a/Casks/beatport-pro.rb
+++ b/Casks/beatport-pro.rb
@@ -1,4 +1,4 @@
-class BeatportPro < Cask
+cask :v1 => 'beatport-pro' do
   version '2.1.1_137'
   sha256 '62526d08723e5a54953473a2c1530e5b298ab2a50a491dd2a846bf7c0b9499cb'
 
diff --git a/Casks/bee.rb b/Casks/bee.rb
index 0b87ea7bdaa8..3f53905aec28 100644
--- a/Casks/bee.rb
+++ b/Casks/bee.rb
@@ -1,4 +1,4 @@
-class Bee < Cask
+cask :v1 => 'bee' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/bettertouchtool.rb b/Casks/bettertouchtool.rb
index dbc658eea021..64aca72db54f 100644
--- a/Casks/bettertouchtool.rb
+++ b/Casks/bettertouchtool.rb
@@ -1,4 +1,4 @@
-class Bettertouchtool < Cask
+cask :v1 => 'bettertouchtool' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/betterzip.rb b/Casks/betterzip.rb
index a344a0937050..b52ebe2a5a1a 100644
--- a/Casks/betterzip.rb
+++ b/Casks/betterzip.rb
@@ -1,4 +1,4 @@
-class Betterzip < Cask
+cask :v1 => 'betterzip' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/betterzipql.rb b/Casks/betterzipql.rb
index 2df6850fe1a5..6c8c14f8ad0e 100644
--- a/Casks/betterzipql.rb
+++ b/Casks/betterzipql.rb
@@ -1,4 +1,4 @@
-class Betterzipql < Cask
+cask :v1 => 'betterzipql' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/beyond-compare.rb b/Casks/beyond-compare.rb
index dfe4cfcb7d88..b7c819ee86b5 100644
--- a/Casks/beyond-compare.rb
+++ b/Casks/beyond-compare.rb
@@ -1,4 +1,4 @@
-class BeyondCompare < Cask
+cask :v1 => 'beyond-compare' do
   version '4.0.0.18847'
   sha256 'cb9987b62ac68a2493b7bc5678125fbf1b8919796bc82718ddd23958768fd457'
 
diff --git a/Casks/bibdesk.rb b/Casks/bibdesk.rb
index 4b59460b044c..06ff12e120df 100644
--- a/Casks/bibdesk.rb
+++ b/Casks/bibdesk.rb
@@ -1,4 +1,4 @@
-class Bibdesk < Cask
+cask :v1 => 'bibdesk' do
   version '1.6.3'
   sha256 '30dcf97dbf1256fbc49e98ff67b7e510ea8b90bcefb4f919d0b2ac8aa8f695a8'
 
diff --git a/Casks/big-mean-folder-machine.rb b/Casks/big-mean-folder-machine.rb
index ed1c36655f42..65dac4b73ae5 100644
--- a/Casks/big-mean-folder-machine.rb
+++ b/Casks/big-mean-folder-machine.rb
@@ -1,4 +1,4 @@
-class BigMeanFolderMachine < Cask
+cask :v1 => 'big-mean-folder-machine' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/biicode.rb b/Casks/biicode.rb
index ce2990e6a907..0a450b48d89a 100644
--- a/Casks/biicode.rb
+++ b/Casks/biicode.rb
@@ -1,4 +1,4 @@
-class Biicode < Cask
+cask :v1 => 'biicode' do
   version '1.10.1'
   sha256 'd7d040c7f39618d032620dbc6011cdc824443e93c2c6a6528e263c4351656de1'
 
diff --git a/Casks/bill.rb b/Casks/bill.rb
index c9ff53bea23a..b1b9612fdf43 100644
--- a/Casks/bill.rb
+++ b/Casks/bill.rb
@@ -1,4 +1,4 @@
-class Bill < Cask
+cask :v1 => 'bill' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/bino.rb b/Casks/bino.rb
index 1c663434a02c..57d14a5317b2 100644
--- a/Casks/bino.rb
+++ b/Casks/bino.rb
@@ -1,4 +1,4 @@
-class Bino < Cask
+cask :v1 => 'bino' do
   version '1.4.4'
   sha256 '924aaef6e95d969bded524647b7a6a35e1c9a8478a7bb855972cfefe25165743'
 
diff --git a/Casks/bit-slicer.rb b/Casks/bit-slicer.rb
index 3f711f72363c..687c23aaad40 100644
--- a/Casks/bit-slicer.rb
+++ b/Casks/bit-slicer.rb
@@ -1,4 +1,4 @@
-class BitSlicer < Cask
+cask :v1 => 'bit-slicer' do
   version '1.7.4'
   sha256 '02766dcb88e21b39b78c91718eff5547904ad121e55b89b5bc11846a0c7e6ed4'
 
diff --git a/Casks/bitcasa.rb b/Casks/bitcasa.rb
index 40e8e2c5465a..123c6e07e5da 100644
--- a/Casks/bitcasa.rb
+++ b/Casks/bitcasa.rb
@@ -1,4 +1,4 @@
-class Bitcasa < Cask
+cask :v1 => 'bitcasa' do
   version '1.4.1387'
   sha256 'c7aa7af89285d986da8bec38decb25f4c94acc5eb446aa5b74684232805757b2'
 
diff --git a/Casks/bitcoin-core.rb b/Casks/bitcoin-core.rb
index b47e1717f5c5..42c4e4300baf 100644
--- a/Casks/bitcoin-core.rb
+++ b/Casks/bitcoin-core.rb
@@ -1,4 +1,4 @@
-class BitcoinCore < Cask
+cask :v1 => 'bitcoin-core' do
   version '0.9.3'
   sha256 '251938650bd79681dd93dcce346589aa5d1217d012a6f8e749165ef2149662d2'
 
diff --git a/Casks/bitlord.rb b/Casks/bitlord.rb
index d2c906ebeabc..9d0265a913a9 100644
--- a/Casks/bitlord.rb
+++ b/Casks/bitlord.rb
@@ -1,4 +1,4 @@
-class Bitlord < Cask
+cask :v1 => 'bitlord' do
   version '2.3.2'
   sha256 'd9af26b1626fd471550fbc3374158b09ae7c129bd3ab17ffbdf559d813e42af1'
 
diff --git a/Casks/bitmessage.rb b/Casks/bitmessage.rb
index 8840b70023d8..d058e947f78b 100644
--- a/Casks/bitmessage.rb
+++ b/Casks/bitmessage.rb
@@ -1,4 +1,4 @@
-class Bitmessage < Cask
+cask :v1 => 'bitmessage' do
   version '0.4.2'
   sha256 'aa109705406d9ab86761d03e2cb6387a5a05a51d7a68747f6284ba32ef2aa445'
 
diff --git a/Casks/bittorrent-sync.rb b/Casks/bittorrent-sync.rb
index 3d7131a3821a..1eec4d628276 100644
--- a/Casks/bittorrent-sync.rb
+++ b/Casks/bittorrent-sync.rb
@@ -1,4 +1,4 @@
-class BittorrentSync < Cask
+cask :v1 => 'bittorrent-sync' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/bitwig-studio.rb b/Casks/bitwig-studio.rb
index 030db54b6fd1..6702f3c69e2b 100644
--- a/Casks/bitwig-studio.rb
+++ b/Casks/bitwig-studio.rb
@@ -1,4 +1,4 @@
-class BitwigStudio < Cask
+cask :v1 => 'bitwig-studio' do
   version '1.0.14'
   sha256 'f968118c93c3449310d48c32f545e83d0f918c8e312e5a4b54cd30467e860b1e'
 
diff --git a/Casks/black-ink.rb b/Casks/black-ink.rb
index c40559e38955..b911d11b3202 100644
--- a/Casks/black-ink.rb
+++ b/Casks/black-ink.rb
@@ -1,4 +1,4 @@
-class BlackInk < Cask
+cask :v1 => 'black-ink' do
   version '1.6.1'
   sha256 'efef4a810b5708478341e92f911aadc4e8f75b285a0bd7b37087d5252d0f6175'
 
diff --git a/Casks/black-light.rb b/Casks/black-light.rb
index 86b2649b7785..aeed25f31d5c 100644
--- a/Casks/black-light.rb
+++ b/Casks/black-light.rb
@@ -1,4 +1,4 @@
-class BlackLight < Cask
+cask :v1 => 'black-light' do
   version '2.0.1'
   sha256 '6f358e319427ddaf91343a05ffb662894502902875bd9b0703b17baaf0c30d10'
 
diff --git a/Casks/blackvue-viewer.rb b/Casks/blackvue-viewer.rb
index 2f7e31b87dc0..5ba690ecbc04 100644
--- a/Casks/blackvue-viewer.rb
+++ b/Casks/blackvue-viewer.rb
@@ -1,4 +1,4 @@
-class BlackvueViewer < Cask
+cask :v1 => 'blackvue-viewer' do
   version '1.25'
   sha256 '80135f4d537a5ce67ed465a58b29e4701c6f2672c7b012ab6f6bea2c4d884fcc'
 
diff --git a/Casks/bleep.rb b/Casks/bleep.rb
index ba4b9cc8926a..7178e7900b1a 100644
--- a/Casks/bleep.rb
+++ b/Casks/bleep.rb
@@ -1,4 +1,4 @@
-class Bleep < Cask
+cask :v1 => 'bleep' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/blender.rb b/Casks/blender.rb
index d9983f414091..c2e9c8b6a42c 100644
--- a/Casks/blender.rb
+++ b/Casks/blender.rb
@@ -1,4 +1,4 @@
-class Blender < Cask
+cask :v1 => 'blender' do
   version '2.72b'
   sha256 'b015f030c416d4aa09617f33e93bba3429624dbbb203fb4b6e728257e61b3d5c'
 
diff --git a/Casks/blink1control.rb b/Casks/blink1control.rb
index 7dd6dcce8408..d7a4938ff1d2 100644
--- a/Casks/blink1control.rb
+++ b/Casks/blink1control.rb
@@ -1,4 +1,4 @@
-class Blink1control < Cask
+cask :v1 => 'blink1control' do
   version '1.91'
   sha256 'fc3624a041f561f086cdce95bd70470b072c9b586e9ee1247d88b78e6abce094'
 
diff --git a/Casks/blu-ray-player.rb b/Casks/blu-ray-player.rb
index 34906a6cfac1..09f7949708a2 100644
--- a/Casks/blu-ray-player.rb
+++ b/Casks/blu-ray-player.rb
@@ -1,4 +1,4 @@
-class BluRayPlayer < Cask
+cask :v1 => 'blu-ray-player' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/bluegriffon.rb b/Casks/bluegriffon.rb
index becada5279c1..cbf9c47ee1a4 100644
--- a/Casks/bluegriffon.rb
+++ b/Casks/bluegriffon.rb
@@ -1,4 +1,4 @@
-class Bluegriffon < Cask
+cask :v1 => 'bluegriffon' do
   version '1.7.2'
   sha256 'a54cfe176dbc67ffa4fdd20b41447fb4c4f2fbf1f80282d81e93e63b5d4b996f'
 
diff --git a/Casks/blueharvest.rb b/Casks/blueharvest.rb
index d24fa24d9e14..821f36740d51 100644
--- a/Casks/blueharvest.rb
+++ b/Casks/blueharvest.rb
@@ -1,4 +1,4 @@
-class Blueharvest < Cask
+cask :v1 => 'blueharvest' do
   version '6.1.2'
   sha256 '51ce55e1cadad80abf198088459e378c28ee7695c23f1ac7f6a48919c4f42c06'
 
diff --git a/Casks/bluej.rb b/Casks/bluej.rb
index cb3edfa9aca7..fad0117dfb79 100644
--- a/Casks/bluej.rb
+++ b/Casks/bluej.rb
@@ -1,4 +1,4 @@
-class Bluej < Cask
+cask :v1 => 'bluej' do
   version '3.1.1'
   sha256 '63be0772de6d35d3627db9c8ea1b26efbee08ba3e105ca51fd3a9809f09f8c39'
 
diff --git a/Casks/bob.rb b/Casks/bob.rb
index c913a51d1847..c0ca94fe49f3 100644
--- a/Casks/bob.rb
+++ b/Casks/bob.rb
@@ -1,4 +1,4 @@
-class Bob < Cask
+cask :v1 => 'bob' do
   version '0.1.2'
   sha256 'e73e5a5a2a4750cfa62f405846d87abc6fc32dba6df4b1bf74f910cee2cf8e87'
 
diff --git a/Casks/boinxtv.rb b/Casks/boinxtv.rb
index 4c8b0c5a8d99..0771d0e12494 100644
--- a/Casks/boinxtv.rb
+++ b/Casks/boinxtv.rb
@@ -1,4 +1,4 @@
-class Boinxtv < Cask
+cask :v1 => 'boinxtv' do
   version '1.9.9-17091'
   sha256 'aeb95fc09c80975e25bd2a584807b408bb219bf39c099d6730bc8983cfedf7b6'
 
diff --git a/Casks/bonjour-browser.rb b/Casks/bonjour-browser.rb
index f90f93568130..2bb244d1d71b 100644
--- a/Casks/bonjour-browser.rb
+++ b/Casks/bonjour-browser.rb
@@ -1,4 +1,4 @@
-class BonjourBrowser < Cask
+cask :v1 => 'bonjour-browser' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/bookends.rb b/Casks/bookends.rb
index a42080dcc0cd..c5d31c8270ab 100644
--- a/Casks/bookends.rb
+++ b/Casks/bookends.rb
@@ -1,4 +1,4 @@
-class Bookends < Cask
+cask :v1 => 'bookends' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/boom-recorder.rb b/Casks/boom-recorder.rb
index c25b5cdfdde7..ebb6e7689e91 100644
--- a/Casks/boom-recorder.rb
+++ b/Casks/boom-recorder.rb
@@ -1,4 +1,4 @@
-class BoomRecorder < Cask
+cask :v1 => 'boom-recorder' do
   version '8.4.0'
   sha256 '6090543358b142d4d14197ef810f9e3641e10c6e1309ac5f8c18c486ab1258a7'
 
diff --git a/Casks/boom.rb b/Casks/boom.rb
index 7cd80a61502d..6d7f7596b134 100644
--- a/Casks/boom.rb
+++ b/Casks/boom.rb
@@ -1,4 +1,4 @@
-class Boom < Cask
+cask :v1 => 'boom' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/boot2docker.rb b/Casks/boot2docker.rb
index 8105ba748d7e..b5b268d3d8aa 100644
--- a/Casks/boot2docker.rb
+++ b/Casks/boot2docker.rb
@@ -1,4 +1,4 @@
-class Boot2docker < Cask
+cask :v1 => 'boot2docker' do
   version '1.3.0'
   sha256 'db53c4a777ced0430fac728e9f28280e610ce0c67cdfa38105414506eae3959e'
 
diff --git a/Casks/bootchamp.rb b/Casks/bootchamp.rb
index dd1d6cf95fce..bd3455714ac7 100644
--- a/Casks/bootchamp.rb
+++ b/Casks/bootchamp.rb
@@ -1,4 +1,4 @@
-class Bootchamp < Cask
+cask :v1 => 'bootchamp' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/bootxchanger.rb b/Casks/bootxchanger.rb
index 314210ac9f4e..180956d8bf2b 100644
--- a/Casks/bootxchanger.rb
+++ b/Casks/bootxchanger.rb
@@ -1,4 +1,4 @@
-class Bootxchanger < Cask
+cask :v1 => 'bootxchanger' do
   version '2.0'
   sha256 'cfb05680ab6a7d0b1793a33135dd15562a7b5fd59bb1ebf3ad6067c2c9fad6c1'
 
diff --git a/Casks/bowery.rb b/Casks/bowery.rb
index 0c1718b1072b..033ae4222ba8 100644
--- a/Casks/bowery.rb
+++ b/Casks/bowery.rb
@@ -1,4 +1,4 @@
-class Bowery < Cask
+cask :v1 => 'bowery' do
   version '3.3.0'
   sha256 'b10ed33caaab237f8ba847325ed0b2f82ef6eaac856b32d018bf4d03add20bb0'
 
diff --git a/Casks/bowtie.rb b/Casks/bowtie.rb
index 1bb4900201f5..cd073b603598 100644
--- a/Casks/bowtie.rb
+++ b/Casks/bowtie.rb
@@ -1,4 +1,4 @@
-class Bowtie < Cask
+cask :v1 => 'bowtie' do
   version '1.5'
   sha256 'd8406b066851c0730ca052036bedd5ded82019403de1fd58b579da34cfa4a948'
 
diff --git a/Casks/box-sync.rb b/Casks/box-sync.rb
index 71cdfa25975c..72ceea568c67 100644
--- a/Casks/box-sync.rb
+++ b/Casks/box-sync.rb
@@ -1,4 +1,4 @@
-class BoxSync < Cask
+cask :v1 => 'box-sync' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/boxcryptor-classic.rb b/Casks/boxcryptor-classic.rb
index a4a2285812b1..015d68b169ff 100644
--- a/Casks/boxcryptor-classic.rb
+++ b/Casks/boxcryptor-classic.rb
@@ -1,4 +1,4 @@
-class BoxcryptorClassic < Cask
+cask :v1 => 'boxcryptor-classic' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/boxer.rb b/Casks/boxer.rb
index eef04936f6f6..8fdad40253a3 100644
--- a/Casks/boxer.rb
+++ b/Casks/boxer.rb
@@ -1,4 +1,4 @@
-class Boxer < Cask
+cask :v1 => 'boxer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/brackets.rb b/Casks/brackets.rb
index ba6e5db46d82..2c0d5ad2526a 100644
--- a/Casks/brackets.rb
+++ b/Casks/brackets.rb
@@ -1,4 +1,4 @@
-class Brackets < Cask
+cask :v1 => 'brackets' do
   version '1.0'
   sha256 '526ec76ca1f36539a7fa7ae499095ab4b3e910f2ca202872210227419d2d0341'
 
diff --git a/Casks/brain-workshop.rb b/Casks/brain-workshop.rb
index 763484980382..8eb394dfd076 100644
--- a/Casks/brain-workshop.rb
+++ b/Casks/brain-workshop.rb
@@ -1,4 +1,4 @@
-class BrainWorkshop < Cask
+cask :v1 => 'brain-workshop' do
   version '4.8.4'
   sha256 'b795220306862f55e79e3de9c8cf8b4e8667e7bb1b0e3f59604b4d5f29f3f623'
 
diff --git a/Casks/breach.rb b/Casks/breach.rb
index c029085742fa..1a8ad6d979ae 100644
--- a/Casks/breach.rb
+++ b/Casks/breach.rb
@@ -1,4 +1,4 @@
-class Breach < Cask
+cask :v1 => 'breach' do
   version '0.3.22-alpha.6'
   sha256 '5f9cd82b3a6e510b8876d3fe16c64dfbc748041a1610710055a4d608169b2a35'
 
diff --git a/Casks/breakaway.rb b/Casks/breakaway.rb
index 47d7cf8a3252..74ac0f7b3dc8 100644
--- a/Casks/breakaway.rb
+++ b/Casks/breakaway.rb
@@ -1,4 +1,4 @@
-class Breakaway < Cask
+cask :v1 => 'breakaway' do
   version '2.0.1'
   sha256 'df5a3d42558f9cdc778c434f88f7e062032cf33dd751ef01e6109a9848a7f76a'
 
diff --git a/Casks/bricksmith.rb b/Casks/bricksmith.rb
index 90c271f3265e..16f2d6f52e0e 100644
--- a/Casks/bricksmith.rb
+++ b/Casks/bricksmith.rb
@@ -1,4 +1,4 @@
-class Bricksmith < Cask
+cask :v1 => 'bricksmith' do
   version '3.0'
   sha256 'bf7dcd7508d2d6e37f6079080e8ae51095e14d05eb507ad85ac4bbaf5b9ae7c5'
 
diff --git a/Casks/brightness.rb b/Casks/brightness.rb
index 6bdda3d25e1d..474338b0a347 100644
--- a/Casks/brightness.rb
+++ b/Casks/brightness.rb
@@ -1,4 +1,4 @@
-class Brightness < Cask
+cask :v1 => 'brightness' do
   version '1.1.2'
   sha256 '1bb6e6a993ee5c64ba27c28f96160ed64c5136835f73f2f7fe9f553b90f4a90c'
 
diff --git a/Casks/brogue.rb b/Casks/brogue.rb
index ea7f61977bc4..1307e260a7f8 100644
--- a/Casks/brogue.rb
+++ b/Casks/brogue.rb
@@ -1,4 +1,4 @@
-class Brogue < Cask
+cask :v1 => 'brogue' do
   version '1.7.3'
   sha256 'a8b6cc384bc0d7a63c60c7675a43fc672d621d03d5eb400b11749a1b1b5ca78f'
 
diff --git a/Casks/broomstick.rb b/Casks/broomstick.rb
index a7591181de74..0f6ade300301 100644
--- a/Casks/broomstick.rb
+++ b/Casks/broomstick.rb
@@ -1,4 +1,4 @@
-class Broomstick < Cask
+cask :v1 => 'broomstick' do
   version '0.91'
   sha256 '2cfb70829bd2456b4a2c88b2b5bf037f3a479df13c58a40620f659f9df5b8b2b'
 
diff --git a/Casks/brow.rb b/Casks/brow.rb
index 982b47eedb8f..51da8e676879 100644
--- a/Casks/brow.rb
+++ b/Casks/brow.rb
@@ -1,4 +1,4 @@
-class Brow < Cask
+cask :v1 => 'brow' do
   version '1.0'
   sha256 'f646b89e63853edab7dfae701f10074b0b966f624d2c1e412f0c07cdeeff2eeb'
 
diff --git a/Casks/browserstacklocal.rb b/Casks/browserstacklocal.rb
index 08e89e32cf4b..c6f70e21bc5f 100644
--- a/Casks/browserstacklocal.rb
+++ b/Casks/browserstacklocal.rb
@@ -1,4 +1,4 @@
-class Browserstacklocal < Cask
+cask :v1 => 'browserstacklocal' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/brushviewql.rb b/Casks/brushviewql.rb
index ee22b0d94e80..5ee5078fdd40 100644
--- a/Casks/brushviewql.rb
+++ b/Casks/brushviewql.rb
@@ -1,4 +1,4 @@
-class Brushviewql < Cask
+cask :v1 => 'brushviewql' do
   version '1.1'
   sha256 '5211b8b62a8d03a9859c96ebba94fa3262e633a3f7420a1972eaa1ab37b1347f'
 
diff --git a/Casks/brytonbridge.rb b/Casks/brytonbridge.rb
index b5b6d9d85f16..70f442502d8d 100644
--- a/Casks/brytonbridge.rb
+++ b/Casks/brytonbridge.rb
@@ -1,4 +1,4 @@
-class Brytonbridge < Cask
+cask :v1 => 'brytonbridge' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/buddi.rb b/Casks/buddi.rb
index 33d8f93ce212..07b24668b346 100644
--- a/Casks/buddi.rb
+++ b/Casks/buddi.rb
@@ -1,4 +1,4 @@
-class Buddi < Cask
+cask :v1 => 'buddi' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/budget.rb b/Casks/budget.rb
index 09aedabdf15b..0fe012769e8e 100644
--- a/Casks/budget.rb
+++ b/Casks/budget.rb
@@ -1,4 +1,4 @@
-class Budget < Cask
+cask :v1 => 'budget' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/burn.rb b/Casks/burn.rb
index b8ca207d9edc..1f17617f1c81 100644
--- a/Casks/burn.rb
+++ b/Casks/burn.rb
@@ -1,4 +1,4 @@
-class Burn < Cask
+cask :v1 => 'burn' do
   version '2.5.1'
   sha256 'e82d2b7ef6a99e5a139706ff4e360659830d618ab8743e4b55ec80cdcdc97596'
 
diff --git a/Casks/butter.rb b/Casks/butter.rb
index ee9aa8fdd7a8..a8a60e8058dd 100644
--- a/Casks/butter.rb
+++ b/Casks/butter.rb
@@ -1,4 +1,4 @@
-class Butter < Cask
+cask :v1 => 'butter' do
   version '0.1.5'
   sha256 '32c9c20453bb4702e10f4d51e93b316eb0f9d4cc57224c526cc5050346913099'
 
diff --git a/Casks/bzflag.rb b/Casks/bzflag.rb
index 00c5e45395d2..1c2ded8990bb 100644
--- a/Casks/bzflag.rb
+++ b/Casks/bzflag.rb
@@ -1,4 +1,4 @@
-class Bzflag < Cask
+cask :v1 => 'bzflag' do
   version '2.4.2'
   sha256 '4ce7f007cb7c78a5243ced84d310c37637a2aa8fe9569231edd2dbc45286e293'
 
diff --git a/Casks/c3.rb b/Casks/c3.rb
index 6ece9dd3f479..2b1c34dc38a8 100644
--- a/Casks/c3.rb
+++ b/Casks/c3.rb
@@ -1,4 +1,4 @@
-class C3 < Cask
+cask :v1 => 'c3' do
   version '0.5.2.2143'
   sha256 '1f039168caf6487c4ded7fdec5ebf80f4400b03188a40b1bc06f0abc8bf3d3ff'
 
diff --git a/Casks/cacoo-ninja.rb b/Casks/cacoo-ninja.rb
index 56f063d571ca..ec99e56f3379 100644
--- a/Casks/cacoo-ninja.rb
+++ b/Casks/cacoo-ninja.rb
@@ -1,4 +1,4 @@
-class CacooNinja < Cask
+cask :v1 => 'cacoo-ninja' do
   version '1.1.0'
   sha256 'a19eb5a97a854a8d15157f0d51d18ff5f84876f262c921d239a1bb0bb1328d1c'
 
diff --git a/Casks/caffeine.rb b/Casks/caffeine.rb
index 22b807b573fe..995dcca08694 100644
--- a/Casks/caffeine.rb
+++ b/Casks/caffeine.rb
@@ -1,4 +1,4 @@
-class Caffeine < Cask
+cask :v1 => 'caffeine' do
   version '1.1.1'
   sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
 
diff --git a/Casks/cajviewer.rb b/Casks/cajviewer.rb
index 9ed81adddcbb..4c58ae8021a9 100644
--- a/Casks/cajviewer.rb
+++ b/Casks/cajviewer.rb
@@ -1,4 +1,4 @@
-class Cajviewer < Cask
+cask :v1 => 'cajviewer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/cakebrew.rb b/Casks/cakebrew.rb
index 1d471a8b9423..523d587281b5 100644
--- a/Casks/cakebrew.rb
+++ b/Casks/cakebrew.rb
@@ -1,4 +1,4 @@
-class Cakebrew < Cask
+cask :v1 => 'cakebrew' do
   version '1.0.9'
   sha256 'e60ad4e04ff74483b41c28585350d0b9935f3143fbb4b34eb3d72869da9c0e9b'
 
diff --git a/Casks/calcservice.rb b/Casks/calcservice.rb
index 77d508b17aa7..be0d946b63fa 100644
--- a/Casks/calcservice.rb
+++ b/Casks/calcservice.rb
@@ -1,4 +1,4 @@
-class Calcservice < Cask
+cask :v1 => 'calcservice' do
   version '3.4'
   sha256 '4406f34eb65a72be04548e4cbd4a10b7e1d1518f2acb8df6d20ae40b8620c4b6'
 
diff --git a/Casks/calibre.rb b/Casks/calibre.rb
index aef02b8b1873..611e396d24f2 100644
--- a/Casks/calibre.rb
+++ b/Casks/calibre.rb
@@ -1,4 +1,4 @@
-class Calibre < Cask
+cask :v1 => 'calibre' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/calibre2opds.rb b/Casks/calibre2opds.rb
index 20aafa6c5687..666adf242a45 100644
--- a/Casks/calibre2opds.rb
+++ b/Casks/calibre2opds.rb
@@ -1,4 +1,4 @@
-class Calibre2opds < Cask
+cask :v1 => 'calibre2opds' do
   version '3.3-246'
   sha256 '7a91b4cc5215ae337f0581e54db7c507ec7f463c87c5237e186168bf4fa9522d'
 
diff --git a/Casks/callnote.rb b/Casks/callnote.rb
index 714d32c702f5..dfb6a4059df5 100644
--- a/Casks/callnote.rb
+++ b/Casks/callnote.rb
@@ -1,4 +1,4 @@
-class Callnote < Cask
+cask :v1 => 'callnote' do
   version '2.3.7'
   sha256 '968c61f2cd1e71f91ec45b9f69023765210010e3d28256eeb65942ee075e756b'
 
diff --git a/Casks/camed.rb b/Casks/camed.rb
index 36989781133a..48bbb05d3d77 100644
--- a/Casks/camed.rb
+++ b/Casks/camed.rb
@@ -1,4 +1,4 @@
-class Camed < Cask
+cask :v1 => 'camed' do
   version '3.1.1'
   sha256 'c9088796b6f5cee228341e2ec6c2ee0ff3e3a506ff0dde3643865ccbc9c4f744'
 
diff --git a/Casks/camerabag.rb b/Casks/camerabag.rb
index 94897c5b346b..3709d240dd67 100644
--- a/Casks/camerabag.rb
+++ b/Casks/camerabag.rb
@@ -1,4 +1,4 @@
-class Camerabag < Cask
+cask :v1 => 'camerabag' do
   version '2.5.06'
   sha256 'cbc34e49c94dfe0e9434c4495e970808b8498bdd7a62251dadcdb192595aff58'
 
diff --git a/Casks/camranger.rb b/Casks/camranger.rb
index 0f70bc56cd25..489cd56359ca 100644
--- a/Casks/camranger.rb
+++ b/Casks/camranger.rb
@@ -1,4 +1,4 @@
-class Camranger < Cask
+cask :v1 => 'camranger' do
   version '1.8'
   sha256 'fe27f11d08df3119d99c5b72b8a5214f5a34e491b43943bfc2b2f1fde905882d'
 
diff --git a/Casks/camtasia.rb b/Casks/camtasia.rb
index 804271ffc4d8..085a2299cfcf 100644
--- a/Casks/camtasia.rb
+++ b/Casks/camtasia.rb
@@ -1,4 +1,4 @@
-class Camtasia < Cask
+cask :v1 => 'camtasia' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/camtwist.rb b/Casks/camtwist.rb
index e08601d7691c..8a87f2c4675d 100644
--- a/Casks/camtwist.rb
+++ b/Casks/camtwist.rb
@@ -1,4 +1,4 @@
-class Camtwist < Cask
+cask :v1 => 'camtwist' do
   version '2.5'
   sha256 'd81576971abe2bc1a8b1e3d8c894cfe18f0442c49a6a242a6ab25b247de01fec'
 
diff --git a/Casks/candybar.rb b/Casks/candybar.rb
index 361a254bfeed..9492d6de1851 100644
--- a/Casks/candybar.rb
+++ b/Casks/candybar.rb
@@ -1,4 +1,4 @@
-class Candybar < Cask
+cask :v1 => 'candybar' do
   version '3.3.4'
   sha256 'f305596f195445016b35c9d99a40789c6671195e9cbad0b6e92e808b6c633ad6'
 
diff --git a/Casks/capo.rb b/Casks/capo.rb
index 2dba907d0e30..cb5b8586ff66 100644
--- a/Casks/capo.rb
+++ b/Casks/capo.rb
@@ -1,4 +1,4 @@
-class Capo < Cask
+cask :v1 => 'capo' do
   version '3.0.3'
   sha256 'ab70d7ba4965cca146507ebbb3ad874b9f67efde11c2b84de58712d7e1c3391b'
 
diff --git a/Casks/capsee.rb b/Casks/capsee.rb
index 139b609b166f..df1b34cced79 100644
--- a/Casks/capsee.rb
+++ b/Casks/capsee.rb
@@ -1,4 +1,4 @@
-class Capsee < Cask
+cask :v1 => 'capsee' do
   version '1.2'
   sha256 'e78cdfe435cca259e0111a2b2131ad3be7d5ba6160cf69c8e7cbcc033eac2fc4'
 
diff --git a/Casks/carbon-copy-cloner.rb b/Casks/carbon-copy-cloner.rb
index 1a6d61ef0f27..305265157e31 100644
--- a/Casks/carbon-copy-cloner.rb
+++ b/Casks/carbon-copy-cloner.rb
@@ -1,4 +1,4 @@
-class CarbonCopyCloner < Cask
+cask :v1 => 'carbon-copy-cloner' do
   version '4.0.3274'
   sha256 '7d6479cd68ba9e8f9e0a74b2426d38c99ad3dea1c3a29dd7aaad8d8854d8a753'
 
diff --git a/Casks/cargo.rb b/Casks/cargo.rb
index 065cc0276bd4..e9c7c0c4cdb1 100644
--- a/Casks/cargo.rb
+++ b/Casks/cargo.rb
@@ -1,4 +1,4 @@
-class Cargo < Cask
+cask :v1 => 'cargo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/carlson-minot.rb b/Casks/carlson-minot.rb
index 8d16fe6a2ac1..37dc43d11e3b 100644
--- a/Casks/carlson-minot.rb
+++ b/Casks/carlson-minot.rb
@@ -1,4 +1,4 @@
-class CarlsonMinot < Cask
+cask :v1 => 'carlson-minot' do
   version '2013.05-24'
   sha256 '1c41265f1a61e8594e9bcd702de0a4e7ed786394c91764e4d7495a6220a95b51'
 
diff --git a/Casks/cartao-de-cidadao.rb b/Casks/cartao-de-cidadao.rb
index 13ea53aa6fa9..3462cdfea1af 100644
--- a/Casks/cartao-de-cidadao.rb
+++ b/Casks/cartao-de-cidadao.rb
@@ -1,4 +1,4 @@
-class CartaoDeCidadao < Cask
+cask :v1 => 'cartao-de-cidadao' do
   version '1.26.0.635'
   sha256 '6333910df54b7e551fa619be1a195695eec08963ef63d6cb73aa8c4e5bff538c'
 
diff --git a/Casks/cartographica.rb b/Casks/cartographica.rb
index d3715d9521bb..af05ce6638f3 100644
--- a/Casks/cartographica.rb
+++ b/Casks/cartographica.rb
@@ -1,4 +1,4 @@
-class Cartographica < Cask
+cask :v1 => 'cartographica' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/catch.rb b/Casks/catch.rb
index 2a895ba3cfec..c44cbfb35c38 100644
--- a/Casks/catch.rb
+++ b/Casks/catch.rb
@@ -1,4 +1,4 @@
-class Catch < Cask
+cask :v1 => 'catch' do
   version '1.8'
   sha256 '0fd58d79ba869583406b7aa9ed707e4c77480417da9f09805f1497098fbbb138'
 
diff --git a/Casks/catchmouse.rb b/Casks/catchmouse.rb
index 1da156b7d483..9d656afd869d 100644
--- a/Casks/catchmouse.rb
+++ b/Casks/catchmouse.rb
@@ -1,4 +1,4 @@
-class Catchmouse < Cask
+cask :v1 => 'catchmouse' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/cathode.rb b/Casks/cathode.rb
index 319b9f1e16c6..6ac1d4780996 100644
--- a/Casks/cathode.rb
+++ b/Casks/cathode.rb
@@ -1,4 +1,4 @@
-class Cathode < Cask
+cask :v1 => 'cathode' do
   version '2.1.3'
   sha256 'b6074daf33e6947786fff1fe6f5df729721427aa827ef21d93db5640bd0162d0'
 
diff --git a/Casks/caustic.rb b/Casks/caustic.rb
index 5d6af77540f9..014c8d973f80 100644
--- a/Casks/caustic.rb
+++ b/Casks/caustic.rb
@@ -1,4 +1,4 @@
-class Caustic < Cask
+cask :v1 => 'caustic' do
   version '3.1.0'
   sha256 'acad8217f7f1bc0ced8c69491be053c19f394fbb5c6becfda07ae3ed06583d0f'
 
diff --git a/Casks/ccleaner.rb b/Casks/ccleaner.rb
index cb1938421c28..d4346d43ca59 100644
--- a/Casks/ccleaner.rb
+++ b/Casks/ccleaner.rb
@@ -1,4 +1,4 @@
-class Ccleaner < Cask
+cask :v1 => 'ccleaner' do
   version '1.09.313'
   sha256 '464a75b9d038dec0334f70846d5ea68679ff907e57b9ec373331c5da18cb4865'
 
diff --git a/Casks/ccmenu.rb b/Casks/ccmenu.rb
index 63b3fb3a1cc5..f8f99798bc12 100644
--- a/Casks/ccmenu.rb
+++ b/Casks/ccmenu.rb
@@ -1,4 +1,4 @@
-class Ccmenu < Cask
+cask :v1 => 'ccmenu' do
   version '1.7'
   sha256 '974a2022dbc9494958334ee8f02e08df7ed184e1f421a53d623dfbeaadf08a2c'
 
diff --git a/Casks/cd-to.rb b/Casks/cd-to.rb
index 44bc75ebbc5d..edc50967669b 100644
--- a/Casks/cd-to.rb
+++ b/Casks/cd-to.rb
@@ -1,4 +1,4 @@
-class CdTo < Cask
+cask :v1 => 'cd-to' do
   version '2.6.0'
   sha256 'a92def521d332a373f655a41338d0ec18dfaa6e24eb9ec2ca6df281398db3d46'
 
diff --git a/Casks/cdock.rb b/Casks/cdock.rb
index c89060097972..3be25bc0502b 100644
--- a/Casks/cdock.rb
+++ b/Casks/cdock.rb
@@ -1,4 +1,4 @@
-class Cdock < Cask
+cask :v1 => 'cdock' do
   version '4.2'
   sha256 '586f1a8972e12b4d71439ef915eca1396d915e28efbcee66ce84bee921aeb0ad'
 
diff --git a/Casks/celestia.rb b/Casks/celestia.rb
index eec70a1df162..795fe8f1b856 100644
--- a/Casks/celestia.rb
+++ b/Casks/celestia.rb
@@ -1,4 +1,4 @@
-class Celestia < Cask
+cask :v1 => 'celestia' do
   version '1.6.1'
   sha256 'db09842a10b377038bedef87fda8d159549234b2e072fa22e096ade84aa3f52a'
 
diff --git a/Casks/cert-quicklook.rb b/Casks/cert-quicklook.rb
index 4feceb36a84e..ec1e6b31b248 100644
--- a/Casks/cert-quicklook.rb
+++ b/Casks/cert-quicklook.rb
@@ -1,4 +1,4 @@
-class CertQuicklook < Cask
+cask :v1 => 'cert-quicklook' do
   version '3'
   sha256 '9fd0508ffb1731b52e6a0b5a9a168ede62b1ad17b591bc42c66efa628877e540'
 
diff --git a/Casks/cfxr.rb b/Casks/cfxr.rb
index cc0bc602b9ab..e4fad72f7657 100644
--- a/Casks/cfxr.rb
+++ b/Casks/cfxr.rb
@@ -1,4 +1,4 @@
-class Cfxr < Cask
+cask :v1 => 'cfxr' do
   version '0.2.1'
   sha256 '106e06fe1c76581ffb89b3f44419a1669526edb1609f54022390b22d0947a1f2'
 
diff --git a/Casks/chainsaw.rb b/Casks/chainsaw.rb
index 9118d789c2f2..c8410e887acf 100644
--- a/Casks/chainsaw.rb
+++ b/Casks/chainsaw.rb
@@ -1,4 +1,4 @@
-class Chainsaw < Cask
+cask :v1 => 'chainsaw' do
   version '2.1.0'
   sha256 '3449c1d0fca70f78b656a151dabaf5c8149e1dbec2854b7a662b7f242ce299d2'
 
diff --git a/Casks/chameleon-ssd-optimizer.rb b/Casks/chameleon-ssd-optimizer.rb
index 4e431785a884..7d3c49485249 100644
--- a/Casks/chameleon-ssd-optimizer.rb
+++ b/Casks/chameleon-ssd-optimizer.rb
@@ -1,4 +1,4 @@
-class ChameleonSsdOptimizer < Cask
+cask :v1 => 'chameleon-ssd-optimizer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/changes-meter.rb b/Casks/changes-meter.rb
index d7809faac9d2..7d073f9745fc 100644
--- a/Casks/changes-meter.rb
+++ b/Casks/changes-meter.rb
@@ -1,4 +1,4 @@
-class ChangesMeter < Cask
+cask :v1 => 'changes-meter' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/changes.rb b/Casks/changes.rb
index 7fcc251b8469..3fbb6f2a6603 100644
--- a/Casks/changes.rb
+++ b/Casks/changes.rb
@@ -1,4 +1,4 @@
-class Changes < Cask
+cask :v1 => 'changes' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/charles.rb b/Casks/charles.rb
index 819a30c8efd5..90b8b2317479 100644
--- a/Casks/charles.rb
+++ b/Casks/charles.rb
@@ -1,4 +1,4 @@
-class Charles < Cask
+cask :v1 => 'charles' do
   version '3.9.3'
   sha256 '84de5c3f233ec6af24f5bab04631daf9ef4af0c549efca8675f9d3946e5aceb8'
 
diff --git a/Casks/chatology.rb b/Casks/chatology.rb
index 578ae492ec50..09a2ca36c6e4 100644
--- a/Casks/chatology.rb
+++ b/Casks/chatology.rb
@@ -1,4 +1,4 @@
-class Chatology < Cask
+cask :v1 => 'chatology' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/cheatsheet.rb b/Casks/cheatsheet.rb
index 3308a9fe2e86..74945e0db0d6 100644
--- a/Casks/cheatsheet.rb
+++ b/Casks/cheatsheet.rb
@@ -1,4 +1,4 @@
-class Cheatsheet < Cask
+cask :v1 => 'cheatsheet' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/cheetah3d.rb b/Casks/cheetah3d.rb
index 369b6161c898..17ab55989c1d 100644
--- a/Casks/cheetah3d.rb
+++ b/Casks/cheetah3d.rb
@@ -1,4 +1,4 @@
-class Cheetah3d < Cask
+cask :v1 => 'cheetah3d' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/chefdk.rb b/Casks/chefdk.rb
index bd23c18a0157..9cbdee7a26a2 100644
--- a/Casks/chefdk.rb
+++ b/Casks/chefdk.rb
@@ -1,4 +1,4 @@
-class Chefdk < Cask
+cask :v1 => 'chefdk' do
   version '0.3.2-1'
   sha256 'ffef287a9eba71eec8ee3f47044d351f6e679ed77b022f8be8bed3b76a912d44'
 
diff --git a/Casks/chemdoodle.rb b/Casks/chemdoodle.rb
index 8355a4a57679..24e671f589dd 100644
--- a/Casks/chemdoodle.rb
+++ b/Casks/chemdoodle.rb
@@ -1,4 +1,4 @@
-class Chemdoodle < Cask
+cask :v1 => 'chemdoodle' do
   version '6.0.1'
   sha256 '004c4d828230f4640678ba31ef07bf878e00ef3f225144fa088a81c4279c1776'
 
diff --git a/Casks/chicken.rb b/Casks/chicken.rb
index 8c1152ff9170..603e5e5bbb86 100644
--- a/Casks/chicken.rb
+++ b/Casks/chicken.rb
@@ -1,4 +1,4 @@
-class Chicken < Cask
+cask :v1 => 'chicken' do
   version '2.2b2'
   sha256 '20e910b6cbf95c3e5dcf6fe8e120d5a0911f19099128981fb95119cee8d5fc6b'
 
diff --git a/Casks/chirp.rb b/Casks/chirp.rb
index be25269752f1..85d564f3bcdd 100644
--- a/Casks/chirp.rb
+++ b/Casks/chirp.rb
@@ -1,4 +1,4 @@
-class Chirp < Cask
+cask :v1 => 'chirp' do
   version '0.4.0'
   sha256 '76842b583f0dbb19cd700a156893b0cd1356dde18bbe730261fdf786772a26f0'
 
diff --git a/Casks/chocolat.rb b/Casks/chocolat.rb
index af82c00d059b..b9b9da8fdc80 100644
--- a/Casks/chocolat.rb
+++ b/Casks/chocolat.rb
@@ -1,4 +1,4 @@
-class Chocolat < Cask
+cask :v1 => 'chocolat' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/choose-wisely.rb b/Casks/choose-wisely.rb
index 20a90691e1bf..4355d4cda8b0 100644
--- a/Casks/choose-wisely.rb
+++ b/Casks/choose-wisely.rb
@@ -1,4 +1,4 @@
-class ChooseWisely < Cask
+cask :v1 => 'choose-wisely' do
   version '0.5'
   sha256 '2b7ef3de0563693a4b8fe895a4f5a9a131bfca2a74726db3380ffe6576c02b5f'
 
diff --git a/Casks/choosy.rb b/Casks/choosy.rb
index 3affed805100..9ed29765a8e5 100644
--- a/Casks/choosy.rb
+++ b/Casks/choosy.rb
@@ -1,4 +1,4 @@
-class Choosy < Cask
+cask :v1 => 'choosy' do
   version '1.0.3'
   sha256 '87513395c94221ae9a83c787ac78f1a1028099dc9be4883e19924768a354c6ca'
 
diff --git a/Casks/chromatic.rb b/Casks/chromatic.rb
index 2a032d500e71..5f58c7a85b10 100644
--- a/Casks/chromatic.rb
+++ b/Casks/chromatic.rb
@@ -1,4 +1,4 @@
-class Chromatic < Cask
+cask :v1 => 'chromatic' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/chrome-remote-desktop-host.rb b/Casks/chrome-remote-desktop-host.rb
index 701cf4184b2b..cd0dd2f23400 100644
--- a/Casks/chrome-remote-desktop-host.rb
+++ b/Casks/chrome-remote-desktop-host.rb
@@ -1,4 +1,4 @@
-class ChromeRemoteDesktopHost < Cask
+cask :v1 => 'chrome-remote-desktop-host' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/chromecast.rb b/Casks/chromecast.rb
index 6a9f5e93d514..123cad60c1aa 100644
--- a/Casks/chromecast.rb
+++ b/Casks/chromecast.rb
@@ -1,4 +1,4 @@
-class Chromecast < Cask
+cask :v1 => 'chromecast' do
   version '1.5.0.531'
   sha256 '66a70feb3bacb3087fdf4a34300cbc6c54455a8b62a2b340123cc1a03cedcbe9'
 
diff --git a/Casks/chromium.rb b/Casks/chromium.rb
index 00066552e1a2..33c178f45603 100644
--- a/Casks/chromium.rb
+++ b/Casks/chromium.rb
@@ -1,4 +1,4 @@
-class Chromium < Cask
+cask :v1 => 'chromium' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/chronicle.rb b/Casks/chronicle.rb
index d31b9a388499..86130c776890 100644
--- a/Casks/chronicle.rb
+++ b/Casks/chronicle.rb
@@ -1,4 +1,4 @@
-class Chronicle < Cask
+cask :v1 => 'chronicle' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/chronoagent.rb b/Casks/chronoagent.rb
index c93645bf03e9..c130325ed5f1 100644
--- a/Casks/chronoagent.rb
+++ b/Casks/chronoagent.rb
@@ -1,4 +1,4 @@
-class Chronoagent < Cask
+cask :v1 => 'chronoagent' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/chronomate.rb b/Casks/chronomate.rb
index af51b5e8c740..4a230b461e40 100644
--- a/Casks/chronomate.rb
+++ b/Casks/chronomate.rb
@@ -1,4 +1,4 @@
-class Chronomate < Cask
+cask :v1 => 'chronomate' do
   version '0.9.2'
   sha256 '76b2f87b088c57aac7dfd18215b07e078d453ed351af056db25bb78d67e4862b'
 
diff --git a/Casks/chronosync.rb b/Casks/chronosync.rb
index ba08be4e712f..be2752cdc8e3 100644
--- a/Casks/chronosync.rb
+++ b/Casks/chronosync.rb
@@ -1,4 +1,4 @@
-class Chronosync < Cask
+cask :v1 => 'chronosync' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/chunkulus.rb b/Casks/chunkulus.rb
index 798d57217515..416bcddab100 100644
--- a/Casks/chunkulus.rb
+++ b/Casks/chunkulus.rb
@@ -1,4 +1,4 @@
-class Chunkulus < Cask
+cask :v1 => 'chunkulus' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/cinch.rb b/Casks/cinch.rb
index 56e101467b37..6d128265b9d6 100644
--- a/Casks/cinch.rb
+++ b/Casks/cinch.rb
@@ -1,4 +1,4 @@
-class Cinch < Cask
+cask :v1 => 'cinch' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/citrix-receiver.rb b/Casks/citrix-receiver.rb
index 10fa07950905..072f8be2cdd0 100644
--- a/Casks/citrix-receiver.rb
+++ b/Casks/citrix-receiver.rb
@@ -1,4 +1,4 @@
-class CitrixReceiver < Cask
+cask :v1 => 'citrix-receiver' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/clamxav.rb b/Casks/clamxav.rb
index bdbb36a796a7..7c1354eaed36 100644
--- a/Casks/clamxav.rb
+++ b/Casks/clamxav.rb
@@ -1,4 +1,4 @@
-class Clamxav < Cask
+cask :v1 => 'clamxav' do
   version '2.6.4'
   sha256 'bbde8181307566bd592930f7318a7c43e253788bf44bab9bae1140b1e50e694f'
 
diff --git a/Casks/clarify.rb b/Casks/clarify.rb
index b20f1dd6f398..d8b572b3f016 100644
--- a/Casks/clarify.rb
+++ b/Casks/clarify.rb
@@ -1,4 +1,4 @@
-class Clarify < Cask
+cask :v1 => 'clarify' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/cleanmymac.rb b/Casks/cleanmymac.rb
index de9ba2481368..19660a0d011c 100644
--- a/Casks/cleanmymac.rb
+++ b/Casks/cleanmymac.rb
@@ -1,4 +1,4 @@
-class Cleanmymac < Cask
+cask :v1 => 'cleanmymac' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/clementine.rb b/Casks/clementine.rb
index 01d9bda54395..4472391f084c 100644
--- a/Casks/clementine.rb
+++ b/Casks/clementine.rb
@@ -1,4 +1,4 @@
-class Clementine < Cask
+cask :v1 => 'clementine' do
   version '1.2.2'
   sha256 '7e3dac7fb184058e69afbf9cf68850debbbacdfbbd3023fbcdce7c159a2eed75'
 
diff --git a/Casks/clion-eap.rb b/Casks/clion-eap.rb
index 7fcca8921106..6d322669aa5b 100644
--- a/Casks/clion-eap.rb
+++ b/Casks/clion-eap.rb
@@ -1,4 +1,4 @@
-class ClionEap < Cask
+cask :v1 => 'clion-eap' do
   version '138.2344.17'
   sha256 '4d15bd684f23add653b3a4ddea13f1d26931769aefd65936b63b96839b089a1e'
 
diff --git a/Casks/clipmenu.rb b/Casks/clipmenu.rb
index c67db76a8786..01efc8ca437c 100644
--- a/Casks/clipmenu.rb
+++ b/Casks/clipmenu.rb
@@ -1,4 +1,4 @@
-class Clipmenu < Cask
+cask :v1 => 'clipmenu' do
   version '0.4.3'
   sha256 'd0d7ca6c23f51b2dfe78c7bb40bf2f212c21b3304b3eacde86112d8ef3e6bfb9'
 
diff --git a/Casks/clix.rb b/Casks/clix.rb
index d048426c33a2..57ee8a10aa39 100644
--- a/Casks/clix.rb
+++ b/Casks/clix.rb
@@ -1,4 +1,4 @@
-class Clix < Cask
+cask :v1 => 'clix' do
   version '2.1'
   sha256 'a4f9d270792e9da698326924e4c899c7a5f13f157c7793b82187688f8c189008'
 
diff --git a/Casks/cloak.rb b/Casks/cloak.rb
index 8e89f1d5ac2f..5f95def5bfbb 100644
--- a/Casks/cloak.rb
+++ b/Casks/cloak.rb
@@ -1,4 +1,4 @@
-class Cloak < Cask
+cask :v1 => 'cloak' do
   version '2.0.8'
   sha256 '7c26d9d835b8d6d190581ac2fb3720d305e280cce916e0cbaba27c941ad66c01'
 
diff --git a/Casks/clock.rb b/Casks/clock.rb
index c627c49c2159..94e3aff9524c 100644
--- a/Casks/clock.rb
+++ b/Casks/clock.rb
@@ -1,4 +1,4 @@
-class Clock < Cask
+cask :v1 => 'clock' do
   version '1.1'
   sha256 'f2def6485626b4d10a535cb86eb7c877da8d59a2103f8da7b211970c88b96913'
 
diff --git a/Casks/clonk.rb b/Casks/clonk.rb
index 5a67f5d125e9..975bfa9023ff 100644
--- a/Casks/clonk.rb
+++ b/Casks/clonk.rb
@@ -1,4 +1,4 @@
-class Clonk < Cask
+cask :v1 => 'clonk' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/cloud.rb b/Casks/cloud.rb
index b87806efa599..bcccc966c107 100644
--- a/Casks/cloud.rb
+++ b/Casks/cloud.rb
@@ -1,4 +1,4 @@
-class Cloud < Cask
+cask :v1 => 'cloud' do
   version '3.1.0'
   sha256 'f412e020c8307ef5872c0c5236f8bc1f1548c47d10b19315aba24ebd391cf293'
 
diff --git a/Casks/cloudera-hive-odbc.rb b/Casks/cloudera-hive-odbc.rb
index 771db13c0f01..ec60ed425494 100644
--- a/Casks/cloudera-hive-odbc.rb
+++ b/Casks/cloudera-hive-odbc.rb
@@ -1,4 +1,4 @@
-class ClouderaHiveOdbc < Cask
+cask :v1 => 'cloudera-hive-odbc' do
   version '2.5.5'
   sha256 'cf31ace79ca995e8b7b57f1b49761777168c9f4b103092a74f6cb111084d71d8'
 
diff --git a/Casks/cloudfoundry-cli.rb b/Casks/cloudfoundry-cli.rb
index 3b39edbee0ee..4b5b4389a8d0 100644
--- a/Casks/cloudfoundry-cli.rb
+++ b/Casks/cloudfoundry-cli.rb
@@ -1,4 +1,4 @@
-class CloudfoundryCli < Cask
+cask :v1 => 'cloudfoundry-cli' do
   version '6.6.1'
   sha256 '1a159944a447b4b321513cadd8c009477dc084ce22b6bfd2e5e20382d98bb5e5'
 
diff --git a/Casks/cloudpull.rb b/Casks/cloudpull.rb
index df1f96e80188..2328e34506cb 100644
--- a/Casks/cloudpull.rb
+++ b/Casks/cloudpull.rb
@@ -1,4 +1,4 @@
-class Cloudpull < Cask
+cask :v1 => 'cloudpull' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/cloudup.rb b/Casks/cloudup.rb
index 7bf514b776c8..efa65ccdccb4 100644
--- a/Casks/cloudup.rb
+++ b/Casks/cloudup.rb
@@ -1,4 +1,4 @@
-class Cloudup < Cask
+cask :v1 => 'cloudup' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/cloudytabs.rb b/Casks/cloudytabs.rb
index 2c2fb63be030..b27b777f28c0 100644
--- a/Casks/cloudytabs.rb
+++ b/Casks/cloudytabs.rb
@@ -1,4 +1,4 @@
-class Cloudytabs < Cask
+cask :v1 => 'cloudytabs' do
   version '1.4'
   sha256 '7ba67b0f7415fe2d2cb545866eb0e9c7c2bea8980445921a9da5d2bf55711d76'
 
diff --git a/Casks/cn3d.rb b/Casks/cn3d.rb
index 1419cfc003f8..baf51fe3e3d0 100644
--- a/Casks/cn3d.rb
+++ b/Casks/cn3d.rb
@@ -1,4 +1,4 @@
-class Cn3d < Cask
+cask :v1 => 'cn3d' do
   version '4.3.1'
   sha256 '0d47a1ec7ee2e445d997eee2caa56f9cdffd68cba0384f5dd71edc00d8812df4'
 
diff --git a/Casks/coccinellida.rb b/Casks/coccinellida.rb
index 6146237c17c2..855cf136e043 100644
--- a/Casks/coccinellida.rb
+++ b/Casks/coccinellida.rb
@@ -1,4 +1,4 @@
-class Coccinellida < Cask
+cask :v1 => 'coccinellida' do
   version '0.6.1'
   sha256 'bd590bf54667b85b4c14dae95d727bfa44cc893a75f231490b48a4a65049d8df'
 
diff --git a/Casks/cockatrice.rb b/Casks/cockatrice.rb
index 41034fef7214..e294fda50aa9 100644
--- a/Casks/cockatrice.rb
+++ b/Casks/cockatrice.rb
@@ -1,4 +1,4 @@
-class Cockatrice < Cask
+cask :v1 => 'cockatrice' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/cocktail.rb b/Casks/cocktail.rb
index 9f4ce28b5537..18730cc20c21 100644
--- a/Casks/cocktail.rb
+++ b/Casks/cocktail.rb
@@ -1,4 +1,4 @@
-class Cocktail < Cask
+cask :v1 => 'cocktail' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/cocoadialog.rb b/Casks/cocoadialog.rb
index e7e4d7e4fd1a..7b5ef758257c 100644
--- a/Casks/cocoadialog.rb
+++ b/Casks/cocoadialog.rb
@@ -1,4 +1,4 @@
-class Cocoadialog < Cask
+cask :v1 => 'cocoadialog' do
   version '2.1.1'
   sha256 '7f721d221697381a51df6091153b0470ce09f4083d86bbb93446db88eac58827'
 
diff --git a/Casks/cocoapacketanalyzer.rb b/Casks/cocoapacketanalyzer.rb
index fc5052f2f1b8..0e4f53e2754d 100644
--- a/Casks/cocoapacketanalyzer.rb
+++ b/Casks/cocoapacketanalyzer.rb
@@ -1,4 +1,4 @@
-class Cocoapacketanalyzer < Cask
+cask :v1 => 'cocoapacketanalyzer' do
   version '1.31'
   sha256 'fc3586868fcf90e3ca766c31dbf184de78e5c907210dfdabbd13a831712fc864'
 
diff --git a/Casks/cocoarestclient.rb b/Casks/cocoarestclient.rb
index 1c4011fc01d8..f0bed2730715 100644
--- a/Casks/cocoarestclient.rb
+++ b/Casks/cocoarestclient.rb
@@ -1,4 +1,4 @@
-class Cocoarestclient < Cask
+cask :v1 => 'cocoarestclient' do
   version '1.3.7'
   sha256 '78400a16afc4017a68b5506e7a6270d72ade48b3e77a802eaaaaae80a0f6319f'
 
diff --git a/Casks/cocoaspell.rb b/Casks/cocoaspell.rb
index 88bf08aebf16..f6efd4fae830 100644
--- a/Casks/cocoaspell.rb
+++ b/Casks/cocoaspell.rb
@@ -1,4 +1,4 @@
-class Cocoaspell < Cask
+cask :v1 => 'cocoaspell' do
   version '2.1'
   sha256 '06d6cd7f2b04c47f553c5a3a33ebe6bc5651457521cbe7e3ead84a6cb218053c'
 
diff --git a/Casks/cocoasplit.rb b/Casks/cocoasplit.rb
index 67c741083454..5716f52a6a65 100644
--- a/Casks/cocoasplit.rb
+++ b/Casks/cocoasplit.rb
@@ -1,4 +1,4 @@
-class Cocoasplit < Cask
+cask :v1 => 'cocoasplit' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/coconutbattery.rb b/Casks/coconutbattery.rb
index eee6e835fa73..912befe2e72b 100644
--- a/Casks/coconutbattery.rb
+++ b/Casks/coconutbattery.rb
@@ -1,4 +1,4 @@
-class Coconutbattery < Cask
+cask :v1 => 'coconutbattery' do
 
   if MacOS.version < :leopard
     version '2.6.6'
diff --git a/Casks/coda.rb b/Casks/coda.rb
index f9f5fc7c8316..0ce9a66eb0a1 100644
--- a/Casks/coda.rb
+++ b/Casks/coda.rb
@@ -1,4 +1,4 @@
-class Coda < Cask
+cask :v1 => 'coda' do
   version '2.5'
   sha256 '9393ef340e04b8dc201d735a3885d14f13e82a6544b47c1ff21c4ad6eacd32ad'
 
diff --git a/Casks/codebox.rb b/Casks/codebox.rb
index fa3f16275130..2e37afe1b85e 100644
--- a/Casks/codebox.rb
+++ b/Casks/codebox.rb
@@ -1,4 +1,4 @@
-class Codebox < Cask
+cask :v1 => 'codebox' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/codebug.rb b/Casks/codebug.rb
index 54dcbaccf272..e06e7dacc680 100644
--- a/Casks/codebug.rb
+++ b/Casks/codebug.rb
@@ -1,4 +1,4 @@
-class Codebug < Cask
+cask :v1 => 'codebug' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/codekit.rb b/Casks/codekit.rb
index da98cbf1364d..f98e8a3694bd 100644
--- a/Casks/codekit.rb
+++ b/Casks/codekit.rb
@@ -1,4 +1,4 @@
-class Codekit < Cask
+cask :v1 => 'codekit' do
   version '2.1.8 (18027)'
   sha256 'b31769ae91834a06499d876c82f2f2b1ce8b379047aa5d89e7d4f50971328a83'
 
diff --git a/Casks/codelite.rb b/Casks/codelite.rb
index 312a92156673..8be9dfeccc40 100644
--- a/Casks/codelite.rb
+++ b/Casks/codelite.rb
@@ -1,4 +1,4 @@
-class Codelite < Cask
+cask :v1 => 'codelite' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/cog.rb b/Casks/cog.rb
index 273358e8f236..548453909e97 100644
--- a/Casks/cog.rb
+++ b/Casks/cog.rb
@@ -1,4 +1,4 @@
-class Cog < Cask
+cask :v1 => 'cog' do
   version 'r2051'
   sha256 '1cc55f718a15810cccc5141312c01079e1da230a2412e4bc66c172de7aee36fe'
 
diff --git a/Casks/colloquy.rb b/Casks/colloquy.rb
index 8d57c3f4f138..0bd9b4f383a0 100644
--- a/Casks/colloquy.rb
+++ b/Casks/colloquy.rb
@@ -1,4 +1,4 @@
-class Colloquy < Cask
+cask :v1 => 'colloquy' do
   version '2.4.3'
   sha256 'b1c54047b9a4aed313e9a4a86073aa5b1215cb8a4ea462c59e7a52d8be6b1a93'
 
diff --git a/Casks/color-oracle.rb b/Casks/color-oracle.rb
index 052fa4364421..533aac82186f 100644
--- a/Casks/color-oracle.rb
+++ b/Casks/color-oracle.rb
@@ -1,4 +1,4 @@
-class ColorOracle < Cask
+cask :v1 => 'color-oracle' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/color-picker-pro.rb b/Casks/color-picker-pro.rb
index c16a9166c37c..e120e1f96b7a 100644
--- a/Casks/color-picker-pro.rb
+++ b/Casks/color-picker-pro.rb
@@ -1,4 +1,4 @@
-class ColorPickerPro < Cask
+cask :v1 => 'color-picker-pro' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/colorpicker-antetype.rb b/Casks/colorpicker-antetype.rb
index 4548cc5b77eb..57d70d91a78a 100644
--- a/Casks/colorpicker-antetype.rb
+++ b/Casks/colorpicker-antetype.rb
@@ -1,4 +1,4 @@
-class ColorpickerAntetype < Cask
+cask :v1 => 'colorpicker-antetype' do
   version '1.4.1'
   sha256 '5b7a925b87ff9ae5b4978170483a5a6f9e7d18ce81e2e0c6cce8731b6626b152'
 
diff --git a/Casks/colorpicker-developer.rb b/Casks/colorpicker-developer.rb
index 53a7fe7f460e..39819c588512 100644
--- a/Casks/colorpicker-developer.rb
+++ b/Casks/colorpicker-developer.rb
@@ -1,4 +1,4 @@
-class ColorpickerDeveloper < Cask
+cask :v1 => 'colorpicker-developer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/colorpicker-hex.rb b/Casks/colorpicker-hex.rb
index 98da9afa3422..1264c8980b79 100644
--- a/Casks/colorpicker-hex.rb
+++ b/Casks/colorpicker-hex.rb
@@ -1,4 +1,4 @@
-class ColorpickerHex < Cask
+cask :v1 => 'colorpicker-hex' do
   version '1.6.1'
   sha256 'c35b00fbe1f6b0efcc4520a45deae15809729f3fec3dff8f4027789d26284089'
 
diff --git a/Casks/colorpicker-propicker.rb b/Casks/colorpicker-propicker.rb
index 9eda1fa2c4b6..ce9b6bfecd9b 100644
--- a/Casks/colorpicker-propicker.rb
+++ b/Casks/colorpicker-propicker.rb
@@ -1,4 +1,4 @@
-class ColorpickerPropicker < Cask
+cask :v1 => 'colorpicker-propicker' do
   version '1.0'
   sha256 'd1c07c116fee22dbbaea86c285327b5468b82863ba575e8fe462a2dcec023891'
 
diff --git a/Casks/colorpicker-rcwebcolorpicker.rb b/Casks/colorpicker-rcwebcolorpicker.rb
index a23e18e442d4..13ebfdde1a25 100644
--- a/Casks/colorpicker-rcwebcolorpicker.rb
+++ b/Casks/colorpicker-rcwebcolorpicker.rb
@@ -1,4 +1,4 @@
-class ColorpickerRcwebcolorpicker < Cask
+cask :v1 => 'colorpicker-rcwebcolorpicker' do
   version '1.2.X'
   sha256 '04a1965f756695ef0387e388aceb598d3fcde39ec82119d298bf3802f09b3f70'
 
diff --git a/Casks/colorpicker-skalacolor.rb b/Casks/colorpicker-skalacolor.rb
index 1b9c1ca7af3e..4d8a7e93685b 100644
--- a/Casks/colorpicker-skalacolor.rb
+++ b/Casks/colorpicker-skalacolor.rb
@@ -1,4 +1,4 @@
-class ColorpickerSkalacolor < Cask
+cask :v1 => 'colorpicker-skalacolor' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/colorpicker.rb b/Casks/colorpicker.rb
index dc2b253f8824..cb6763511463 100644
--- a/Casks/colorpicker.rb
+++ b/Casks/colorpicker.rb
@@ -1,4 +1,4 @@
-class Colorpicker < Cask
+cask :v1 => 'colorpicker' do
   version '1.6.1'
   sha256 '23f2e782e20ff172b06746803ad2879ab5e7208dc04818a1716c18249d1e360d'
 
diff --git a/Casks/colorport.rb b/Casks/colorport.rb
index 25323c033b03..1beecd0e99b7 100644
--- a/Casks/colorport.rb
+++ b/Casks/colorport.rb
@@ -1,4 +1,4 @@
-class Colorport < Cask
+cask :v1 => 'colorport' do
   version '2.0.5'
   sha256 'ae176e3118ba55b4dd8a0716707d149a4e13827b30cdc3f1d29bc329a0ef4bd0'
 
diff --git a/Casks/colors.rb b/Casks/colors.rb
index e48f9f2745df..dd6ee47b8528 100644
--- a/Casks/colors.rb
+++ b/Casks/colors.rb
@@ -1,4 +1,4 @@
-class Colors < Cask
+cask :v1 => 'colors' do
   version '1.9'
   sha256 '60c8b53d0030624677dc500fd235e5ef41ba3b8a50d4d3ab68a8fba34de84e2c'
 
diff --git a/Casks/colorschemer-studio.rb b/Casks/colorschemer-studio.rb
index f3146930db23..e858c9698468 100644
--- a/Casks/colorschemer-studio.rb
+++ b/Casks/colorschemer-studio.rb
@@ -1,4 +1,4 @@
-class ColorschemerStudio < Cask
+cask :v1 => 'colorschemer-studio' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/comicbooklover.rb b/Casks/comicbooklover.rb
index cac5d53d86f3..0f510a632779 100644
--- a/Casks/comicbooklover.rb
+++ b/Casks/comicbooklover.rb
@@ -1,4 +1,4 @@
-class Comicbooklover < Cask
+cask :v1 => 'comicbooklover' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/comicbookloversync.rb b/Casks/comicbookloversync.rb
index 80f3236357ba..de6846772eb9 100644
--- a/Casks/comicbookloversync.rb
+++ b/Casks/comicbookloversync.rb
@@ -1,4 +1,4 @@
-class Comicbookloversync < Cask
+cask :v1 => 'comicbookloversync' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/comictagger.rb b/Casks/comictagger.rb
index 15c8329fcc8c..27492902d471 100644
--- a/Casks/comictagger.rb
+++ b/Casks/comictagger.rb
@@ -1,4 +1,4 @@
-class Comictagger < Cask
+cask :v1 => 'comictagger' do
   version '1.1.10-beta'
   sha256 'f59514cfd15e64a8c595c4ad9707266b2c01d7744ca9f5836bee484954ce2fa6'
 
diff --git a/Casks/commandq.rb b/Casks/commandq.rb
index eff4df0dda57..d3309f1eb2cb 100644
--- a/Casks/commandq.rb
+++ b/Casks/commandq.rb
@@ -1,4 +1,4 @@
-class Commandq < Cask
+cask :v1 => 'commandq' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/concentrate.rb b/Casks/concentrate.rb
index b970d8f26e78..50ac3fd05505 100644
--- a/Casks/concentrate.rb
+++ b/Casks/concentrate.rb
@@ -1,4 +1,4 @@
-class Concentrate < Cask
+cask :v1 => 'concentrate' do
   version '1.2.2'
   sha256 '16e9ad16b915b98460a66553d1ec8eef20fece7d53ae50701b6e3ac048aba47e'
 
diff --git a/Casks/connected-desktop.rb b/Casks/connected-desktop.rb
index 134e912d208e..279e19657b2b 100644
--- a/Casks/connected-desktop.rb
+++ b/Casks/connected-desktop.rb
@@ -1,4 +1,4 @@
-class ConnectedDesktop < Cask
+cask :v1 => 'connected-desktop' do
   version '2.4.20_11945'
   sha256 '3c64d4234a7a2dc69112718be79eae2bad6b0c6bcd9514ce0dab08b5e2e64c98'
 
diff --git a/Casks/connector.rb b/Casks/connector.rb
index 6ec80ef28626..ccfb99fd2db1 100644
--- a/Casks/connector.rb
+++ b/Casks/connector.rb
@@ -1,4 +1,4 @@
-class Connector < Cask
+cask :v1 => 'connector' do
   version '2.2.3'
   sha256 'fa05fc0332ead81a16ad43ce64e67e645f6a73e98b845405bbcd827caec6834f'
 
diff --git a/Casks/consul.rb b/Casks/consul.rb
index 28968dddbeb3..541c4a1f6a25 100644
--- a/Casks/consul.rb
+++ b/Casks/consul.rb
@@ -1,4 +1,4 @@
-class Consul < Cask
+cask :v1 => 'consul' do
   version '0.4.1'
   sha256 '957fe9ba27bbaf99539cd534db8ac8ec4c9fa1c6b3b4675d0c0eb3a7fbfb646c'
 
diff --git a/Casks/contexts.rb b/Casks/contexts.rb
index 2e3b6e9c945f..d5996a5c1051 100644
--- a/Casks/contexts.rb
+++ b/Casks/contexts.rb
@@ -1,4 +1,4 @@
-class Contexts < Cask
+cask :v1 => 'contexts' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/continuity-keypad.rb b/Casks/continuity-keypad.rb
index 8a9cd43c75fb..d7e6d5cb1bbe 100644
--- a/Casks/continuity-keypad.rb
+++ b/Casks/continuity-keypad.rb
@@ -1,4 +1,4 @@
-class ContinuityKeypad < Cask
+cask :v1 => 'continuity-keypad' do
   version '0.5.5'
   sha256 '284831c4cda8b68decfc8c7f2f276c211a7dbb310ef5e9aa71fc52ffdf12e445'
 
diff --git a/Casks/controllermate.rb b/Casks/controllermate.rb
index dd60daafb09e..f24e0369ddae 100644
--- a/Casks/controllermate.rb
+++ b/Casks/controllermate.rb
@@ -1,4 +1,4 @@
-class Controllermate < Cask
+cask :v1 => 'controllermate' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/controlplane.rb b/Casks/controlplane.rb
index ab6ef28a3df9..0b0374b3f11c 100644
--- a/Casks/controlplane.rb
+++ b/Casks/controlplane.rb
@@ -1,4 +1,4 @@
-class Controlplane < Cask
+cask :v1 => 'controlplane' do
   version '1.5.4'
   sha256 'd35f24b8559a0554b501bc6ff6a0b5b8b4f3ab3c123db1464d5720df9359152b'
 
diff --git a/Casks/coolterm.rb b/Casks/coolterm.rb
index 201dbee85ef9..64e07180cc76 100644
--- a/Casks/coolterm.rb
+++ b/Casks/coolterm.rb
@@ -1,4 +1,4 @@
-class Coolterm < Cask
+cask :v1 => 'coolterm' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/cooviewer.rb b/Casks/cooviewer.rb
index 3cc602d9baa2..4decab0729a5 100644
--- a/Casks/cooviewer.rb
+++ b/Casks/cooviewer.rb
@@ -1,4 +1,4 @@
-class Cooviewer < Cask
+cask :v1 => 'cooviewer' do
   version '1.2b24'
   sha256 '2bc2feaebc249beaad4f43c84aadcd5f08dda9deca452251924f0b2c89df1354'
 
diff --git a/Casks/copy.rb b/Casks/copy.rb
index 8ca7b56ae5d1..4575f966344c 100644
--- a/Casks/copy.rb
+++ b/Casks/copy.rb
@@ -1,4 +1,4 @@
-class Copy < Cask
+cask :v1 => 'copy' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/coqide.rb b/Casks/coqide.rb
index 70fb5db41638..facf265d1bc3 100644
--- a/Casks/coqide.rb
+++ b/Casks/coqide.rb
@@ -1,4 +1,4 @@
-class Coqide < Cask
+cask :v1 => 'coqide' do
   version '8.4pl4'
   sha256 'b476b95b60940f347f515decf4e5d4d35499ffa5080df9027395b47c9561b9b0'
 
diff --git a/Casks/cord.rb b/Casks/cord.rb
index 7a964fe9526a..ef72f697c93b 100644
--- a/Casks/cord.rb
+++ b/Casks/cord.rb
@@ -1,4 +1,4 @@
-class Cord < Cask
+cask :v1 => 'cord' do
   version '0.5.7'
   sha256 '8f505b12b94167100b3b8b44ed3cee32ffcc94b73dc44fe0ecc896151f114100'
 
diff --git a/Casks/cornerstone.rb b/Casks/cornerstone.rb
index f1149a7a796b..6dded89c484f 100644
--- a/Casks/cornerstone.rb
+++ b/Casks/cornerstone.rb
@@ -1,4 +1,4 @@
-class Cornerstone < Cask
+cask :v1 => 'cornerstone' do
   version '2.7.10'
   sha256 '297237f24cbd605d6e7497fb893db3e7fbc6efef1333f5f25be8238a418d7650'
 
diff --git a/Casks/corsixth.rb b/Casks/corsixth.rb
index 3462ccd1087f..372526890a40 100644
--- a/Casks/corsixth.rb
+++ b/Casks/corsixth.rb
@@ -1,4 +1,4 @@
-class Corsixth < Cask
+cask :v1 => 'corsixth' do
   version '0.30'
   sha256 '2d9fbe47ac31955643ee1de0e53fd30ddac9e64d5a1c205c46ecd3bfda1929b4'
 
diff --git a/Casks/coteditor.rb b/Casks/coteditor.rb
index 47a5947fbbab..3cf87fc72d22 100644
--- a/Casks/coteditor.rb
+++ b/Casks/coteditor.rb
@@ -1,4 +1,4 @@
-class Coteditor < Cask
+cask :v1 => 'coteditor' do
   version '2.0.0'
   sha256 '70377acae52d5599d5adf7e0a56d0b3c7d5b82697a7fe3469da41b3fea2ae85c'
 
diff --git a/Casks/couchbase-server-community.rb b/Casks/couchbase-server-community.rb
index 8c767833d82c..47a192d0b627 100644
--- a/Casks/couchbase-server-community.rb
+++ b/Casks/couchbase-server-community.rb
@@ -1,4 +1,4 @@
-class CouchbaseServerCommunity < Cask
+cask :v1 => 'couchbase-server-community' do
   version '3.0.1'
   sha256 '6693176f6799ce43f71b9fa1f09af8ff6857309382e0d115a9a2253474e5a31a'
 
diff --git a/Casks/couchbase-server-enterprise.rb b/Casks/couchbase-server-enterprise.rb
index 6fb4a27e4a09..b9ec47703d6f 100644
--- a/Casks/couchbase-server-enterprise.rb
+++ b/Casks/couchbase-server-enterprise.rb
@@ -1,4 +1,4 @@
-class CouchbaseServerEnterprise < Cask
+cask :v1 => 'couchbase-server-enterprise' do
   version '3.0.1'
   sha256 '1cbd844855102013b0b7afe129721900771f1069b550696a30fc639d78c4eca8'
 
diff --git a/Casks/craftstudio.rb b/Casks/craftstudio.rb
index c858647c5a41..3ac3c3ec5bf4 100644
--- a/Casks/craftstudio.rb
+++ b/Casks/craftstudio.rb
@@ -1,4 +1,4 @@
-class Craftstudio < Cask
+cask :v1 => 'craftstudio' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/crashlytics.rb b/Casks/crashlytics.rb
index 10581e57e92a..7ad31e74df71 100644
--- a/Casks/crashlytics.rb
+++ b/Casks/crashlytics.rb
@@ -1,4 +1,4 @@
-class Crashlytics < Cask
+cask :v1 => 'crashlytics' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/crashplan.rb b/Casks/crashplan.rb
index 90884f542768..8960b6b90e6b 100644
--- a/Casks/crashplan.rb
+++ b/Casks/crashplan.rb
@@ -1,4 +1,4 @@
-class Crashplan < Cask
+cask :v1 => 'crashplan' do
   version '3.6.3'
   sha256 'c3bb61fda36d777395748a6c6946085255e8ffa64c1538c453888e0de8ce2b73'
 
diff --git a/Casks/createuserpkg.rb b/Casks/createuserpkg.rb
index b210989685f3..63b11bc7e997 100644
--- a/Casks/createuserpkg.rb
+++ b/Casks/createuserpkg.rb
@@ -1,4 +1,4 @@
-class Createuserpkg < Cask
+cask :v1 => 'createuserpkg' do
   version '1.2.4'
   sha256 '4bac91af9d8fb2e34c036964c6f9bf49a8f19f8e994b30e2900a0ddbebef246f'
 
diff --git a/Casks/cronnix.rb b/Casks/cronnix.rb
index cba66ad28a79..23f1818c886c 100644
--- a/Casks/cronnix.rb
+++ b/Casks/cronnix.rb
@@ -1,4 +1,4 @@
-class Cronnix < Cask
+cask :v1 => 'cronnix' do
   version '3.0.2'
   sha256 'e61144dc7b489d581fea10bc5d04dab1c0ea590ba8a69ed5d3c4e4617f557cd2'
 
diff --git a/Casks/crosspack-avr.rb b/Casks/crosspack-avr.rb
index bc957d2f12cf..9d910d2ac3b1 100644
--- a/Casks/crosspack-avr.rb
+++ b/Casks/crosspack-avr.rb
@@ -1,4 +1,4 @@
-class CrosspackAvr < Cask
+cask :v1 => 'crosspack-avr' do
   version '2013-12-16'
   sha256 '959f9bf00429a0e46e649a14d7891cb4086c9cf2d032d9f66899d6efbb628f6e'
 
diff --git a/Casks/crushftp.rb b/Casks/crushftp.rb
index 8f24012ac233..c58fff59ff70 100644
--- a/Casks/crushftp.rb
+++ b/Casks/crushftp.rb
@@ -1,4 +1,4 @@
-class Crushftp < Cask
+cask :v1 => 'crushftp' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/crypt.rb b/Casks/crypt.rb
index c44ac1030bf8..b31e7ce98de6 100644
--- a/Casks/crypt.rb
+++ b/Casks/crypt.rb
@@ -1,4 +1,4 @@
-class Crypt < Cask
+cask :v1 => 'crypt' do
   version '3'
   sha256 'e9e82ad331fe26a26ddb9625a9e1ac8e65086770c1abf4bfa503c8336bdf37bd'
 
diff --git a/Casks/cryptol.rb b/Casks/cryptol.rb
index a49ef1f517a4..4b2dfa836a1b 100644
--- a/Casks/cryptol.rb
+++ b/Casks/cryptol.rb
@@ -1,4 +1,4 @@
-class Cryptol < Cask
+cask :v1 => 'cryptol' do
   version '2.0.0'
   sha256 '19b3c24390ccb66584f42f34fed91cefc12f667879ab0228cdf806016bcd53c4'
 
diff --git a/Casks/ctivo.rb b/Casks/ctivo.rb
index 74e4d8a7dc74..e15c7c434930 100644
--- a/Casks/ctivo.rb
+++ b/Casks/ctivo.rb
@@ -1,4 +1,4 @@
-class Ctivo < Cask
+cask :v1 => 'ctivo' do
   version '2.3.1'
   sha256 '55ad469432634a77be432741ee6dfc5480c3baf652a6d2b3cde70f919c1d13d7'
 
diff --git a/Casks/cuda-z.rb b/Casks/cuda-z.rb
index d93f27797299..c84b79c3d262 100644
--- a/Casks/cuda-z.rb
+++ b/Casks/cuda-z.rb
@@ -1,4 +1,4 @@
-class CudaZ < Cask
+cask :v1 => 'cuda-z' do
   version '0.8.207'
   sha256 '5dcb79ada1fe872cf849e050e5c60471fca9ba18178ecf5819859e6990e96196'
 
diff --git a/Casks/cuppa.rb b/Casks/cuppa.rb
index f5efe8f2a889..e0daac67114f 100644
--- a/Casks/cuppa.rb
+++ b/Casks/cuppa.rb
@@ -1,4 +1,4 @@
-class Cuppa < Cask
+cask :v1 => 'cuppa' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/cups-pdf.rb b/Casks/cups-pdf.rb
index 385c12ac9ecd..c575bd0f557d 100644
--- a/Casks/cups-pdf.rb
+++ b/Casks/cups-pdf.rb
@@ -1,4 +1,4 @@
-class CupsPdf < Cask
+cask :v1 => 'cups-pdf' do
   version '2.6.1'
   sha256 '24bf65884dda2d3fd60266f96bf76791a61ec9095f11073047d880de692784b9'
 
diff --git a/Casks/cura.rb b/Casks/cura.rb
index a8b26294e8a1..9b1197d219e9 100644
--- a/Casks/cura.rb
+++ b/Casks/cura.rb
@@ -1,4 +1,4 @@
-class Cura < Cask
+cask :v1 => 'cura' do
   version '14.09'
   sha256 '563674f1696c1faf21a5a79b8684811085c868dbb891c87a0ba45c46539f316b'
 
diff --git a/Casks/curb.rb b/Casks/curb.rb
index 0fa011095347..08389c46276b 100644
--- a/Casks/curb.rb
+++ b/Casks/curb.rb
@@ -1,4 +1,4 @@
-class Curb < Cask
+cask :v1 => 'curb' do
   version '1.1.1'
   sha256 '832750d2a75272763c5c2f681b11670584626c9d93bf993d6b3af96234558f68'
 
diff --git a/Casks/curio.rb b/Casks/curio.rb
index cbe9fecbb37a..3b559fc5f2dd 100644
--- a/Casks/curio.rb
+++ b/Casks/curio.rb
@@ -1,4 +1,4 @@
-class Curio < Cask
+cask :v1 => 'curio' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/curse-client.rb b/Casks/curse-client.rb
index 36dbe7e59e11..e20a05f00837 100644
--- a/Casks/curse-client.rb
+++ b/Casks/curse-client.rb
@@ -1,4 +1,4 @@
-class CurseClient < Cask
+cask :v1 => 'curse-client' do
   version '4.0.0.425'
   sha256 'f76eda5d21b85ee4db080c794a3e852ecadaa71fe2d32308d698d95286f36a1f'
 
diff --git a/Casks/cursorcerer.rb b/Casks/cursorcerer.rb
index 08be708bf372..ed86b996a40e 100644
--- a/Casks/cursorcerer.rb
+++ b/Casks/cursorcerer.rb
@@ -1,4 +1,4 @@
-class Cursorcerer < Cask
+cask :v1 => 'cursorcerer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/cutesdr.rb b/Casks/cutesdr.rb
index c7ffa6e4ca97..da7573113bed 100644
--- a/Casks/cutesdr.rb
+++ b/Casks/cutesdr.rb
@@ -1,4 +1,4 @@
-class Cutesdr < Cask
+cask :v1 => 'cutesdr' do
   version '1.14'
   sha256 'acac69ffe1fd36231d7c1948019fed4ff1eda59e8bfc88bd75797b875238a8ae'
 
diff --git a/Casks/cx.rb b/Casks/cx.rb
index 9172ff881a25..75882b3ca4df 100644
--- a/Casks/cx.rb
+++ b/Casks/cx.rb
@@ -1,4 +1,4 @@
-class Cx < Cask
+cask :v1 => 'cx' do
   version '1.0.3.6'
   sha256 'b78a6af89942e34d77638d98b86a321928c1eaa1d44604dabba4aa9e02366b12'
 
diff --git a/Casks/cyberduck.rb b/Casks/cyberduck.rb
index 14b7bf816c5a..c131cb4fbf8d 100644
--- a/Casks/cyberduck.rb
+++ b/Casks/cyberduck.rb
@@ -1,4 +1,4 @@
-class Cyberduck < Cask
+cask :v1 => 'cyberduck' do
   version '4.5.2'
   sha256 'cff337f880b6ebbcc7f2e246b677fa5346fd225ae83289dca71ab35cf4b6eb8f'
 
diff --git a/Casks/cycling74-max.rb b/Casks/cycling74-max.rb
index d3f2667b0cf1..efc1998fb818 100644
--- a/Casks/cycling74-max.rb
+++ b/Casks/cycling74-max.rb
@@ -1,4 +1,4 @@
-class Cycling74Max < Cask
+cask :v1 => 'cycling74-max' do
   version '6.1.7-140421'
   sha256 'deb3070e0161e074c7ee91861e06cfeec2c1dc85eb715e476797d026821c32c9'
 
diff --git a/Casks/d235j-xbox360-controller-driver.rb b/Casks/d235j-xbox360-controller-driver.rb
index ffaa300b977f..0161b436f46a 100644
--- a/Casks/d235j-xbox360-controller-driver.rb
+++ b/Casks/d235j-xbox360-controller-driver.rb
@@ -1,4 +1,4 @@
-class D235jXbox360ControllerDriver < Cask
+cask :v1 => 'd235j-xbox360-controller-driver' do
   version '0.14'
   sha256 '520d78f43006202956a985c073bac901e85151361fdecb9af37f94b61e3effeb'
 
diff --git a/Casks/daemon-tools-lite.rb b/Casks/daemon-tools-lite.rb
index 2eb069ca0009..28e9a67ca67b 100644
--- a/Casks/daemon-tools-lite.rb
+++ b/Casks/daemon-tools-lite.rb
@@ -1,4 +1,4 @@
-class DaemonToolsLite < Cask
+cask :v1 => 'daemon-tools-lite' do
   version '2.1'
   sha256 '7b4ec2ac2faceedd16b339647aceae19d428fa20afc145e06fbe8eb38148f803'
 
diff --git a/Casks/daisydisk.rb b/Casks/daisydisk.rb
index 045df0f8b308..2e5a1ca422ee 100644
--- a/Casks/daisydisk.rb
+++ b/Casks/daisydisk.rb
@@ -1,4 +1,4 @@
-class Daisydisk < Cask
+cask :v1 => 'daisydisk' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/darktable.rb b/Casks/darktable.rb
index bf679730dea2..5b37872e6d17 100644
--- a/Casks/darktable.rb
+++ b/Casks/darktable.rb
@@ -1,4 +1,4 @@
-class Darktable < Cask
+cask :v1 => 'darktable' do
   version '1.4.2'
   sha256 '27b03c2ef1bfe8a66665e252d55746abd9b8a29b7f5e00ec1f646a3f22e7551a'
 
diff --git a/Casks/darteditor.rb b/Casks/darteditor.rb
index fd0590420c72..8b3273339644 100644
--- a/Casks/darteditor.rb
+++ b/Casks/darteditor.rb
@@ -1,4 +1,4 @@
-class Darteditor < Cask
+cask :v1 => 'darteditor' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/dash.rb b/Casks/dash.rb
index f737563600fa..0b62f101a4d4 100644
--- a/Casks/dash.rb
+++ b/Casks/dash.rb
@@ -1,4 +1,4 @@
-class Dash < Cask
+cask :v1 => 'dash' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/dashlane.rb b/Casks/dashlane.rb
index 5295663c690e..405e5d060114 100644
--- a/Casks/dashlane.rb
+++ b/Casks/dashlane.rb
@@ -1,4 +1,4 @@
-class Dashlane < Cask
+cask :v1 => 'dashlane' do
   version '2.4.1.62949'
   sha256 '97bca51c71ba32e5fa13160a77b9a12824e2e44990958d9831263936ed3f1f40'
 
diff --git a/Casks/datagraph.rb b/Casks/datagraph.rb
index ad5e51dc1b77..c65f5637b2d9 100644
--- a/Casks/datagraph.rb
+++ b/Casks/datagraph.rb
@@ -1,4 +1,4 @@
-class Datagraph < Cask
+cask :v1 => 'datagraph' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/dataurlmaker.rb b/Casks/dataurlmaker.rb
index 1b9857bf5bbc..72bad55b9939 100644
--- a/Casks/dataurlmaker.rb
+++ b/Casks/dataurlmaker.rb
@@ -1,4 +1,4 @@
-class Dataurlmaker < Cask
+cask :v1 => 'dataurlmaker' do
   version '1.1'
   sha256 'dc297a57ea7180273a17fe8503f7ed7423afb66e210f67d32c4e566fa8e797e1'
 
diff --git a/Casks/day-o.rb b/Casks/day-o.rb
index 3e395ad66f54..c778cb42c262 100644
--- a/Casks/day-o.rb
+++ b/Casks/day-o.rb
@@ -1,4 +1,4 @@
-class DayO < Cask
+cask :v1 => 'day-o' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/dbeaver-community.rb b/Casks/dbeaver-community.rb
index 7b40032342b4..7ac7d3dd88ff 100644
--- a/Casks/dbeaver-community.rb
+++ b/Casks/dbeaver-community.rb
@@ -1,4 +1,4 @@
-class DbeaverCommunity < Cask
+cask :v1 => 'dbeaver-community' do
   version '3.0.1'
 
   if Hardware::CPU.is_32_bit?
diff --git a/Casks/dbeaver-enterprise.rb b/Casks/dbeaver-enterprise.rb
index 4d15338a5960..7c755c3ce949 100644
--- a/Casks/dbeaver-enterprise.rb
+++ b/Casks/dbeaver-enterprise.rb
@@ -1,4 +1,4 @@
-class DbeaverEnterprise < Cask
+cask :v1 => 'dbeaver-enterprise' do
   version '3.0.1'
 
   if Hardware::CPU.is_32_bit?
diff --git a/Casks/dbvisualizer.rb b/Casks/dbvisualizer.rb
index d64e691f6374..0b1baa6d1670 100644
--- a/Casks/dbvisualizer.rb
+++ b/Casks/dbvisualizer.rb
@@ -1,4 +1,4 @@
-class Dbvisualizer < Cask
+cask :v1 => 'dbvisualizer' do
   version '9.1.11'
   sha256 '066e63bfda0032dde126a64e51cfe037f5c8dfd226b43b069d09a2ff7df3d17b'
 
diff --git a/Casks/dealalert.rb b/Casks/dealalert.rb
index 500870319391..20333971a528 100644
--- a/Casks/dealalert.rb
+++ b/Casks/dealalert.rb
@@ -1,4 +1,4 @@
-class Dealalert < Cask
+cask :v1 => 'dealalert' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/deathtodsstore.rb b/Casks/deathtodsstore.rb
index 66febea5b0f9..8335f9758e89 100644
--- a/Casks/deathtodsstore.rb
+++ b/Casks/deathtodsstore.rb
@@ -1,4 +1,4 @@
-class Deathtodsstore < Cask
+cask :v1 => 'deathtodsstore' do
   version '1.0.4'
   sha256 'ea5f92d902b99be9f385df47e9cbb15bf9d4dcda3bb9534be3aed71e26b18ffb'
 
diff --git a/Casks/debookee.rb b/Casks/debookee.rb
index 5aa62a60e71e..6d71bf45f669 100644
--- a/Casks/debookee.rb
+++ b/Casks/debookee.rb
@@ -1,4 +1,4 @@
-class Debookee < Cask
+cask :v1 => 'debookee' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/debt-quencher.rb b/Casks/debt-quencher.rb
index 8a32046ed5be..cd2449832aee 100644
--- a/Casks/debt-quencher.rb
+++ b/Casks/debt-quencher.rb
@@ -1,4 +1,4 @@
-class DebtQuencher < Cask
+cask :v1 => 'debt-quencher' do
   version '1.2.2'
   sha256 '2083fdb28d3138998a0d6b4b5c4405a18a2e8dd7b71554786386623313c166ad'
 
diff --git a/Casks/decitime.rb b/Casks/decitime.rb
index cf4b8bcdae3d..3c89a4452dba 100644
--- a/Casks/decitime.rb
+++ b/Casks/decitime.rb
@@ -1,4 +1,4 @@
-class Decitime < Cask
+cask :v1 => 'decitime' do
   version '1.0.1'
   sha256 '3fcd9d6af7cf4710abd42df4db418432ca1758ba8db7affecb1a466d1996f877'
 
diff --git a/Casks/deeper.rb b/Casks/deeper.rb
index fd3d4c361090..50b6e4a5c0c1 100644
--- a/Casks/deeper.rb
+++ b/Casks/deeper.rb
@@ -1,4 +1,4 @@
-class Deeper < Cask
+cask :v1 => 'deeper' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/deeq.rb b/Casks/deeq.rb
index 4e0905dd0a7b..4eab1f398bfe 100644
--- a/Casks/deeq.rb
+++ b/Casks/deeq.rb
@@ -1,4 +1,4 @@
-class Deeq < Cask
+cask :v1 => 'deeq' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/default-folder-x.rb b/Casks/default-folder-x.rb
index 25d3a62efc47..8c93898ad668 100644
--- a/Casks/default-folder-x.rb
+++ b/Casks/default-folder-x.rb
@@ -1,4 +1,4 @@
-class DefaultFolderX < Cask
+cask :v1 => 'default-folder-x' do
   version '4.6.10'
   sha256 '95752cf84ffd5f8090397ba85689ebaa409b205de9d15a4af4b0e5eae8626d59'
 
diff --git a/Casks/delibar.rb b/Casks/delibar.rb
index d73bbc99070a..a602e8e32762 100644
--- a/Casks/delibar.rb
+++ b/Casks/delibar.rb
@@ -1,4 +1,4 @@
-class Delibar < Cask
+cask :v1 => 'delibar' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/delicious-library.rb b/Casks/delicious-library.rb
index 78ea73cb06cf..4c47ba51c499 100644
--- a/Casks/delicious-library.rb
+++ b/Casks/delicious-library.rb
@@ -1,4 +1,4 @@
-class DeliciousLibrary < Cask
+cask :v1 => 'delicious-library' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/delivery-status.rb b/Casks/delivery-status.rb
index b18c13f2efba..137eddf71d47 100644
--- a/Casks/delivery-status.rb
+++ b/Casks/delivery-status.rb
@@ -1,4 +1,4 @@
-class DeliveryStatus < Cask
+cask :v1 => 'delivery-status' do
   version '6.1.2'
   sha256 'f39afd137c99df16baf149c60f1a982edb9485f6211f4aefb9cad19af7a51514'
 
diff --git a/Casks/deltawalker.rb b/Casks/deltawalker.rb
index 6c97e5f7bdf8..38628a217469 100644
--- a/Casks/deltawalker.rb
+++ b/Casks/deltawalker.rb
@@ -1,4 +1,4 @@
-class Deltawalker < Cask
+cask :v1 => 'deltawalker' do
   version '2.0.1'
   sha256 'eae3127fb05d84885c91e7ce5da5277aaaf128fd53225d1721d66456719b82fa'
 
diff --git a/Casks/deluge.rb b/Casks/deluge.rb
index fb19e2b52f26..33e3ebc90b6a 100644
--- a/Casks/deluge.rb
+++ b/Casks/deluge.rb
@@ -1,4 +1,4 @@
-class Deluge < Cask
+cask :v1 => 'deluge' do
   version '1.3.10'
   sha256 '4399467735fb6339a8f2f75887179dd673b52a032cc784ab976966dead361d6d'
 
diff --git a/Casks/deskfun.rb b/Casks/deskfun.rb
index ee47c24c1325..59d7314df383 100644
--- a/Casks/deskfun.rb
+++ b/Casks/deskfun.rb
@@ -1,4 +1,4 @@
-class Deskfun < Cask
+cask :v1 => 'deskfun' do
   version '0.5.7'
   sha256 '4a3315d21350e118ea8fce934b7d500230c76680bc3345b59a9e86f90d2bb33f'
 
diff --git a/Casks/desktop-log.rb b/Casks/desktop-log.rb
index 7974dbf7500d..eb28edf79168 100644
--- a/Casks/desktop-log.rb
+++ b/Casks/desktop-log.rb
@@ -1,4 +1,4 @@
-class DesktopLog < Cask
+cask :v1 => 'desktop-log' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/desmume.rb b/Casks/desmume.rb
index 6d5d48404561..a4d8e59da03a 100644
--- a/Casks/desmume.rb
+++ b/Casks/desmume.rb
@@ -1,4 +1,4 @@
-class Desmume < Cask
+cask :v1 => 'desmume' do
   version '0.9.10'
   sha256 '5124a3ea2c64e55bf6b31bb8eb3408d3157e3fa739021dba16e39801388fbb2d'
 
diff --git a/Casks/detune.rb b/Casks/detune.rb
index 596d6826d9a5..a37b1f5e7dfc 100644
--- a/Casks/detune.rb
+++ b/Casks/detune.rb
@@ -1,4 +1,4 @@
-class Detune < Cask
+cask :v1 => 'detune' do
   version '1.0.8'
   sha256 '2e3a422ea8b41fcc862a8c725ee9eecfb307398b636397d458b47ec0384ab0a1'
 
diff --git a/Casks/devcenter.rb b/Casks/devcenter.rb
index 0b4ffde86f76..c0042a50061a 100644
--- a/Casks/devcenter.rb
+++ b/Casks/devcenter.rb
@@ -1,4 +1,4 @@
-class Devcenter < Cask
+cask :v1 => 'devcenter' do
   version '1.2.0'
   sha256 '39820d3a7ec66ae3011cf72bee029d4f9817490319648837cc72b59d01a870f2'
 
diff --git a/Casks/devonthink-pro-office.rb b/Casks/devonthink-pro-office.rb
index 39a1e2d76d86..c10647baead5 100644
--- a/Casks/devonthink-pro-office.rb
+++ b/Casks/devonthink-pro-office.rb
@@ -1,4 +1,4 @@
-class DevonthinkProOffice < Cask
+cask :v1 => 'devonthink-pro-office' do
   version '2.8'
   sha256 '592d2c5e8ce9839102afb7c15eb71147d94006c5710ff91a06c8783bee8ef91b'
 
diff --git a/Casks/devonthink-pro.rb b/Casks/devonthink-pro.rb
index e3a1c1de8c18..2c675ae0fe09 100644
--- a/Casks/devonthink-pro.rb
+++ b/Casks/devonthink-pro.rb
@@ -1,4 +1,4 @@
-class DevonthinkPro < Cask
+cask :v1 => 'devonthink-pro' do
   version '2.8'
   sha256 'ac9521a0017643f1305d24f7d1b8cdd19ab6dde78319ae9a862aae1b1fde2521'
 
diff --git a/Casks/dewdrop.rb b/Casks/dewdrop.rb
index 7bd352553671..8b36d865c6ac 100644
--- a/Casks/dewdrop.rb
+++ b/Casks/dewdrop.rb
@@ -1,4 +1,4 @@
-class Dewdrop < Cask
+cask :v1 => 'dewdrop' do
   version '0.4'
   sha256 '88cf0ff182f5b4c49e761186b735e69b4a2d724e4e8781d4f87121faac850c57'
 
diff --git a/Casks/dfontsplitter.rb b/Casks/dfontsplitter.rb
index 7c6b78117d48..cdc346c2c642 100644
--- a/Casks/dfontsplitter.rb
+++ b/Casks/dfontsplitter.rb
@@ -1,4 +1,4 @@
-class Dfontsplitter < Cask
+cask :v1 => 'dfontsplitter' do
   version '0.4.1'
   sha256 'd9345ffe0e9be0c096e65114be21fc3aac676a9a3a53e84f1d6cebff0b7796b3'
 
diff --git a/Casks/dia.rb b/Casks/dia.rb
index 369078a419fd..b4976bfd3480 100644
--- a/Casks/dia.rb
+++ b/Casks/dia.rb
@@ -1,4 +1,4 @@
-class Dia < Cask
+cask :v1 => 'dia' do
   version '0.97.2-7'
   sha256 '9d3038c01347716800688830eaf52204deb78affe74a5f0c6e0a48fd414d44be'
 
diff --git a/Casks/diashapes.rb b/Casks/diashapes.rb
index 2ea950c4239d..cc86c75ce348 100644
--- a/Casks/diashapes.rb
+++ b/Casks/diashapes.rb
@@ -1,4 +1,4 @@
-class Diashapes < Cask
+cask :v1 => 'diashapes' do
   version '0.3.0'
   sha256 '2b858e180f7ed1fff23c0fd7c917ad161b6ed4e561bc7a7ce4d71bd368947925'
 
diff --git a/Casks/dictunifier.rb b/Casks/dictunifier.rb
index 21fd7452e05d..e02ae0d5ff07 100644
--- a/Casks/dictunifier.rb
+++ b/Casks/dictunifier.rb
@@ -1,4 +1,4 @@
-class Dictunifier < Cask
+cask :v1 => 'dictunifier' do
   version '2.1'
   sha256 'ff80b354ebcbe7ddad0e01d64c667e6a026d92f6bac01d380ec009205679f14c'
 
diff --git a/Casks/difffork.rb b/Casks/difffork.rb
index f915c65a0021..0fde557db9a0 100644
--- a/Casks/difffork.rb
+++ b/Casks/difffork.rb
@@ -1,4 +1,4 @@
-class Difffork < Cask
+cask :v1 => 'difffork' do
   version '1.1.9.2'
   sha256 'e366234c71a797a7f2fe794195bc8096157f2a77f883b24e8f6cf78438fc433a'
 
diff --git a/Casks/diffmerge.rb b/Casks/diffmerge.rb
index c9d0b15c56dc..9adb8d6c9a0d 100644
--- a/Casks/diffmerge.rb
+++ b/Casks/diffmerge.rb
@@ -1,4 +1,4 @@
-class Diffmerge < Cask
+cask :v1 => 'diffmerge' do
   version '4.2.0.697'
   sha256 '2c6368653af2440bb4460aef9bb1b2b5d8b84b5a3f47994c4abafc4d7ddbff9e'
 
diff --git a/Casks/disk-drill.rb b/Casks/disk-drill.rb
index fcfba22ef6ba..244e3d0391a4 100644
--- a/Casks/disk-drill.rb
+++ b/Casks/disk-drill.rb
@@ -1,4 +1,4 @@
-class DiskDrill < Cask
+cask :v1 => 'disk-drill' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/disk-inventory-x.rb b/Casks/disk-inventory-x.rb
index a54cd0cb4de2..3fc699c984c0 100644
--- a/Casks/disk-inventory-x.rb
+++ b/Casks/disk-inventory-x.rb
@@ -1,4 +1,4 @@
-class DiskInventoryX < Cask
+cask :v1 => 'disk-inventory-x' do
   version '1.0'
   sha256 'f61c070a1ec8f29ee78b8a7c84dd4124553098acc87134e2ef05dbaf2a442636'
 
diff --git a/Casks/diskmaker-x.rb b/Casks/diskmaker-x.rb
index cc30c5f6a16c..495a1d3ec866 100644
--- a/Casks/diskmaker-x.rb
+++ b/Casks/diskmaker-x.rb
@@ -1,4 +1,4 @@
-class DiskmakerX < Cask
+cask :v1 => 'diskmaker-x' do
   version '4b4'
   sha256 '84c7c61973182573ba4d819f493528b665ad2c06a77698999f21ee2026b18a15'
 
diff --git a/Casks/diskwave.rb b/Casks/diskwave.rb
index f13b7d56e287..db8bb60821ca 100644
--- a/Casks/diskwave.rb
+++ b/Casks/diskwave.rb
@@ -1,4 +1,4 @@
-class Diskwave < Cask
+cask :v1 => 'diskwave' do
   version '0.4.0'
   sha256 '976324e46e4ca4d54240de13cf2c6f0db9afdb703b0e6ef78e2b5b5d36d63e75'
 
diff --git a/Casks/dispcalgui.rb b/Casks/dispcalgui.rb
index 422612dbb0bc..725192ab9b26 100644
--- a/Casks/dispcalgui.rb
+++ b/Casks/dispcalgui.rb
@@ -1,4 +1,4 @@
-class Dispcalgui < Cask
+cask :v1 => 'dispcalgui' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/displaperture.rb b/Casks/displaperture.rb
index 2419db2db665..d4bf80ee4cc8 100644
--- a/Casks/displaperture.rb
+++ b/Casks/displaperture.rb
@@ -1,4 +1,4 @@
-class Displaperture < Cask
+cask :v1 => 'displaperture' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/displaylink.rb b/Casks/displaylink.rb
index b911cb1b9171..16342143fde2 100644
--- a/Casks/displaylink.rb
+++ b/Casks/displaylink.rb
@@ -1,4 +1,4 @@
-class Displaylink < Cask
+cask :v1 => 'displaylink' do
   version '2.2'
   sha256 '5c9a97a476b5ff27811491eebb653a03c96f899562b67566c24100d8593b1daa'
 
diff --git a/Casks/diumoo.rb b/Casks/diumoo.rb
index 969c74377333..e0c52d039902 100644
--- a/Casks/diumoo.rb
+++ b/Casks/diumoo.rb
@@ -1,4 +1,4 @@
-class Diumoo < Cask
+cask :v1 => 'diumoo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/divvy.rb b/Casks/divvy.rb
index 6c40ec09e6d5..31301c5ed309 100644
--- a/Casks/divvy.rb
+++ b/Casks/divvy.rb
@@ -1,4 +1,4 @@
-class Divvy < Cask
+cask :v1 => 'divvy' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/djay.rb b/Casks/djay.rb
index 71c8135fc174..b8ca2017a588 100644
--- a/Casks/djay.rb
+++ b/Casks/djay.rb
@@ -1,4 +1,4 @@
-class Djay < Cask
+cask :v1 => 'djay' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/djv.rb b/Casks/djv.rb
index fb728ff69f39..3563f5424116 100644
--- a/Casks/djv.rb
+++ b/Casks/djv.rb
@@ -1,4 +1,4 @@
-class Djv < Cask
+cask :v1 => 'djv' do
   version '1.0.4'
   sha256 '9607814fe120eecd875ed73eb05f97df2b0869b5412b23bbc0f7c4ea6b86d200'
 
diff --git a/Casks/djview.rb b/Casks/djview.rb
index 045f99b70e5b..cf4647cfce07 100644
--- a/Casks/djview.rb
+++ b/Casks/djview.rb
@@ -1,4 +1,4 @@
-class Djview < Cask
+cask :v1 => 'djview' do
   version '4.5'
   sha256 'eec2efee86136725ae0a7164f80e2cea428c647fe987e3b6843b81280c7c7664'
 
diff --git a/Casks/dmm.rb b/Casks/dmm.rb
index 3c4399b4db2c..77e507dd6564 100644
--- a/Casks/dmm.rb
+++ b/Casks/dmm.rb
@@ -1,4 +1,4 @@
-class Dmm < Cask
+cask :v1 => 'dmm' do
   version '1.1.3'
   sha256 'a903754cfa215bea8b041f67269525ba29a9fe34875f819c41d0bd65e5e1628f'
 
diff --git a/Casks/dnscrypt.rb b/Casks/dnscrypt.rb
index 48cc1e54e5aa..a28421a3e8a0 100644
--- a/Casks/dnscrypt.rb
+++ b/Casks/dnscrypt.rb
@@ -1,4 +1,4 @@
-class Dnscrypt < Cask
+cask :v1 => 'dnscrypt' do
   version '1.0.3'
   sha256 '08fc0ee0a029a1a99ffc44a0cb5f7f844f41e7fb0a30e31fea714ac103d69557'
 
diff --git a/Casks/docear.rb b/Casks/docear.rb
index 46a057c33f6b..5b4ff43cc63a 100644
--- a/Casks/docear.rb
+++ b/Casks/docear.rb
@@ -1,4 +1,4 @@
-class Docear < Cask
+cask :v1 => 'docear' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/dockmod.rb b/Casks/dockmod.rb
index 3a8bed639f0f..4c761c93c048 100644
--- a/Casks/dockmod.rb
+++ b/Casks/dockmod.rb
@@ -1,4 +1,4 @@
-class Dockmod < Cask
+cask :v1 => 'dockmod' do
   version '2.04'
   sha256 '86c92aa446d436296a800ee832466afa845048316a09df15d0e793f5a4cad55d'
 
diff --git a/Casks/dogecoin.rb b/Casks/dogecoin.rb
index b9949668ee2e..6c6d0d727d14 100644
--- a/Casks/dogecoin.rb
+++ b/Casks/dogecoin.rb
@@ -1,4 +1,4 @@
-class Dogecoin < Cask
+cask :v1 => 'dogecoin' do
   version '1.8.0'
   sha256 '905ae1eba55294dfd32b6e3ffb357010d04b564455434d918c863fe55c2be968'
 
diff --git a/Casks/dolphin.rb b/Casks/dolphin.rb
index b8310843db99..64c8ff29e541 100644
--- a/Casks/dolphin.rb
+++ b/Casks/dolphin.rb
@@ -1,4 +1,4 @@
-class Dolphin < Cask
+cask :v1 => 'dolphin' do
   version '4.0-3587'
   sha256 'c2b526d6dd8d9ff74ac908d2b13562910486b1647dbf022b36ac91f42ebfa499'
 
diff --git a/Casks/dosbox.rb b/Casks/dosbox.rb
index 36bb2e570c59..91bf57943538 100644
--- a/Casks/dosbox.rb
+++ b/Casks/dosbox.rb
@@ -1,4 +1,4 @@
-class Dosbox < Cask
+cask :v1 => 'dosbox' do
   version '0.74'
   sha256 '99057370b478608a6f0167ef522ef59e0e1b876f8565622d3dbd707925d61f6c'
 
diff --git a/Casks/doubanradio.rb b/Casks/doubanradio.rb
index 5e0adebf026e..306b36d775e8 100644
--- a/Casks/doubanradio.rb
+++ b/Casks/doubanradio.rb
@@ -1,4 +1,4 @@
-class Doubanradio < Cask
+cask :v1 => 'doubanradio' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/double-commander.rb b/Casks/double-commander.rb
index bbfca678ecad..6a39a9314098 100644
--- a/Casks/double-commander.rb
+++ b/Casks/double-commander.rb
@@ -1,4 +1,4 @@
-class DoubleCommander < Cask
+cask :v1 => 'double-commander' do
   version '0.5.8'
   sha256 'a4bf455f028783a4c14d600068d27556984bfc3357a80dc0715f047efbf6dbfe'
 
diff --git a/Casks/doublecommand.rb b/Casks/doublecommand.rb
index 6dbb963250ed..86f496005a01 100644
--- a/Casks/doublecommand.rb
+++ b/Casks/doublecommand.rb
@@ -1,4 +1,4 @@
-class Doublecommand < Cask
+cask :v1 => 'doublecommand' do
   version '1.7'
   sha256 '312aaf1a60517c694b24131bf502945dc23a22c917971c3e7a3adca163560503'
 
diff --git a/Casks/doubletwist.rb b/Casks/doubletwist.rb
index 693751adfd02..5292c52593ec 100644
--- a/Casks/doubletwist.rb
+++ b/Casks/doubletwist.rb
@@ -1,4 +1,4 @@
-class Doubletwist < Cask
+cask :v1 => 'doubletwist' do
   version '3.1.2'
   sha256 '47975cc7517a6cf8c90362536a7feb53f0ff8af7d45866481d37cad2fcae4dac'
 
diff --git a/Casks/doxie.rb b/Casks/doxie.rb
index 4ab2dbb76564..95fadb1d3deb 100644
--- a/Casks/doxie.rb
+++ b/Casks/doxie.rb
@@ -1,4 +1,4 @@
-class Doxie < Cask
+cask :v1 => 'doxie' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/doxygen.rb b/Casks/doxygen.rb
index 98168266fb69..743dc7e5c6a3 100644
--- a/Casks/doxygen.rb
+++ b/Casks/doxygen.rb
@@ -1,4 +1,4 @@
-class Doxygen < Cask
+cask :v1 => 'doxygen' do
   version '1.8.7'
   sha256 'd4d23df0372362358d26ab3c3c13d701b1f1751a7b80d427742665739a4f49c0'
 
diff --git a/Casks/dradio.rb b/Casks/dradio.rb
index 746aca727e7c..c79a09f31872 100644
--- a/Casks/dradio.rb
+++ b/Casks/dradio.rb
@@ -1,4 +1,4 @@
-class Dradio < Cask
+cask :v1 => 'dradio' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/dragondisk.rb b/Casks/dragondisk.rb
index 83a2e435f907..540b5a3ed9a3 100644
--- a/Casks/dragondisk.rb
+++ b/Casks/dragondisk.rb
@@ -1,4 +1,4 @@
-class Dragondisk < Cask
+cask :v1 => 'dragondisk' do
   version '1.05'
   sha256 '66499e1aa9ca322a3a14f74710fe78675f2d4c11df754cc4a3912e1165c7bc39'
 
diff --git a/Casks/dragthing.rb b/Casks/dragthing.rb
index 17a9db311cad..2e73b1e9ec5e 100644
--- a/Casks/dragthing.rb
+++ b/Casks/dragthing.rb
@@ -1,4 +1,4 @@
-class Dragthing < Cask
+cask :v1 => 'dragthing' do
   version '5.9.12'
   sha256 '4a351c593aff1c3214613d622a4e81f184e8ae238df6db921dd822efeefe27e6'
 
diff --git a/Casks/drobo-dashboard.rb b/Casks/drobo-dashboard.rb
index ee2c4738c8af..c6572cc1a5f4 100644
--- a/Casks/drobo-dashboard.rb
+++ b/Casks/drobo-dashboard.rb
@@ -1,4 +1,4 @@
-class DroboDashboard < Cask
+cask :v1 => 'drobo-dashboard' do
   version '2.6.3'
   sha256 '8881b0713fed7bb9aeb2c1ca98db3e31ee304de0fad5d05778872e256a78ece1'
 
diff --git a/Casks/dropbox-encore.rb b/Casks/dropbox-encore.rb
index 8879a5022965..766f54e0d3ff 100644
--- a/Casks/dropbox-encore.rb
+++ b/Casks/dropbox-encore.rb
@@ -1,4 +1,4 @@
-class DropboxEncore < Cask
+cask :v1 => 'dropbox-encore' do
   version '1.0'
   sha256 '2dfa8abd5a1b48b5e1f323b5167a1ef53559f862520bf358f9500aa328ecaf90'
 
diff --git a/Casks/dropbox.rb b/Casks/dropbox.rb
index a5dd6f0bc79d..1d15db079618 100644
--- a/Casks/dropbox.rb
+++ b/Casks/dropbox.rb
@@ -1,4 +1,4 @@
-class Dropbox < Cask
+cask :v1 => 'dropbox' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/dropin.rb b/Casks/dropin.rb
index a432e8409b86..95ba840d15ad 100644
--- a/Casks/dropin.rb
+++ b/Casks/dropin.rb
@@ -1,4 +1,4 @@
-class Dropin < Cask
+cask :v1 => 'dropin' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/dropletmanager.rb b/Casks/dropletmanager.rb
index 63c0465fd2fe..7d94aed1dcd7 100644
--- a/Casks/dropletmanager.rb
+++ b/Casks/dropletmanager.rb
@@ -1,4 +1,4 @@
-class Dropletmanager < Cask
+cask :v1 => 'dropletmanager' do
   version '0.5.0'
   sha256 'ed8011cef55f3bcdde4e7e7e331775808e4701fc41acc3191d3e4d80f8ab8335'
 
diff --git a/Casks/droplr.rb b/Casks/droplr.rb
index 92711430596d..d94387d08614 100644
--- a/Casks/droplr.rb
+++ b/Casks/droplr.rb
@@ -1,4 +1,4 @@
-class Droplr < Cask
+cask :v1 => 'droplr' do
   version '4.2.0'
   sha256 'e68b9c618fbbb2c4c27dab69acc088a441ab3a7571fa62e9108673751d04ab88'
 
diff --git a/Casks/dropshare.rb b/Casks/dropshare.rb
index e2c8c5651aa3..c74c4c3086c8 100644
--- a/Casks/dropshare.rb
+++ b/Casks/dropshare.rb
@@ -1,4 +1,4 @@
-class Dropshare < Cask
+cask :v1 => 'dropshare' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/dropzone.rb b/Casks/dropzone.rb
index 9b637fea0b79..ec353da53b1b 100644
--- a/Casks/dropzone.rb
+++ b/Casks/dropzone.rb
@@ -1,4 +1,4 @@
-class Dropzone < Cask
+cask :v1 => 'dropzone' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/dsp-radio.rb b/Casks/dsp-radio.rb
index ed82576f68d0..24279b5290f5 100644
--- a/Casks/dsp-radio.rb
+++ b/Casks/dsp-radio.rb
@@ -1,4 +1,4 @@
-class DspRadio < Cask
+cask :v1 => 'dsp-radio' do
   version '1.4.1'
   sha256 'b04ff63d41a47923455499340e32706df83a184c54c590d70191072b8fdbbbc9'
 
diff --git a/Casks/dterm.rb b/Casks/dterm.rb
index da30eb8a0915..58bb7aab31be 100644
--- a/Casks/dterm.rb
+++ b/Casks/dterm.rb
@@ -1,4 +1,4 @@
-class Dterm < Cask
+cask :v1 => 'dterm' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/dukto.rb b/Casks/dukto.rb
index f58655fed026..eed84e2e44d9 100644
--- a/Casks/dukto.rb
+++ b/Casks/dukto.rb
@@ -1,4 +1,4 @@
-class Dukto < Cask
+cask :v1 => 'dukto' do
   version 'R6'
   sha256 '86f06ca92a28b5835cb3eaadfb09897f581a5da3fb8ee8246897b1bf4ee7348a'
 
diff --git a/Casks/dump-truck.rb b/Casks/dump-truck.rb
index 3dc7a957c6ad..222d96e03962 100644
--- a/Casks/dump-truck.rb
+++ b/Casks/dump-truck.rb
@@ -1,4 +1,4 @@
-class DumpTruck < Cask
+cask :v1 => 'dump-truck' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/dungeon-crawl-stone-soup-console.rb b/Casks/dungeon-crawl-stone-soup-console.rb
index d1cfb6998c0a..ac25d2d7c0b7 100644
--- a/Casks/dungeon-crawl-stone-soup-console.rb
+++ b/Casks/dungeon-crawl-stone-soup-console.rb
@@ -1,4 +1,4 @@
-class DungeonCrawlStoneSoupConsole < Cask
+cask :v1 => 'dungeon-crawl-stone-soup-console' do
   version '0.14.0'
   sha256 'aea657c098a662f83dd227a2e3aa1f2f2c566bfea5076d686f601691538d298e'
 
diff --git a/Casks/dungeon-crawl-stone-soup-tiles.rb b/Casks/dungeon-crawl-stone-soup-tiles.rb
index a7fbd9f2a294..c1973768f394 100644
--- a/Casks/dungeon-crawl-stone-soup-tiles.rb
+++ b/Casks/dungeon-crawl-stone-soup-tiles.rb
@@ -1,4 +1,4 @@
-class DungeonCrawlStoneSoupTiles < Cask
+cask :v1 => 'dungeon-crawl-stone-soup-tiles' do
   version '0.14.0'
   sha256 '0cd2b2a7cf8675a208889ae406e6992c2a4c056ff05a974edfb99fd7a9e77e79'
 
diff --git a/Casks/dupeguru-me.rb b/Casks/dupeguru-me.rb
index a936d6438686..bf9df141558f 100644
--- a/Casks/dupeguru-me.rb
+++ b/Casks/dupeguru-me.rb
@@ -1,4 +1,4 @@
-class DupeguruMe < Cask
+cask :v1 => 'dupeguru-me' do
   version '6.8.0'
   sha256 '1c589d7113e580f7a9475d061ef17c63b8156632058ff6a37f01780e3bc4b4bf'
 
diff --git a/Casks/dupeguru-pe.rb b/Casks/dupeguru-pe.rb
index 8620625194c8..bc8934f31308 100644
--- a/Casks/dupeguru-pe.rb
+++ b/Casks/dupeguru-pe.rb
@@ -1,4 +1,4 @@
-class DupeguruPe < Cask
+cask :v1 => 'dupeguru-pe' do
   version '2.10.0'
   sha256 '7de4375058952b59badb91fb5827f09ef9c71e25f41cff8d386f0c1d3c81534c'
 
diff --git a/Casks/dupeguru.rb b/Casks/dupeguru.rb
index fd4b63c94c2f..90ba7e0996bd 100644
--- a/Casks/dupeguru.rb
+++ b/Casks/dupeguru.rb
@@ -1,4 +1,4 @@
-class Dupeguru < Cask
+cask :v1 => 'dupeguru' do
   version '3.9.0'
   sha256 '4c35a3556f43aeaad75e2c9b21075d0087634bb546b72a13d31cfaa731f6f697'
 
diff --git a/Casks/duplicate-annihilator.rb b/Casks/duplicate-annihilator.rb
index 1b23cccdfbde..316f2f375e21 100644
--- a/Casks/duplicate-annihilator.rb
+++ b/Casks/duplicate-annihilator.rb
@@ -1,4 +1,4 @@
-class DuplicateAnnihilator < Cask
+cask :v1 => 'duplicate-annihilator' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/duplicati.rb b/Casks/duplicati.rb
index 3309d9d4eb42..2b998c7f4728 100644
--- a/Casks/duplicati.rb
+++ b/Casks/duplicati.rb
@@ -1,4 +1,4 @@
-class Duplicati < Cask
+cask :v1 => 'duplicati' do
   version '1.3.4'
   sha256 'd97065d012fb929fa4e37b5efab2d246b6aef667f892a95301a1271f704963f2'
 
diff --git a/Casks/dupscanub.rb b/Casks/dupscanub.rb
index 78eb63d45b2a..b1adeb03e685 100644
--- a/Casks/dupscanub.rb
+++ b/Casks/dupscanub.rb
@@ -1,4 +1,4 @@
-class Dupscanub < Cask
+cask :v1 => 'dupscanub' do
   version '2.4.1'
   sha256 'd9c318d017012266461c8705bb9f9ebe23f052b4e794ace950f7edee8836f614'
 
diff --git a/Casks/dvdstyler.rb b/Casks/dvdstyler.rb
index a0cb5d3a4c05..bf5bc30bbf18 100644
--- a/Casks/dvdstyler.rb
+++ b/Casks/dvdstyler.rb
@@ -1,4 +1,4 @@
-class Dvdstyler < Cask
+cask :v1 => 'dvdstyler' do
   version '2.6'
   sha256 'fbb26aeb2ee50890b4a192d06d16ddc8a98a8465aa4eeff75d16fdc4de375ed6'
 
diff --git a/Casks/dwarf-fortress.rb b/Casks/dwarf-fortress.rb
index 790591e32e78..3569b98f1c06 100644
--- a/Casks/dwarf-fortress.rb
+++ b/Casks/dwarf-fortress.rb
@@ -1,4 +1,4 @@
-class DwarfFortress < Cask
+cask :v1 => 'dwarf-fortress' do
   version '0.40.14'
   sha256 'f5c2e841702327af73fbed1f32eeb6ade7c3789ae795e8fa2b6a1a777e927ceb'
 
diff --git a/Casks/dynamiclyrics.rb b/Casks/dynamiclyrics.rb
index 77a08a68d4bb..6c442a2cc676 100644
--- a/Casks/dynamiclyrics.rb
+++ b/Casks/dynamiclyrics.rb
@@ -1,4 +1,4 @@
-class Dynamiclyrics < Cask
+cask :v1 => 'dynamiclyrics' do
   version '2.1.1320'
   sha256 'eb00070104a441561482144ab6cb9a7de60b7a82e58db1329c813087b61afad6'
 
diff --git a/Casks/e-tax2014.rb b/Casks/e-tax2014.rb
index 6b2cdf7c2cb9..af1b521695aa 100644
--- a/Casks/e-tax2014.rb
+++ b/Casks/e-tax2014.rb
@@ -1,4 +1,4 @@
-class ETax2014 < Cask
+cask :v1 => 'e-tax2014' do
   version '1'
   sha256 '740410f77b0a41f4666293ecd5b0d6cb9a824ac56c2673ae2ed1b8fcf4ad8af1'
 
diff --git a/Casks/eagle.rb b/Casks/eagle.rb
index e958687e86bc..5b67f820fb62 100644
--- a/Casks/eagle.rb
+++ b/Casks/eagle.rb
@@ -1,4 +1,4 @@
-class Eagle < Cask
+cask :v1 => 'eagle' do
   version '7.1.0'
   sha256 '95a721bae751ea210fad390c9b414ec5e317332133072f08247b552e125ab2d5'
 
diff --git a/Casks/eaglefiler.rb b/Casks/eaglefiler.rb
index 05d438110469..ccca80fdf076 100644
--- a/Casks/eaglefiler.rb
+++ b/Casks/eaglefiler.rb
@@ -1,4 +1,4 @@
-class Eaglefiler < Cask
+cask :v1 => 'eaglefiler' do
   version '1.6.2'
   sha256 '0c16140443b863df4847da18ec3f22c86529ea0bcdf8d53b90702f4e49bcaa93'
 
diff --git a/Casks/easyfind.rb b/Casks/easyfind.rb
index 0cd3081190e7..a3dc4e925b56 100644
--- a/Casks/easyfind.rb
+++ b/Casks/easyfind.rb
@@ -1,4 +1,4 @@
-class Easyfind < Cask
+cask :v1 => 'easyfind' do
   version '4.9.2'
   sha256 '7804841f000ca8bf891911d83fa830d33119d6fac4f82e3716481ef1a598702a'
 
diff --git a/Casks/easysimbl.rb b/Casks/easysimbl.rb
index 0be6d5fa57f8..53a94fa7f853 100644
--- a/Casks/easysimbl.rb
+++ b/Casks/easysimbl.rb
@@ -1,4 +1,4 @@
-class Easysimbl < Cask
+cask :v1 => 'easysimbl' do
   version '1.6'
   sha256 '42139885e35946f1b2decb9cdfa755b8df8c050134463d76b2e3e0f68e783e26'
 
diff --git a/Casks/easyvpn.rb b/Casks/easyvpn.rb
index ba92ba5dbb20..37c08439bbc4 100644
--- a/Casks/easyvpn.rb
+++ b/Casks/easyvpn.rb
@@ -1,4 +1,4 @@
-class Easyvpn < Cask
+cask :v1 => 'easyvpn' do
   version '1.6'
   sha256 '4ece3c25ea7fb03340603caf3bef3454a08d0e1a7e89dead87bb53ca1631ca40'
 
diff --git a/Casks/eclipse-ide.rb b/Casks/eclipse-ide.rb
index 57f2b240e31d..95c40cc79f3a 100644
--- a/Casks/eclipse-ide.rb
+++ b/Casks/eclipse-ide.rb
@@ -1,4 +1,4 @@
-class EclipseIde < Cask
+cask :v1 => 'eclipse-ide' do
   version '4.4.0'
 
   if Hardware::CPU.is_32_bit?
diff --git a/Casks/eclipse-java.rb b/Casks/eclipse-java.rb
index dbed378bfca5..d7c5f9f5cbc8 100644
--- a/Casks/eclipse-java.rb
+++ b/Casks/eclipse-java.rb
@@ -1,4 +1,4 @@
-class EclipseJava < Cask
+cask :v1 => 'eclipse-java' do
   version '4.4.0'
 
   if Hardware::CPU.is_32_bit?
diff --git a/Casks/eclipse-jee.rb b/Casks/eclipse-jee.rb
index a57022fb90aa..4429755007b2 100644
--- a/Casks/eclipse-jee.rb
+++ b/Casks/eclipse-jee.rb
@@ -1,4 +1,4 @@
-class EclipseJee < Cask
+cask :v1 => 'eclipse-jee' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/eclipse-platform.rb b/Casks/eclipse-platform.rb
index aa016bd4022e..3b3c050f5ecc 100644
--- a/Casks/eclipse-platform.rb
+++ b/Casks/eclipse-platform.rb
@@ -1,4 +1,4 @@
-class EclipsePlatform < Cask
+cask :v1 => 'eclipse-platform' do
   version '4.4.0'
 
   if Hardware::CPU.is_32_bit?
diff --git a/Casks/ecoute.rb b/Casks/ecoute.rb
index 03820629a5f8..923a4c54e3d0 100644
--- a/Casks/ecoute.rb
+++ b/Casks/ecoute.rb
@@ -1,4 +1,4 @@
-class Ecoute < Cask
+cask :v1 => 'ecoute' do
   version '3.0.8'
   sha256 'e374016797980f658d2376cf261f6599103b4ade32df275513634b2f5cfc0da7'
 
diff --git a/Casks/eid-mw.rb b/Casks/eid-mw.rb
index 2a2d90a47622..07f9fe4e5e4c 100644
--- a/Casks/eid-mw.rb
+++ b/Casks/eid-mw.rb
@@ -1,4 +1,4 @@
-class EidMw < Cask
+cask :v1 => 'eid-mw' do
   version '4.0.6'
   sha256 'd88dad806fd4a8e01e636a22f9322a14f8bfdec596ce61f194c47a69d64668bb'
 
diff --git a/Casks/ejector.rb b/Casks/ejector.rb
index 0f01711ab9ad..6c6a2d948fa6 100644
--- a/Casks/ejector.rb
+++ b/Casks/ejector.rb
@@ -1,4 +1,4 @@
-class Ejector < Cask
+cask :v1 => 'ejector' do
   version '0.9.0'
   sha256 '78e588ba2f9b02c753af7e4f432c0dc980d3745c3b8d3978b6b11e113e109f19'
 
diff --git a/Casks/electric-sheep.rb b/Casks/electric-sheep.rb
index d310a2a14557..255634f659b2 100644
--- a/Casks/electric-sheep.rb
+++ b/Casks/electric-sheep.rb
@@ -1,4 +1,4 @@
-class ElectricSheep < Cask
+cask :v1 => 'electric-sheep' do
   version '2.7b35b'
   sha256 '767062403cc93aa75192def84b509b4530caca3e271ba23267ffe79cb50da44f'
 
diff --git a/Casks/electrum-ltc.rb b/Casks/electrum-ltc.rb
index 39e4c5925bfd..5bec31780d0f 100644
--- a/Casks/electrum-ltc.rb
+++ b/Casks/electrum-ltc.rb
@@ -1,4 +1,4 @@
-class ElectrumLtc < Cask
+cask :v1 => 'electrum-ltc' do
   version '1.9.8.5'
   sha256 'db5a36d7c4dca249fd6c4fee2dec04f88d9778e35b02a7e1df992327d0a66944'
 
diff --git a/Casks/electrum.rb b/Casks/electrum.rb
index 15fedce5a73e..90ba3e6766cd 100644
--- a/Casks/electrum.rb
+++ b/Casks/electrum.rb
@@ -1,4 +1,4 @@
-class Electrum < Cask
+cask :v1 => 'electrum' do
   version '1.9.8'
   sha256 'ad3818e34a9b3a292257377e337603ed362ff928f2054e92f764d771f0e49ec0'
 
diff --git a/Casks/elm-platform.rb b/Casks/elm-platform.rb
index 6c8f6a6c8d88..93093a2c505b 100644
--- a/Casks/elm-platform.rb
+++ b/Casks/elm-platform.rb
@@ -1,4 +1,4 @@
-class ElmPlatform < Cask
+cask :v1 => 'elm-platform' do
   version '0.13'
   sha256 '9f2a6446fdb1fad1536ec2ddce36a678265fe5b1112ca3edc992c07eebac1e62'
 
diff --git a/Casks/eloquent.rb b/Casks/eloquent.rb
index ecafdaadf97e..6fa0190a25d5 100644
--- a/Casks/eloquent.rb
+++ b/Casks/eloquent.rb
@@ -1,4 +1,4 @@
-class Eloquent < Cask
+cask :v1 => 'eloquent' do
   version '2.4.8'
   sha256 '3116ce1e74a6305ad60bb60ba010ccd864f3dce71eaa1a64fee2791651119857'
 
diff --git a/Casks/elyse.rb b/Casks/elyse.rb
index 3592a44135a7..843a275e9091 100644
--- a/Casks/elyse.rb
+++ b/Casks/elyse.rb
@@ -1,4 +1,4 @@
-class Elyse < Cask
+cask :v1 => 'elyse' do
   version '3.1.0'
   sha256 'b66bf959d30045e2f80193a6b4f9de88341c9c9e13a691afa74ddcf44eee02d7'
 
diff --git a/Casks/emacs.rb b/Casks/emacs.rb
index 2007eadf2453..5ac85bd8c9ac 100644
--- a/Casks/emacs.rb
+++ b/Casks/emacs.rb
@@ -1,4 +1,4 @@
-class Emacs < Cask
+cask :v1 => 'emacs' do
   version '24.4'
   sha256 '2d13ff9edff16d4e8f4bc9cf37961cf91a3f308fad5e9c214c4a546e86719312'
 
diff --git a/Casks/ember.rb b/Casks/ember.rb
index 7dd008fc33df..c316fe93d16a 100644
--- a/Casks/ember.rb
+++ b/Casks/ember.rb
@@ -1,4 +1,4 @@
-class Ember < Cask
+cask :v1 => 'ember' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/emin-webpquicklook.rb b/Casks/emin-webpquicklook.rb
index aa936e0395d6..a02f95ca38be 100644
--- a/Casks/emin-webpquicklook.rb
+++ b/Casks/emin-webpquicklook.rb
@@ -1,4 +1,4 @@
-class EminWebpquicklook < Cask
+cask :v1 => 'emin-webpquicklook' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/endnote.rb b/Casks/endnote.rb
index 8992586996d0..39fda525c91b 100644
--- a/Casks/endnote.rb
+++ b/Casks/endnote.rb
@@ -1,4 +1,4 @@
-class Endnote < Cask
+cask :v1 => 'endnote' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/enfusegui.rb b/Casks/enfusegui.rb
index 708dea73b13a..1fad80f796ef 100644
--- a/Casks/enfusegui.rb
+++ b/Casks/enfusegui.rb
@@ -1,4 +1,4 @@
-class Enfusegui < Cask
+cask :v1 => 'enfusegui' do
   version '2.1.3'
   sha256 'da762b7be32b9d264ffc121b43fae4b039dc797994be50e31f448bccf0d4b908'
 
diff --git a/Casks/enjoyable.rb b/Casks/enjoyable.rb
index ddf3aa5b1d1c..3c934d471cf7 100644
--- a/Casks/enjoyable.rb
+++ b/Casks/enjoyable.rb
@@ -1,4 +1,4 @@
-class Enjoyable < Cask
+cask :v1 => 'enjoyable' do
   version '1.2'
   sha256 'f455b951ba8cf7c8426756ea6479e2232442508d8190d7ec2675266bf7ff14f6'
 
diff --git a/Casks/enolsoft-chm-view.rb b/Casks/enolsoft-chm-view.rb
index 483598e1849f..c408f710fd80 100644
--- a/Casks/enolsoft-chm-view.rb
+++ b/Casks/enolsoft-chm-view.rb
@@ -1,4 +1,4 @@
-class EnolsoftChmView < Cask
+cask :v1 => 'enolsoft-chm-view' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/entropy.rb b/Casks/entropy.rb
index 84fcde624816..314fd8dfe759 100644
--- a/Casks/entropy.rb
+++ b/Casks/entropy.rb
@@ -1,4 +1,4 @@
-class Entropy < Cask
+cask :v1 => 'entropy' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/epic.rb b/Casks/epic.rb
index 757a53055cf0..0ffec7612a25 100644
--- a/Casks/epic.rb
+++ b/Casks/epic.rb
@@ -1,4 +1,4 @@
-class Epic < Cask
+cask :v1 => 'epic' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/epub-to-pdf.rb b/Casks/epub-to-pdf.rb
index 2c77bcd30b51..a2f00167561c 100644
--- a/Casks/epub-to-pdf.rb
+++ b/Casks/epub-to-pdf.rb
@@ -1,4 +1,4 @@
-class EpubToPdf < Cask
+cask :v1 => 'epub-to-pdf' do
   version '3.1'
   sha256 'dcfc59d57f756802e844614b7dae43bca67284ec85fe6b909f244e41f20987b3'
 
diff --git a/Casks/epubquicklook.rb b/Casks/epubquicklook.rb
index 75a3e9f34e58..29b29355b5a9 100644
--- a/Casks/epubquicklook.rb
+++ b/Casks/epubquicklook.rb
@@ -1,4 +1,4 @@
-class Epubquicklook < Cask
+cask :v1 => 'epubquicklook' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/escritorio-movistar.rb b/Casks/escritorio-movistar.rb
index 95df71729ff7..7989148386de 100644
--- a/Casks/escritorio-movistar.rb
+++ b/Casks/escritorio-movistar.rb
@@ -1,4 +1,4 @@
-class EscritorioMovistar < Cask
+cask :v1 => 'escritorio-movistar' do
   version '8.9'
   sha256 '0709299be3faf37e99497ffdf6668c6f0f90cb335fa86e797f8a04548a65689b'
 
diff --git a/Casks/espionage.rb b/Casks/espionage.rb
index 37ab8d618ce6..f04a3aa45c54 100644
--- a/Casks/espionage.rb
+++ b/Casks/espionage.rb
@@ -1,4 +1,4 @@
-class Espionage < Cask
+cask :v1 => 'espionage' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/espresso.rb b/Casks/espresso.rb
index 88e654d6d6e0..9ca74f931c06 100644
--- a/Casks/espresso.rb
+++ b/Casks/espresso.rb
@@ -1,4 +1,4 @@
-class Espresso < Cask
+cask :v1 => 'espresso' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/etrecheck.rb b/Casks/etrecheck.rb
index 3eb3e3d8a695..b3454c8c6056 100644
--- a/Casks/etrecheck.rb
+++ b/Casks/etrecheck.rb
@@ -1,4 +1,4 @@
-class Etrecheck < Cask
+cask :v1 => 'etrecheck' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/evasi0n.rb b/Casks/evasi0n.rb
index be4df984ea50..42fe109d45e7 100644
--- a/Casks/evasi0n.rb
+++ b/Casks/evasi0n.rb
@@ -1,4 +1,4 @@
-class Evasi0n < Cask
+cask :v1 => 'evasi0n' do
   version '1.0.7'
   sha256 '653cd14f25e2b2819f189216c6e920c13feb82d8d3a94c8f0e3949793aa831a2'
 
diff --git a/Casks/eve.rb b/Casks/eve.rb
index 05d6c42b9274..07cb4331e192 100644
--- a/Casks/eve.rb
+++ b/Casks/eve.rb
@@ -1,4 +1,4 @@
-class Eve < Cask
+cask :v1 => 'eve' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/evernote.rb b/Casks/evernote.rb
index 76e71a84c67f..bec65cede860 100644
--- a/Casks/evernote.rb
+++ b/Casks/evernote.rb
@@ -1,4 +1,4 @@
-class Evernote < Cask
+cask :v1 => 'evernote' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/everweb.rb b/Casks/everweb.rb
index 7899f928878e..da71dc67aea2 100644
--- a/Casks/everweb.rb
+++ b/Casks/everweb.rb
@@ -1,4 +1,4 @@
-class Everweb < Cask
+cask :v1 => 'everweb' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/evom.rb b/Casks/evom.rb
index 35dbdcaf25ad..13774cca903b 100644
--- a/Casks/evom.rb
+++ b/Casks/evom.rb
@@ -1,4 +1,4 @@
-class Evom < Cask
+cask :v1 => 'evom' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/exhaust.rb b/Casks/exhaust.rb
index 1a3f3786e4b9..75ccd23044e6 100644
--- a/Casks/exhaust.rb
+++ b/Casks/exhaust.rb
@@ -1,4 +1,4 @@
-class Exhaust < Cask
+cask :v1 => 'exhaust' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/exist-db.rb b/Casks/exist-db.rb
index 2b90d1e65b9b..9e260823e5cb 100644
--- a/Casks/exist-db.rb
+++ b/Casks/exist-db.rb
@@ -1,4 +1,4 @@
-class ExistDb < Cask
+cask :v1 => 'exist-db' do
   version '2.2RC2'
   sha256 '35aa7e36f21043629a7d562968cc803e6dae84429be4a0d1c77ed62bdf6f9f2f'
 
diff --git a/Casks/expandrive.rb b/Casks/expandrive.rb
index f6b986d3f414..3f349ef48487 100644
--- a/Casks/expandrive.rb
+++ b/Casks/expandrive.rb
@@ -1,4 +1,4 @@
-class Expandrive < Cask
+cask :v1 => 'expandrive' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/eye-fi.rb b/Casks/eye-fi.rb
index 49579ee9c13a..3388c1c62184 100644
--- a/Casks/eye-fi.rb
+++ b/Casks/eye-fi.rb
@@ -1,4 +1,4 @@
-class EyeFi < Cask
+cask :v1 => 'eye-fi' do
   version '3.4.35'
   sha256 '7de117d0ee443683ad5ca7b3ab4ef5fc9e96c1a3d226cf87358c46b1270fca4e'
 
diff --git a/Casks/eye-one-profiler.rb b/Casks/eye-one-profiler.rb
index eb71d8cdbf82..ad946ae1653b 100644
--- a/Casks/eye-one-profiler.rb
+++ b/Casks/eye-one-profiler.rb
@@ -1,4 +1,4 @@
-class EyeOneProfiler < Cask
+cask :v1 => 'eye-one-profiler' do
   version '1.5.6'
   sha256 '29804334aebcb98469e7db4ab476b1d20c42b73eb98e2c8b495057f282972528'
 
diff --git a/Casks/eyetv.rb b/Casks/eyetv.rb
index 34bf99a0f831..378921cde335 100644
--- a/Casks/eyetv.rb
+++ b/Casks/eyetv.rb
@@ -1,4 +1,4 @@
-class Eyetv < Cask
+cask :v1 => 'eyetv' do
   version '3.6.5'
   sha256 'cc8d7b1db43eabe827bab3a2401be97c6687cf83806ff585e3a125768c8c05f7'
 
diff --git a/Casks/ezeep.rb b/Casks/ezeep.rb
index 2abc130afb79..2bab680533e9 100644
--- a/Casks/ezeep.rb
+++ b/Casks/ezeep.rb
@@ -1,4 +1,4 @@
-class Ezeep < Cask
+cask :v1 => 'ezeep' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/facebook-ios-sdk.rb b/Casks/facebook-ios-sdk.rb
index d14132748dea..5b4309210236 100644
--- a/Casks/facebook-ios-sdk.rb
+++ b/Casks/facebook-ios-sdk.rb
@@ -1,4 +1,4 @@
-class FacebookIosSdk < Cask
+cask :v1 => 'facebook-ios-sdk' do
   version '3.20'
   sha256 'a5ee15d4ce3e6ed0139fab3f5cfc26fed13496249a60e97765fd7c0adc634501'
 
diff --git a/Casks/factor.rb b/Casks/factor.rb
index 4885514bf963..6a786f5ac6e7 100644
--- a/Casks/factor.rb
+++ b/Casks/factor.rb
@@ -1,4 +1,4 @@
-class Factor < Cask
+cask :v1 => 'factor' do
   version '0.96'
   sha256 'bd5dca1393c444a9491ef0c70f48b94ae7e39712ea0748a061cd721d26e83c40'
 
diff --git a/Casks/fairmount.rb b/Casks/fairmount.rb
index de3ced4a3149..0f7fe21c24e3 100644
--- a/Casks/fairmount.rb
+++ b/Casks/fairmount.rb
@@ -1,4 +1,4 @@
-class Fairmount < Cask
+cask :v1 => 'fairmount' do
   version '1.1.3'
   sha256 '0a775f48595ce0c9d0eead76b6d50ab190815cd4ce0e80017f318226e00a5c0e'
 
diff --git a/Casks/fake.rb b/Casks/fake.rb
index 5e50db2dd8d6..50453177bba2 100644
--- a/Casks/fake.rb
+++ b/Casks/fake.rb
@@ -1,4 +1,4 @@
-class Fake < Cask
+cask :v1 => 'fake' do
   version '1.8.9.1'
   sha256 'a350b00e17e690077feb05c3b26a6ca173a21bfbe39d51d8db1cd5689a4574c5'
 
diff --git a/Casks/fakethunder.rb b/Casks/fakethunder.rb
index e9a42a5487b6..365a0f9968cc 100644
--- a/Casks/fakethunder.rb
+++ b/Casks/fakethunder.rb
@@ -1,4 +1,4 @@
-class Fakethunder < Cask
+cask :v1 => 'fakethunder' do
   version '2.0.17'
   sha256 'c4f2d26535279e84b4b82d1e203b0efcc3bfaaed796d9fa7b587b17282f57a10'
 
diff --git a/Casks/fantastical.rb b/Casks/fantastical.rb
index eace9c7d61ee..f6ae8ad3a06a 100644
--- a/Casks/fantastical.rb
+++ b/Casks/fantastical.rb
@@ -1,4 +1,4 @@
-class Fantastical < Cask
+cask :v1 => 'fantastical' do
   version '1.3.18'
   sha256 '435d4818b2911eed956322261ba083df2abe9c2b21c63eee46876c23f7925beb'
 
diff --git a/Casks/fastest-free-youtube-downloader.rb b/Casks/fastest-free-youtube-downloader.rb
index 06d8f7c12757..39a85ceab44a 100644
--- a/Casks/fastest-free-youtube-downloader.rb
+++ b/Casks/fastest-free-youtube-downloader.rb
@@ -1,4 +1,4 @@
-class FastestFreeYoutubeDownloader < Cask
+cask :v1 => 'fastest-free-youtube-downloader' do
   version '5.0'
   sha256 'd301a1e6243c9e79f3ccac85ab19d3d8dd6c1ef3ddd81ba7006e539f2c88b71c'
 
diff --git a/Casks/fastscripts.rb b/Casks/fastscripts.rb
index 761591807014..0e2d090dd64f 100644
--- a/Casks/fastscripts.rb
+++ b/Casks/fastscripts.rb
@@ -1,4 +1,4 @@
-class Fastscripts < Cask
+cask :v1 => 'fastscripts' do
   version '2.6.8'
   sha256 '7cc170ecacad63872fe3faddd8dbaaa8f0e232687dbd8365594221ff64999def'
 
diff --git a/Casks/faux-pas.rb b/Casks/faux-pas.rb
index e06a341b97aa..6a16f55f92a6 100644
--- a/Casks/faux-pas.rb
+++ b/Casks/faux-pas.rb
@@ -1,4 +1,4 @@
-class FauxPas < Cask
+cask :v1 => 'faux-pas' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/fdt.rb b/Casks/fdt.rb
index 13581889adc6..375dbed6ffd7 100644
--- a/Casks/fdt.rb
+++ b/Casks/fdt.rb
@@ -1,4 +1,4 @@
-class Fdt < Cask
+cask :v1 => 'fdt' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/feedbinnotifier.rb b/Casks/feedbinnotifier.rb
index e03e2c25fec9..18edaf9c75ed 100644
--- a/Casks/feedbinnotifier.rb
+++ b/Casks/feedbinnotifier.rb
@@ -1,4 +1,4 @@
-class Feedbinnotifier < Cask
+cask :v1 => 'feedbinnotifier' do
   version '1.0.4'
   sha256 '20f94b5cecc2b730da1cfaae3633ce41f7b6ef6b28f56b7684538394544515f8'
 
diff --git a/Casks/feeder.rb b/Casks/feeder.rb
index 52a098dad902..0a369fea6c75 100644
--- a/Casks/feeder.rb
+++ b/Casks/feeder.rb
@@ -1,4 +1,4 @@
-class Feeder < Cask
+cask :v1 => 'feeder' do
   version '2.5.1'
   sha256 '8c3334e7eccff45006707c44257eb5ab7946b6c4f51dae0fecf8a3552c6168ae'
 
diff --git a/Casks/feeds.rb b/Casks/feeds.rb
index 62dd0579bd0c..b27518ca13b1 100644
--- a/Casks/feeds.rb
+++ b/Casks/feeds.rb
@@ -1,4 +1,4 @@
-class Feeds < Cask
+cask :v1 => 'feeds' do
   version '2.0.5.1'
   sha256 'abc72e4ef77a0bef4ea89d62b570698d47b197f2d56b74a48a9f3da52c6cd71e'
 
diff --git a/Casks/feisty-dog-tag.rb b/Casks/feisty-dog-tag.rb
index c0fe2159a548..9931f4540bea 100644
--- a/Casks/feisty-dog-tag.rb
+++ b/Casks/feisty-dog-tag.rb
@@ -1,4 +1,4 @@
-class FeistyDogTag < Cask
+cask :v1 => 'feisty-dog-tag' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/fender-amp-drivers.rb b/Casks/fender-amp-drivers.rb
index 7e95330ed09f..8f87b2c98ebf 100644
--- a/Casks/fender-amp-drivers.rb
+++ b/Casks/fender-amp-drivers.rb
@@ -1,4 +1,4 @@
-class FenderAmpDrivers < Cask
+cask :v1 => 'fender-amp-drivers' do
   version '2.7.1'
   sha256 'f73c4c66c6d9bc6492d8f22126415f5a36eb555714adc147590fb3a5d25b8c34'
 
diff --git a/Casks/fender-fuse.rb b/Casks/fender-fuse.rb
index 1c4c920a685c..8c3dbb9521ab 100644
--- a/Casks/fender-fuse.rb
+++ b/Casks/fender-fuse.rb
@@ -1,4 +1,4 @@
-class FenderFuse < Cask
+cask :v1 => 'fender-fuse' do
   version '2.7.1'
   sha256 'e68de1a1c1068d34dda354e2678ddac4a796b2ccdface95b034a438455442919'
 
diff --git a/Casks/fenics.rb b/Casks/fenics.rb
index 316d6e818f0b..89fb116e318c 100644
--- a/Casks/fenics.rb
+++ b/Casks/fenics.rb
@@ -1,4 +1,4 @@
-class Fenics < Cask
+cask :v1 => 'fenics' do
   version '1.4.0'
   sha256 'b0071fa25759fcef124e418c202cc81d297d12633b24385b70b9408af76c2bb5'
 
diff --git a/Casks/fenix.rb b/Casks/fenix.rb
index ec40455c2496..ef83c1cdc6a1 100644
--- a/Casks/fenix.rb
+++ b/Casks/fenix.rb
@@ -1,4 +1,4 @@
-class Fenix < Cask
+cask :v1 => 'fenix' do
   version '2.0.0'
   sha256 'f2155a6611c7048f0f3a94c06de6cfa4b2e6e5df05e1d68ed7c9aebf8786c1cf'
 
diff --git a/Casks/fetch.rb b/Casks/fetch.rb
index 8e501e68f911..984f3e97500f 100644
--- a/Casks/fetch.rb
+++ b/Casks/fetch.rb
@@ -1,4 +1,4 @@
-class Fetch < Cask
+cask :v1 => 'fetch' do
   version '5.7.3'
   sha256 'fd75b4ab78211cc067906341576657e41e130080ce05a1f20947a6acbb816ea3'
 
diff --git a/Casks/ffmpegx.rb b/Casks/ffmpegx.rb
index 718475daf877..a7ae802d3b62 100644
--- a/Casks/ffmpegx.rb
+++ b/Casks/ffmpegx.rb
@@ -1,4 +1,4 @@
-class Ffmpegx < Cask
+cask :v1 => 'ffmpegx' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/fiery-color-profiler-suite.rb b/Casks/fiery-color-profiler-suite.rb
index 8f681b1357dd..f623ff93f876 100644
--- a/Casks/fiery-color-profiler-suite.rb
+++ b/Casks/fiery-color-profiler-suite.rb
@@ -1,4 +1,4 @@
-class FieryColorProfilerSuite < Cask
+cask :v1 => 'fiery-color-profiler-suite' do
   version '4.6.2.08'
   sha256 'cc9614227e7f3e24fbb8862fc16ae1e27d81e8e03f2c07ad30a0ed9823b1c92f'
 
diff --git a/Casks/fiery-software-manager.rb b/Casks/fiery-software-manager.rb
index a86f46305d52..5f51dfda479f 100644
--- a/Casks/fiery-software-manager.rb
+++ b/Casks/fiery-software-manager.rb
@@ -1,4 +1,4 @@
-class FierySoftwareManager < Cask
+cask :v1 => 'fiery-software-manager' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/figtree.rb b/Casks/figtree.rb
index a045347f3605..72d0b7ec0d9a 100644
--- a/Casks/figtree.rb
+++ b/Casks/figtree.rb
@@ -1,4 +1,4 @@
-class Figtree < Cask
+cask :v1 => 'figtree' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/fiji.rb b/Casks/fiji.rb
index 298cd436ece5..9fd102e1f29d 100644
--- a/Casks/fiji.rb
+++ b/Casks/fiji.rb
@@ -1,4 +1,4 @@
-class Fiji < Cask
+cask :v1 => 'fiji' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/file-juicer.rb b/Casks/file-juicer.rb
index 1c22236e377b..f561c797fdf0 100644
--- a/Casks/file-juicer.rb
+++ b/Casks/file-juicer.rb
@@ -1,4 +1,4 @@
-class FileJuicer < Cask
+cask :v1 => 'file-juicer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/filebot.rb b/Casks/filebot.rb
index 055baa7e5875..89b2bddc279e 100644
--- a/Casks/filebot.rb
+++ b/Casks/filebot.rb
@@ -1,4 +1,4 @@
-class Filebot < Cask
+cask :v1 => 'filebot' do
   version '4.5'
   sha256 '43f461ffdca299f5a329defb5360992b57930daaa14d46102cb859ec80a5366e'
 
diff --git a/Casks/filedrop.rb b/Casks/filedrop.rb
index 949bd738adfa..e372278ce1e8 100644
--- a/Casks/filedrop.rb
+++ b/Casks/filedrop.rb
@@ -1,4 +1,4 @@
-class Filedrop < Cask
+cask :v1 => 'filedrop' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/fileshuttle.rb b/Casks/fileshuttle.rb
index d66bc0722e0d..433f79bb862a 100644
--- a/Casks/fileshuttle.rb
+++ b/Casks/fileshuttle.rb
@@ -1,4 +1,4 @@
-class Fileshuttle < Cask
+cask :v1 => 'fileshuttle' do
   version '2.1'
   sha256 '431b7cb2161eace5b8d39146bdd1b7cc9a85d335eb29175c1a1879208928565a'
 
diff --git a/Casks/filezilla.rb b/Casks/filezilla.rb
index 28d4a4004097..ec5a0718f0c5 100644
--- a/Casks/filezilla.rb
+++ b/Casks/filezilla.rb
@@ -1,4 +1,4 @@
-class Filezilla < Cask
+cask :v1 => 'filezilla' do
   version '3.9.0.6'
   sha256 '9486be1f5dec41df8ef1b60893ca612e6791b8d98609c6b9e42ced977210d15b'
 
diff --git a/Casks/find-any-file.rb b/Casks/find-any-file.rb
index 26aecfb75998..0afabbfd0154 100644
--- a/Casks/find-any-file.rb
+++ b/Casks/find-any-file.rb
@@ -1,4 +1,4 @@
-class FindAnyFile < Cask
+cask :v1 => 'find-any-file' do
   version '1.8.8'
   sha256 '3ef7b2a0f5373ac904198fb574d61d39316a0c4f6cb6740742b719bd7c842255'
 
diff --git a/Casks/findings.rb b/Casks/findings.rb
index d4f4134cf33c..8232457a754d 100644
--- a/Casks/findings.rb
+++ b/Casks/findings.rb
@@ -1,4 +1,4 @@
-class Findings < Cask
+cask :v1 => 'findings' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/fing.rb b/Casks/fing.rb
index d93164b072d5..d9d0af39a978 100644
--- a/Casks/fing.rb
+++ b/Casks/fing.rb
@@ -1,4 +1,4 @@
-class Fing < Cask
+cask :v1 => 'fing' do
   version '2.2'
   sha256 '6794afb734c266b0a9617209688259bf04ad8738cb9126fbb922d8816c7d74aa'
 
diff --git a/Casks/firefox.rb b/Casks/firefox.rb
index c5a229e3f4ea..b649ffc86782 100644
--- a/Casks/firefox.rb
+++ b/Casks/firefox.rb
@@ -1,4 +1,4 @@
-class Firefox < Cask
+cask :v1 => 'firefox' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/fission.rb b/Casks/fission.rb
index 14f3c65ff9bb..cbe180deabe1 100644
--- a/Casks/fission.rb
+++ b/Casks/fission.rb
@@ -1,4 +1,4 @@
-class Fission < Cask
+cask :v1 => 'fission' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/fitbit-connect.rb b/Casks/fitbit-connect.rb
index eceda63e33a1..8bef04aa3e96 100644
--- a/Casks/fitbit-connect.rb
+++ b/Casks/fitbit-connect.rb
@@ -1,4 +1,4 @@
-class FitbitConnect < Cask
+cask :v1 => 'fitbit-connect' do
   version '1.0.3.5510'
   sha256 '14ffe8fdc6040cbcb17e551e04cdbe1dabcff99641eed6a2495631d2b83ffc0f'
 
diff --git a/Casks/fivedetails-flow.rb b/Casks/fivedetails-flow.rb
index 2fbf7d8905e2..33dd981dc8f4 100644
--- a/Casks/fivedetails-flow.rb
+++ b/Casks/fivedetails-flow.rb
@@ -1,4 +1,4 @@
-class FivedetailsFlow < Cask
+cask :v1 => 'fivedetails-flow' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/flame.rb b/Casks/flame.rb
index 8e86360e957d..7bb07463a679 100644
--- a/Casks/flame.rb
+++ b/Casks/flame.rb
@@ -1,4 +1,4 @@
-class Flame < Cask
+cask :v1 => 'flame' do
   version '0.2.1'
   sha256 'b81f216caf290fc34824661b06b68eb538a675eada627c3606276762f1d1786e'
 
diff --git a/Casks/flash-decompiler-trillix.rb b/Casks/flash-decompiler-trillix.rb
index 7fafcd48db50..b5765e19ae72 100644
--- a/Casks/flash-decompiler-trillix.rb
+++ b/Casks/flash-decompiler-trillix.rb
@@ -1,4 +1,4 @@
-class FlashDecompilerTrillix < Cask
+cask :v1 => 'flash-decompiler-trillix' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/flash-player-debugger.rb b/Casks/flash-player-debugger.rb
index 279978c7de05..712f59e793e0 100644
--- a/Casks/flash-player-debugger.rb
+++ b/Casks/flash-player-debugger.rb
@@ -1,4 +1,4 @@
-class FlashPlayerDebugger < Cask
+cask :v1 => 'flash-player-debugger' do
   version '14.0.0.176'
   sha256 '4ea23e909aa54c130de0d7a6453409207d303523cce15c4621ad4a55e0681fcf'
 
diff --git a/Casks/flash-player.rb b/Casks/flash-player.rb
index ef7370ca7e7b..dd8455452309 100644
--- a/Casks/flash-player.rb
+++ b/Casks/flash-player.rb
@@ -1,4 +1,4 @@
-class FlashPlayer < Cask
+cask :v1 => 'flash-player' do
   version '15.0.0.189'
   sha256 '91d21b45f3a5639b89029b1cf07bf9e3bc424255a62ed62d5180ea7e0ad107f0'
 
diff --git a/Casks/flash.rb b/Casks/flash.rb
index 3900710a2538..1936a306d9e4 100644
--- a/Casks/flash.rb
+++ b/Casks/flash.rb
@@ -1,4 +1,4 @@
-class Flash < Cask
+cask :v1 => 'flash' do
   version '15.0.0.189'
   sha256 'd5fd0973439a9250751930735508152cb8b9923fc4bf8c2501ca6750b9ca8623'
 
diff --git a/Casks/flashlight.rb b/Casks/flashlight.rb
index 2c06df813f45..34063a790365 100644
--- a/Casks/flashlight.rb
+++ b/Casks/flashlight.rb
@@ -1,4 +1,4 @@
-class Flashlight < Cask
+cask :v1 => 'flashlight' do
   version 'v0.42-alpha'
   sha256 '9a2f787ca691c49379510dcb89b699e2de33710d73bb9bf79459a12027d75a74'
 
diff --git a/Casks/flavours.rb b/Casks/flavours.rb
index 81302ca24eea..4efa6ad08074 100644
--- a/Casks/flavours.rb
+++ b/Casks/flavours.rb
@@ -1,4 +1,4 @@
-class Flavours < Cask
+cask :v1 => 'flavours' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/flexiglass.rb b/Casks/flexiglass.rb
index 7f54a2e5541a..c50a4d98ba98 100644
--- a/Casks/flexiglass.rb
+++ b/Casks/flexiglass.rb
@@ -1,4 +1,4 @@
-class Flexiglass < Cask
+cask :v1 => 'flexiglass' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/flickr-uploadr.rb b/Casks/flickr-uploadr.rb
index ab9fb56cb06d..746b182ecf67 100644
--- a/Casks/flickr-uploadr.rb
+++ b/Casks/flickr-uploadr.rb
@@ -1,4 +1,4 @@
-class FlickrUploadr < Cask
+cask :v1 => 'flickr-uploadr' do
   version '3.2.1'
   sha256 'c41a1e4a8b6f7e3c9cb5d1adfc1b3bdc4a835dfbc31f16c0dbd657b74523214a'
 
diff --git a/Casks/flightgear.rb b/Casks/flightgear.rb
index fd72a46b179d..e934bb89c9b2 100644
--- a/Casks/flightgear.rb
+++ b/Casks/flightgear.rb
@@ -1,4 +1,4 @@
-class Flightgear < Cask
+cask :v1 => 'flightgear' do
   version '3.2.0'
   sha256 '1d2721c74e46869b3d13bc9c3d1f8e086f8771f23586c92ce156d0f3d076699b'
 
diff --git a/Casks/flip4mac.rb b/Casks/flip4mac.rb
index bceb1686261a..31f4e6df57ce 100644
--- a/Casks/flip4mac.rb
+++ b/Casks/flip4mac.rb
@@ -1,4 +1,4 @@
-class Flip4mac < Cask
+cask :v1 => 'flip4mac' do
   version '3.2.0.16'
   sha256 'd1574ca9896f8f40bf4d868e8ff91b1da1ac1dcd91a5b7898f3580543b02988e'
 
diff --git a/Casks/fliqlo.rb b/Casks/fliqlo.rb
index c5e975436c72..89bb11bb14ae 100644
--- a/Casks/fliqlo.rb
+++ b/Casks/fliqlo.rb
@@ -1,4 +1,4 @@
-class Fliqlo < Cask
+cask :v1 => 'fliqlo' do
   version '1.5.2'
   sha256 '132f760525e2b1956e708c99676b1f1a6d30c10d64eda912a669c0a25c38ad46'
 
diff --git a/Casks/flow.rb b/Casks/flow.rb
index c119f434edc7..7338c3d81a55 100644
--- a/Casks/flow.rb
+++ b/Casks/flow.rb
@@ -1,4 +1,4 @@
-class Flow < Cask
+cask :v1 => 'flow' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/flowdock.rb b/Casks/flowdock.rb
index e35f0d754e63..1bc1029f828b 100644
--- a/Casks/flowdock.rb
+++ b/Casks/flowdock.rb
@@ -1,4 +1,4 @@
-class Flowdock < Cask
+cask :v1 => 'flowdock' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/fluid.rb b/Casks/fluid.rb
index 1726d1f8c9a7..cf06296e456c 100644
--- a/Casks/fluid.rb
+++ b/Casks/fluid.rb
@@ -1,4 +1,4 @@
-class Fluid < Cask
+cask :v1 => 'fluid' do
   version '1.8.3'
   sha256 '56438a946b281b009626a06cb099a7198e948bc8bef18a19c1bceb28bbe4d619'
 
diff --git a/Casks/fluke.rb b/Casks/fluke.rb
index bd7ba07f7159..45da6b8df8a1 100644
--- a/Casks/fluke.rb
+++ b/Casks/fluke.rb
@@ -1,4 +1,4 @@
-class Fluke < Cask
+cask :v1 => 'fluke' do
   version '0.2.5b'
   sha256 '3a68f42674aeb3a1089df5581bae5bbf8f28525d2d6588a03e257fc3b688f18a'
 
diff --git a/Casks/flux.rb b/Casks/flux.rb
index b69d8af14328..6542279ba9b4 100644
--- a/Casks/flux.rb
+++ b/Casks/flux.rb
@@ -1,4 +1,4 @@
-class Flux < Cask
+cask :v1 => 'flux' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/fm-fw-installer.rb b/Casks/fm-fw-installer.rb
index 731ca082d55a..b3d7c7dc627b 100644
--- a/Casks/fm-fw-installer.rb
+++ b/Casks/fm-fw-installer.rb
@@ -1,4 +1,4 @@
-class FmFwInstaller < Cask
+cask :v1 => 'fm-fw-installer' do
   version '1.2'
   sha256 'b62dc5208dd079c93bd191578e7aa4a1905eee970589c45e01b99f65ccca2ec3'
 
diff --git a/Casks/focus.rb b/Casks/focus.rb
index a4fe81d38472..b907c695bd48 100644
--- a/Casks/focus.rb
+++ b/Casks/focus.rb
@@ -1,4 +1,4 @@
-class Focus < Cask
+cask :v1 => 'focus' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/focuswriter.rb b/Casks/focuswriter.rb
index 8ecc337a18e6..e4a795eca204 100644
--- a/Casks/focuswriter.rb
+++ b/Casks/focuswriter.rb
@@ -1,4 +1,4 @@
-class Focuswriter < Cask
+cask :v1 => 'focuswriter' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/folding-text.rb b/Casks/folding-text.rb
index b23d71b8b0ba..fe8e9639f486 100644
--- a/Casks/folding-text.rb
+++ b/Casks/folding-text.rb
@@ -1,4 +1,4 @@
-class FoldingText < Cask
+cask :v1 => 'folding-text' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/foldit.rb b/Casks/foldit.rb
index 923847f3e294..7aa42c8f1576 100644
--- a/Casks/foldit.rb
+++ b/Casks/foldit.rb
@@ -1,4 +1,4 @@
-class Foldit < Cask
+cask :v1 => 'foldit' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/folx.rb b/Casks/folx.rb
index 441675dff4bd..f2ee05ea9f4c 100644
--- a/Casks/folx.rb
+++ b/Casks/folx.rb
@@ -1,4 +1,4 @@
-class Folx < Cask
+cask :v1 => 'folx' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/fontexplorer-x-pro.rb b/Casks/fontexplorer-x-pro.rb
index 1c6c02ffcc62..41048b1f08b9 100644
--- a/Casks/fontexplorer-x-pro.rb
+++ b/Casks/fontexplorer-x-pro.rb
@@ -1,4 +1,4 @@
-class FontexplorerXPro < Cask
+cask :v1 => 'fontexplorer-x-pro' do
   version '4.2.1'
   sha256 '9fd225ff73804231d094f16bdb435355a3b7557d74ec1aeb9d89e925f0673350'
 
diff --git a/Casks/fontprep.rb b/Casks/fontprep.rb
index 965d63ce6fc0..2c59a7578c14 100644
--- a/Casks/fontprep.rb
+++ b/Casks/fontprep.rb
@@ -1,4 +1,4 @@
-class Fontprep < Cask
+cask :v1 => 'fontprep' do
   version '3.1.1'
   sha256 '769d64b78d1a8db42dcb02beff6f929670448f77259388c9d01692374be2ec46'
 
diff --git a/Casks/forklift.rb b/Casks/forklift.rb
index a32a2f0d10df..acf9b0ab58c6 100644
--- a/Casks/forklift.rb
+++ b/Casks/forklift.rb
@@ -1,4 +1,4 @@
-class Forklift < Cask
+cask :v1 => 'forklift' do
   version '2.6.2'
   sha256 '326ef943df71204940ce1de537e00ec07724d69012901f5a967fa54747215a34'
 
diff --git a/Casks/fotomagico.rb b/Casks/fotomagico.rb
index 5c4385edae29..b41bd718dd7d 100644
--- a/Casks/fotomagico.rb
+++ b/Casks/fotomagico.rb
@@ -1,4 +1,4 @@
-class Fotomagico < Cask
+cask :v1 => 'fotomagico' do
   version '4.3.1-18650'
   sha256 'ad4fff8a197424cc02770ca7bf2f71fe78abf5428a234b098d4589133fd16b39'
 
diff --git a/Casks/fotowall.rb b/Casks/fotowall.rb
index 61d84820fd97..bb0d54bae820 100644
--- a/Casks/fotowall.rb
+++ b/Casks/fotowall.rb
@@ -1,4 +1,4 @@
-class Fotowall < Cask
+cask :v1 => 'fotowall' do
   version '0.8.2'
   sha256 'f49ad020eb6d36b9ad5492edd24ce608aef4466b727b5d0811ed4218b35d0c8c'
 
diff --git a/Casks/fourk-video-downloader.rb b/Casks/fourk-video-downloader.rb
index 015f647b5dba..0bd2a20eea5e 100644
--- a/Casks/fourk-video-downloader.rb
+++ b/Casks/fourk-video-downloader.rb
@@ -1,4 +1,4 @@
-class FourkVideoDownloader < Cask
+cask :v1 => 'fourk-video-downloader' do
   version '3.1'
   sha256 '5f2243e9d2352b411414e3819d2dbb36cbd2c4f4d9a72a9579e4fbc1f820a324'
 
diff --git a/Casks/fourk-youtube-to-mp3.rb b/Casks/fourk-youtube-to-mp3.rb
index 05767aa835c0..3e9ebafc17b6 100644
--- a/Casks/fourk-youtube-to-mp3.rb
+++ b/Casks/fourk-youtube-to-mp3.rb
@@ -1,4 +1,4 @@
-class FourkYoutubeToMp3 < Cask
+cask :v1 => 'fourk-youtube-to-mp3' do
   version '3.2.5'
   sha256 '6c60b0830964bf682d9140e79bd732baa01299fb5f27f4eb67cdbe94231c6094'
 
diff --git a/Casks/fourpeaks.rb b/Casks/fourpeaks.rb
index 285401e8c7f3..d56d38befb99 100644
--- a/Casks/fourpeaks.rb
+++ b/Casks/fourpeaks.rb
@@ -1,4 +1,4 @@
-class Fourpeaks < Cask
+cask :v1 => 'fourpeaks' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/foxmail.rb b/Casks/foxmail.rb
index 2e0545d52b08..481db2b2d8f3 100644
--- a/Casks/foxmail.rb
+++ b/Casks/foxmail.rb
@@ -1,4 +1,4 @@
-class Foxmail < Cask
+cask :v1 => 'foxmail' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/fpc.rb b/Casks/fpc.rb
index b624785e4fa3..da4535cdc4fa 100644
--- a/Casks/fpc.rb
+++ b/Casks/fpc.rb
@@ -1,4 +1,4 @@
-class Fpc < Cask
+cask :v1 => 'fpc' do
   version '2.6.2'
   sha256 '09b0964c6fb11eaa04e0fa065e479674384aab81e69e377bb1e030ec1d3398a6'
 
diff --git a/Casks/framer-studio.rb b/Casks/framer-studio.rb
index 01cb8750b69e..eb5b2e0e3296 100644
--- a/Casks/framer-studio.rb
+++ b/Casks/framer-studio.rb
@@ -1,4 +1,4 @@
-class FramerStudio < Cask
+cask :v1 => 'framer-studio' do
   version '1.9.9'
   sha256 '87ef1a7cf363e772a1c0cbc2dd6ca6dceb41d677b547b0cac28a8c982557650f'
 
diff --git a/Casks/free-ruler.rb b/Casks/free-ruler.rb
index 9e5245dcc68e..0b1b563d3e7d 100644
--- a/Casks/free-ruler.rb
+++ b/Casks/free-ruler.rb
@@ -1,4 +1,4 @@
-class FreeRuler < Cask
+cask :v1 => 'free-ruler' do
   version '1.7b5'
   sha256 'f746e49ae012bee5ccef9871592276de47d3b6affbe92ab3f45f2591cb05b915'
 
diff --git a/Casks/freecad.rb b/Casks/freecad.rb
index 531d574afb79..3a9a12e39f99 100644
--- a/Casks/freecad.rb
+++ b/Casks/freecad.rb
@@ -1,4 +1,4 @@
-class Freecad < Cask
+cask :v1 => 'freecad' do
   version '0.14.3703'
   sha256 'ee7814988c91c489536cfa61b41ef65c90226758f3d4f588d520c6c54ea84dfb'
 
diff --git a/Casks/freecol.rb b/Casks/freecol.rb
index 575fb516c4b6..8a14d742d4c7 100644
--- a/Casks/freecol.rb
+++ b/Casks/freecol.rb
@@ -1,4 +1,4 @@
-class Freecol < Cask
+cask :v1 => 'freecol' do
   version '0.10.7'
   sha256 'eb05ea179df6adc6bcf4234ce3809c48b8c2d5597da20a10910ded677f2b6a2d'
 
diff --git a/Casks/freedv.rb b/Casks/freedv.rb
index eaa1ca448ceb..2177a9d55ffd 100644
--- a/Casks/freedv.rb
+++ b/Casks/freedv.rb
@@ -1,4 +1,4 @@
-class Freedv < Cask
+cask :v1 => 'freedv' do
   version '0.96.6'
   sha256 'e8c42dbb7fc5b8dd88020aa000149185adc5f9583094617966008e5b39d54970'
 
diff --git a/Casks/freefilesync.rb b/Casks/freefilesync.rb
index 651c6cf47b97..32c75f7374cf 100644
--- a/Casks/freefilesync.rb
+++ b/Casks/freefilesync.rb
@@ -1,4 +1,4 @@
-class Freefilesync < Cask
+cask :v1 => 'freefilesync' do
   version '6.10'
   sha256 'f0a1a52ef8e1a011b522af98afe64e9474f68f98eb0ab7c3a3dafb3fb6d0a6bf'
 
diff --git a/Casks/freelancy.rb b/Casks/freelancy.rb
index 4ecf55f1f273..02a786b9043a 100644
--- a/Casks/freelancy.rb
+++ b/Casks/freelancy.rb
@@ -1,4 +1,4 @@
-class Freelancy < Cask
+cask :v1 => 'freelancy' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/freemind.rb b/Casks/freemind.rb
index 6f0aa2c5cd9b..c7b95eb8d4e3 100644
--- a/Casks/freemind.rb
+++ b/Casks/freemind.rb
@@ -1,4 +1,4 @@
-class Freemind < Cask
+cask :v1 => 'freemind' do
   version '1.0.1'
   sha256 '0bd93317567f947e7fa3b3e8d2e0d908300642edc5e07f1929157469ffd14ea3'
 
diff --git a/Casks/freeplane.rb b/Casks/freeplane.rb
index aa26b09e16c2..4caf9f692778 100644
--- a/Casks/freeplane.rb
+++ b/Casks/freeplane.rb
@@ -1,4 +1,4 @@
-class Freeplane < Cask
+cask :v1 => 'freeplane' do
   version '1.3.12'
   sha256 '761cf0abb98c4678f8f40b7ea3810c7faf72e096ab8f3e2085628650028f68f1'
 
diff --git a/Casks/freezer.rb b/Casks/freezer.rb
index 58fa2428aadb..492771634e5b 100644
--- a/Casks/freezer.rb
+++ b/Casks/freezer.rb
@@ -1,4 +1,4 @@
-class Freezer < Cask
+cask :v1 => 'freezer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/fritzing.rb b/Casks/fritzing.rb
index f92c2b3d4534..ab86be5100e6 100644
--- a/Casks/fritzing.rb
+++ b/Casks/fritzing.rb
@@ -1,4 +1,4 @@
-class Fritzing < Cask
+cask :v1 => 'fritzing' do
   version '0.9.0b'
   sha256 '853194e16cc66aa4fd8235d651f649e25eabbaed7bd95b4ee0d438d2e4f8ab6b'
 
diff --git a/Casks/frizzix.rb b/Casks/frizzix.rb
index 51a36c63e3d2..109711cfced1 100644
--- a/Casks/frizzix.rb
+++ b/Casks/frizzix.rb
@@ -1,4 +1,4 @@
-class Frizzix < Cask
+cask :v1 => 'frizzix' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/frostwire.rb b/Casks/frostwire.rb
index 943a7127aa28..e4433427daca 100644
--- a/Casks/frostwire.rb
+++ b/Casks/frostwire.rb
@@ -1,4 +1,4 @@
-class Frostwire < Cask
+cask :v1 => 'frostwire' do
   version '5.7.2'
   sha256 'c559d214576684a97cee0bea15c91caf8dd2c3609cc498039813724ea475642e'
 
diff --git a/Casks/fs-uae.rb b/Casks/fs-uae.rb
index 633e3cd56589..a95e4c8e8eaf 100644
--- a/Casks/fs-uae.rb
+++ b/Casks/fs-uae.rb
@@ -1,4 +1,4 @@
-class FsUae < Cask
+cask :v1 => 'fs-uae' do
   version '2.2.3'
   sha256 '3e949a673fb44abd8c788aa70361315fb7fb389575966dddee89f66fbda354ca'
 
diff --git a/Casks/fseventer.rb b/Casks/fseventer.rb
index 12d2f1ea09b0..20c2245a6e7b 100644
--- a/Casks/fseventer.rb
+++ b/Casks/fseventer.rb
@@ -1,4 +1,4 @@
-class Fseventer < Cask
+cask :v1 => 'fseventer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/fstream.rb b/Casks/fstream.rb
index 59329288ca44..aefb17f35f90 100644
--- a/Casks/fstream.rb
+++ b/Casks/fstream.rb
@@ -1,4 +1,4 @@
-class Fstream < Cask
+cask :v1 => 'fstream' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/fugu.rb b/Casks/fugu.rb
index 02fce433d931..937d58c1b648 100644
--- a/Casks/fugu.rb
+++ b/Casks/fugu.rb
@@ -1,4 +1,4 @@
-class Fugu < Cask
+cask :v1 => 'fugu' do
   version '1.2.1pre1'
   sha256 '3f96ac9c94516c100bab5fe03cc1571634955f15e1949d32d675b91f5058e328'
 
diff --git a/Casks/functionflip.rb b/Casks/functionflip.rb
index 79a3eb77667a..6213fe959bb8 100644
--- a/Casks/functionflip.rb
+++ b/Casks/functionflip.rb
@@ -1,4 +1,4 @@
-class Functionflip < Cask
+cask :v1 => 'functionflip' do
   version '2.2.2'
   sha256 '66ac937e9ade979eca2d94881093ee5301bce660da1ace98e3c792da29b33c72'
 
diff --git a/Casks/futuniuniu.rb b/Casks/futuniuniu.rb
index a4fe44fc23c2..0ee6c6eda1db 100644
--- a/Casks/futuniuniu.rb
+++ b/Casks/futuniuniu.rb
@@ -1,4 +1,4 @@
-class Futuniuniu < Cask
+cask :v1 => 'futuniuniu' do
   version '2.14.316'
   sha256 'abe44dc80551e6cfaea7bc2265997766fd3fadd68a2f859193db732598516028'
 
diff --git a/Casks/fuze.rb b/Casks/fuze.rb
index 997ad0e114c1..758e08309b00 100644
--- a/Casks/fuze.rb
+++ b/Casks/fuze.rb
@@ -1,4 +1,4 @@
-class Fuze < Cask
+cask :v1 => 'fuze' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/fwbuilder.rb b/Casks/fwbuilder.rb
index 516e07fa26ad..c7b05d1efcd1 100644
--- a/Casks/fwbuilder.rb
+++ b/Casks/fwbuilder.rb
@@ -1,4 +1,4 @@
-class Fwbuilder < Cask
+cask :v1 => 'fwbuilder' do
   version '5.1.0.3599'
   sha256 '447e05956fdfe676e87a10ac2f81259d0e00f519bbf66da38e7f1b0c922f85f3'
 
diff --git a/Casks/gambit-c.rb b/Casks/gambit-c.rb
index 9060d1a26de8..2b0f55c7abad 100644
--- a/Casks/gambit-c.rb
+++ b/Casks/gambit-c.rb
@@ -1,4 +1,4 @@
-class GambitC < Cask
+cask :v1 => 'gambit-c' do
   version '4.7.3'
 
   if Hardware::CPU.is_32_bit?
diff --git a/Casks/gamesalad.rb b/Casks/gamesalad.rb
index 890c1bd3af7b..b155ad411da5 100644
--- a/Casks/gamesalad.rb
+++ b/Casks/gamesalad.rb
@@ -1,4 +1,4 @@
-class Gamesalad < Cask
+cask :v1 => 'gamesalad' do
   version '0.14.4.1-beta'
   sha256 '05f68db92cee37fedffe23a2950fa55c375fd53acd7d19ae8fd42884345814e7'
 
diff --git a/Casks/ganttproject.rb b/Casks/ganttproject.rb
index 993e9c5b26d5..af53f1ae00af 100644
--- a/Casks/ganttproject.rb
+++ b/Casks/ganttproject.rb
@@ -1,4 +1,4 @@
-class Ganttproject < Cask
+cask :v1 => 'ganttproject' do
   version '2.6.2-r1544'
   sha256 '8db9b2da23c581f4907ec091db07b7d19e784f4fcbc7fd7cea03d5ab0de23f70'
 
diff --git a/Casks/garagebuy.rb b/Casks/garagebuy.rb
index 3035fad1c29b..ca9597796391 100644
--- a/Casks/garagebuy.rb
+++ b/Casks/garagebuy.rb
@@ -1,4 +1,4 @@
-class Garagebuy < Cask
+cask :v1 => 'garagebuy' do
   version '3.1.1'
   sha256 '4f7b7b941a40be516d923338df84a43073149f785d123ea2ff938f412757f8cf'
 
diff --git a/Casks/garagesale.rb b/Casks/garagesale.rb
index 4009b95c112a..e9e98ab6e530 100644
--- a/Casks/garagesale.rb
+++ b/Casks/garagesale.rb
@@ -1,4 +1,4 @@
-class Garagesale < Cask
+cask :v1 => 'garagesale' do
   version '6.6.6'
   sha256 '2a740647b5eafc543bc3b2ba604ece8921fb59ee3b096edb4d13193642bc4897'
 
diff --git a/Casks/gargoyle.rb b/Casks/gargoyle.rb
index faf17e3ff4f7..b47653d4d179 100644
--- a/Casks/gargoyle.rb
+++ b/Casks/gargoyle.rb
@@ -1,4 +1,4 @@
-class Gargoyle < Cask
+cask :v1 => 'gargoyle' do
   version '2011.1'
   sha256 '4e830ad3feec78d623ce5c13ce14f440f9769d302ac46604afc4b9785baa038c'
 
diff --git a/Casks/garmin-ant-agent.rb b/Casks/garmin-ant-agent.rb
index b29863124ce3..28fec01b34d8 100644
--- a/Casks/garmin-ant-agent.rb
+++ b/Casks/garmin-ant-agent.rb
@@ -1,4 +1,4 @@
-class GarminAntAgent < Cask
+cask :v1 => 'garmin-ant-agent' do
   version '2.2.2'
   sha256 '11df82fdd8d39a9d83df03c8efe8b1b1cb3e8f65d1e1bd47f823e9eda9bfcc57'
 
diff --git a/Casks/garmin-communicator.rb b/Casks/garmin-communicator.rb
index adfeb6c60440..b14e8c41fac9 100644
--- a/Casks/garmin-communicator.rb
+++ b/Casks/garmin-communicator.rb
@@ -1,4 +1,4 @@
-class GarminCommunicator < Cask
+cask :v1 => 'garmin-communicator' do
   version '4.20'
   sha256 'a706a48926fc3907e84781bdf642ec1754c6081dd3d727ce09ca26c1ae8d9fde'
 
diff --git a/Casks/garmin-express.rb b/Casks/garmin-express.rb
index ba7a87f6239d..ac78dc1b44e1 100644
--- a/Casks/garmin-express.rb
+++ b/Casks/garmin-express.rb
@@ -1,4 +1,4 @@
-class GarminExpress < Cask
+cask :v1 => 'garmin-express' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/garmin-training-center.rb b/Casks/garmin-training-center.rb
index 691255abb8d8..3971488d82b0 100644
--- a/Casks/garmin-training-center.rb
+++ b/Casks/garmin-training-center.rb
@@ -1,4 +1,4 @@
-class GarminTrainingCenter < Cask
+cask :v1 => 'garmin-training-center' do
   version '3.2.1'
   sha256 '82bda2f40b3ad8402f1e88fd7750b2827dc8f8f17ea45165e0c85fe6dbd7dfb6'
 
diff --git a/Casks/gas-mask.rb b/Casks/gas-mask.rb
index 84f864715504..ec41f1562297 100644
--- a/Casks/gas-mask.rb
+++ b/Casks/gas-mask.rb
@@ -1,4 +1,4 @@
-class GasMask < Cask
+cask :v1 => 'gas-mask' do
   version '0.8.1'
   sha256 'f384e973603088ed5afbe841ef7d5698262988c65a0437a9d8011dcb667fcc2e'
 
diff --git a/Casks/gawker.rb b/Casks/gawker.rb
index e5433870fae9..a101ce2b2b3f 100644
--- a/Casks/gawker.rb
+++ b/Casks/gawker.rb
@@ -1,4 +1,4 @@
-class Gawker < Cask
+cask :v1 => 'gawker' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/gdal-framework.rb b/Casks/gdal-framework.rb
index 05ef0fd70e53..1efd3e33bc8f 100644
--- a/Casks/gdal-framework.rb
+++ b/Casks/gdal-framework.rb
@@ -1,4 +1,4 @@
-class GdalFramework < Cask
+cask :v1 => 'gdal-framework' do
   version '1.11'
   sha256 'd8aa6d59236a75519e94a764dfc71d3122c8e88fa4f99072046c3a8a0bfb4124'
 
diff --git a/Casks/geekbench.rb b/Casks/geekbench.rb
index 8ee2bdbba4cd..6622b7ab0b03 100644
--- a/Casks/geekbench.rb
+++ b/Casks/geekbench.rb
@@ -1,4 +1,4 @@
-class Geekbench < Cask
+cask :v1 => 'geekbench' do
   version '3.2.2'
   sha256 'c4891501fe720981e1baca7311241bbd036b82b8d540bc5ad1016465ee40ebe1'
 
diff --git a/Casks/geektool.rb b/Casks/geektool.rb
index a22652ca6f5c..a662b991b98b 100644
--- a/Casks/geektool.rb
+++ b/Casks/geektool.rb
@@ -1,4 +1,4 @@
-class Geektool < Cask
+cask :v1 => 'geektool' do
   version '3.1.1-311'
   sha256 'ef1a7439d91f0de9e459a4677c6f95fe35bd7e02c300adc9ce315b5590cbbfc9'
 
diff --git a/Casks/geneious.rb b/Casks/geneious.rb
index ce0aa34417ec..e597af027486 100644
--- a/Casks/geneious.rb
+++ b/Casks/geneious.rb
@@ -1,4 +1,4 @@
-class Geneious < Cask
+cask :v1 => 'geneious' do
   version '7.1.7'
   sha256 '1a3c9ad7349e7676d8be7f85db83cad8a7879d9fa188c19fc94f97eb8683403a'
 
diff --git a/Casks/genymotion.rb b/Casks/genymotion.rb
index 3f64ee5907cb..ed45b768e13f 100644
--- a/Casks/genymotion.rb
+++ b/Casks/genymotion.rb
@@ -1,4 +1,4 @@
-class Genymotion < Cask
+cask :v1 => 'genymotion' do
   version '2.3.1'
   sha256 'aa41be79a773ccf3a6b68971088c38ef34ff864128c57b09a8362b878f4534e0'
 
diff --git a/Casks/gephi.rb b/Casks/gephi.rb
index ba8d816a89a0..29ecce7e5faf 100644
--- a/Casks/gephi.rb
+++ b/Casks/gephi.rb
@@ -1,4 +1,4 @@
-class Gephi < Cask
+cask :v1 => 'gephi' do
   version '0.8.2-beta'
   sha256 'ee8f7845ade6109de7e88ed03cc92885c6d936c34d666503d7c92bf3c5d0659d'
 
diff --git a/Casks/geppetto.rb b/Casks/geppetto.rb
index 8e76cbfea604..7af333d623ff 100644
--- a/Casks/geppetto.rb
+++ b/Casks/geppetto.rb
@@ -1,4 +1,4 @@
-class Geppetto < Cask
+cask :v1 => 'geppetto' do
   version '4.2.0'
 
   if Hardware::CPU.is_32_bit?
diff --git a/Casks/get-lyrical.rb b/Casks/get-lyrical.rb
index 392269a4b534..ab96293eb0f0 100644
--- a/Casks/get-lyrical.rb
+++ b/Casks/get-lyrical.rb
@@ -1,4 +1,4 @@
-class GetLyrical < Cask
+cask :v1 => 'get-lyrical' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/gfxcardstatus.rb b/Casks/gfxcardstatus.rb
index 800c0dd554f8..d8b0f3436d45 100644
--- a/Casks/gfxcardstatus.rb
+++ b/Casks/gfxcardstatus.rb
@@ -1,4 +1,4 @@
-class Gfxcardstatus < Cask
+cask :v1 => 'gfxcardstatus' do
   version '2.3'
   sha256 '092b3e2fad44681ba396cf498707c8b6c228fd55310770a8323ebb9344b4d9a1'
 
diff --git a/Casks/ghc.rb b/Casks/ghc.rb
index 18b9c417aef1..935047ccdc5f 100644
--- a/Casks/ghc.rb
+++ b/Casks/ghc.rb
@@ -1,4 +1,4 @@
-class Ghc < Cask
+cask :v1 => 'ghc' do
   version '7.8.3-r1'
   sha256 '4f48e373f3fa682c8c29e2128038c040e69d7852a8529173f53105027199c21c'
 
diff --git a/Casks/ghostlab.rb b/Casks/ghostlab.rb
index 1bc3d9992679..e80d8d484b71 100644
--- a/Casks/ghostlab.rb
+++ b/Casks/ghostlab.rb
@@ -1,4 +1,4 @@
-class Ghostlab < Cask
+cask :v1 => 'ghostlab' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/giffun.rb b/Casks/giffun.rb
index 28e266041574..ea96715b3332 100644
--- a/Casks/giffun.rb
+++ b/Casks/giffun.rb
@@ -1,4 +1,4 @@
-class Giffun < Cask
+cask :v1 => 'giffun' do
   version '2008-03-13'
   sha256 '057e89ee3e5e39c82f40ea490f9f601a487bf688f55cd7e5e7e3b3f9ce812a4a'
 
diff --git a/Casks/gifrocket.rb b/Casks/gifrocket.rb
index 82c1faba7d3b..f9d51dbd23ca 100644
--- a/Casks/gifrocket.rb
+++ b/Casks/gifrocket.rb
@@ -1,4 +1,4 @@
-class Gifrocket < Cask
+cask :v1 => 'gifrocket' do
   version '0.1.2'
   sha256 'c5407c9caad8c038f604d35da9a6554dede79611daaf5174116ea9517a704593'
 
diff --git a/Casks/gifzo.rb b/Casks/gifzo.rb
index 84c35b9ce4f3..25c30a874131 100644
--- a/Casks/gifzo.rb
+++ b/Casks/gifzo.rb
@@ -1,4 +1,4 @@
-class Gifzo < Cask
+cask :v1 => 'gifzo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/gimp-lisanet.rb b/Casks/gimp-lisanet.rb
index 3ea7d37cd4ac..a443ff910f85 100644
--- a/Casks/gimp-lisanet.rb
+++ b/Casks/gimp-lisanet.rb
@@ -1,4 +1,4 @@
-class GimpLisanet < Cask
+cask :v1 => 'gimp-lisanet' do
   version '2.8.14p1'
   sha256 '2a755c08e50290b494c26c416b6dda6ad4151610f752216d0db126d479ed787e'
 
diff --git a/Casks/gimp.rb b/Casks/gimp.rb
index 0de68212553d..eeb8bf0938c7 100644
--- a/Casks/gimp.rb
+++ b/Casks/gimp.rb
@@ -1,4 +1,4 @@
-class Gimp < Cask
+cask :v1 => 'gimp' do
   version '2.8.14'
   sha256 'a90fe7001ee4f64d5108cd7b6aad843772aab7f1a7e67018564c620a4374460a'
 
diff --git a/Casks/gingr.rb b/Casks/gingr.rb
index 8a74d4ede004..d988994e357f 100644
--- a/Casks/gingr.rb
+++ b/Casks/gingr.rb
@@ -1,4 +1,4 @@
-class Gingr < Cask
+cask :v1 => 'gingr' do
   version '1.0.1'
   sha256 '29a705836ae11114f4e9aa787c885e1960861cc9119c23afda22ea8618322498'
 
diff --git a/Casks/gisto.rb b/Casks/gisto.rb
index 7c092b3d075f..25458a129a7a 100644
--- a/Casks/gisto.rb
+++ b/Casks/gisto.rb
@@ -1,4 +1,4 @@
-class Gisto < Cask
+cask :v1 => 'gisto' do
   version '0.2.6b'
   sha256 '7dffc22e5274e7ee88194f59a950e26d41fd1463d50785ffaf117ad5dd892840'
 
diff --git a/Casks/git-annex.rb b/Casks/git-annex.rb
index 9fe7f12a0e85..0d530b7767a1 100644
--- a/Casks/git-annex.rb
+++ b/Casks/git-annex.rb
@@ -1,4 +1,4 @@
-class GitAnnex < Cask
+cask :v1 => 'git-annex' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/gitbook.rb b/Casks/gitbook.rb
index dd7e6f82182a..020bcc9095c7 100644
--- a/Casks/gitbook.rb
+++ b/Casks/gitbook.rb
@@ -1,4 +1,4 @@
-class Gitbook < Cask
+cask :v1 => 'gitbook' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/gitbox.rb b/Casks/gitbox.rb
index 1d366cfdc87e..6f354c9156c4 100644
--- a/Casks/gitbox.rb
+++ b/Casks/gitbox.rb
@@ -1,4 +1,4 @@
-class Gitbox < Cask
+cask :v1 => 'gitbox' do
   version '1.6.2'
   sha256 '181ac55515221bf07c9994f25a11e962a9057e4249600b4d95424bcb6bb5c6d7'
 
diff --git a/Casks/github.rb b/Casks/github.rb
index c20cebec08dd..8a8f03bd923c 100644
--- a/Casks/github.rb
+++ b/Casks/github.rb
@@ -1,4 +1,4 @@
-class Github < Cask
+cask :v1 => 'github' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/gitifier.rb b/Casks/gitifier.rb
index 1a525ee895e7..d344c6a73436 100644
--- a/Casks/gitifier.rb
+++ b/Casks/gitifier.rb
@@ -1,4 +1,4 @@
-class Gitifier < Cask
+cask :v1 => 'gitifier' do
   version '1.3'
   sha256 'b199743bdae2305db99d9d3a247f9c8846031d1fbb19201ea81262b25e629d2f'
 
diff --git a/Casks/gitter.rb b/Casks/gitter.rb
index d6e6f055bc4e..e68f61f8e027 100644
--- a/Casks/gitter.rb
+++ b/Casks/gitter.rb
@@ -1,4 +1,4 @@
-class Gitter < Cask
+cask :v1 => 'gitter' do
   version '1.159'
   sha256 'd118559341385e8b0eba1c5c3ff578a3e03914aaf5c4f0c71d5db89e1444b1b6'
 
diff --git a/Casks/gitx-l.rb b/Casks/gitx-l.rb
index 72efc5cfe471..0abe5a1784a1 100644
--- a/Casks/gitx-l.rb
+++ b/Casks/gitx-l.rb
@@ -1,4 +1,4 @@
-class GitxL < Cask
+cask :v1 => 'gitx-l' do
   version '0.8.4'
   sha256 'c5f4088497abf5a219bb7bde4fae643fec61647be25bf836fd679567dcabd7df'
 
diff --git a/Casks/gitx-rowanj.rb b/Casks/gitx-rowanj.rb
index 14c92843f095..68d3ca216ac1 100644
--- a/Casks/gitx-rowanj.rb
+++ b/Casks/gitx-rowanj.rb
@@ -1,4 +1,4 @@
-class GitxRowanj < Cask
+cask :v1 => 'gitx-rowanj' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/gitx.rb b/Casks/gitx.rb
index e0d06230fbc3..30ac243fba40 100644
--- a/Casks/gitx.rb
+++ b/Casks/gitx.rb
@@ -1,4 +1,4 @@
-class Gitx < Cask
+cask :v1 => 'gitx' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/gity.rb b/Casks/gity.rb
index 80edac5d40d2..0301aedcecf3 100644
--- a/Casks/gity.rb
+++ b/Casks/gity.rb
@@ -1,4 +1,4 @@
-class Gity < Cask
+cask :v1 => 'gity' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/glcplayer.rb b/Casks/glcplayer.rb
index 66c776ebc785..2ccab67746f1 100644
--- a/Casks/glcplayer.rb
+++ b/Casks/glcplayer.rb
@@ -1,4 +1,4 @@
-class Glcplayer < Cask
+cask :v1 => 'glcplayer' do
   version '2.3.0'
   sha256 '490d1971f56b5a20f915e01ce9f993b4441e99ea7f12e1107340062de14dc221'
 
diff --git a/Casks/glimmerblocker.rb b/Casks/glimmerblocker.rb
index acd8ce756c50..84c5f9f46922 100644
--- a/Casks/glimmerblocker.rb
+++ b/Casks/glimmerblocker.rb
@@ -1,4 +1,4 @@
-class Glimmerblocker < Cask
+cask :v1 => 'glimmerblocker' do
   version '1.5.3'
   sha256 '872f3edc5f6dc3b92ba17eaf00236308e561bf353ffb1579cc5d7afc27bbf0a5'
 
diff --git a/Casks/glo.rb b/Casks/glo.rb
index d5e16e685f91..afc496667d03 100644
--- a/Casks/glo.rb
+++ b/Casks/glo.rb
@@ -1,4 +1,4 @@
-class Glo < Cask
+cask :v1 => 'glo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/globalsync.rb b/Casks/globalsync.rb
index 632be9196016..9f99ddd316e3 100644
--- a/Casks/globalsync.rb
+++ b/Casks/globalsync.rb
@@ -1,4 +1,4 @@
-class Globalsync < Cask
+cask :v1 => 'globalsync' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/glyphish-color-changer.rb b/Casks/glyphish-color-changer.rb
index 9a88ede44f56..7c33592f1f10 100644
--- a/Casks/glyphish-color-changer.rb
+++ b/Casks/glyphish-color-changer.rb
@@ -1,4 +1,4 @@
-class GlyphishColorChanger < Cask
+cask :v1 => 'glyphish-color-changer' do
   version '1.0-beta.2'
   sha256 '2fe6d7b5b056a67ca69c4f5cf477bc0c9ecf47a8d7aa95eefcb97c0fde0e75d8'
 
diff --git a/Casks/glyphish-gallery.rb b/Casks/glyphish-gallery.rb
index 7db9874855fd..8b0b5bc48145 100644
--- a/Casks/glyphish-gallery.rb
+++ b/Casks/glyphish-gallery.rb
@@ -1,4 +1,4 @@
-class GlyphishGallery < Cask
+cask :v1 => 'glyphish-gallery' do
   version '2.0'
   sha256 'c5f224d44ecf4a853a51105d1fce8b4e3eab099ddc16791ce412a7a679b104a7'
 
diff --git a/Casks/gmail-notifier.rb b/Casks/gmail-notifier.rb
index b1d5aff62ad2..59ee18bf6d88 100644
--- a/Casks/gmail-notifier.rb
+++ b/Casks/gmail-notifier.rb
@@ -1,4 +1,4 @@
-class GmailNotifier < Cask
+cask :v1 => 'gmail-notifier' do
   version '2.0.1'
   sha256 '6d91b6b0e00041cde61a267c484f6f004330a96dfd608a61f7954f5b7abdd66e'
 
diff --git a/Casks/gmail-notifr.rb b/Casks/gmail-notifr.rb
index acf869029b69..2a8d370d0bc2 100644
--- a/Casks/gmail-notifr.rb
+++ b/Casks/gmail-notifr.rb
@@ -1,4 +1,4 @@
-class GmailNotifr < Cask
+cask :v1 => 'gmail-notifr' do
   version '0.9.0'
   sha256 '47ecf1edf08678e6a1c53cb5a3e39d5c6c5f63a9145fc7cbc7df2ebada42b662'
 
diff --git a/Casks/gnucash.rb b/Casks/gnucash.rb
index c026c345e5ba..cb4a8cebde59 100644
--- a/Casks/gnucash.rb
+++ b/Casks/gnucash.rb
@@ -1,4 +1,4 @@
-class Gnucash < Cask
+cask :v1 => 'gnucash' do
   version '2.6.4-5'
   sha256 '8c9701cbc6acf191b682d80c5e2eedd5dc4099ccaacacef3f89cecd967ca8651'
 
diff --git a/Casks/go-agent.rb b/Casks/go-agent.rb
index f0abfbd36956..6a24154447f6 100644
--- a/Casks/go-agent.rb
+++ b/Casks/go-agent.rb
@@ -1,4 +1,4 @@
-class GoAgent < Cask
+cask :v1 => 'go-agent' do
   version '14.2.0-377'
   sha256 'b3886afe748bbba3dccd0f3282af4e1860ca93223a5a70bf22a3b132adeb3701'
 
diff --git a/Casks/go-server.rb b/Casks/go-server.rb
index e56d842daba7..76c7d4b592b5 100644
--- a/Casks/go-server.rb
+++ b/Casks/go-server.rb
@@ -1,4 +1,4 @@
-class GoServer < Cask
+cask :v1 => 'go-server' do
   version '14.2.0-377'
   sha256 '19fd85946f838a647dba5de75aff4a63eb0c03f6b0c2f619e42705936053d493'
 
diff --git a/Casks/goagentx.rb b/Casks/goagentx.rb
index 8c773adc3ca6..392d4921d534 100644
--- a/Casks/goagentx.rb
+++ b/Casks/goagentx.rb
@@ -1,4 +1,4 @@
-class Goagentx < Cask
+cask :v1 => 'goagentx' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/gog-downloader.rb b/Casks/gog-downloader.rb
index 963e08a14941..fc53ea059270 100644
--- a/Casks/gog-downloader.rb
+++ b/Casks/gog-downloader.rb
@@ -1,4 +1,4 @@
-class GogDownloader < Cask
+cask :v1 => 'gog-downloader' do
   version '1.2.512'
   sha256 '353604a2123feacf438c6586b3ec20967dca637b0a97d36203adbc3e1dfdefce'
 
diff --git a/Casks/golly.rb b/Casks/golly.rb
index f7667a894608..0ed464dbc9b3 100644
--- a/Casks/golly.rb
+++ b/Casks/golly.rb
@@ -1,4 +1,4 @@
-class Golly < Cask
+cask :v1 => 'golly' do
   version '2.6'
 
   if MacOS.version < :mavericks
diff --git a/Casks/goodsync.rb b/Casks/goodsync.rb
index e2b815ed4062..aaca14870f01 100644
--- a/Casks/goodsync.rb
+++ b/Casks/goodsync.rb
@@ -1,4 +1,4 @@
-class Goodsync < Cask
+cask :v1 => 'goodsync' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/google-adwords-editor.rb b/Casks/google-adwords-editor.rb
index 3b51d95b2ffc..06f14347d4f5 100644
--- a/Casks/google-adwords-editor.rb
+++ b/Casks/google-adwords-editor.rb
@@ -1,4 +1,4 @@
-class GoogleAdwordsEditor < Cask
+cask :v1 => 'google-adwords-editor' do
   version '10.4.1'
   sha256 '570d606ac6593ac31a82ece928d7b04ad6f0355b0f58382e604be7f922c4c4ba'
 
diff --git a/Casks/google-chrome.rb b/Casks/google-chrome.rb
index 3db111e19875..a6252a3db066 100644
--- a/Casks/google-chrome.rb
+++ b/Casks/google-chrome.rb
@@ -1,4 +1,4 @@
-class GoogleChrome < Cask
+cask :v1 => 'google-chrome' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/google-cloud-sdk.rb b/Casks/google-cloud-sdk.rb
index f3e83cd1d486..94416487f5da 100644
--- a/Casks/google-cloud-sdk.rb
+++ b/Casks/google-cloud-sdk.rb
@@ -1,4 +1,4 @@
-class GoogleCloudSdk < Cask
+cask :v1 => 'google-cloud-sdk' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/google-drive.rb b/Casks/google-drive.rb
index fa29b52dd9c7..6cce16b04b9f 100644
--- a/Casks/google-drive.rb
+++ b/Casks/google-drive.rb
@@ -1,4 +1,4 @@
-class GoogleDrive < Cask
+cask :v1 => 'google-drive' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/google-earth-web-plugin.rb b/Casks/google-earth-web-plugin.rb
index e75e20fafd1c..78ea4a0f8c32 100644
--- a/Casks/google-earth-web-plugin.rb
+++ b/Casks/google-earth-web-plugin.rb
@@ -1,4 +1,4 @@
-class GoogleEarthWebPlugin < Cask
+cask :v1 => 'google-earth-web-plugin' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/google-earth.rb b/Casks/google-earth.rb
index f45d94a373fd..1c51afba9c0a 100644
--- a/Casks/google-earth.rb
+++ b/Casks/google-earth.rb
@@ -1,4 +1,4 @@
-class GoogleEarth < Cask
+cask :v1 => 'google-earth' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/google-hangouts.rb b/Casks/google-hangouts.rb
index fea7f91e541a..b1ddc2eb342f 100644
--- a/Casks/google-hangouts.rb
+++ b/Casks/google-hangouts.rb
@@ -1,4 +1,4 @@
-class GoogleHangouts < Cask
+cask :v1 => 'google-hangouts' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/google-japanese-ime.rb b/Casks/google-japanese-ime.rb
index 4f6ca714637a..161fa1188f81 100644
--- a/Casks/google-japanese-ime.rb
+++ b/Casks/google-japanese-ime.rb
@@ -1,4 +1,4 @@
-class GoogleJapaneseIme < Cask
+cask :v1 => 'google-japanese-ime' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/google-nik-collection.rb b/Casks/google-nik-collection.rb
index 001a1b5ce2ee..3583a0a99376 100644
--- a/Casks/google-nik-collection.rb
+++ b/Casks/google-nik-collection.rb
@@ -1,4 +1,4 @@
-class GoogleNikCollection < Cask
+cask :v1 => 'google-nik-collection' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/google-notifier.rb b/Casks/google-notifier.rb
index a63af91ce494..8dc3c2ffcf7e 100644
--- a/Casks/google-notifier.rb
+++ b/Casks/google-notifier.rb
@@ -1,4 +1,4 @@
-class GoogleNotifier < Cask
+cask :v1 => 'google-notifier' do
   version '1.10.7'
   sha256 '055775cb02773e4ec0e133111c7720134d32bb8d3a1f747231dc0c7d4078f5f7'
 
diff --git a/Casks/google-plus-auto-backup.rb b/Casks/google-plus-auto-backup.rb
index ff9b1c049a9e..e3af3cee9902 100644
--- a/Casks/google-plus-auto-backup.rb
+++ b/Casks/google-plus-auto-backup.rb
@@ -1,4 +1,4 @@
-class GooglePlusAutoBackup < Cask
+cask :v1 => 'google-plus-auto-backup' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/google-refine.rb b/Casks/google-refine.rb
index 43a13f3c0592..3c74e996792f 100644
--- a/Casks/google-refine.rb
+++ b/Casks/google-refine.rb
@@ -1,4 +1,4 @@
-class GoogleRefine < Cask
+cask :v1 => 'google-refine' do
   version '2.5-r2407'
   sha256 '16454020c402fa0ab0fedfff44b63e8f027194723ae6ade9b5bb5b9223c68fcc'
 
diff --git a/Casks/google-web-designer.rb b/Casks/google-web-designer.rb
index f2c02d7cb915..697824134de7 100644
--- a/Casks/google-web-designer.rb
+++ b/Casks/google-web-designer.rb
@@ -1,4 +1,4 @@
-class GoogleWebDesigner < Cask
+cask :v1 => 'google-web-designer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/googleappenginelauncher.rb b/Casks/googleappenginelauncher.rb
index 2d8da75b4cbb..b189dc5150fa 100644
--- a/Casks/googleappenginelauncher.rb
+++ b/Casks/googleappenginelauncher.rb
@@ -1,4 +1,4 @@
-class Googleappenginelauncher < Cask
+cask :v1 => 'googleappenginelauncher' do
   version '1.9.15'
   sha256 '0f11d2411ee245e9bd99323672fc967c2eb796f8baa42d48554b59696b64c362'
 
diff --git a/Casks/gopanda.rb b/Casks/gopanda.rb
index fd052920774b..38a8a396f853 100644
--- a/Casks/gopanda.rb
+++ b/Casks/gopanda.rb
@@ -1,4 +1,4 @@
-class Gopanda < Cask
+cask :v1 => 'gopanda' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/gopro-studio.rb b/Casks/gopro-studio.rb
index d88097822cdc..eadcd89503c0 100644
--- a/Casks/gopro-studio.rb
+++ b/Casks/gopro-studio.rb
@@ -1,4 +1,4 @@
-class GoproStudio < Cask
+cask :v1 => 'gopro-studio' do
   version '2.5.3.460'
   sha256 '870ede8a7f446caaf34690dcb623b2d3b193449575517339dca4ff81f07e2f9a'
 
diff --git a/Casks/gpgtools.rb b/Casks/gpgtools.rb
index 67157dca7a2d..8c0d1a0f392c 100644
--- a/Casks/gpgtools.rb
+++ b/Casks/gpgtools.rb
@@ -1,4 +1,4 @@
-class Gpgtools < Cask
+cask :v1 => 'gpgtools' do
   version '2013.10.22'
   sha256 'd37ccf01e5ddd07dd84b76574e99b605ca9ead89cb0c6c126f4045e271eb3841'
 
diff --git a/Casks/gpower.rb b/Casks/gpower.rb
index 56862a8744b1..03816e8b4636 100644
--- a/Casks/gpower.rb
+++ b/Casks/gpower.rb
@@ -1,4 +1,4 @@
-class Gpower < Cask
+cask :v1 => 'gpower' do
   version '3.1.9.2'
   sha256 'ee4eb27493959fc6614b6061829c6b7d2aee9edf0fe0c1bf3d143ee2fa74c3e6'
 
diff --git a/Casks/gqrx.rb b/Casks/gqrx.rb
index bfa270bb5f17..564f07e2d77f 100644
--- a/Casks/gqrx.rb
+++ b/Casks/gqrx.rb
@@ -1,4 +1,4 @@
-class Gqrx < Cask
+cask :v1 => 'gqrx' do
   version '2.2.0'
   sha256 'b4d81d542ea095bb882d465461d33f75ace2fca8806f8074464e9a586314ed07'
 
diff --git a/Casks/grabbox.rb b/Casks/grabbox.rb
index bdf85d84d167..866e9b32fcda 100644
--- a/Casks/grabbox.rb
+++ b/Casks/grabbox.rb
@@ -1,4 +1,4 @@
-class Grabbox < Cask
+cask :v1 => 'grabbox' do
   version '0.4.2'
   sha256 'e6f92efce8585b58d1b5d9afc4a2187e07bf76c14961aff1b83a8422fb342f2f'
 
diff --git a/Casks/grafx2.rb b/Casks/grafx2.rb
index d02aa552eb26..5bdc41e59523 100644
--- a/Casks/grafx2.rb
+++ b/Casks/grafx2.rb
@@ -1,4 +1,4 @@
-class Grafx2 < Cask
+cask :v1 => 'grafx2' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/grandperspective.rb b/Casks/grandperspective.rb
index c99f34d8771c..ac21c3b8ebe1 100644
--- a/Casks/grandperspective.rb
+++ b/Casks/grandperspective.rb
@@ -1,4 +1,4 @@
-class Grandperspective < Cask
+cask :v1 => 'grandperspective' do
   version '1.5.1'
   sha256 '92204458042a337c1091879e167ea95e45cae33a7be16fa6c11e80572c54d135'
 
diff --git a/Casks/grandtotal.rb b/Casks/grandtotal.rb
index d81a5695c9ad..11d4bf87f05f 100644
--- a/Casks/grandtotal.rb
+++ b/Casks/grandtotal.rb
@@ -1,4 +1,4 @@
-class Grandtotal < Cask
+cask :v1 => 'grandtotal' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/graphicconverter.rb b/Casks/graphicconverter.rb
index 6bccf5406348..7cf0af24c3df 100644
--- a/Casks/graphicconverter.rb
+++ b/Casks/graphicconverter.rb
@@ -1,4 +1,4 @@
-class Graphicconverter < Cask
+cask :v1 => 'graphicconverter' do
   version '9.4'
   sha256 'bd3d837e4c3366131fa4c87ad186995ac40c48157c21df1c31aa94a4a57ee06c'
 
diff --git a/Casks/graphsketcher.rb b/Casks/graphsketcher.rb
index 15e62715b03b..1684d9235e5c 100644
--- a/Casks/graphsketcher.rb
+++ b/Casks/graphsketcher.rb
@@ -1,4 +1,4 @@
-class Graphsketcher < Cask
+cask :v1 => 'graphsketcher' do
   version 'v2.0_test_46'
   sha256 '34fe6fc319b2fcfe0bf51e02bc05d020b2867ff1ee20587becb60d7e67309be6'
 
diff --git a/Casks/graphviz.rb b/Casks/graphviz.rb
index 49b5494ff617..b7da99e7064d 100644
--- a/Casks/graphviz.rb
+++ b/Casks/graphviz.rb
@@ -1,4 +1,4 @@
-class Graphviz < Cask
+cask :v1 => 'graphviz' do
   version '2.36.0'
   sha256 '6b84c663b29ac7b3e96de709f80159ffc060eeaea71a80c1b199f3dc1fe5a9e6'
 
diff --git a/Casks/gravit.rb b/Casks/gravit.rb
index f3201d0dcd34..3aab7068cb64 100644
--- a/Casks/gravit.rb
+++ b/Casks/gravit.rb
@@ -1,4 +1,4 @@
-class Gravit < Cask
+cask :v1 => 'gravit' do
   version 'v1.0-rc1'
   sha256 'bb267504f87d39aaf2b654d33cc0b48ccb4c74a72f8b88dd9d78ced1a984f265'
 
diff --git a/Casks/gridwars.rb b/Casks/gridwars.rb
index 48ba784fca83..d772c492bfb9 100644
--- a/Casks/gridwars.rb
+++ b/Casks/gridwars.rb
@@ -1,4 +1,4 @@
-class Gridwars < Cask
+cask :v1 => 'gridwars' do
   version '9.3.2006'
   sha256 '39694d6d7f7af1a25818d10dbd811d0309562622f91f43f71d8b217bccdb03fb'
 
diff --git a/Casks/grooveshark.rb b/Casks/grooveshark.rb
index c8fbf19a3eda..7de43f728fa8 100644
--- a/Casks/grooveshark.rb
+++ b/Casks/grooveshark.rb
@@ -1,4 +1,4 @@
-class Grooveshark < Cask
+cask :v1 => 'grooveshark' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/groovesquid.rb b/Casks/groovesquid.rb
index 93a07cbd3ffc..6fc652632a4c 100644
--- a/Casks/groovesquid.rb
+++ b/Casks/groovesquid.rb
@@ -1,4 +1,4 @@
-class Groovesquid < Cask
+cask :v1 => 'groovesquid' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/growl-fork.rb b/Casks/growl-fork.rb
index a72e3bf028bf..fc5eec655b17 100644
--- a/Casks/growl-fork.rb
+++ b/Casks/growl-fork.rb
@@ -1,4 +1,4 @@
-class GrowlFork < Cask
+cask :v1 => 'growl-fork' do
   version '1.2.2f1'
   sha256 'b57085eed9bafcafa75bdc2a4a482c77d33ebf2f1d9994bf5ff5a997c3958bcc'
 
diff --git a/Casks/growler.rb b/Casks/growler.rb
index d3b2f760c791..7929457387a5 100644
--- a/Casks/growler.rb
+++ b/Casks/growler.rb
@@ -1,4 +1,4 @@
-class Growler < Cask
+cask :v1 => 'growler' do
   version '3.1'
   sha256 '5de013f7447e4c7f712951035994e759b9168525ee52b1f2e77f04b664bbf1b4'
 
diff --git a/Casks/growlnotify.rb b/Casks/growlnotify.rb
index 796a85bfe709..5d918e5da7ea 100644
--- a/Casks/growlnotify.rb
+++ b/Casks/growlnotify.rb
@@ -1,4 +1,4 @@
-class Growlnotify < Cask
+cask :v1 => 'growlnotify' do
   version '2.1'
   sha256 'eec601488b19c9e9b9cb7f0081638436518bce782d079f6e43ddc195727c04ca'
 
diff --git a/Casks/growlvoice.rb b/Casks/growlvoice.rb
index bd7727ea53be..b70753267255 100644
--- a/Casks/growlvoice.rb
+++ b/Casks/growlvoice.rb
@@ -1,4 +1,4 @@
-class Growlvoice < Cask
+cask :v1 => 'growlvoice' do
   version '2.0.3'
   sha256 '6c9e15b83894746e2bf9488228e95eb2f47520b1fdac728da52d16532e2ee979'
 
diff --git a/Casks/guitar-tuner.rb b/Casks/guitar-tuner.rb
index c25e99c8dba4..8991fb88f22e 100644
--- a/Casks/guitar-tuner.rb
+++ b/Casks/guitar-tuner.rb
@@ -1,4 +1,4 @@
-class GuitarTuner < Cask
+cask :v1 => 'guitar-tuner' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/gulp.rb b/Casks/gulp.rb
index d752518a7acb..b252016e1e07 100644
--- a/Casks/gulp.rb
+++ b/Casks/gulp.rb
@@ -1,4 +1,4 @@
-class Gulp < Cask
+cask :v1 => 'gulp' do
   version '0.1.0'
   sha256 '59fed5d8c801c9302debf463f2d274404548e23433c965144e69a0b4a2e23851'
 
diff --git a/Casks/gurps-character-sheet.rb b/Casks/gurps-character-sheet.rb
index ff4051211ecd..0d6d4a9825c6 100644
--- a/Casks/gurps-character-sheet.rb
+++ b/Casks/gurps-character-sheet.rb
@@ -1,4 +1,4 @@
-class GurpsCharacterSheet < Cask
+cask :v1 => 'gurps-character-sheet' do
   version '4.0.1'
   sha256 'ddff9b883b29be7dce0798cfedfe48c54d02a2adb16dc1e60cbcaa37d2ef902e'
 
diff --git a/Casks/gyazo.rb b/Casks/gyazo.rb
index 1851fbe37483..f07afee3bf7a 100644
--- a/Casks/gyazo.rb
+++ b/Casks/gyazo.rb
@@ -1,4 +1,4 @@
-class Gyazo < Cask
+cask :v1 => 'gyazo' do
   version '2.0'
   sha256 '41242a421ee0c2b467ac0ff7fa1baa895c824e940bc5aee92a4ec2bf8e204eb3'
 
diff --git a/Casks/hall.rb b/Casks/hall.rb
index 5aaee5bb03d6..df7d3f47fbb9 100644
--- a/Casks/hall.rb
+++ b/Casks/hall.rb
@@ -1,4 +1,4 @@
-class Hall < Cask
+cask :v1 => 'hall' do
   version '1.0.5'
   sha256 '70e8db2d6f8336d656ad5faa34125ecd76ed2b5322e654180fb9459dbcfa1aec'
 
diff --git a/Casks/hammerspoon.rb b/Casks/hammerspoon.rb
index f16d61125ba2..9156a3e69822 100644
--- a/Casks/hammerspoon.rb
+++ b/Casks/hammerspoon.rb
@@ -1,4 +1,4 @@
-class Hammerspoon < Cask
+cask :v1 => 'hammerspoon' do
   version '0.9.10'
   sha256 '671ef52625bfc885915d98523dee77a75fdfafa5194eedba5c78e07f0e7fe3b9'
 
diff --git a/Casks/handbrake.rb b/Casks/handbrake.rb
index 526f61b683c4..b882903ce381 100644
--- a/Casks/handbrake.rb
+++ b/Casks/handbrake.rb
@@ -1,4 +1,4 @@
-class Handbrake < Cask
+cask :v1 => 'handbrake' do
   version '0.9.9'
   sha256 '050f9d0d3a126b25d24cb4971062d66f4f975317b6586f8c288795c17a0c05f9'
 
diff --git a/Casks/handbrakebatch.rb b/Casks/handbrakebatch.rb
index f5af231fa3bc..39881dcf33c0 100644
--- a/Casks/handbrakebatch.rb
+++ b/Casks/handbrakebatch.rb
@@ -1,4 +1,4 @@
-class Handbrakebatch < Cask
+cask :v1 => 'handbrakebatch' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/handbrakecli.rb b/Casks/handbrakecli.rb
index 8e69bb241d03..b727f92080c4 100644
--- a/Casks/handbrakecli.rb
+++ b/Casks/handbrakecli.rb
@@ -1,4 +1,4 @@
-class Handbrakecli < Cask
+cask :v1 => 'handbrakecli' do
   version '0.9.9'
   sha256 '120d7d0a9af5d15813d05781cbbf2599e454b4400f0266db4fa1acd4f62d244e'
 
diff --git a/Casks/hands-off.rb b/Casks/hands-off.rb
index a1373e3bc020..9aa859fb341f 100644
--- a/Casks/hands-off.rb
+++ b/Casks/hands-off.rb
@@ -1,4 +1,4 @@
-class HandsOff < Cask
+cask :v1 => 'hands-off' do
   version '2.2.0'
   sha256 'c64e24aaa347bc392f711840a77153d02f59876a5c1fb5969d1145de9760d154'
 
diff --git a/Casks/happygrep.rb b/Casks/happygrep.rb
index af0f392f98ae..9e0afd3f85f8 100644
--- a/Casks/happygrep.rb
+++ b/Casks/happygrep.rb
@@ -1,4 +1,4 @@
-class Happygrep < Cask
+cask :v1 => 'happygrep' do
   version '1.0'
   sha256 '05c5f33142c9ea4559b20ca421c76fa0b081ae3edc0d6e3b8f7c3dd8ba21a518'
 
diff --git a/Casks/haroopad.rb b/Casks/haroopad.rb
index ef7a613981c6..54e1d58e13c0 100644
--- a/Casks/haroopad.rb
+++ b/Casks/haroopad.rb
@@ -1,4 +1,4 @@
-class Haroopad < Cask
+cask :v1 => 'haroopad' do
   version '0.12.2'
   sha256 'f8fe84ec70090c7517b4ef9f8c2896a4dedb9774d0a87800fdd98f706a64929b'
 
diff --git a/Casks/harvest.rb b/Casks/harvest.rb
index 6f2d0667ce58..2e32de802616 100644
--- a/Casks/harvest.rb
+++ b/Casks/harvest.rb
@@ -1,4 +1,4 @@
-class Harvest < Cask
+cask :v1 => 'harvest' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hashcat.rb b/Casks/hashcat.rb
index 2ded445ed3aa..40042f58dc16 100644
--- a/Casks/hashcat.rb
+++ b/Casks/hashcat.rb
@@ -1,4 +1,4 @@
-class Hashcat < Cask
+cask :v1 => 'hashcat' do
   version '0.48'
   sha256 '39fee1757b33b3e7232ce3797f0be024fa784dbbd0939b475b5b1ea7462cec5e'
 
diff --git a/Casks/haskell-platform.rb b/Casks/haskell-platform.rb
index 4c7ca5109a41..cb5893220b0b 100644
--- a/Casks/haskell-platform.rb
+++ b/Casks/haskell-platform.rb
@@ -1,4 +1,4 @@
-class HaskellPlatform < Cask
+cask :v1 => 'haskell-platform' do
   version '2014.2.0.0'
   sha256 '62f39246ad95dd2aed6ece5138f6297f945d2b450f215d074820294310e0c48a'
 
diff --git a/Casks/hazel.rb b/Casks/hazel.rb
index 665764486344..a1a5d82035c9 100644
--- a/Casks/hazel.rb
+++ b/Casks/hazel.rb
@@ -1,4 +1,4 @@
-class Hazel < Cask
+cask :v1 => 'hazel' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hbuilder.rb b/Casks/hbuilder.rb
index 7c34e75b486b..87a48f076d78 100644
--- a/Casks/hbuilder.rb
+++ b/Casks/hbuilder.rb
@@ -1,4 +1,4 @@
-class Hbuilder < Cask
+cask :v1 => 'hbuilder' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hear.rb b/Casks/hear.rb
index cf7d6242bd32..24595b02778f 100644
--- a/Casks/hear.rb
+++ b/Casks/hear.rb
@@ -1,4 +1,4 @@
-class Hear < Cask
+cask :v1 => 'hear' do
   version '1.1.6'
   sha256 'e7b5e5782020be407f456e59167770b07afc97afb0f1f7e9d226c00c524b106b'
 
diff --git a/Casks/heart.rb b/Casks/heart.rb
index 9db06385c7b6..a757a9c72c58 100644
--- a/Casks/heart.rb
+++ b/Casks/heart.rb
@@ -1,4 +1,4 @@
-class Heart < Cask
+cask :v1 => 'heart' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hedgewars.rb b/Casks/hedgewars.rb
index 7585a956f673..4f2e0f63b465 100644
--- a/Casks/hedgewars.rb
+++ b/Casks/hedgewars.rb
@@ -1,4 +1,4 @@
-class Hedgewars < Cask
+cask :v1 => 'hedgewars' do
   version '0.9.20'
   sha256 '167667f32f4798733b7bfd50423493067e6a9fd19f02f45e737b324038f0d559'
 
diff --git a/Casks/hermes.rb b/Casks/hermes.rb
index a7d5a5e9e42b..a7a3d1cb3070 100644
--- a/Casks/hermes.rb
+++ b/Casks/hermes.rb
@@ -1,4 +1,4 @@
-class Hermes < Cask
+cask :v1 => 'hermes' do
   version '1.2.2'
   sha256 'f03963ce4fdb8461c269882080beebc56101158bce13e13d3f1adce8b20fd5d2'
 
diff --git a/Casks/heroku-toolbelt.rb b/Casks/heroku-toolbelt.rb
index 16c6242bca2c..1d16d913f949 100644
--- a/Casks/heroku-toolbelt.rb
+++ b/Casks/heroku-toolbelt.rb
@@ -1,4 +1,4 @@
-class HerokuToolbelt < Cask
+cask :v1 => 'heroku-toolbelt' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hex-fiend.rb b/Casks/hex-fiend.rb
index 0578b210dbd6..c0de71589312 100644
--- a/Casks/hex-fiend.rb
+++ b/Casks/hex-fiend.rb
@@ -1,4 +1,4 @@
-class HexFiend < Cask
+cask :v1 => 'hex-fiend' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hex.rb b/Casks/hex.rb
index 5daa27682344..89f4ed923b55 100644
--- a/Casks/hex.rb
+++ b/Casks/hex.rb
@@ -1,4 +1,4 @@
-class Hex < Cask
+cask :v1 => 'hex' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hexchat.rb b/Casks/hexchat.rb
index af5cd9f3d659..1dd662d24227 100644
--- a/Casks/hexchat.rb
+++ b/Casks/hexchat.rb
@@ -1,4 +1,4 @@
-class Hexchat < Cask
+cask :v1 => 'hexchat' do
   version '2.10.0'
   sha256 'b23f36027d81c6b1152e9ad32793e5466df33dafb5bce508d1391c6de82c156d'
 
diff --git a/Casks/hexels.rb b/Casks/hexels.rb
index a87aa5b557bb..7676eeb92c2d 100644
--- a/Casks/hexels.rb
+++ b/Casks/hexels.rb
@@ -1,4 +1,4 @@
-class Hexels < Cask
+cask :v1 => 'hexels' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hipchat.rb b/Casks/hipchat.rb
index bac780d6b267..f737117c7449 100644
--- a/Casks/hipchat.rb
+++ b/Casks/hipchat.rb
@@ -1,4 +1,4 @@
-class Hipchat < Cask
+cask :v1 => 'hipchat' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hippoconnect.rb b/Casks/hippoconnect.rb
index 4e298f3170a6..5df0e17d5442 100644
--- a/Casks/hippoconnect.rb
+++ b/Casks/hippoconnect.rb
@@ -1,4 +1,4 @@
-class Hippoconnect < Cask
+cask :v1 => 'hippoconnect' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hiss.rb b/Casks/hiss.rb
index df97c0a217bd..baaf1ed5f6ca 100644
--- a/Casks/hiss.rb
+++ b/Casks/hiss.rb
@@ -1,4 +1,4 @@
-class Hiss < Cask
+cask :v1 => 'hiss' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/historyhound.rb b/Casks/historyhound.rb
index 4f9d63df614e..c33a812e132a 100644
--- a/Casks/historyhound.rb
+++ b/Casks/historyhound.rb
@@ -1,4 +1,4 @@
-class Historyhound < Cask
+cask :v1 => 'historyhound' do
   version '1.9.9'
   sha256 '3b0873d2425115680c347d5e4be607e9232781e1711aec58ef76e07a07847ad3'
 
diff --git a/Casks/hive.rb b/Casks/hive.rb
index 26fa9bfde399..5f84f1c64e39 100644
--- a/Casks/hive.rb
+++ b/Casks/hive.rb
@@ -1,4 +1,4 @@
-class Hive < Cask
+cask :v1 => 'hive' do
   version '1.3.4'
   sha256 'bbf99210f9d359d1f75482abebd24eb7cb3103d437c47a0dbf107f4bf9dcd97b'
 
diff --git a/Casks/hockeyapp.rb b/Casks/hockeyapp.rb
index f01d2d3f94ab..d7ac170a2ea1 100644
--- a/Casks/hockeyapp.rb
+++ b/Casks/hockeyapp.rb
@@ -1,4 +1,4 @@
-class Hockeyapp < Cask
+cask :v1 => 'hockeyapp' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/homestream.rb b/Casks/homestream.rb
index 00743ef3f910..ac66c80afd8c 100644
--- a/Casks/homestream.rb
+++ b/Casks/homestream.rb
@@ -1,4 +1,4 @@
-class Homestream < Cask
+cask :v1 => 'homestream' do
   version '1.1'
   sha256 '193dd9fb3488dfb754057b9c216e09fe2f0528b20a95bbe9b7d5f4b0556a4e2b'
 
diff --git a/Casks/honer.rb b/Casks/honer.rb
index 9306fc0b80e3..efb3f3ecfebf 100644
--- a/Casks/honer.rb
+++ b/Casks/honer.rb
@@ -1,4 +1,4 @@
-class Honer < Cask
+cask :v1 => 'honer' do
   version '1.0'
   sha256 'bae10bea6875dbc5c948fb2e86b168c15ee3738d485bd7ab2a9758e64812c531'
 
diff --git a/Casks/hopper-disassembler.rb b/Casks/hopper-disassembler.rb
index 7c85228d72f3..c57e2d710524 100644
--- a/Casks/hopper-disassembler.rb
+++ b/Casks/hopper-disassembler.rb
@@ -1,4 +1,4 @@
-class HopperDisassembler < Cask
+cask :v1 => 'hopper-disassembler' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hoppergdbserver.rb b/Casks/hoppergdbserver.rb
index 415a89cb7014..279aa670135c 100644
--- a/Casks/hoppergdbserver.rb
+++ b/Casks/hoppergdbserver.rb
@@ -1,4 +1,4 @@
-class Hoppergdbserver < Cask
+cask :v1 => 'hoppergdbserver' do
   version '1.6'
   sha256 '124ea3e34f970f412de28de0e482edf527e064efdb954b3804aab248edc3c017'
 
diff --git a/Casks/horndis.rb b/Casks/horndis.rb
index 9e1b9c4a5761..d022ada7e04a 100644
--- a/Casks/horndis.rb
+++ b/Casks/horndis.rb
@@ -1,4 +1,4 @@
-class Horndis < Cask
+cask :v1 => 'horndis' do
   version '7'
   sha256 '6e12e75a07ed729986cc0d7a25faa1aa1171c2e4a8ddf3ccf819a35a20c6e98d'
 
diff --git a/Casks/hostbuddy.rb b/Casks/hostbuddy.rb
index 441c5295e401..0f198317a21a 100644
--- a/Casks/hostbuddy.rb
+++ b/Casks/hostbuddy.rb
@@ -1,4 +1,4 @@
-class Hostbuddy < Cask
+cask :v1 => 'hostbuddy' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hoster.rb b/Casks/hoster.rb
index 1132c9aade60..f8aa24c66572 100644
--- a/Casks/hoster.rb
+++ b/Casks/hoster.rb
@@ -1,4 +1,4 @@
-class Hoster < Cask
+cask :v1 => 'hoster' do
   version '1.2'
   sha256 'aad3404d5127bd3299e57ecf152c911776bf47bea877be56c4a9cefbc0cbf095'
 
diff --git a/Casks/hosts.rb b/Casks/hosts.rb
index cd0ffdcd3ba1..93c2cbd92472 100644
--- a/Casks/hosts.rb
+++ b/Casks/hosts.rb
@@ -1,4 +1,4 @@
-class Hosts < Cask
+cask :v1 => 'hosts' do
   version '1.3'
   sha256 '70a73c0fb9f8d9f60f2bc24e549ae2bb6fefa27f59e81d3edf64daccfd6d0ab0'
 
diff --git a/Casks/houdahgeo.rb b/Casks/houdahgeo.rb
index 38115d09ce54..fc02616c72d2 100644
--- a/Casks/houdahgeo.rb
+++ b/Casks/houdahgeo.rb
@@ -1,4 +1,4 @@
-class Houdahgeo < Cask
+cask :v1 => 'houdahgeo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/houdahspot.rb b/Casks/houdahspot.rb
index 7f2cd3715939..e94d9c696a6d 100644
--- a/Casks/houdahspot.rb
+++ b/Casks/houdahspot.rb
@@ -1,4 +1,4 @@
-class Houdahspot < Cask
+cask :v1 => 'houdahspot' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hpuload.rb b/Casks/hpuload.rb
index 5fed39818c0f..ba9bd35db61f 100644
--- a/Casks/hpuload.rb
+++ b/Casks/hpuload.rb
@@ -1,4 +1,4 @@
-class Hpuload < Cask
+cask :v1 => 'hpuload' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hr.rb b/Casks/hr.rb
index 2369f7bab248..f24d6f7b9bdc 100644
--- a/Casks/hr.rb
+++ b/Casks/hr.rb
@@ -1,4 +1,4 @@
-class Hr < Cask
+cask :v1 => 'hr' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hsang.rb b/Casks/hsang.rb
index c91ac2954c61..87b5884ae3d9 100644
--- a/Casks/hsang.rb
+++ b/Casks/hsang.rb
@@ -1,4 +1,4 @@
-class Hsang < Cask
+cask :v1 => 'hsang' do
   version '1.2.3'
   sha256 '4ccbbfaeb0a0afe1570e6bc515b519b6b40a9b790678c81e44d38d6aa1421fa1'
 
diff --git a/Casks/httpscoop.rb b/Casks/httpscoop.rb
index 704dcc8945c5..6824ba226c4d 100644
--- a/Casks/httpscoop.rb
+++ b/Casks/httpscoop.rb
@@ -1,4 +1,4 @@
-class Httpscoop < Cask
+cask :v1 => 'httpscoop' do
   version '1.4.3'
   sha256 'cf3d9767a86e996ecbb3c7abe7e1b43eef985d6125bb3c6680f9246e4db9214e'
 
diff --git a/Casks/hubic.rb b/Casks/hubic.rb
index 19a44f04e560..fa1e0f20a653 100644
--- a/Casks/hubic.rb
+++ b/Casks/hubic.rb
@@ -1,4 +1,4 @@
-class Hubic < Cask
+cask :v1 => 'hubic' do
   version '0.2.5'
   sha256 '14a354a3029361b9f0c6560a6d702ce34e685da08361869bead7f87ec09a51df'
 
diff --git a/Casks/hugin.rb b/Casks/hugin.rb
index 88b5300cb0d7..b4237ab41b54 100644
--- a/Casks/hugin.rb
+++ b/Casks/hugin.rb
@@ -1,4 +1,4 @@
-class Hugin < Cask
+cask :v1 => 'hugin' do
   version '2013.0.0'
   sha256 '528cc2249d4cdf9267e85ab836ff36cc0e2450de6663661adfc5e2cc3ef1ec60'
 
diff --git a/Casks/hunt-x.rb b/Casks/hunt-x.rb
index 1b55654acfde..d861b3e56ef4 100644
--- a/Casks/hunt-x.rb
+++ b/Casks/hunt-x.rb
@@ -1,4 +1,4 @@
-class HuntX < Cask
+cask :v1 => 'hunt-x' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hush.rb b/Casks/hush.rb
index f39bd3ee2f62..76a806e99549 100644
--- a/Casks/hush.rb
+++ b/Casks/hush.rb
@@ -1,4 +1,4 @@
-class Hush < Cask
+cask :v1 => 'hush' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hype.rb b/Casks/hype.rb
index f33667b93355..abd18ec71429 100644
--- a/Casks/hype.rb
+++ b/Casks/hype.rb
@@ -1,4 +1,4 @@
-class Hype < Cask
+cask :v1 => 'hype' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hyperdither.rb b/Casks/hyperdither.rb
index f5e52856a434..a5078edffe84 100644
--- a/Casks/hyperdither.rb
+++ b/Casks/hyperdither.rb
@@ -1,4 +1,4 @@
-class Hyperdither < Cask
+cask :v1 => 'hyperdither' do
   version '1.3'
   sha256 'd91952bff7faf69255c03896a26c907fca256bbad4d1444a05b75b2ebdf10785'
 
diff --git a/Casks/hyperdock.rb b/Casks/hyperdock.rb
index d8fd94186eba..640096ae6242 100644
--- a/Casks/hyperdock.rb
+++ b/Casks/hyperdock.rb
@@ -1,4 +1,4 @@
-class Hyperdock < Cask
+cask :v1 => 'hyperdock' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hyperswitch.rb b/Casks/hyperswitch.rb
index f049f4b71559..53637583b401 100644
--- a/Casks/hyperswitch.rb
+++ b/Casks/hyperswitch.rb
@@ -1,4 +1,4 @@
-class Hyperswitch < Cask
+cask :v1 => 'hyperswitch' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/hyro.rb b/Casks/hyro.rb
index 41a94de9cebb..2d592cd6004d 100644
--- a/Casks/hyro.rb
+++ b/Casks/hyro.rb
@@ -1,4 +1,4 @@
-class Hyro < Cask
+cask :v1 => 'hyro' do
   version '0.0.3'
   sha256 '2a1fed542c0e9ecc148ac0e7241adf774762f06fc6bfbbf8b2e96437a4c915f7'
 
diff --git a/Casks/iannix.rb b/Casks/iannix.rb
index 04fbd85c6250..143860eae61f 100644
--- a/Casks/iannix.rb
+++ b/Casks/iannix.rb
@@ -1,4 +1,4 @@
-class Iannix < Cask
+cask :v1 => 'iannix' do
   version '0.9.16'
   sha256 'b45d332fc450342ad9a5b73fedcd554c299d435f989f0fe099522554434d00de'
 
diff --git a/Casks/ibabel.rb b/Casks/ibabel.rb
index 5ee7e54a9601..07dc9194450c 100644
--- a/Casks/ibabel.rb
+++ b/Casks/ibabel.rb
@@ -1,4 +1,4 @@
-class Ibabel < Cask
+cask :v1 => 'ibabel' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ibackup.rb b/Casks/ibackup.rb
index bd5d24d01729..f231539fc5b1 100644
--- a/Casks/ibackup.rb
+++ b/Casks/ibackup.rb
@@ -1,4 +1,4 @@
-class Ibackup < Cask
+cask :v1 => 'ibackup' do
   version '7.5'
   sha256 'faa69e95f62dfeb04a6ede20e7b856d43645f1bd07aede743c5d364d2845aabf'
 
diff --git a/Casks/ibank.rb b/Casks/ibank.rb
index ec7bb4d7d4ff..43982a16fce0 100644
--- a/Casks/ibank.rb
+++ b/Casks/ibank.rb
@@ -1,4 +1,4 @@
-class Ibank < Cask
+cask :v1 => 'ibank' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ibettercharge.rb b/Casks/ibettercharge.rb
index 327bd4f1f928..e7d22a02837c 100644
--- a/Casks/ibettercharge.rb
+++ b/Casks/ibettercharge.rb
@@ -1,4 +1,4 @@
-class Ibettercharge < Cask
+cask :v1 => 'ibettercharge' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/iboostup.rb b/Casks/iboostup.rb
index 9f547c17e738..59ebf8bcd5bf 100644
--- a/Casks/iboostup.rb
+++ b/Casks/iboostup.rb
@@ -1,4 +1,4 @@
-class Iboostup < Cask
+cask :v1 => 'iboostup' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ibored.rb b/Casks/ibored.rb
index 6251bb19e8b3..2ddd5e2d51f4 100644
--- a/Casks/ibored.rb
+++ b/Casks/ibored.rb
@@ -1,4 +1,4 @@
-class Ibored < Cask
+cask :v1 => 'ibored' do
   version '1.1.19'
   sha256 'c507817d3b286f831e2ebb08e24b21e2183d166e3ef5e513f631b3f01bf6f495'
 
diff --git a/Casks/ibrowse.rb b/Casks/ibrowse.rb
index 05eff733d745..f9d2a4a8d093 100644
--- a/Casks/ibrowse.rb
+++ b/Casks/ibrowse.rb
@@ -1,4 +1,4 @@
-class Ibrowse < Cask
+cask :v1 => 'ibrowse' do
   version '1.0.0.5'
   sha256 'c3cae297d676e64c3d21638c21583f7c30a8fdbe6a4e127adb0857bafcd8037d'
 
diff --git a/Casks/icefloor.rb b/Casks/icefloor.rb
index 647f08b52641..a186a03c93b8 100644
--- a/Casks/icefloor.rb
+++ b/Casks/icefloor.rb
@@ -1,4 +1,4 @@
-class Icefloor < Cask
+cask :v1 => 'icefloor' do
   version '2.0.2'
   sha256 'b326bab20c022c12be9ed01c3aa0e5f072853ce7dc5fb756bddebc2c3abddf64'
 
diff --git a/Casks/ichm.rb b/Casks/ichm.rb
index 19c1adfe5a0a..88e982aa9665 100644
--- a/Casks/ichm.rb
+++ b/Casks/ichm.rb
@@ -1,4 +1,4 @@
-class Ichm < Cask
+cask :v1 => 'ichm' do
   version '1.4.3'
   sha256 '2a00ab7fdfedd1dfea6a7a290af2eb791072812199e6d98cfdcafb9fd83e9697'
 
diff --git a/Casks/icolors.rb b/Casks/icolors.rb
index 773c9f98333d..b96024b5521f 100644
--- a/Casks/icolors.rb
+++ b/Casks/icolors.rb
@@ -1,4 +1,4 @@
-class Icolors < Cask
+cask :v1 => 'icolors' do
   version '3.0'
   sha256 '92fab479c7916ee7c52efcc457d8d120acc555a05825b01ebca047f017c097b9'
 
diff --git a/Casks/icompta.rb b/Casks/icompta.rb
index 38c2e9e1966e..6c62bc58e89c 100644
--- a/Casks/icompta.rb
+++ b/Casks/icompta.rb
@@ -1,4 +1,4 @@
-class Icompta < Cask
+cask :v1 => 'icompta' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/iconping.rb b/Casks/iconping.rb
index 9df1ffc61728..9821b3912c35 100644
--- a/Casks/iconping.rb
+++ b/Casks/iconping.rb
@@ -1,4 +1,4 @@
-class Iconping < Cask
+cask :v1 => 'iconping' do
   version '1.02'
   sha256 '9f02c99b360ed2a0a424e1bdeb4f810ffb120a3cf78b6889b8a6c5b29b06d0c9'
 
diff --git a/Casks/icons.rb b/Casks/icons.rb
index c7b51b7ec52c..4b48e4de2a4d 100644
--- a/Casks/icons.rb
+++ b/Casks/icons.rb
@@ -1,4 +1,4 @@
-class Icons < Cask
+cask :v1 => 'icons' do
   version '1.0'
   sha256 '1c9fc20d8b10677c11f70d43e511227209d83f260bfbef6fddf00a7469e8f8c1'
 
diff --git a/Casks/icons8.rb b/Casks/icons8.rb
index 273e15561b4d..9769151b7c08 100644
--- a/Casks/icons8.rb
+++ b/Casks/icons8.rb
@@ -1,4 +1,4 @@
-class Icons8 < Cask
+cask :v1 => 'icons8' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/icursor.rb b/Casks/icursor.rb
index 80440969645c..32a341edb15f 100644
--- a/Casks/icursor.rb
+++ b/Casks/icursor.rb
@@ -1,4 +1,4 @@
-class Icursor < Cask
+cask :v1 => 'icursor' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/id3-editor.rb b/Casks/id3-editor.rb
index 3de6a5b24b9a..6e4c855cde13 100644
--- a/Casks/id3-editor.rb
+++ b/Casks/id3-editor.rb
@@ -1,4 +1,4 @@
-class Id3Editor < Cask
+cask :v1 => 'id3-editor' do
   version '1.21.25'
   sha256 '9d11840530236e9f746f8d050ef3c2b5690e5b48283e711af16cb5ff08914131'
 
diff --git a/Casks/identify.rb b/Casks/identify.rb
index 9ba1b5331533..2dc87b52ffec 100644
--- a/Casks/identify.rb
+++ b/Casks/identify.rb
@@ -1,4 +1,4 @@
-class Identify < Cask
+cask :v1 => 'identify' do
   version '545'
   sha256 'e850d12335befe8c092b8758f0ca1b26cb7f0c1decda98e5ef0525b3a37fb2d2'
 
diff --git a/Casks/ideskcal.rb b/Casks/ideskcal.rb
index c089b0484ccd..eee7f4aee7da 100644
--- a/Casks/ideskcal.rb
+++ b/Casks/ideskcal.rb
@@ -1,4 +1,4 @@
-class Ideskcal < Cask
+cask :v1 => 'ideskcal' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/idisplay.rb b/Casks/idisplay.rb
index 9d5abedce556..fada3a39f44b 100644
--- a/Casks/idisplay.rb
+++ b/Casks/idisplay.rb
@@ -1,4 +1,4 @@
-class Idisplay < Cask
+cask :v1 => 'idisplay' do
   version '2.3.10'
   sha256 '6d87e0566e2e2693d89c4fdb1cddcfed9db6316f6f7b2bada24104ea18b996ae'
 
diff --git a/Casks/idocument-plus.rb b/Casks/idocument-plus.rb
index f26d8ad991ea..4859033a7817 100644
--- a/Casks/idocument-plus.rb
+++ b/Casks/idocument-plus.rb
@@ -1,4 +1,4 @@
-class IdocumentPlus < Cask
+cask :v1 => 'idocument-plus' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/idris.rb b/Casks/idris.rb
index 30f06e0ca8b1..cdd113e5f4e5 100644
--- a/Casks/idris.rb
+++ b/Casks/idris.rb
@@ -1,4 +1,4 @@
-class Idris < Cask
+cask :v1 => 'idris' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/iexplorer.rb b/Casks/iexplorer.rb
index f7afc1ddd0bc..eb223630bc96 100644
--- a/Casks/iexplorer.rb
+++ b/Casks/iexplorer.rb
@@ -1,4 +1,4 @@
-class Iexplorer < Cask
+cask :v1 => 'iexplorer' do
   version '3.5.1.2'
   sha256 'd94d00f9eaad1f6b7c0ac1d9c6f426ba152ad0434ac8b41b55761121b37dcd31'
 
diff --git a/Casks/ifilex.rb b/Casks/ifilex.rb
index c6fe81aaef5f..db709d1e4436 100644
--- a/Casks/ifilex.rb
+++ b/Casks/ifilex.rb
@@ -1,4 +1,4 @@
-class Ifilex < Cask
+cask :v1 => 'ifilex' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ifunbox.rb b/Casks/ifunbox.rb
index 735cff73b01a..1cf409257e03 100644
--- a/Casks/ifunbox.rb
+++ b/Casks/ifunbox.rb
@@ -1,4 +1,4 @@
-class Ifunbox < Cask
+cask :v1 => 'ifunbox' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/igetter.rb b/Casks/igetter.rb
index 1b3c3fb35b35..90ee96cdd722 100644
--- a/Casks/igetter.rb
+++ b/Casks/igetter.rb
@@ -1,4 +1,4 @@
-class Igetter < Cask
+cask :v1 => 'igetter' do
   version '2.9.2'
   sha256 '86fd84cbd16ad975e586498cad89a7784087a62e11ba969000a1d48a0b634461'
 
diff --git a/Casks/iloc.rb b/Casks/iloc.rb
index a03d5214f576..19a8b3ff735e 100644
--- a/Casks/iloc.rb
+++ b/Casks/iloc.rb
@@ -1,4 +1,4 @@
-class Iloc < Cask
+cask :v1 => 'iloc' do
   version '0.3'
   sha256 '3c9909b73ba4a17aef20cdc7efea2333d94f23fca2c87bc6c402bc4f17ce9ef3'
 
diff --git a/Casks/image-tool.rb b/Casks/image-tool.rb
index a5bd9cdad01f..8a0e55e86d07 100644
--- a/Casks/image-tool.rb
+++ b/Casks/image-tool.rb
@@ -1,4 +1,4 @@
-class ImageTool < Cask
+cask :v1 => 'image-tool' do
   version '1.4.1'
   sha256 '66ef0c6cdf2e90981bc8bd0d1131e6e0f141744406997712550b8b5a05022d39'
 
diff --git a/Casks/imagealpha.rb b/Casks/imagealpha.rb
index 34a7e262a61b..814e875e4eaa 100644
--- a/Casks/imagealpha.rb
+++ b/Casks/imagealpha.rb
@@ -1,4 +1,4 @@
-class Imagealpha < Cask
+cask :v1 => 'imagealpha' do
   version '1.3.5'
   sha256 'ba1ca1f50fa5b2a3472e6c2dbe410ecc3a66f425975cf9e39380e5c3421cca49'
 
diff --git a/Casks/imagemin.rb b/Casks/imagemin.rb
index 6c22ff74f657..b0fd189280f9 100644
--- a/Casks/imagemin.rb
+++ b/Casks/imagemin.rb
@@ -1,4 +1,4 @@
-class Imagemin < Cask
+cask :v1 => 'imagemin' do
   version '0.1.0'
   sha256 '8a4304d37eaa8a71fbeb550aece6a80c98dbcdf7a9fb6eb09faae1ad93df40d6'
 
diff --git a/Casks/imageoptim.rb b/Casks/imageoptim.rb
index 154da5822ea3..f64e6583bccf 100644
--- a/Casks/imageoptim.rb
+++ b/Casks/imageoptim.rb
@@ -1,4 +1,4 @@
-class Imageoptim < Cask
+cask :v1 => 'imageoptim' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/imazing.rb b/Casks/imazing.rb
index 04d92eca1a7e..6f5f375f0a67 100644
--- a/Casks/imazing.rb
+++ b/Casks/imazing.rb
@@ -1,4 +1,4 @@
-class Imazing < Cask
+cask :v1 => 'imazing' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/img2icns.rb b/Casks/img2icns.rb
index 2e8e65f607f5..6701e390a055 100644
--- a/Casks/img2icns.rb
+++ b/Casks/img2icns.rb
@@ -1,4 +1,4 @@
-class Img2icns < Cask
+cask :v1 => 'img2icns' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/imitone.rb b/Casks/imitone.rb
index 865b7073b467..59f52886bf11 100644
--- a/Casks/imitone.rb
+++ b/Casks/imitone.rb
@@ -1,4 +1,4 @@
-class Imitone < Cask
+cask :v1 => 'imitone' do
   version '0.6.0'
   sha256 '20b262c59d770de364a6ebc4c6e8e38a25a9fcdd691345b4acb4041ce25e397f'
 
diff --git a/Casks/imodsign.rb b/Casks/imodsign.rb
index 85637f958889..628dae770845 100644
--- a/Casks/imodsign.rb
+++ b/Casks/imodsign.rb
@@ -1,4 +1,4 @@
-class Imodsign < Cask
+cask :v1 => 'imodsign' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/import-io.rb b/Casks/import-io.rb
index 592cbecbd5f9..8aa2621b3e71 100644
--- a/Casks/import-io.rb
+++ b/Casks/import-io.rb
@@ -1,4 +1,4 @@
-class ImportIo < Cask
+cask :v1 => 'import-io' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/inboard.rb b/Casks/inboard.rb
index a9b9e381d766..d6848641c5ae 100644
--- a/Casks/inboard.rb
+++ b/Casks/inboard.rb
@@ -1,4 +1,4 @@
-class Inboard < Cask
+cask :v1 => 'inboard' do
   version '184'
   sha256 '3bb602cde63f0b3401fc681cd50a3545c5a47c2326ea81cf66844039fb100522'
 
diff --git a/Casks/inc.rb b/Casks/inc.rb
index 124db2c191af..b303b44f6cd8 100644
--- a/Casks/inc.rb
+++ b/Casks/inc.rb
@@ -1,4 +1,4 @@
-class Inc < Cask
+cask :v1 => 'inc' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/indigo.rb b/Casks/indigo.rb
index cc8a3875d2d7..a5c0a0e8e886 100644
--- a/Casks/indigo.rb
+++ b/Casks/indigo.rb
@@ -1,4 +1,4 @@
-class Indigo < Cask
+cask :v1 => 'indigo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/induction.rb b/Casks/induction.rb
index d3a1ef670ddc..3f1a4ec4b8b5 100644
--- a/Casks/induction.rb
+++ b/Casks/induction.rb
@@ -1,4 +1,4 @@
-class Induction < Cask
+cask :v1 => 'induction' do
   version 'alpha-28'
   sha256 'b209e4ca234749435c8e014ec79b2bc0bdcfe626ff4cbbeb6b3ee51cd1f2e68c'
 
diff --git a/Casks/infinit.rb b/Casks/infinit.rb
index 5deee86fc3d1..65e7ce87ef13 100644
--- a/Casks/infinit.rb
+++ b/Casks/infinit.rb
@@ -1,4 +1,4 @@
-class Infinit < Cask
+cask :v1 => 'infinit' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/inform.rb b/Casks/inform.rb
index f5617afe1e09..4d037c6a5675 100644
--- a/Casks/inform.rb
+++ b/Casks/inform.rb
@@ -1,4 +1,4 @@
-class Inform < Cask
+cask :v1 => 'inform' do
   version '7.6L02'
   sha256 '182134881d44b1c096af979d9cff195d33ec51d7c1f81f59a7c25d5a917d8987'
 
diff --git a/Casks/injection.rb b/Casks/injection.rb
index 0f8c64c51340..8a0612cbdffe 100644
--- a/Casks/injection.rb
+++ b/Casks/injection.rb
@@ -1,4 +1,4 @@
-class Injection < Cask
+cask :v1 => 'injection' do
   version '5.1'
   sha256 'c5e6dbaca14e3b9ee7e084d6787047cc61345ec38c2614b7c8016525ef18de9c'
 
diff --git a/Casks/inkscape.rb b/Casks/inkscape.rb
index 553f746bbf22..9ab8105b2287 100644
--- a/Casks/inkscape.rb
+++ b/Casks/inkscape.rb
@@ -1,4 +1,4 @@
-class Inkscape < Cask
+cask :v1 => 'inkscape' do
   version '0.48.5-2'
   sha256 '72191861ee19a4e047d9084c7181a5ccf6e89d9b4410e197a98c2e1027e65e72'
 
diff --git a/Casks/inky.rb b/Casks/inky.rb
index d17a44fdf42d..dd074498e901 100644
--- a/Casks/inky.rb
+++ b/Casks/inky.rb
@@ -1,4 +1,4 @@
-class Inky < Cask
+cask :v1 => 'inky' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/insertpic.rb b/Casks/insertpic.rb
index 89eace27701f..50301209e7f2 100644
--- a/Casks/insertpic.rb
+++ b/Casks/insertpic.rb
@@ -1,4 +1,4 @@
-class Insertpic < Cask
+cask :v1 => 'insertpic' do
   version '3.5'
   sha256 'f12f9ec1f023f8c38fd735ecc2d2c725ee0e7dab757f6a5250e22198ea179e26'
 
diff --git a/Casks/insomniax.rb b/Casks/insomniax.rb
index 6a39904093de..a821d2994168 100644
--- a/Casks/insomniax.rb
+++ b/Casks/insomniax.rb
@@ -1,4 +1,4 @@
-class Insomniax < Cask
+cask :v1 => 'insomniax' do
   version '2.1.8'
   sha256 'abbf4b27e86da934042a1dcedd339ffb59e16c4aa8e0c0d44534533be42e3efb'
 
diff --git a/Casks/instabridge.rb b/Casks/instabridge.rb
index eb95ba06cd40..d8251e29a522 100644
--- a/Casks/instabridge.rb
+++ b/Casks/instabridge.rb
@@ -1,4 +1,4 @@
-class Instabridge < Cask
+cask :v1 => 'instabridge' do
   version '1.0'
   sha256 '62fa0d8766e1be5f21404c5d530c87c3c7351cced0a43c1176aefffee0c2c788'
 
diff --git a/Casks/instacast.rb b/Casks/instacast.rb
index 06f0ba27f09e..cd9b0c6976f5 100644
--- a/Casks/instacast.rb
+++ b/Casks/instacast.rb
@@ -1,4 +1,4 @@
-class Instacast < Cask
+cask :v1 => 'instacast' do
   version '1.2.6-2380'
   sha256 '560922bd0ccc7ebab002035d80ae4e630d6f30fde7eebacb7dff616e633a1a4d'
 
diff --git a/Casks/instead.rb b/Casks/instead.rb
index fd9fef6dff10..2510193a14b7 100644
--- a/Casks/instead.rb
+++ b/Casks/instead.rb
@@ -1,4 +1,4 @@
-class Instead < Cask
+cask :v1 => 'instead' do
   version '2.0.3'
   sha256 'ccad05fce186df643c1312eb07f8b6e2c537df56de54f5a2f7059830822b5500'
 
diff --git a/Casks/insync.rb b/Casks/insync.rb
index b6cf820aef99..1fe8edda5ac9 100644
--- a/Casks/insync.rb
+++ b/Casks/insync.rb
@@ -1,4 +1,4 @@
-class Insync < Cask
+cask :v1 => 'insync' do
   version '1.0.37.31804'
   sha256 '782c66bab03e1edf9235b88aed68680e63116242e696c9d1016800dc9ffbe92c'
 
diff --git a/Casks/integrity.rb b/Casks/integrity.rb
index 48946abf68f1..e079aa7ff2dc 100644
--- a/Casks/integrity.rb
+++ b/Casks/integrity.rb
@@ -1,4 +1,4 @@
-class Integrity < Cask
+cask :v1 => 'integrity' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/intel-haxm.rb b/Casks/intel-haxm.rb
index be8ef0c42280..5561075b8111 100644
--- a/Casks/intel-haxm.rb
+++ b/Casks/intel-haxm.rb
@@ -1,4 +1,4 @@
-class IntelHaxm < Cask
+cask :v1 => 'intel-haxm' do
   version '1.0.8'
   sha256 'cee233cf1a0293d9e19b15c375f2c4cb7cf0c6948b7fd579bec28719e0b51d35'
 
diff --git a/Casks/intel-power-gadget.rb b/Casks/intel-power-gadget.rb
index c21ba352d8d4..5eebdf815999 100644
--- a/Casks/intel-power-gadget.rb
+++ b/Casks/intel-power-gadget.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-class IntelPowerGadget < Cask
+cask :v1 => 'intel-power-gadget' do
   version '3.0.1'
   sha256 '538a792721604e2155b3a48caa4084db751a91b170e5fa62bf0331d3147f2239'
 
diff --git a/Casks/intel-xdk-iot.rb b/Casks/intel-xdk-iot.rb
index fbec87a9965b..712a8dd8b515 100644
--- a/Casks/intel-xdk-iot.rb
+++ b/Casks/intel-xdk-iot.rb
@@ -1,4 +1,4 @@
-class IntelXdkIot < Cask
+cask :v1 => 'intel-xdk-iot' do
   version '52'
   sha256 'f8b378b36848245503127fc079a4dccf483aa949eb0b05ea0b7c50f0153b3db1'
 
diff --git a/Casks/intel-xdk.rb b/Casks/intel-xdk.rb
index e832644fc71a..ac1163963d50 100644
--- a/Casks/intel-xdk.rb
+++ b/Casks/intel-xdk.rb
@@ -1,4 +1,4 @@
-class IntelXdk < Cask
+cask :v1 => 'intel-xdk' do
   version '0769'
   sha256 '365a1850ccbf52fb3f1946bb569c454ccd6ea1a72d43074a9e92d9a646881489'
 
diff --git a/Casks/intellij-idea-ce.rb b/Casks/intellij-idea-ce.rb
index c203302214d5..ef72a32c42af 100644
--- a/Casks/intellij-idea-ce.rb
+++ b/Casks/intellij-idea-ce.rb
@@ -1,4 +1,4 @@
-class IntellijIdeaCe < Cask
+cask :v1 => 'intellij-idea-ce' do
   version '14'
   sha256 'd742778574f244ef1f70277a65bbe73b9baf38ead3b6c15d555d5418357f07e1'
 
diff --git a/Casks/intellij-idea.rb b/Casks/intellij-idea.rb
index 64a0c43ef7c9..303a5936be5f 100644
--- a/Casks/intellij-idea.rb
+++ b/Casks/intellij-idea.rb
@@ -1,4 +1,4 @@
-class IntellijIdea < Cask
+cask :v1 => 'intellij-idea' do
   version '14'
   sha256 '9695bedfe145d70010b853cc67d7dc07bf2768e38b5b9034d1f6a00b0b9a15a7'
 
diff --git a/Casks/intensify-pro.rb b/Casks/intensify-pro.rb
index e15c711b33ae..6f0fdcfc0210 100644
--- a/Casks/intensify-pro.rb
+++ b/Casks/intensify-pro.rb
@@ -1,4 +1,4 @@
-class IntensifyPro < Cask
+cask :v1 => 'intensify-pro' do
   version '1.0.3-610'
   sha256 'd02fc658bc422bd3b60d9c69d7bb2868dd2abc9585ab1ae4832f620f2e49979f'
 
diff --git a/Casks/interface-inspector.rb b/Casks/interface-inspector.rb
index f2525bd30a44..8b83197f5c10 100644
--- a/Casks/interface-inspector.rb
+++ b/Casks/interface-inspector.rb
@@ -1,4 +1,4 @@
-class InterfaceInspector < Cask
+cask :v1 => 'interface-inspector' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/intermission.rb b/Casks/intermission.rb
index 9b76d3cd1c05..725b8499d85b 100644
--- a/Casks/intermission.rb
+++ b/Casks/intermission.rb
@@ -1,4 +1,4 @@
-class Intermission < Cask
+cask :v1 => 'intermission' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/invisiblix.rb b/Casks/invisiblix.rb
index 09b72acdfcd1..29248b3002e1 100644
--- a/Casks/invisiblix.rb
+++ b/Casks/invisiblix.rb
@@ -1,4 +1,4 @@
-class Invisiblix < Cask
+cask :v1 => 'invisiblix' do
   version '3.2'
   sha256 '528328a0e7c3f0a72e763ea766324d491dfe20d6f18a2882eefda1a5a2c4d68e'
 
diff --git a/Casks/invisionsync.rb b/Casks/invisionsync.rb
index f3233be58058..8a71ea06ff2d 100644
--- a/Casks/invisionsync.rb
+++ b/Casks/invisionsync.rb
@@ -1,4 +1,4 @@
-class Invisionsync < Cask
+cask :v1 => 'invisionsync' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/invisorql.rb b/Casks/invisorql.rb
index a8792a9c0b4e..9a2ef8736b7b 100644
--- a/Casks/invisorql.rb
+++ b/Casks/invisorql.rb
@@ -1,4 +1,4 @@
-class Invisorql < Cask
+cask :v1 => 'invisorql' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/iograph.rb b/Casks/iograph.rb
index 44f995631b9d..10fec3010bae 100644
--- a/Casks/iograph.rb
+++ b/Casks/iograph.rb
@@ -1,4 +1,4 @@
-class Iograph < Cask
+cask :v1 => 'iograph' do
   version '1.0.1'
   sha256 '9da847f06c59b51bb484e3c38a8c5725d37c92099aea3eda79d099a52bcd68e2'
 
diff --git a/Casks/ionu.rb b/Casks/ionu.rb
index dc571d2559d1..bdfb19ac6b9e 100644
--- a/Casks/ionu.rb
+++ b/Casks/ionu.rb
@@ -1,4 +1,4 @@
-class Ionu < Cask
+cask :v1 => 'ionu' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ioquake3.rb b/Casks/ioquake3.rb
index 4d99d7c6f040..072877f229a8 100644
--- a/Casks/ioquake3.rb
+++ b/Casks/ioquake3.rb
@@ -1,4 +1,4 @@
-class Ioquake3 < Cask
+cask :v1 => 'ioquake3' do
   version '1.36'
   sha256 'ff310471aa641cc27980055691b3e3cf5496ac262f10967c9d5052fd3815a3fc'
 
diff --git a/Casks/ios7-screensaver.rb b/Casks/ios7-screensaver.rb
index d4588e57a49c..12c25df5ff8d 100644
--- a/Casks/ios7-screensaver.rb
+++ b/Casks/ios7-screensaver.rb
@@ -1,4 +1,4 @@
-class Ios7Screensaver < Cask
+cask :v1 => 'ios7-screensaver' do
   version '2.8'
   sha256 '5b71814a11a701fc074994eba0af7f35533aa35acc6eaa78c2e70ce923e9f19d'
 
diff --git a/Casks/ip-in-menu-bar.rb b/Casks/ip-in-menu-bar.rb
index 589b570dc588..9276835029d8 100644
--- a/Casks/ip-in-menu-bar.rb
+++ b/Casks/ip-in-menu-bar.rb
@@ -1,4 +1,4 @@
-class IpInMenuBar < Cask
+cask :v1 => 'ip-in-menu-bar' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ipalette.rb b/Casks/ipalette.rb
index e5bc1e9a06ea..ea24b5c628e1 100644
--- a/Casks/ipalette.rb
+++ b/Casks/ipalette.rb
@@ -1,4 +1,4 @@
-class Ipalette < Cask
+cask :v1 => 'ipalette' do
   version '2.2'
   sha256 '1a2b56a3c9c3072e4857e8982d5197583463e3d745b8cdce44d7dec18a8d868d'
 
diff --git a/Casks/ipaql.rb b/Casks/ipaql.rb
index d32aa66f190a..647f84f86d3a 100644
--- a/Casks/ipaql.rb
+++ b/Casks/ipaql.rb
@@ -1,4 +1,4 @@
-class Ipaql < Cask
+cask :v1 => 'ipaql' do
   version '1.3.0'
   sha256 'bcff849e15b351c224fbd65888c1e5901f335ed034758eb673de1ce454000b18'
 
diff --git a/Casks/iphone-backup-extractor.rb b/Casks/iphone-backup-extractor.rb
index 93faddc01e37..5e5ef8f61cf8 100644
--- a/Casks/iphone-backup-extractor.rb
+++ b/Casks/iphone-backup-extractor.rb
@@ -1,4 +1,4 @@
-class IphoneBackupExtractor < Cask
+cask :v1 => 'iphone-backup-extractor' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/iphone-configuration-utility.rb b/Casks/iphone-configuration-utility.rb
index 6c563dd6a44b..0b57435434fa 100644
--- a/Casks/iphone-configuration-utility.rb
+++ b/Casks/iphone-configuration-utility.rb
@@ -1,4 +1,4 @@
-class IphoneConfigurationUtility < Cask
+cask :v1 => 'iphone-configuration-utility' do
   version '3.5'
   sha256 '822204947ae5f7739bcb1e9694814f8e3ef65cd184952b76104f525d97a28163'
 
diff --git a/Casks/iphoney.rb b/Casks/iphoney.rb
index df28f99e435f..1e836edf6a29 100644
--- a/Casks/iphoney.rb
+++ b/Casks/iphoney.rb
@@ -1,4 +1,4 @@
-class Iphoney < Cask
+cask :v1 => 'iphoney' do
   version '1.2'
   sha256 'f5bffb663944eea228bb9acb315ac23e8f95b6562ae71d0cb031ecc046f72ff4'
 
diff --git a/Casks/iphoto-library-manager.rb b/Casks/iphoto-library-manager.rb
index ef6f30faa5b8..6211ed44d2dc 100644
--- a/Casks/iphoto-library-manager.rb
+++ b/Casks/iphoto-library-manager.rb
@@ -1,4 +1,4 @@
-class IphotoLibraryManager < Cask
+cask :v1 => 'iphoto-library-manager' do
   version '4.1.7'
   sha256 'b56414de3c6e08f9c40ee1fd688ea9f3393fcb6e5d4f83685dde7c45fec2533f'
 
diff --git a/Casks/ireadfast.rb b/Casks/ireadfast.rb
index 5a31c4ce17e7..ccadd48f11eb 100644
--- a/Casks/ireadfast.rb
+++ b/Casks/ireadfast.rb
@@ -1,4 +1,4 @@
-class Ireadfast < Cask
+cask :v1 => 'ireadfast' do
   version '2.0'
   sha256 '0bc213c6da72a7917ceba8a9de46e307933608cd6d2bf397770517401ab3d98c'
 
diff --git a/Casks/irip.rb b/Casks/irip.rb
index 5c2fcaf26dce..70bc09d6a34a 100644
--- a/Casks/irip.rb
+++ b/Casks/irip.rb
@@ -1,4 +1,4 @@
-class Irip < Cask
+cask :v1 => 'irip' do
   sha256 :no_check
   version :latest
 
diff --git a/Casks/isabelle.rb b/Casks/isabelle.rb
index 0b96814479d0..626eb6a8c6f5 100644
--- a/Casks/isabelle.rb
+++ b/Casks/isabelle.rb
@@ -1,4 +1,4 @@
-class Isabelle < Cask
+cask :v1 => 'isabelle' do
   version '2014'
   sha256 'e4a4b5f454d6cb24d5ef7271adc54e9fa7109addda8c6707bd7414b4d4061a23'
 
diff --git a/Casks/isolator.rb b/Casks/isolator.rb
index 1996131d0237..c0dc199a5d31 100644
--- a/Casks/isolator.rb
+++ b/Casks/isolator.rb
@@ -1,4 +1,4 @@
-class Isolator < Cask
+cask :v1 => 'isolator' do
   version '4.9beta'
   sha256 '0f77f1165223196af77df9565f0573bce4d42ac6c327c73bb01c6eaa74081d6c'
 
diff --git a/Casks/istat-menus.rb b/Casks/istat-menus.rb
index c71c3f85f12d..465e30b3515e 100644
--- a/Casks/istat-menus.rb
+++ b/Casks/istat-menus.rb
@@ -1,4 +1,4 @@
-class IstatMenus < Cask
+cask :v1 => 'istat-menus' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/istat-server.rb b/Casks/istat-server.rb
index 158190a7a871..82a705420552 100644
--- a/Casks/istat-server.rb
+++ b/Casks/istat-server.rb
@@ -1,4 +1,4 @@
-class IstatServer < Cask
+cask :v1 => 'istat-server' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/isteg.rb b/Casks/isteg.rb
index f09f3643be4a..05c35f6f0bf5 100644
--- a/Casks/isteg.rb
+++ b/Casks/isteg.rb
@@ -1,4 +1,4 @@
-class Isteg < Cask
+cask :v1 => 'isteg' do
   version '1.6.2'
   sha256 '5f385efce3416c9df75c6d97a35de82b76d9c829c2956461dd2fc95ca843702d'
 
diff --git a/Casks/istopmotion.rb b/Casks/istopmotion.rb
index eeec7da9a6a7..3c2e4d2f3246 100644
--- a/Casks/istopmotion.rb
+++ b/Casks/istopmotion.rb
@@ -1,4 +1,4 @@
-class Istopmotion < Cask
+cask :v1 => 'istopmotion' do
   version '3.2.2-15432'
   sha256 '080c56eb60094247855be2a8b16a89f23741fb5fe2bb06ade13d31d8ff2ed9fc'
 
diff --git a/Casks/istumbler.rb b/Casks/istumbler.rb
index f143cdfb9f3a..fe12d65a6140 100644
--- a/Casks/istumbler.rb
+++ b/Casks/istumbler.rb
@@ -1,4 +1,4 @@
-class Istumbler < Cask
+cask :v1 => 'istumbler' do
   version '100'
   sha256 'f8d9ff03fc2d9feeb05fafa1c9fc1133b6e2017b1ef5235bab4fa12ae4250773'
 
diff --git a/Casks/iswiff.rb b/Casks/iswiff.rb
index 78fd56a7c4bb..003eeece73b5 100644
--- a/Casks/iswiff.rb
+++ b/Casks/iswiff.rb
@@ -1,4 +1,4 @@
-class Iswiff < Cask
+cask :v1 => 'iswiff' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/isyncr.rb b/Casks/isyncr.rb
index 5fb487363d8b..dbeeb250dcb9 100644
--- a/Casks/isyncr.rb
+++ b/Casks/isyncr.rb
@@ -1,4 +1,4 @@
-class Isyncr < Cask
+cask :v1 => 'isyncr' do
   version '5.0.3'
   sha256 'd819a9063ce2bc8294464efae1518f0eb3882debfa86b84754be976ede50d6de'
 
diff --git a/Casks/iterm2.rb b/Casks/iterm2.rb
index 81001df0671a..e8a134d38295 100644
--- a/Casks/iterm2.rb
+++ b/Casks/iterm2.rb
@@ -1,4 +1,4 @@
-class Iterm2 < Cask
+cask :v1 => 'iterm2' do
   # note: "2" is not a version number, but indicates a different vendor
   version '2.0.0'
   sha256 '6a59e1b96d9037b6ff1b8aaaf7aed5cff572d74d6e58390db16028433769c058'
diff --git a/Casks/itools.rb b/Casks/itools.rb
index 58b82aba84b2..0be73abb6fab 100644
--- a/Casks/itools.rb
+++ b/Casks/itools.rb
@@ -1,4 +1,4 @@
-class Itools < Cask
+cask :v1 => 'itools' do
   version '2.4.2'
   sha256 'd927a4e6d4f96b1641e48ce09c083d7cba92ba00694eb96a9907bd1c4a7b2a9e'
 
diff --git a/Casks/itsycal.rb b/Casks/itsycal.rb
index 211d718204d7..e65c28081d4a 100644
--- a/Casks/itsycal.rb
+++ b/Casks/itsycal.rb
@@ -1,4 +1,4 @@
-class Itsycal < Cask
+cask :v1 => 'itsycal' do
   version '0.8.10'
   sha256 '2cfa08066722a13b994559f45b9d01bba1ff02e98c6797f2fc7c93344747093b'
 
diff --git a/Casks/itunes-volume-control.rb b/Casks/itunes-volume-control.rb
index 8606208bb142..2c1ec596e74a 100644
--- a/Casks/itunes-volume-control.rb
+++ b/Casks/itunes-volume-control.rb
@@ -1,4 +1,4 @@
-class ItunesVolumeControl < Cask
+cask :v1 => 'itunes-volume-control' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/itunesscrobbler.rb b/Casks/itunesscrobbler.rb
index 8689dc599714..105fce7953ec 100644
--- a/Casks/itunesscrobbler.rb
+++ b/Casks/itunesscrobbler.rb
@@ -1,4 +1,4 @@
-class Itunesscrobbler < Cask
+cask :v1 => 'itunesscrobbler' do
   version '0.6.0'
   sha256 '01dcacb1738e824d853dab7825cee88b017f47a65f8e22fdbd7bf762802cc893'
 
diff --git a/Casks/itweax.rb b/Casks/itweax.rb
index f9ad817fee7c..597a459fc6f5 100644
--- a/Casks/itweax.rb
+++ b/Casks/itweax.rb
@@ -1,4 +1,4 @@
-class Itweax < Cask
+cask :v1 => 'itweax' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/iupx.rb b/Casks/iupx.rb
index 1af0e7269f1b..e2cb1dab51f6 100644
--- a/Casks/iupx.rb
+++ b/Casks/iupx.rb
@@ -1,4 +1,4 @@
-class Iupx < Cask
+cask :v1 => 'iupx' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ivolume.rb b/Casks/ivolume.rb
index f635952afd27..a6bd0951d223 100644
--- a/Casks/ivolume.rb
+++ b/Casks/ivolume.rb
@@ -1,4 +1,4 @@
-class Ivolume < Cask
+cask :v1 => 'ivolume' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/izip.rb b/Casks/izip.rb
index 5c32748d4338..05da87bf72b4 100644
--- a/Casks/izip.rb
+++ b/Casks/izip.rb
@@ -1,4 +1,4 @@
-class Izip < Cask
+cask :v1 => 'izip' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/j.rb b/Casks/j.rb
index c3c8c25c5231..9fb654e37fc9 100644
--- a/Casks/j.rb
+++ b/Casks/j.rb
@@ -1,4 +1,4 @@
-class J < Cask
+cask :v1 => 'j' do
   version '802'
   sha256 '294cc7a2b92afe43ad19ec7921de2d9a65351ba1c5cfd9836bc07fe9d9a0d159'
 
diff --git a/Casks/jabber-video.rb b/Casks/jabber-video.rb
index 13a580061815..3c3d636fb3aa 100644
--- a/Casks/jabber-video.rb
+++ b/Casks/jabber-video.rb
@@ -1,4 +1,4 @@
-class JabberVideo < Cask
+cask :v1 => 'jabber-video' do
   version '4.8.6'
   sha256 '9f0436cdfe65ebd3955a33eefac72af03def89075acd28280e27b0a6dd12738a'
 
diff --git a/Casks/jabref.rb b/Casks/jabref.rb
index f0df2e45f81d..aeb864b1d310 100644
--- a/Casks/jabref.rb
+++ b/Casks/jabref.rb
@@ -1,4 +1,4 @@
-class Jabref < Cask
+cask :v1 => 'jabref' do
   version '2.10'
   sha256 'c63a49e47a43bdb026dde7fb695210d9a3f8c0e71445af7d6736c5379b23baa2'
 
diff --git a/Casks/jaikoz.rb b/Casks/jaikoz.rb
index 430ed84fdbf0..274efcc9a988 100644
--- a/Casks/jaikoz.rb
+++ b/Casks/jaikoz.rb
@@ -1,4 +1,4 @@
-class Jaikoz < Cask
+cask :v1 => 'jaikoz' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/jaksta.rb b/Casks/jaksta.rb
index c8e9064cc5ce..fad2d580fb14 100644
--- a/Casks/jaksta.rb
+++ b/Casks/jaksta.rb
@@ -1,4 +1,4 @@
-class Jaksta < Cask
+cask :v1 => 'jaksta' do
   version '1.3.3'
   sha256 '8f54cdba4ab42aec0430cdc15f9fd62370391bd2c42e0b734d6d5adea0355f69'
 
diff --git a/Casks/jameica.rb b/Casks/jameica.rb
index 3eaf29bb3e1c..fc46d5456048 100644
--- a/Casks/jameica.rb
+++ b/Casks/jameica.rb
@@ -1,4 +1,4 @@
-class Jameica < Cask
+cask :v1 => 'jameica' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/jaspersoft-studio.rb b/Casks/jaspersoft-studio.rb
index fbcbf82ae2e8..5a7124615bdb 100644
--- a/Casks/jaspersoft-studio.rb
+++ b/Casks/jaspersoft-studio.rb
@@ -1,4 +1,4 @@
-class JaspersoftStudio < Cask
+cask :v1 => 'jaspersoft-studio' do
   version '5.6.1'
   sha256 '339222ba8c1d640f90d6339b9f5ce5292e620c2bc256a09f75b6f413acd061d2'
 
diff --git a/Casks/java.rb b/Casks/java.rb
index edff3780a843..1dcf903dc132 100644
--- a/Casks/java.rb
+++ b/Casks/java.rb
@@ -1,4 +1,4 @@
-class Java < Cask
+cask :v1 => 'java' do
   version '1.8.0_25'
   sha256 '65b18e9a081435d06c18ba8d9b19e6eb23c902204f5ac3a9f029ec5b3fe2d2a6'
 
diff --git a/Casks/javafx-scene-builder.rb b/Casks/javafx-scene-builder.rb
index 1f7f9ade9b81..25699e4bee4a 100644
--- a/Casks/javafx-scene-builder.rb
+++ b/Casks/javafx-scene-builder.rb
@@ -1,4 +1,4 @@
-class JavafxSceneBuilder < Cask
+cask :v1 => 'javafx-scene-builder' do
   version '2.0-b20'
   sha256 '9551326dd98f85204434d293da445eb5f2cf862c785f3dbe420cb4643221d96b'
 
diff --git a/Casks/jawbone-updater.rb b/Casks/jawbone-updater.rb
index 36eed332638e..4f600e208f51 100644
--- a/Casks/jawbone-updater.rb
+++ b/Casks/jawbone-updater.rb
@@ -1,4 +1,4 @@
-class JawboneUpdater < Cask
+cask :v1 => 'jawbone-updater' do
   version '2.2.3'
   sha256 '3085edf935347e45573405ee7e51fbacce366847f5f06f783a4e1ea89d70aee6'
 
diff --git a/Casks/jbidwatcher.rb b/Casks/jbidwatcher.rb
index 2a8c70efad0b..07baa316b5d6 100644
--- a/Casks/jbidwatcher.rb
+++ b/Casks/jbidwatcher.rb
@@ -1,4 +1,4 @@
-class Jbidwatcher < Cask
+cask :v1 => 'jbidwatcher' do
   version '2.5.6'
   sha256 '659de073d9e0d71fa86e21db1524b7df57b36ff7826600a01ed93da6df5f5c9f'
 
diff --git a/Casks/jd-gui.rb b/Casks/jd-gui.rb
index 371bc479c323..0915ac13fa7a 100644
--- a/Casks/jd-gui.rb
+++ b/Casks/jd-gui.rb
@@ -1,4 +1,4 @@
-class JdGui < Cask
+cask :v1 => 'jd-gui' do
   version '0.3.5'
   sha256 'c76dff6d27410e0a11167dd52055b7c3df3a62b64ff2613bbabec5712a95054a'
 
diff --git a/Casks/jdiskreport.rb b/Casks/jdiskreport.rb
index 76464cc97d81..3cc7e9f1b70d 100644
--- a/Casks/jdiskreport.rb
+++ b/Casks/jdiskreport.rb
@@ -1,4 +1,4 @@
-class Jdiskreport < Cask
+cask :v1 => 'jdiskreport' do
   version '1.4.1'
   sha256 'cb64f3d7ea8e43b142a69cabdded832b8de8e503766ccf1c7a16b314d2bc0d44'
 
diff --git a/Casks/jdownloader.rb b/Casks/jdownloader.rb
index 504b3681ac76..9549a27a1a40 100644
--- a/Casks/jdownloader.rb
+++ b/Casks/jdownloader.rb
@@ -1,4 +1,4 @@
-class Jdownloader < Cask
+cask :v1 => 'jdownloader' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/jedit.rb b/Casks/jedit.rb
index 30c4d6bdd319..ab6455dcf1f4 100644
--- a/Casks/jedit.rb
+++ b/Casks/jedit.rb
@@ -1,4 +1,4 @@
-class Jedit < Cask
+cask :v1 => 'jedit' do
   version '5.1.0'
   sha256 '29922afea1411631436f5f1154e45ddf8d3f6db53c9e41b832cefe86f8b81446'
 
diff --git a/Casks/jenkins-menu.rb b/Casks/jenkins-menu.rb
index c2cdd791d4b1..54c4e7447cc0 100644
--- a/Casks/jenkins-menu.rb
+++ b/Casks/jenkins-menu.rb
@@ -1,4 +1,4 @@
-class JenkinsMenu < Cask
+cask :v1 => 'jenkins-menu' do
   version '0.1.1'
   sha256 'c53e72473ff1d64b0b63b28ebd6297553cd6045c383b48e15887041487b588fb'
 
diff --git a/Casks/jetphoto-studio.rb b/Casks/jetphoto-studio.rb
index 35aff279c07f..63e4f0349587 100644
--- a/Casks/jetphoto-studio.rb
+++ b/Casks/jetphoto-studio.rb
@@ -1,4 +1,4 @@
-class JetphotoStudio < Cask
+cask :v1 => 'jetphoto-studio' do
   version '5.5'
   sha256 'c583a173d018696d613545acacba4c43f641d770de4e5d5bbb0964c1cb2e9f7f'
 
diff --git a/Casks/jewelrybox.rb b/Casks/jewelrybox.rb
index 48bc3407bbdf..a91daca86655 100644
--- a/Casks/jewelrybox.rb
+++ b/Casks/jewelrybox.rb
@@ -1,4 +1,4 @@
-class Jewelrybox < Cask
+cask :v1 => 'jewelrybox' do
   version '1.5'
   sha256 '96c0bae3cc0ce312ce3df290a4d1eddff2da781dfaafe4707b298dc17eb53993'
 
diff --git a/Casks/jiggler.rb b/Casks/jiggler.rb
index b4c9ead3b544..ea3b26b921e6 100644
--- a/Casks/jiggler.rb
+++ b/Casks/jiggler.rb
@@ -1,4 +1,4 @@
-class Jiggler < Cask
+cask :v1 => 'jiggler' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/jin.rb b/Casks/jin.rb
index 8bcbafa33731..89bb10168338 100644
--- a/Casks/jin.rb
+++ b/Casks/jin.rb
@@ -1,4 +1,4 @@
-class Jin < Cask
+cask :v1 => 'jin' do
   version '2.14.1'
   sha256 'd5592e35bc1e1bb6cf8337d0adaf883c7f5964e9e6f378f66f3fa29979d653aa'
 
diff --git a/Casks/jing.rb b/Casks/jing.rb
index a36463862381..0f00bcf6a457 100644
--- a/Casks/jing.rb
+++ b/Casks/jing.rb
@@ -1,4 +1,4 @@
-class Jing < Cask
+cask :v1 => 'jing' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/jitouch.rb b/Casks/jitouch.rb
index 4f1fd86f60d6..d9df0b603a23 100644
--- a/Casks/jitouch.rb
+++ b/Casks/jitouch.rb
@@ -1,4 +1,4 @@
-class Jitouch < Cask
+cask :v1 => 'jitouch' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/jitsi.rb b/Casks/jitsi.rb
index e80e507ec235..f360258b91f9 100644
--- a/Casks/jitsi.rb
+++ b/Casks/jitsi.rb
@@ -1,4 +1,4 @@
-class Jitsi < Cask
+cask :v1 => 'jitsi' do
   version '2.4'
   sha256 'ceb6b2ab04206a51faf1dbffb704a7a60ae2b7c47834b50f87da5557f543ad13'
 
diff --git a/Casks/joinme.rb b/Casks/joinme.rb
index 3b3c4e67f485..312c798dd804 100644
--- a/Casks/joinme.rb
+++ b/Casks/joinme.rb
@@ -1,4 +1,4 @@
-class Joinme < Cask
+cask :v1 => 'joinme' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/josm.rb b/Casks/josm.rb
index d2add7784695..e3a498fbecfb 100644
--- a/Casks/josm.rb
+++ b/Casks/josm.rb
@@ -1,4 +1,4 @@
-class Josm < Cask
+cask :v1 => 'josm' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/jotta.rb b/Casks/jotta.rb
index b9beac87a770..873f07bd6be0 100644
--- a/Casks/jotta.rb
+++ b/Casks/jotta.rb
@@ -1,4 +1,4 @@
-class Jotta < Cask
+cask :v1 => 'jotta' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/jsonlook.rb b/Casks/jsonlook.rb
index 50ea56bb8ac7..a0975cb2cb0a 100644
--- a/Casks/jsonlook.rb
+++ b/Casks/jsonlook.rb
@@ -1,4 +1,4 @@
-class Jsonlook < Cask
+cask :v1 => 'jsonlook' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/jubler.rb b/Casks/jubler.rb
index 62b14494ffcb..f0bc5e6a28f4 100644
--- a/Casks/jubler.rb
+++ b/Casks/jubler.rb
@@ -1,4 +1,4 @@
-class Jubler < Cask
+cask :v1 => 'jubler' do
   version '5.0.1'
   sha256 '295d23433a88a26c113529e6eb15548b260525acc2d86fec1b90cbfbf9572b1e'
 
diff --git a/Casks/julia.rb b/Casks/julia.rb
index 50333398857f..f87913217cd2 100644
--- a/Casks/julia.rb
+++ b/Casks/julia.rb
@@ -1,4 +1,4 @@
-class Julia < Cask
+cask :v1 => 'julia' do
   version '0.3.2'
   sha256 '33d05ca32633fbec2837f724aa6b5ad0721966323a3a1b3bff59fc468a4c23e3'
 
diff --git a/Casks/juliastudio.rb b/Casks/juliastudio.rb
index 470c97d7de33..50b014f7df7a 100644
--- a/Casks/juliastudio.rb
+++ b/Casks/juliastudio.rb
@@ -1,4 +1,4 @@
-class Juliastudio < Cask
+cask :v1 => 'juliastudio' do
   version '0.4.4'
 
   if MacOS.version < '10.7'
diff --git a/Casks/jump-desktop.rb b/Casks/jump-desktop.rb
index dd29c3d88251..254f3e8e16e0 100644
--- a/Casks/jump-desktop.rb
+++ b/Casks/jump-desktop.rb
@@ -1,4 +1,4 @@
-class JumpDesktop < Cask
+cask :v1 => 'jump-desktop' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/jumpcut.rb b/Casks/jumpcut.rb
index 50bc0d737fcf..08d55305df06 100644
--- a/Casks/jumpcut.rb
+++ b/Casks/jumpcut.rb
@@ -1,4 +1,4 @@
-class Jumpcut < Cask
+cask :v1 => 'jumpcut' do
   version '0.63'
   sha256 '19c84eefbc7f173af45affe3a9ca6fd9ec58d9bdf6bacef165085e63e82d54e1'
 
diff --git a/Casks/jumpshare.rb b/Casks/jumpshare.rb
index 5df34fc70a75..2be5da5129ea 100644
--- a/Casks/jumpshare.rb
+++ b/Casks/jumpshare.rb
@@ -1,4 +1,4 @@
-class Jumpshare < Cask
+cask :v1 => 'jumpshare' do
   version '1.0.25-3'
   sha256 'a2a2d44d858616965c8271dcfc177ec299e9592fed3abb795ddb81b533f6d818'
 
diff --git a/Casks/justlooking.rb b/Casks/justlooking.rb
index 8516652baad7..411d1a5060d7 100644
--- a/Casks/justlooking.rb
+++ b/Casks/justlooking.rb
@@ -1,4 +1,4 @@
-class Justlooking < Cask
+cask :v1 => 'justlooking' do
   version '3.3.3'
   sha256 '730b852c020498886ed061996d9fd5c13c85da707dd18dabbe4cb804afcf1786'
 
diff --git a/Casks/jxplorer.rb b/Casks/jxplorer.rb
index 55e2673f087b..c795cc26537e 100644
--- a/Casks/jxplorer.rb
+++ b/Casks/jxplorer.rb
@@ -1,4 +1,4 @@
-class Jxplorer < Cask
+cask :v1 => 'jxplorer' do
   version '3.3.1'
   sha256 'b51995a93203590e6690d8ad54f73cd7af1c9f2bef6219adca79c58eda71d860'
 
diff --git a/Casks/kaleidoscope.rb b/Casks/kaleidoscope.rb
index 59e49712da73..8e6550af73c9 100644
--- a/Casks/kaleidoscope.rb
+++ b/Casks/kaleidoscope.rb
@@ -1,4 +1,4 @@
-class Kaleidoscope < Cask
+cask :v1 => 'kaleidoscope' do
   version '2.1.0-134'
   sha256 'e16360273fb6d37560c7974b95728d82a0482268641753c49f903bf36445d35b'
 
diff --git a/Casks/kamakiri.rb b/Casks/kamakiri.rb
index d99499d94f78..aaf9def410ce 100644
--- a/Casks/kamakiri.rb
+++ b/Casks/kamakiri.rb
@@ -1,4 +1,4 @@
-class Kamakiri < Cask
+cask :v1 => 'kamakiri' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/karabiner.rb b/Casks/karabiner.rb
index 14e95469bb56..162160304530 100644
--- a/Casks/karabiner.rb
+++ b/Casks/karabiner.rb
@@ -1,4 +1,4 @@
-class Karabiner < Cask
+cask :v1 => 'karabiner' do
   version '10.4.0'
   sha256 'b1e3ffb7cd10ec8651c68b184c236589f182a273dad4b1c68ab2c15d36a34248'
 
diff --git a/Casks/katana.rb b/Casks/katana.rb
index 082a44080ed0..d18c53e99144 100644
--- a/Casks/katana.rb
+++ b/Casks/katana.rb
@@ -1,4 +1,4 @@
-class Katana < Cask
+cask :v1 => 'katana' do
   version '1.1.1'
   sha256 'cac0091f63a0281f6f95f609e04455db98f915f4e1f40a575e822208b3265eae'
 
diff --git a/Casks/kdiff3.rb b/Casks/kdiff3.rb
index e36a700357bb..b03e8f6f31e2 100644
--- a/Casks/kdiff3.rb
+++ b/Casks/kdiff3.rb
@@ -1,4 +1,4 @@
-class Kdiff3 < Cask
+cask :v1 => 'kdiff3' do
   # note: "3" is not a version number, but an intrinsic part of the product name (3-way diff)
   version '0.9.98'
   sha256 '3cbfb7f30989af2b28658a5f9f331c1a20275f16f42f3126119913b65cb06777'
diff --git a/Casks/keepassx.rb b/Casks/keepassx.rb
index 7f8908db761b..f43a00d10819 100644
--- a/Casks/keepassx.rb
+++ b/Casks/keepassx.rb
@@ -1,4 +1,4 @@
-class Keepassx < Cask
+cask :v1 => 'keepassx' do
   version '2.0-alpha6'
   sha256 '55aeaba8257d728b62ba173ba56df27897552737a556dc1e4e4ed6dcd3d6dd8a'
 
diff --git a/Casks/keepingyouawake.rb b/Casks/keepingyouawake.rb
index 3290e3b2657e..71a2120660e0 100644
--- a/Casks/keepingyouawake.rb
+++ b/Casks/keepingyouawake.rb
@@ -1,4 +1,4 @@
-class Keepingyouawake < Cask
+cask :v1 => 'keepingyouawake' do
   version '1.1'
   sha256 '78abc2e8451be3120dc49886feae1894a5eecaa1d2d0f988b767729f97560cc6'
 
diff --git a/Casks/keka.rb b/Casks/keka.rb
index 481140c7195d..e14abe8da1a7 100644
--- a/Casks/keka.rb
+++ b/Casks/keka.rb
@@ -1,4 +1,4 @@
-class Keka < Cask
+cask :v1 => 'keka' do
   version '1.0.4'
   sha256 '0075741ed52e2c86d7749dfe2baf54c8b6dad75a780b4b51ca5fb14337124701'
 
diff --git a/Casks/kensington-trackball-works.rb b/Casks/kensington-trackball-works.rb
index cdd85d88766c..ed0c7b1547b9 100644
--- a/Casks/kensington-trackball-works.rb
+++ b/Casks/kensington-trackball-works.rb
@@ -1,4 +1,4 @@
-class KensingtonTrackballWorks < Cask
+cask :v1 => 'kensington-trackball-works' do
   version '1.1.2'
   sha256 '02e3fed2fe01c234206d3fcf2c85f71f10aa2a3bc3d3dd6f4694ac41b725e3df'
 
diff --git a/Casks/kext-drop.rb b/Casks/kext-drop.rb
index e00eb6d92517..c5c03f30a1d8 100644
--- a/Casks/kext-drop.rb
+++ b/Casks/kext-drop.rb
@@ -1,4 +1,4 @@
-class KextDrop < Cask
+cask :v1 => 'kext-drop' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/kext-utility.rb b/Casks/kext-utility.rb
index 60cb8c48c08b..e6160cf8fa94 100644
--- a/Casks/kext-utility.rb
+++ b/Casks/kext-utility.rb
@@ -1,4 +1,4 @@
-class KextUtility < Cask
+cask :v1 => 'kext-utility' do
   version '2.5.6'
   sha256 'ae3533e15b646f6b3cd8b8ad84e0bbd3edcf51661ef573255658546d9fbeda5a'
 
diff --git a/Casks/kext-wizard.rb b/Casks/kext-wizard.rb
index 4f4a3071b740..022897c50674 100644
--- a/Casks/kext-wizard.rb
+++ b/Casks/kext-wizard.rb
@@ -1,4 +1,4 @@
-class KextWizard < Cask
+cask :v1 => 'kext-wizard' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/key-codes.rb b/Casks/key-codes.rb
index 8de79960866a..b9453b24ee64 100644
--- a/Casks/key-codes.rb
+++ b/Casks/key-codes.rb
@@ -1,4 +1,4 @@
-class KeyCodes < Cask
+cask :v1 => 'key-codes' do
   version '2.0.1'
   sha256 '47d61049953e8fcf881c0c6b9c7060fed2248750f23c26b71b51092384bd5a4a'
 
diff --git a/Casks/keyboard-cleaner.rb b/Casks/keyboard-cleaner.rb
index 8dcd0ec84ad0..f8733c371060 100644
--- a/Casks/keyboard-cleaner.rb
+++ b/Casks/keyboard-cleaner.rb
@@ -1,4 +1,4 @@
-class KeyboardCleaner < Cask
+cask :v1 => 'keyboard-cleaner' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/keyboard-maestro.rb b/Casks/keyboard-maestro.rb
index 08cacdad3cfe..18851e106feb 100644
--- a/Casks/keyboard-maestro.rb
+++ b/Casks/keyboard-maestro.rb
@@ -1,4 +1,4 @@
-class KeyboardMaestro < Cask
+cask :v1 => 'keyboard-maestro' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/keyboardcleantool.rb b/Casks/keyboardcleantool.rb
index 30a45853d721..1b32c73fcf69 100644
--- a/Casks/keyboardcleantool.rb
+++ b/Casks/keyboardcleantool.rb
@@ -1,4 +1,4 @@
-class Keyboardcleantool < Cask
+cask :v1 => 'keyboardcleantool' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/keycastr.rb b/Casks/keycastr.rb
index 1748b3dbf633..0681187c5541 100644
--- a/Casks/keycastr.rb
+++ b/Casks/keycastr.rb
@@ -1,4 +1,4 @@
-class Keycastr < Cask
+cask :v1 => 'keycastr' do
   version '0.8.0'
   sha256 'ecf59a2e46a8ca450c12f426a4d41000de1c3010a5c46fe12f23fdc647f3f1e7'
 
diff --git a/Casks/keycue.rb b/Casks/keycue.rb
index 28de214f613d..d8091307acc6 100644
--- a/Casks/keycue.rb
+++ b/Casks/keycue.rb
@@ -1,4 +1,4 @@
-class Keycue < Cask
+cask :v1 => 'keycue' do
   version '7.3'
   sha256 'd46a4aa6fe99584e75aa49f3668d2f4d76cc18d4631d7782a129b7f9fb1d4fa9'
 
diff --git a/Casks/keyfinder.rb b/Casks/keyfinder.rb
index 4db33d4cc39e..284e796f9c3f 100644
--- a/Casks/keyfinder.rb
+++ b/Casks/keyfinder.rb
@@ -1,4 +1,4 @@
-class Keyfinder < Cask
+cask :v1 => 'keyfinder' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/keymo.rb b/Casks/keymo.rb
index a26408552ccd..85fa92025511 100644
--- a/Casks/keymo.rb
+++ b/Casks/keymo.rb
@@ -1,4 +1,4 @@
-class Keymo < Cask
+cask :v1 => 'keymo' do
   version '1.2.1'
   sha256 '6ae33f5287e8be279c87f0bb5d22e77f806b9e2438f826935de5d6df34641d67'
 
diff --git a/Casks/keystore-explorer.rb b/Casks/keystore-explorer.rb
index 77652f64ba3d..883fd97fdde1 100644
--- a/Casks/keystore-explorer.rb
+++ b/Casks/keystore-explorer.rb
@@ -1,4 +1,4 @@
-class KeystoreExplorer < Cask
+cask :v1 => 'keystore-explorer' do
   version '5.0.1'
   sha256 '64932fc5a26bd4de32d952b73431307c9a7c3100c1b11e76ab9f55e2a2cf7d49'
 
diff --git a/Casks/kicad.rb b/Casks/kicad.rb
index cb1d4d2678af..6921aea09fd7 100644
--- a/Casks/kicad.rb
+++ b/Casks/kicad.rb
@@ -1,4 +1,4 @@
-class Kicad < Cask
+cask :v1 => 'kicad' do
   version '2014-02-26'
   sha256 '066520f10e9646e88c2e1d7812adf54a73a331592076f394cb439a97c228410b'
 
diff --git a/Casks/kid3.rb b/Casks/kid3.rb
index 21a1c309b482..5082843ad56d 100644
--- a/Casks/kid3.rb
+++ b/Casks/kid3.rb
@@ -1,4 +1,4 @@
-class Kid3 < Cask
+cask :v1 => 'kid3' do
   # note: "3" is not a version number, but an intrinsic part of the product name (ID3 tags)
   version '3.1.1'
   sha256 '1a27b9743a4029221601fb872a38aca235a23f8234c7a07fa0cb547eb58129c6'
diff --git a/Casks/kindle-previewer.rb b/Casks/kindle-previewer.rb
index 6a2128c2f173..c47a7332cfcf 100644
--- a/Casks/kindle-previewer.rb
+++ b/Casks/kindle-previewer.rb
@@ -1,4 +1,4 @@
-class KindlePreviewer < Cask
+cask :v1 => 'kindle-previewer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/kindlegen.rb b/Casks/kindlegen.rb
index 66e9530bef0e..02420a25e5e2 100644
--- a/Casks/kindlegen.rb
+++ b/Casks/kindlegen.rb
@@ -1,4 +1,4 @@
-class Kindlegen < Cask
+cask :v1 => 'kindlegen' do
   version '2.9'
   sha256 '45e5feac97f0590038a911fffd7d332973d88a40ad52135dce89afed33e7236c'
 
diff --git a/Casks/kinsky.rb b/Casks/kinsky.rb
index 204febe32aa6..bfcfdbc7b25a 100644
--- a/Casks/kinsky.rb
+++ b/Casks/kinsky.rb
@@ -1,4 +1,4 @@
-class Kinsky < Cask
+cask :v1 => 'kinsky' do
   version '4.3.17'
   sha256 '624d2ee1c2ab62e347b7effe0ec8b1bd32d6e70d9cae6fb62d8fb8e2995c7173'
 
diff --git a/Casks/kismac.rb b/Casks/kismac.rb
index 4bd5c910e7f7..f92319606afe 100644
--- a/Casks/kismac.rb
+++ b/Casks/kismac.rb
@@ -1,4 +1,4 @@
-class Kismac < Cask
+cask :v1 => 'kismac' do
   version '0.3.3'
   sha256 'd48f307c1c46a1d1a6b4465d653cf417e583bc09b7ea76d21183068066bc49bb'
 
diff --git a/Casks/kitematic.rb b/Casks/kitematic.rb
index 88168bd7de39..27de7de65c3d 100644
--- a/Casks/kitematic.rb
+++ b/Casks/kitematic.rb
@@ -1,4 +1,4 @@
-class Kitematic < Cask
+cask :v1 => 'kitematic' do
   version '0.3.0'
   sha256 '1f7695c23024fc5661b8d8714c3a80e8fe50bcce093ce64b0f2c4c77b70700f0'
 
diff --git a/Casks/kivy.rb b/Casks/kivy.rb
index a1fc70f5a1a6..135a8528e244 100644
--- a/Casks/kivy.rb
+++ b/Casks/kivy.rb
@@ -1,4 +1,4 @@
-class Kivy < Cask
+cask :v1 => 'kivy' do
   version '1.8.0'
   sha256 'e6db3a157e67d09bacbe2e423feec33dedaca8e10d170362ddf59a70a59e2590'
 
diff --git a/Casks/kiwi.rb b/Casks/kiwi.rb
index b132e45a0334..fc0376be60bc 100644
--- a/Casks/kiwi.rb
+++ b/Casks/kiwi.rb
@@ -1,4 +1,4 @@
-class Kiwi < Cask
+cask :v1 => 'kiwi' do
   version '3.1.0'
   sha256 'd01a76d44246237995c85109df089449396d9d82f8b020a71fac5c779600d402'
 
diff --git a/Casks/kkbox.rb b/Casks/kkbox.rb
index a191c17b8851..676aa386d59c 100644
--- a/Casks/kkbox.rb
+++ b/Casks/kkbox.rb
@@ -1,4 +1,4 @@
-class Kkbox < Cask
+cask :v1 => 'kkbox' do
   version '5.0.18'
   sha256 '7e0a888eafc67e5cf040fe3ff95a00f2aa966f7e66e44406cd636c5861c90286'
 
diff --git a/Casks/klayout.rb b/Casks/klayout.rb
index cae5026b977f..af90098f0635 100644
--- a/Casks/klayout.rb
+++ b/Casks/klayout.rb
@@ -1,4 +1,4 @@
-class Klayout < Cask
+cask :v1 => 'klayout' do
   version '0.23.2'
   sha256 '96ce3fdead710248ed2ed4f25c9a94859949466d42eaa4f87881c17567dc1f15'
 
diff --git a/Casks/knock.rb b/Casks/knock.rb
index caf7b960129c..f3b0e8d1bf3c 100644
--- a/Casks/knock.rb
+++ b/Casks/knock.rb
@@ -1,4 +1,4 @@
-class Knock < Cask
+cask :v1 => 'knock' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/knox.rb b/Casks/knox.rb
index e4315e954115..a87f461ac13b 100644
--- a/Casks/knox.rb
+++ b/Casks/knox.rb
@@ -1,4 +1,4 @@
-class Knox < Cask
+cask :v1 => 'knox' do
   version '2.2.0'
   sha256 'c19c56a35d299a2cd85c612e1e99009bff9d7536ddd24f9d565910702be9742a'
 
diff --git a/Casks/kobito.rb b/Casks/kobito.rb
index 691ac44a8659..39d258d7de01 100644
--- a/Casks/kobito.rb
+++ b/Casks/kobito.rb
@@ -1,4 +1,4 @@
-class Kobito < Cask
+cask :v1 => 'kobito' do
   version '1.9.2'
   sha256 '8129e70fda4595fe4e4be5406f2383f5900421da2bc9b7c53cd0e74762f42ba2'
 
diff --git a/Casks/kobo.rb b/Casks/kobo.rb
index 074bd7b21574..fffbd8ebf830 100644
--- a/Casks/kobo.rb
+++ b/Casks/kobo.rb
@@ -1,4 +1,4 @@
-class Kobo < Cask
+cask :v1 => 'kobo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/kod.rb b/Casks/kod.rb
index bf85116c7c8b..857b6e1f22b1 100644
--- a/Casks/kod.rb
+++ b/Casks/kod.rb
@@ -1,4 +1,4 @@
-class Kod < Cask
+cask :v1 => 'kod' do
   version '0.0.3'
   sha256 'bbc645f03e3aa49438606f2c874b6773c648e8409a395149492ec000b10d4ddb'
 
diff --git a/Casks/komanda.rb b/Casks/komanda.rb
index 39e7f4b30ed6..6840da7ed24e 100644
--- a/Casks/komanda.rb
+++ b/Casks/komanda.rb
@@ -1,4 +1,4 @@
-class Komanda < Cask
+cask :v1 => 'komanda' do
   version '1.0.0 beta'
   sha256 'e54f195185d92b0b4a9e9be3b1db4b2cbd99723c93e9b6e57feb0df90b27a5d1'
 
diff --git a/Casks/komodo-edit.rb b/Casks/komodo-edit.rb
index 74a2dd7f75a4..f6970f1fb0ca 100644
--- a/Casks/komodo-edit.rb
+++ b/Casks/komodo-edit.rb
@@ -1,4 +1,4 @@
-class KomodoEdit < Cask
+cask :v1 => 'komodo-edit' do
   version '8.5.4'
   sha256 '424558813e2926386e9d1de2bf93eb772a9b61b2f90688efc13e073d0d1b452e'
 
diff --git a/Casks/komodo-ide.rb b/Casks/komodo-ide.rb
index 1c91c65d1f35..7f8fd2b3c040 100644
--- a/Casks/komodo-ide.rb
+++ b/Casks/komodo-ide.rb
@@ -1,4 +1,4 @@
-class KomodoIde < Cask
+cask :v1 => 'komodo-ide' do
   version '8.5.4-86985'
   sha256 'dde427a79aa17f5404b15bb286c075857fe5407f98395cc97f3e0e9c8b27851c'
 
diff --git a/Casks/kompozer.rb b/Casks/kompozer.rb
index 50a252f31b04..7de1bd845255 100644
--- a/Casks/kompozer.rb
+++ b/Casks/kompozer.rb
@@ -1,4 +1,4 @@
-class Kompozer < Cask
+cask :v1 => 'kompozer' do
   version '0.8b3'
   sha256 '415e019c9b3ec1c76465bf4f561fa515f403e57ac6f92c76365d902241dc14ed'
 
diff --git a/Casks/ksdiff.rb b/Casks/ksdiff.rb
index 38fe1638ecea..8d488dbe2e64 100644
--- a/Casks/ksdiff.rb
+++ b/Casks/ksdiff.rb
@@ -1,4 +1,4 @@
-class Ksdiff < Cask
+cask :v1 => 'ksdiff' do
   version '2.1.0 (122)'
   sha256 '9570f53dcbeb558c53f4808ba58e8c9f394a3026e8bdd122277200a1cdf11e52'
 
diff --git a/Casks/kuaipan.rb b/Casks/kuaipan.rb
index 9f696b63abf8..77bc6c5d2002 100644
--- a/Casks/kuaipan.rb
+++ b/Casks/kuaipan.rb
@@ -1,4 +1,4 @@
-class Kuaipan < Cask
+cask :v1 => 'kuaipan' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/kugoumusic.rb b/Casks/kugoumusic.rb
index 14ef76d002b8..fe9ff7a447a9 100644
--- a/Casks/kugoumusic.rb
+++ b/Casks/kugoumusic.rb
@@ -1,4 +1,4 @@
-class Kugoumusic < Cask
+cask :v1 => 'kugoumusic' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/kvirc.rb b/Casks/kvirc.rb
index 9ab140764c75..6a837e68bee8 100644
--- a/Casks/kvirc.rb
+++ b/Casks/kvirc.rb
@@ -1,4 +1,4 @@
-class Kvirc < Cask
+cask :v1 => 'kvirc' do
   version '4.2.0'
   sha256 'bb450b5abc2012cfc6c3f2cce3c8b13239acad4553cdd73d48f8d47dd8cf61c2'
 
diff --git a/Casks/kylo.rb b/Casks/kylo.rb
index da0fed4ef884..23b135cc600a 100644
--- a/Casks/kylo.rb
+++ b/Casks/kylo.rb
@@ -1,4 +1,4 @@
-class Kylo < Cask
+cask :v1 => 'kylo' do
   version '1.0.1.76141'
   sha256 '5c5f1c3aedba9aa2807cffbc3aec448f0f51e16e1039c0314cf6394ddbe391b1'
 
diff --git a/Casks/laplock.rb b/Casks/laplock.rb
index cb0bd2c8e940..9c79ea2c1d54 100644
--- a/Casks/laplock.rb
+++ b/Casks/laplock.rb
@@ -1,4 +1,4 @@
-class Laplock < Cask
+cask :v1 => 'laplock' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/lastfm.rb b/Casks/lastfm.rb
index 3b11916a13cb..3470b7eed4dd 100644
--- a/Casks/lastfm.rb
+++ b/Casks/lastfm.rb
@@ -1,4 +1,4 @@
-class Lastfm < Cask
+cask :v1 => 'lastfm' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/lastpass-universal.rb b/Casks/lastpass-universal.rb
index 3233ac76357a..d9a79efdcf24 100644
--- a/Casks/lastpass-universal.rb
+++ b/Casks/lastpass-universal.rb
@@ -1,4 +1,4 @@
-class LastpassUniversal < Cask
+cask :v1 => 'lastpass-universal' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/latexian.rb b/Casks/latexian.rb
index e826768f4b65..205467a25ae7 100644
--- a/Casks/latexian.rb
+++ b/Casks/latexian.rb
@@ -1,4 +1,4 @@
-class Latexian < Cask
+cask :v1 => 'latexian' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/latexit.rb b/Casks/latexit.rb
index 6d779368551a..64492eb28b18 100644
--- a/Casks/latexit.rb
+++ b/Casks/latexit.rb
@@ -1,4 +1,4 @@
-class Latexit < Cask
+cask :v1 => 'latexit' do
   version '2.7.3'
   sha256 '45efeeea0d7bde36ba08aa663d6dd10092ec66d7622bccccf73732257e1e82f0'
 
diff --git a/Casks/launchbar.rb b/Casks/launchbar.rb
index 702802b7a646..baefc1b29a2f 100644
--- a/Casks/launchbar.rb
+++ b/Casks/launchbar.rb
@@ -1,4 +1,4 @@
-class Launchbar < Cask
+cask :v1 => 'launchbar' do
   version '6.1.3'
   sha256 'e5d52b87fa3c5c72062a3115cf300618e9a60d99958160a4c35a0b9365db5c43'
 
diff --git a/Casks/launchcontrol.rb b/Casks/launchcontrol.rb
index 23a03d159139..056f23a02e8e 100644
--- a/Casks/launchcontrol.rb
+++ b/Casks/launchcontrol.rb
@@ -1,4 +1,4 @@
-class Launchcontrol < Cask
+cask :v1 => 'launchcontrol' do
   version '1.16.2'
   sha256 '207b90ff2342ad3eee66036c7e97057d1c73f5c81abd243a4804e715d371e015'
 
diff --git a/Casks/launchrocket.rb b/Casks/launchrocket.rb
index 9707699fedfd..f73803f5d9a1 100644
--- a/Casks/launchrocket.rb
+++ b/Casks/launchrocket.rb
@@ -1,4 +1,4 @@
-class Launchrocket < Cask
+cask :v1 => 'launchrocket' do
   version '0.7'
   sha256 '51dc78902fecfb7ec26ab5c6516b84d1c62692349864ef48aca2fde81bd2ef4a'
 
diff --git a/Casks/launchy.rb b/Casks/launchy.rb
index 04adaa10f263..50349c7dba3a 100644
--- a/Casks/launchy.rb
+++ b/Casks/launchy.rb
@@ -1,4 +1,4 @@
-class Launchy < Cask
+cask :v1 => 'launchy' do
   version '2.5'
   sha256 '9a1112261c7f00d8600c2bf52abc98d5fabf89af56d5881a807b403b7c94e288'
 
diff --git a/Casks/layervault.rb b/Casks/layervault.rb
index 04e7c29af877..6d4bfe28bfc0 100644
--- a/Casks/layervault.rb
+++ b/Casks/layervault.rb
@@ -1,4 +1,4 @@
-class Layervault < Cask
+cask :v1 => 'layervault' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/lazarus.rb b/Casks/lazarus.rb
index 8469659832c9..739ca172db32 100644
--- a/Casks/lazarus.rb
+++ b/Casks/lazarus.rb
@@ -1,4 +1,4 @@
-class Lazarus < Cask
+cask :v1 => 'lazarus' do
   version '1.0.14'
   sha256 'b371f073ae2b8b83c88c356aed8dd717811ba4d9adfee6623a9a48a9c341531a'
 
diff --git a/Casks/league-of-legends.rb b/Casks/league-of-legends.rb
index bbe8c40c8955..526841969a20 100644
--- a/Casks/league-of-legends.rb
+++ b/Casks/league-of-legends.rb
@@ -1,4 +1,4 @@
-class LeagueOfLegends < Cask
+cask :v1 => 'league-of-legends' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/leap-motion.rb b/Casks/leap-motion.rb
index a18b3700808b..1c13756417b6 100644
--- a/Casks/leap-motion.rb
+++ b/Casks/leap-motion.rb
@@ -1,4 +1,4 @@
-class LeapMotion < Cask
+cask :v1 => 'leap-motion' do
   version '2.1.5'
   sha256 '472d1e535bf21ffd847ff5a872ac23bbb042c955a5e1a9351f52dc7fbb2b85b0'
 
diff --git a/Casks/leech.rb b/Casks/leech.rb
index a778f07217fa..0ce7668c6133 100644
--- a/Casks/leech.rb
+++ b/Casks/leech.rb
@@ -1,4 +1,4 @@
-class Leech < Cask
+cask :v1 => 'leech' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/leksah.rb b/Casks/leksah.rb
index 73c5555a48ab..6ce630c1ad5b 100644
--- a/Casks/leksah.rb
+++ b/Casks/leksah.rb
@@ -1,4 +1,4 @@
-class Leksah < Cask
+cask :v1 => 'leksah' do
   version '0.14.1.0-ghc-7.8.3'
   sha256 '52e0441a6cdb00f6bb96bd79444fe5ceb07812488e9797698278a93f833bae58'
 
diff --git a/Casks/levelator.rb b/Casks/levelator.rb
index 96768f2983d3..8158b43b26b0 100644
--- a/Casks/levelator.rb
+++ b/Casks/levelator.rb
@@ -1,4 +1,4 @@
-class Levelator < Cask
+cask :v1 => 'levelator' do
   version '2.1.1'
   sha256 '2f22f1cf7851a987dcb194a504e43f8255261d428074ea7144e2683b79d6975d'
 
diff --git a/Casks/librecad.rb b/Casks/librecad.rb
index 10188025ca9b..03c7085e6e84 100644
--- a/Casks/librecad.rb
+++ b/Casks/librecad.rb
@@ -1,4 +1,4 @@
-class Librecad < Cask
+cask :v1 => 'librecad' do
   version '2.0.5'
 
   if MacOS.version <= :mountain_lion
diff --git a/Casks/libreoffice.rb b/Casks/libreoffice.rb
index d94b9a37cd45..88c07e92d85a 100644
--- a/Casks/libreoffice.rb
+++ b/Casks/libreoffice.rb
@@ -1,4 +1,4 @@
-class Libreoffice < Cask
+cask :v1 => 'libreoffice' do
   version '4.3.3'
 
   if Hardware::CPU.is_32_bit? or MacOS.version < :mountain_lion
diff --git a/Casks/licecap.rb b/Casks/licecap.rb
index 53c0b5424f55..bebe4a95fe03 100644
--- a/Casks/licecap.rb
+++ b/Casks/licecap.rb
@@ -1,4 +1,4 @@
-class Licecap < Cask
+cask :v1 => 'licecap' do
   version '1.24'
   sha256 '0aae74885097731048b7e2111db9afbe77c30eb10779898bf9ea817de845bcbb'
 
diff --git a/Casks/licensed.rb b/Casks/licensed.rb
index 8d4dbb8da803..54299898449e 100644
--- a/Casks/licensed.rb
+++ b/Casks/licensed.rb
@@ -1,4 +1,4 @@
-class Licensed < Cask
+cask :v1 => 'licensed' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/lightpaper.rb b/Casks/lightpaper.rb
index 808ad0b772c5..31e67118afa9 100644
--- a/Casks/lightpaper.rb
+++ b/Casks/lightpaper.rb
@@ -1,4 +1,4 @@
-class Lightpaper < Cask
+cask :v1 => 'lightpaper' do
   version '0.9.0'
   sha256 'e90ad6d7052573a8048b65c590f9227f75a55690731ccf6986ded5982fc02afe'
 
diff --git a/Casks/lighttable.rb b/Casks/lighttable.rb
index 794f7ca58b59..0336398a21b1 100644
--- a/Casks/lighttable.rb
+++ b/Casks/lighttable.rb
@@ -1,4 +1,4 @@
-class Lighttable < Cask
+cask :v1 => 'lighttable' do
   version '0.6.7'
   sha256 'b398d71401abf476fd7f6c36b326d2d4459782783a07e62d2d631a67c1bc1cb3'
 
diff --git a/Casks/lilypond.rb b/Casks/lilypond.rb
index 5a920077d704..9efbafb606d7 100644
--- a/Casks/lilypond.rb
+++ b/Casks/lilypond.rb
@@ -1,4 +1,4 @@
-class Lilypond < Cask
+cask :v1 => 'lilypond' do
   version '2.18.2-1'
   sha256 '0009bf234db6a598e30940ae9a5cef50ffe939992c9bf0c7959ecd9c0d179c80'
 
diff --git a/Casks/limechat.rb b/Casks/limechat.rb
index 5c914688c6eb..c98129cefb5e 100644
--- a/Casks/limechat.rb
+++ b/Casks/limechat.rb
@@ -1,4 +1,4 @@
-class Limechat < Cask
+cask :v1 => 'limechat' do
 
   if MacOS.version < :mountain_lion
     version '2.38'
diff --git a/Casks/lincastor.rb b/Casks/lincastor.rb
index a54868cc9f66..274acb69238e 100644
--- a/Casks/lincastor.rb
+++ b/Casks/lincastor.rb
@@ -1,4 +1,4 @@
-class Lincastor < Cask
+cask :v1 => 'lincastor' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/linein.rb b/Casks/linein.rb
index ec528cc54613..17853c2509bc 100644
--- a/Casks/linein.rb
+++ b/Casks/linein.rb
@@ -1,4 +1,4 @@
-class Linein < Cask
+cask :v1 => 'linein' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/lingon-x.rb b/Casks/lingon-x.rb
index 061c3c425f7b..4e22d8245a16 100644
--- a/Casks/lingon-x.rb
+++ b/Casks/lingon-x.rb
@@ -1,4 +1,4 @@
-class LingonX < Cask
+cask :v1 => 'lingon-x' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/lingrradar.rb b/Casks/lingrradar.rb
index c9691187a93e..3f1d5fe753d9 100644
--- a/Casks/lingrradar.rb
+++ b/Casks/lingrradar.rb
@@ -1,4 +1,4 @@
-class Lingrradar < Cask
+cask :v1 => 'lingrradar' do
   version '2.26'
   sha256 'c1883e5bb0d31055a34651c1315dd5fdbdc5126dc493a84ea40cf518e4ff23b6'
 
diff --git a/Casks/linkinus.rb b/Casks/linkinus.rb
index 24b90a5d62ad..0e00c3d81f9c 100644
--- a/Casks/linkinus.rb
+++ b/Casks/linkinus.rb
@@ -1,4 +1,4 @@
-class Linkinus < Cask
+cask :v1 => 'linkinus' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/linkliar.rb b/Casks/linkliar.rb
index e3856220411b..93d50c73250c 100644
--- a/Casks/linkliar.rb
+++ b/Casks/linkliar.rb
@@ -1,4 +1,4 @@
-class Linkliar < Cask
+cask :v1 => 'linkliar' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/linphone.rb b/Casks/linphone.rb
index a7896ed0b103..786964010b52 100644
--- a/Casks/linphone.rb
+++ b/Casks/linphone.rb
@@ -1,4 +1,4 @@
-class Linphone < Cask
+cask :v1 => 'linphone' do
   version '3.7.0'
   sha256 '4d4a01354a7b5cd011746d3477a93ffb6e531ff8e2afccd2b9bb031f06cc42cc'
 
diff --git a/Casks/liquifile.rb b/Casks/liquifile.rb
index a8399903f996..9929f00068d0 100644
--- a/Casks/liquifile.rb
+++ b/Casks/liquifile.rb
@@ -1,4 +1,4 @@
-class Liquifile < Cask
+cask :v1 => 'liquifile' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/litecoin.rb b/Casks/litecoin.rb
index 052d3b56425c..94ccc73aa6c1 100644
--- a/Casks/litecoin.rb
+++ b/Casks/litecoin.rb
@@ -1,4 +1,4 @@
-class Litecoin < Cask
+cask :v1 => 'litecoin' do
   version '0.8.7.4'
   sha256 'ab69c7b668cae4cff2025e3ea6845751277851e880a7f030e12ec525d088eeb9'
 
diff --git a/Casks/liteicon.rb b/Casks/liteicon.rb
index edc6df2f0d4a..6cb27c3dbe9a 100644
--- a/Casks/liteicon.rb
+++ b/Casks/liteicon.rb
@@ -1,4 +1,4 @@
-class Liteicon < Cask
+cask :v1 => 'liteicon' do
   version '3.5.3'
   sha256 '73f1e5c6fe0bb9ad08004234d4a0b245fd6698f1623c7485080ae0a2ae7cf299'
 
diff --git a/Casks/liteide.rb b/Casks/liteide.rb
index ff006369ed95..b9e40f7ce6eb 100644
--- a/Casks/liteide.rb
+++ b/Casks/liteide.rb
@@ -1,4 +1,4 @@
-class Liteide < Cask
+cask :v1 => 'liteide' do
   version '24.2'
   sha256 '2178ec58f1aa3fe64be6d4f9c516fe6f712667bfe1abfa85aed6718cc7f3ef9a'
 
diff --git a/Casks/little-snitch.rb b/Casks/little-snitch.rb
index 4a10568b84ed..962fd6509e56 100644
--- a/Casks/little-snitch.rb
+++ b/Casks/little-snitch.rb
@@ -1,4 +1,4 @@
-class LittleSnitch < Cask
+cask :v1 => 'little-snitch' do
   version '3.4.2'
   sha256 'ddb2e739334d759508bb356ae7b18a3228664fd5a6d5aff39d355f8c0d23e8b3'
 
diff --git a/Casks/littleipsum.rb b/Casks/littleipsum.rb
index 14d0585471ef..c98da0ec5edb 100644
--- a/Casks/littleipsum.rb
+++ b/Casks/littleipsum.rb
@@ -1,4 +1,4 @@
-class Littleipsum < Cask
+cask :v1 => 'littleipsum' do
   version '1.1.2'
   sha256 '5fa88e5cd2cc1c837ac3e9ff3a23ce1569835d56c71e2741243ce9f0424099db'
 
diff --git a/Casks/livereload.rb b/Casks/livereload.rb
index 590896c35da7..73f269a7d778 100644
--- a/Casks/livereload.rb
+++ b/Casks/livereload.rb
@@ -1,4 +1,4 @@
-class Livereload < Cask
+cask :v1 => 'livereload' do
   version '2.3.26'
   sha256 '94ede4d8b0c991f3e712659628e9dc01d20991ebaabb3a5579647ea3646c9ad4'
 
diff --git a/Casks/livestation.rb b/Casks/livestation.rb
index c25d45173bf0..0560e859bee7 100644
--- a/Casks/livestation.rb
+++ b/Casks/livestation.rb
@@ -1,4 +1,4 @@
-class Livestation < Cask
+cask :v1 => 'livestation' do
   version '3.3.0'
   sha256 '8ed0bdcb6aee4dca18e64c6c6390b3f83c67c6d9c36358ff800ece7a870f9dd3'
 
diff --git a/Casks/loadmytracks.rb b/Casks/loadmytracks.rb
index f192a4f3544e..ff20abbc27b7 100644
--- a/Casks/loadmytracks.rb
+++ b/Casks/loadmytracks.rb
@@ -1,4 +1,4 @@
-class Loadmytracks < Cask
+cask :v1 => 'loadmytracks' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/locko.rb b/Casks/locko.rb
index 19aeff676278..7b02160abd2d 100644
--- a/Casks/locko.rb
+++ b/Casks/locko.rb
@@ -1,4 +1,4 @@
-class Locko < Cask
+cask :v1 => 'locko' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/logic.rb b/Casks/logic.rb
index 48d54c65eada..04ce9925aa52 100644
--- a/Casks/logic.rb
+++ b/Casks/logic.rb
@@ -1,4 +1,4 @@
-class Logic < Cask
+cask :v1 => 'logic' do
   version '1.1.15'
   sha256 '1c37d6809bfb6daec88a7a34c6f056b93179c2471385f5e7be4d4271995995b1'
 
diff --git a/Casks/logicsniffer.rb b/Casks/logicsniffer.rb
index cb3dfe1f282d..1619ec6e5c3d 100644
--- a/Casks/logicsniffer.rb
+++ b/Casks/logicsniffer.rb
@@ -1,4 +1,4 @@
-class Logicsniffer < Cask
+cask :v1 => 'logicsniffer' do
   version '0.9.7.1'
   sha256 'd3901d6c2356abc5fcbbeb8dc9950148d486b98239cd26c0cca7cc1ce3c4f106'
 
diff --git a/Casks/logisim.rb b/Casks/logisim.rb
index e8b03b08f05d..9a7e08e29011 100644
--- a/Casks/logisim.rb
+++ b/Casks/logisim.rb
@@ -1,4 +1,4 @@
-class Logisim < Cask
+cask :v1 => 'logisim' do
   version '2.7.1'
   sha256 '41c5555b8021794e268a3fc2c9c51301d919680ae780b000b99380fc492bae7c'
 
diff --git a/Casks/logitech-control-center.rb b/Casks/logitech-control-center.rb
index 628bb87c10f4..e1de34506fda 100644
--- a/Casks/logitech-control-center.rb
+++ b/Casks/logitech-control-center.rb
@@ -1,4 +1,4 @@
-class LogitechControlCenter < Cask
+cask :v1 => 'logitech-control-center' do
   version '3.9.0.60'
   sha256 '1eab6118dc5ad0b3c790b9132b5968050dab0117b07d8f338c471aff00078df1'
 
diff --git a/Casks/logitech-gaming-software.rb b/Casks/logitech-gaming-software.rb
index 71e057433e97..84b8919a50ae 100644
--- a/Casks/logitech-gaming-software.rb
+++ b/Casks/logitech-gaming-software.rb
@@ -1,4 +1,4 @@
-class LogitechGamingSoftware < Cask
+cask :v1 => 'logitech-gaming-software' do
   version '8.53.10'
   sha256 '60ce2aacf33ab523333328128ce96239e6e4bb90f6100d1d7d3d40fce28185a9'
 
diff --git a/Casks/logitech-harmony.rb b/Casks/logitech-harmony.rb
index 2f38dbe64e52..596d82c55043 100644
--- a/Casks/logitech-harmony.rb
+++ b/Casks/logitech-harmony.rb
@@ -1,4 +1,4 @@
-class LogitechHarmony < Cask
+cask :v1 => 'logitech-harmony' do
   version '7.8.1'
   sha256 '13a100211fb18569563c9d9bbe6c231cbfaa50989df0b471703ec942be2ecafb'
 
diff --git a/Casks/logitech-myharmony.rb b/Casks/logitech-myharmony.rb
index 797b598218a5..705f10dfad78 100644
--- a/Casks/logitech-myharmony.rb
+++ b/Casks/logitech-myharmony.rb
@@ -1,4 +1,4 @@
-class LogitechMyharmony < Cask
+cask :v1 => 'logitech-myharmony' do
   version '1.0'
   sha256 '537a11f2174dc748c27aff02bf01569b5bb2c93539b339c6fd61a7da07bb059f'
 
diff --git a/Casks/logitech-unifying.rb b/Casks/logitech-unifying.rb
index a55f1307e573..31a2e6232254 100644
--- a/Casks/logitech-unifying.rb
+++ b/Casks/logitech-unifying.rb
@@ -1,4 +1,4 @@
-class LogitechUnifying < Cask
+cask :v1 => 'logitech-unifying' do
   version '1.10.421'
   sha256 'd9e196411cc4c0aec72fd01575eaffed228f95bc7d7ededc532d53f8602caa03'
 
diff --git a/Casks/logmein-client.rb b/Casks/logmein-client.rb
index 338d558c0d8d..6f6acfaadf77 100644
--- a/Casks/logmein-client.rb
+++ b/Casks/logmein-client.rb
@@ -1,4 +1,4 @@
-class LogmeinClient < Cask
+cask :v1 => 'logmein-client' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/logmein-hamachi.rb b/Casks/logmein-hamachi.rb
index bb670b155397..f1d90c8fb9b8 100644
--- a/Casks/logmein-hamachi.rb
+++ b/Casks/logmein-hamachi.rb
@@ -1,4 +1,4 @@
-class LogmeinHamachi < Cask
+cask :v1 => 'logmein-hamachi' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/logoist.rb b/Casks/logoist.rb
index 7faea74ed604..0e3d017385a2 100644
--- a/Casks/logoist.rb
+++ b/Casks/logoist.rb
@@ -1,4 +1,4 @@
-class Logoist < Cask
+cask :v1 => 'logoist' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/loom.rb b/Casks/loom.rb
index d71d144bd951..c30b05116930 100644
--- a/Casks/loom.rb
+++ b/Casks/loom.rb
@@ -1,4 +1,4 @@
-class Loom < Cask
+cask :v1 => 'loom' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/love.rb b/Casks/love.rb
index df229ef9d67d..7a19e4877644 100644
--- a/Casks/love.rb
+++ b/Casks/love.rb
@@ -1,4 +1,4 @@
-class Love < Cask
+cask :v1 => 'love' do
   version '0.9.1'
   sha256 '40dfeb1069f6c056b06d0e87c64f3950fd1b1523a9e19af2b03912a5d5c03b13'
 
diff --git a/Casks/lpk25-editor.rb b/Casks/lpk25-editor.rb
index f8743760ecb9..4b97ee3ba517 100644
--- a/Casks/lpk25-editor.rb
+++ b/Casks/lpk25-editor.rb
@@ -1,4 +1,4 @@
-class Lpk25Editor < Cask
+cask :v1 => 'lpk25-editor' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ltspice.rb b/Casks/ltspice.rb
index 2553e87cb0b1..1f7d697a9dd2 100644
--- a/Casks/ltspice.rb
+++ b/Casks/ltspice.rb
@@ -1,4 +1,4 @@
-class Ltspice < Cask
+cask :v1 => 'ltspice' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/lucidor.rb b/Casks/lucidor.rb
index 7f96be275e8b..63f6e618d330 100644
--- a/Casks/lucidor.rb
+++ b/Casks/lucidor.rb
@@ -1,4 +1,4 @@
-class Lucidor < Cask
+cask :v1 => 'lucidor' do
   version '0.9.8-1'
   sha256 'b94cca22b82ba508a8a9bd5ced62ec3ff093e74c1bf2841a0962c3bba1306a8d'
 
diff --git a/Casks/luminance-hdr.rb b/Casks/luminance-hdr.rb
index 252ad8c6b52c..6582f3dae916 100644
--- a/Casks/luminance-hdr.rb
+++ b/Casks/luminance-hdr.rb
@@ -1,4 +1,4 @@
-class LuminanceHdr < Cask
+cask :v1 => 'luminance-hdr' do
   version '2.4.0'
   sha256 '8b97a9bf902aba0249091a70637df5f6040cdc25f9522aaa25bbb73aa9e297b9'
 
diff --git a/Casks/lyn.rb b/Casks/lyn.rb
index bcf4073832e3..54cc839c33a4 100644
--- a/Casks/lyn.rb
+++ b/Casks/lyn.rb
@@ -1,4 +1,4 @@
-class Lyn < Cask
+cask :v1 => 'lyn' do
   version '1.5.2'
   sha256 'a4200b35eb4e51c3932a9e7cd40e1be3291a26921da350d396d337fa667798f6'
 
diff --git a/Casks/lynxlet.rb b/Casks/lynxlet.rb
index 7b2db5ac8e9c..00eef6b005f6 100644
--- a/Casks/lynxlet.rb
+++ b/Casks/lynxlet.rb
@@ -1,4 +1,4 @@
-class Lynxlet < Cask
+cask :v1 => 'lynxlet' do
   version '0.8.1'
   sha256 '78224e5bfcfcea7d63a22e3baaeac0df215673b94af32c572714b061cf05789f'
 
diff --git a/Casks/lyrics-master.rb b/Casks/lyrics-master.rb
index 152a0c1a07ab..3afc4425e841 100644
--- a/Casks/lyrics-master.rb
+++ b/Casks/lyrics-master.rb
@@ -1,4 +1,4 @@
-class LyricsMaster < Cask
+cask :v1 => 'lyrics-master' do
   version '2.4.2'
   sha256 '1cd0f639ea1e557e0abef320ee8ea61877c24bab444cb573bfd41d0887605d7f'
 
diff --git a/Casks/lyx.rb b/Casks/lyx.rb
index 1d5146eb2750..6a06bfa5f182 100644
--- a/Casks/lyx.rb
+++ b/Casks/lyx.rb
@@ -1,4 +1,4 @@
-class Lyx < Cask
+cask :v1 => 'lyx' do
   version '2.1.2'
   sha256 '2230c29e1ac0334b2c58bf072c28bbd9a9e2c98eaab90adf04d25f9e12dd3730'
 
diff --git a/Casks/mac-informer.rb b/Casks/mac-informer.rb
index 0c5bd8dfd47a..48c128caab77 100644
--- a/Casks/mac-informer.rb
+++ b/Casks/mac-informer.rb
@@ -1,4 +1,4 @@
-class MacInformer < Cask
+cask :v1 => 'mac-informer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mac-linux-usb-loader.rb b/Casks/mac-linux-usb-loader.rb
index 598070589c9e..65ac90b85b27 100644
--- a/Casks/mac-linux-usb-loader.rb
+++ b/Casks/mac-linux-usb-loader.rb
@@ -1,4 +1,4 @@
-class MacLinuxUsbLoader < Cask
+cask :v1 => 'mac-linux-usb-loader' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/macaw.rb b/Casks/macaw.rb
index 7f65fe1bfb64..fa5b7cdfe127 100644
--- a/Casks/macaw.rb
+++ b/Casks/macaw.rb
@@ -1,4 +1,4 @@
-class Macaw < Cask
+cask :v1 => 'macaw' do
   version '1.5.8'
   sha256 '9c4350f6035823407a45c0ef465c10ff7bb8ec831ace69d2febc234babfc7a2a'
 
diff --git a/Casks/macbreakz.rb b/Casks/macbreakz.rb
index 991fe225f12d..880887b094e7 100644
--- a/Casks/macbreakz.rb
+++ b/Casks/macbreakz.rb
@@ -1,4 +1,4 @@
-class Macbreakz < Cask
+cask :v1 => 'macbreakz' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/macdown.rb b/Casks/macdown.rb
index a4092c69ad3d..94b2bba7616d 100644
--- a/Casks/macdown.rb
+++ b/Casks/macdown.rb
@@ -1,4 +1,4 @@
-class Macdown < Cask
+cask :v1 => 'macdown' do
   version '0.3'
   sha256 '3d0b49792525830b44dc912bc4a0d3801ce2d4f6453a1835c681d379b3c63128'
 
diff --git a/Casks/macdrops.rb b/Casks/macdrops.rb
index 9577846e1059..f88ab07efd6e 100644
--- a/Casks/macdrops.rb
+++ b/Casks/macdrops.rb
@@ -1,4 +1,4 @@
-class Macdrops < Cask
+cask :v1 => 'macdrops' do
   version '1.1'
   sha256 'c91f10418d8dd88f395603f9b824fc1ef319ec91affe2326cff5bce7f2bd63bb'
 
diff --git a/Casks/macfusion.rb b/Casks/macfusion.rb
index 8e28a8d15e10..31c1cbf29a07 100644
--- a/Casks/macfusion.rb
+++ b/Casks/macfusion.rb
@@ -1,4 +1,4 @@
-class Macfusion < Cask
+cask :v1 => 'macfusion' do
   version '2.0.4'
   sha256 '6693241fd54d686013864adb86a6ea7eef6c1291546573b628b3ddf7889ef71c'
 
diff --git a/Casks/macgdbp.rb b/Casks/macgdbp.rb
index c55a2e4dd72c..09b61f5234ed 100644
--- a/Casks/macgdbp.rb
+++ b/Casks/macgdbp.rb
@@ -1,4 +1,4 @@
-class Macgdbp < Cask
+cask :v1 => 'macgdbp' do
   version '1.5'
   sha256 '90697835c77c0a294cea7aec62276fbf6920763968e5c77a0791199c7d718744'
 
diff --git a/Casks/machacha.rb b/Casks/machacha.rb
index 2c9602716777..5c36d718bf76 100644
--- a/Casks/machacha.rb
+++ b/Casks/machacha.rb
@@ -1,4 +1,4 @@
-class Machacha < Cask
+cask :v1 => 'machacha' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/machg.rb b/Casks/machg.rb
index 506419cfc149..d4cd65560513 100644
--- a/Casks/machg.rb
+++ b/Casks/machg.rb
@@ -1,4 +1,4 @@
-class Machg < Cask
+cask :v1 => 'machg' do
   version '0.9.25'
   sha256 '4eaf4abf4a8c52ce0bf4075a3aae7b0b94c8f551340245b3cb72d2a97fb93531'
 
diff --git a/Casks/macintosh-explorer.rb b/Casks/macintosh-explorer.rb
index d14af4cb09a3..db37f8d0027e 100644
--- a/Casks/macintosh-explorer.rb
+++ b/Casks/macintosh-explorer.rb
@@ -1,4 +1,4 @@
-class MacintoshExplorer < Cask
+cask :v1 => 'macintosh-explorer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/macmoney.rb b/Casks/macmoney.rb
index 569c6e30b5a4..dc5cb02747c4 100644
--- a/Casks/macmoney.rb
+++ b/Casks/macmoney.rb
@@ -1,4 +1,4 @@
-class Macmoney < Cask
+cask :v1 => 'macmoney' do
   version '3.7'
   sha256 'cc4b7524f340a4c66f793c86736254d431c65dbdb21ec9e8b25c06ea737f084f'
 
diff --git a/Casks/macpar-deluxe.rb b/Casks/macpar-deluxe.rb
index 14d0b33c7eaa..753fd259fc4e 100644
--- a/Casks/macpar-deluxe.rb
+++ b/Casks/macpar-deluxe.rb
@@ -1,4 +1,4 @@
-class MacparDeluxe < Cask
+cask :v1 => 'macpar-deluxe' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/macpass.rb b/Casks/macpass.rb
index 2f93a2e25252..a884c90ff501 100644
--- a/Casks/macpass.rb
+++ b/Casks/macpass.rb
@@ -1,4 +1,4 @@
-class Macpass < Cask
+cask :v1 => 'macpass' do
   version '0.4.1-alpha'
   sha256 '1beaec4f0f8e33e5bf2575a4706befe6ef513f46ddc49f7662b6af3721680039'
 
diff --git a/Casks/macpaw-gemini.rb b/Casks/macpaw-gemini.rb
index 25def2205c7c..45abfb03c5a2 100644
--- a/Casks/macpaw-gemini.rb
+++ b/Casks/macpaw-gemini.rb
@@ -1,4 +1,4 @@
-class MacpawGemini < Cask
+cask :v1 => 'macpaw-gemini' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/macpilot.rb b/Casks/macpilot.rb
index d83a525c1ab8..800cb3056015 100644
--- a/Casks/macpilot.rb
+++ b/Casks/macpilot.rb
@@ -1,4 +1,4 @@
-class Macpilot < Cask
+cask :v1 => 'macpilot' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/macports.rb b/Casks/macports.rb
index 57518560316a..e95abbdc2205 100644
--- a/Casks/macports.rb
+++ b/Casks/macports.rb
@@ -1,4 +1,4 @@
-class Macports < Cask
+cask :v1 => 'macports' do
   version '2.3.2'
 
   if MacOS.version < :mavericks
diff --git a/Casks/macs-fan-control.rb b/Casks/macs-fan-control.rb
index 24fe58ff29f1..d4a390ab9b72 100644
--- a/Casks/macs-fan-control.rb
+++ b/Casks/macs-fan-control.rb
@@ -1,4 +1,4 @@
-class MacsFanControl < Cask
+cask :v1 => 'macs-fan-control' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/macscale.rb b/Casks/macscale.rb
index 8f08fee56485..af647dd1fa6e 100644
--- a/Casks/macscale.rb
+++ b/Casks/macscale.rb
@@ -1,4 +1,4 @@
-class Macscale < Cask
+cask :v1 => 'macscale' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/macterm.rb b/Casks/macterm.rb
index c71f76dc03d6..c094a18a9dcf 100644
--- a/Casks/macterm.rb
+++ b/Casks/macterm.rb
@@ -1,4 +1,4 @@
-class Macterm < Cask
+cask :v1 => 'macterm' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mactex.rb b/Casks/mactex.rb
index 59f3b5395921..06cac3395f4a 100644
--- a/Casks/mactex.rb
+++ b/Casks/mactex.rb
@@ -1,4 +1,4 @@
-class Mactex < Cask
+cask :v1 => 'mactex' do
   version '20140525'
   sha256 '4e7fc21dbddae436f604dbeb3db2dc13c44aa9e2dd827a669a170418e84fc7e6'
 
diff --git a/Casks/mactracker.rb b/Casks/mactracker.rb
index 2d16a1a9c575..49057d42d9ce 100644
--- a/Casks/mactracker.rb
+++ b/Casks/mactracker.rb
@@ -1,4 +1,4 @@
-class Mactracker < Cask
+cask :v1 => 'mactracker' do
   version '7.3.2'
   sha256 '3a156082b09b3c4e1ef2d94cba91fe67c42ee0d4010fa7e73a213481c384dab5'
 
diff --git a/Casks/mactubes.rb b/Casks/mactubes.rb
index 9851319f6e57..d1cd19cce322 100644
--- a/Casks/mactubes.rb
+++ b/Casks/mactubes.rb
@@ -1,4 +1,4 @@
-class Mactubes < Cask
+cask :v1 => 'mactubes' do
   version '3.1.6'
   sha256 'd3fbe0ee7fb95c1eea0f70b84140a816561601f0a1f36ba2b16ba63bfa57cd19'
 
diff --git a/Casks/macupdate-desktop.rb b/Casks/macupdate-desktop.rb
index 42e2f1da17a5..a8478d4cb4d4 100644
--- a/Casks/macupdate-desktop.rb
+++ b/Casks/macupdate-desktop.rb
@@ -1,4 +1,4 @@
-class MacupdateDesktop < Cask
+cask :v1 => 'macupdate-desktop' do
   version '6.0.2'
   sha256 '1aa04e0bec920f28af5417a2b875e40af832d5303a29dca27e527e30c4db42f5'
 
diff --git a/Casks/macvim.rb b/Casks/macvim.rb
index 8da69a0fb2ea..fed0a18bbd45 100644
--- a/Casks/macvim.rb
+++ b/Casks/macvim.rb
@@ -1,4 +1,4 @@
-class Macvim < Cask
+cask :v1 => 'macvim' do
   version '7.4-73'
 
   if MacOS.version < :mavericks
diff --git a/Casks/macwinzipper.rb b/Casks/macwinzipper.rb
index c9bac4aaaa3b..856a30d8efbd 100644
--- a/Casks/macwinzipper.rb
+++ b/Casks/macwinzipper.rb
@@ -1,4 +1,4 @@
-class Macwinzipper < Cask
+cask :v1 => 'macwinzipper' do
   version '2.5'
   sha256 'fc3afd92ecfbde16bbdd388285e16ef8f7aa5f5edf669496115823fef92a0186'
 
diff --git a/Casks/maczip4win.rb b/Casks/maczip4win.rb
index f9dca85d7dd4..b5b7efd262fe 100644
--- a/Casks/maczip4win.rb
+++ b/Casks/maczip4win.rb
@@ -1,4 +1,4 @@
-class Maczip4win < Cask
+cask :v1 => 'maczip4win' do
   version '0.4.1'
   sha256 '169e84b66dfd2d513385c86726a8c78c37cf73c8c2bf753ddb6fd112d7b38ec7'
 
diff --git a/Casks/madruby.rb b/Casks/madruby.rb
index 145aeb9ea127..2b9115c57d25 100644
--- a/Casks/madruby.rb
+++ b/Casks/madruby.rb
@@ -1,4 +1,4 @@
-class Madruby < Cask
+cask :v1 => 'madruby' do
   version '1.0.3'
   sha256 'a0d45b892b28e9fd4e5ae17578e3afc6e385307635c422d71292d47b177d7480'
 
diff --git a/Casks/magic-launch.rb b/Casks/magic-launch.rb
index b32d7b4da107..c7acfad44927 100644
--- a/Casks/magic-launch.rb
+++ b/Casks/magic-launch.rb
@@ -1,4 +1,4 @@
-class MagicLaunch < Cask
+cask :v1 => 'magic-launch' do
   version '1.4.3'
   sha256 'f209f58e22c5881dc226b294181cc324a9e446425548b5de35c6f26bab1c7a4d'
 
diff --git a/Casks/magican.rb b/Casks/magican.rb
index 0c1ca8f6b564..ba53df8dbb4d 100644
--- a/Casks/magican.rb
+++ b/Casks/magican.rb
@@ -1,4 +1,4 @@
-class Magican < Cask
+cask :v1 => 'magican' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/magicprefs.rb b/Casks/magicprefs.rb
index 6e5ca31bb4e8..e977d5e97a68 100644
--- a/Casks/magicprefs.rb
+++ b/Casks/magicprefs.rb
@@ -1,4 +1,4 @@
-class Magicprefs < Cask
+cask :v1 => 'magicprefs' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mail-plugin-manager.rb b/Casks/mail-plugin-manager.rb
index a075fad382d5..91de4c2f014e 100644
--- a/Casks/mail-plugin-manager.rb
+++ b/Casks/mail-plugin-manager.rb
@@ -1,4 +1,4 @@
-class MailPluginManager < Cask
+cask :v1 => 'mail-plugin-manager' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mailbox.rb b/Casks/mailbox.rb
index 67391f276e04..79b5d2452706 100644
--- a/Casks/mailbox.rb
+++ b/Casks/mailbox.rb
@@ -1,4 +1,4 @@
-class Mailbox < Cask
+cask :v1 => 'mailbox' do
   version '0.3.14_141017'
   sha256 '93a0ebd06399b899a8742148c1df6876f82716790dd394009fd8edc59078e902'
 
diff --git a/Casks/mailfollowup.rb b/Casks/mailfollowup.rb
index 930dbc81516a..5b0f451851c8 100644
--- a/Casks/mailfollowup.rb
+++ b/Casks/mailfollowup.rb
@@ -1,4 +1,4 @@
-class Mailfollowup < Cask
+cask :v1 => 'mailfollowup' do
   version '1.6.2'
   sha256 'f656c121e04fac6185b24a96888613729c366275151c891258b634c71372b2af'
 
diff --git a/Casks/mailmate.rb b/Casks/mailmate.rb
index 99ea05d3ebed..174ee137253f 100644
--- a/Casks/mailmate.rb
+++ b/Casks/mailmate.rb
@@ -1,4 +1,4 @@
-class Mailmate < Cask
+cask :v1 => 'mailmate' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mailpile.rb b/Casks/mailpile.rb
index c96305a3cca1..413a686b9ec3 100644
--- a/Casks/mailpile.rb
+++ b/Casks/mailpile.rb
@@ -1,4 +1,4 @@
-class Mailpile < Cask
+cask :v1 => 'mailpile' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mailplane.rb b/Casks/mailplane.rb
index ca733a36aa99..88ec4bc40a3c 100644
--- a/Casks/mailplane.rb
+++ b/Casks/mailplane.rb
@@ -1,4 +1,4 @@
-class Mailplane < Cask
+cask :v1 => 'mailplane' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/maintenance.rb b/Casks/maintenance.rb
index 141ab34787e4..da22dd9d6c0b 100644
--- a/Casks/maintenance.rb
+++ b/Casks/maintenance.rb
@@ -1,4 +1,4 @@
-class Maintenance < Cask
+cask :v1 => 'maintenance' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/majic.rb b/Casks/majic.rb
index 2b010ee4e9de..81fd8570eecd 100644
--- a/Casks/majic.rb
+++ b/Casks/majic.rb
@@ -1,4 +1,4 @@
-class Majic < Cask
+cask :v1 => 'majic' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/makehuman.rb b/Casks/makehuman.rb
index fee39d0dbba7..3f84f63e15b6 100644
--- a/Casks/makehuman.rb
+++ b/Casks/makehuman.rb
@@ -1,4 +1,4 @@
-class Makehuman < Cask
+cask :v1 => 'makehuman' do
   version '1.0.1'
   sha256 'c3a4d693a23aff5e4f6dd93c0452d7d753703d48b9d3600d210c436b6dc756f4'
 
diff --git a/Casks/makemkv.rb b/Casks/makemkv.rb
index 87a3f0c7b06e..83d0a8ea292e 100644
--- a/Casks/makemkv.rb
+++ b/Casks/makemkv.rb
@@ -1,4 +1,4 @@
-class Makemkv < Cask
+cask :v1 => 'makemkv' do
   version '1.8.14'
   sha256 '099acced826a05d1013c03705d07a344731b3f078d866437f54568f2e3065c53'
 
diff --git a/Casks/makerware.rb b/Casks/makerware.rb
index 272c0e38f637..53b2526e4e89 100644
--- a/Casks/makerware.rb
+++ b/Casks/makerware.rb
@@ -1,4 +1,4 @@
-class Makerware < Cask
+cask :v1 => 'makerware' do
   version '2.4.1.35'
   sha256 'bb01a6b2b2f46d8e1ec9522fe3f914646c39550f10d9fde8f0e830f670e933a8'
 
diff --git a/Casks/mame.rb b/Casks/mame.rb
index a46e173a0f95..f6db3553f5e9 100644
--- a/Casks/mame.rb
+++ b/Casks/mame.rb
@@ -1,4 +1,4 @@
-class Mame < Cask
+cask :v1 => 'mame' do
   version '0.135'
   sha256 'fce1a45e53e0f6bc2ef20e5b6fc84bd48806f1bc2a38acec57fd9fafe7e2af7e'
 
diff --git a/Casks/mamp.rb b/Casks/mamp.rb
index 0d1756639495..a4424afda01a 100644
--- a/Casks/mamp.rb
+++ b/Casks/mamp.rb
@@ -1,4 +1,4 @@
-class Mamp < Cask
+cask :v1 => 'mamp' do
   version '3.0.7.2'
   sha256 'a6e72143efa73eb919efeb0e9dc0089e291204676da37e9508ac53c2f51f8878'
 
diff --git a/Casks/managenameext.rb b/Casks/managenameext.rb
index 3951a2979c63..ed4435ce9cbe 100644
--- a/Casks/managenameext.rb
+++ b/Casks/managenameext.rb
@@ -1,4 +1,4 @@
-class Managenameext < Cask
+cask :v1 => 'managenameext' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/manager.rb b/Casks/manager.rb
index 2caa794a512d..9e45d3f5efe7 100644
--- a/Casks/manager.rb
+++ b/Casks/manager.rb
@@ -1,4 +1,4 @@
-class Manager < Cask
+cask :v1 => 'manager' do
   version '14.2.35'
   sha256 'aa5f89f9e1323cf0ac44dbfb3287e57615c585a6c747879e24cce7187db46b35'
 
diff --git a/Casks/manico.rb b/Casks/manico.rb
index 243351435b31..c4f3a8126dd7 100644
--- a/Casks/manico.rb
+++ b/Casks/manico.rb
@@ -1,4 +1,4 @@
-class Manico < Cask
+cask :v1 => 'manico' do
   version '1.4.2'
   sha256 '5244586f0b7568e654175940a2052a4b746a1122ecea3eba08e4470c5b4f3095'
 
diff --git a/Casks/manopen.rb b/Casks/manopen.rb
index 092111ac2436..187916fd5d04 100644
--- a/Casks/manopen.rb
+++ b/Casks/manopen.rb
@@ -1,4 +1,4 @@
-class Manopen < Cask
+cask :v1 => 'manopen' do
   version '2.6'
   sha256 '7b383ca493b0b360bb58e65f7e7ce0a92383ff38c5221cc410eaf03f1117a958'
 
diff --git a/Casks/mapbox-studio.rb b/Casks/mapbox-studio.rb
index 1870b77f367f..24cf6cbfc69b 100644
--- a/Casks/mapbox-studio.rb
+++ b/Casks/mapbox-studio.rb
@@ -1,4 +1,4 @@
-class MapboxStudio < Cask
+cask :v1 => 'mapbox-studio' do
   version '0.1.5'
   sha256 '284741137e2d711107debe0a5d940cee3d3a3eece55f4e95beb8de98006f116f'
 
diff --git a/Casks/mapture.rb b/Casks/mapture.rb
index eb5125c9d75b..c713b7b43c39 100644
--- a/Casks/mapture.rb
+++ b/Casks/mapture.rb
@@ -1,4 +1,4 @@
-class Mapture < Cask
+cask :v1 => 'mapture' do
   version '0.0.16'
   sha256 '54301ca09e3f781dd979fc41978ee2dc547c56bc5776d4b25876bad1ab37b85d'
 
diff --git a/Casks/maratis.rb b/Casks/maratis.rb
index eb4048c38aa3..a9dc1069d1d3 100644
--- a/Casks/maratis.rb
+++ b/Casks/maratis.rb
@@ -1,4 +1,4 @@
-class Maratis < Cask
+cask :v1 => 'maratis' do
   version '3.21'
   sha256 '7ec6dd97f1ce1ce09e08df0947fcb6ceb7a9f63024998f44afed3d3965829707'
 
diff --git a/Casks/marble.rb b/Casks/marble.rb
index cd1d16de2ed3..06ba47e80e6d 100644
--- a/Casks/marble.rb
+++ b/Casks/marble.rb
@@ -1,4 +1,4 @@
-class Marble < Cask
+cask :v1 => 'marble' do
   version '1.5.0'
   sha256 '6d1bf3e02c34ef0df0d5d0311d580bfae1d5259e3db45036163a5330dc139c04'
 
diff --git a/Casks/mari0.rb b/Casks/mari0.rb
index 7356c878546d..3bf43b2df2ae 100644
--- a/Casks/mari0.rb
+++ b/Casks/mari0.rb
@@ -1,4 +1,4 @@
-class Mari0 < Cask
+cask :v1 => 'mari0' do
   version '1.6'
   sha256 'da280f99c744cb161ca4a731a5442a72116f92a4170bf94fd0c9d52557e38727'
 
diff --git a/Casks/marked.rb b/Casks/marked.rb
index 7b015ed2bf65..92ff7422a026 100644
--- a/Casks/marked.rb
+++ b/Casks/marked.rb
@@ -1,4 +1,4 @@
-class Marked < Cask
+cask :v1 => 'marked' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/marsedit.rb b/Casks/marsedit.rb
index 34fbfa9c90db..afd9e726cdcd 100644
--- a/Casks/marsedit.rb
+++ b/Casks/marsedit.rb
@@ -1,4 +1,4 @@
-class Marsedit < Cask
+cask :v1 => 'marsedit' do
   version '3.6.7'
   sha256 '5620407616b21bc2099be344402b93adc0832f90f4b8773d724b8e48a990da9b'
 
diff --git a/Casks/mass-replace-it.rb b/Casks/mass-replace-it.rb
index 0074cddfa2e6..99ddcb857277 100644
--- a/Casks/mass-replace-it.rb
+++ b/Casks/mass-replace-it.rb
@@ -1,4 +1,4 @@
-class MassReplaceIt < Cask
+cask :v1 => 'mass-replace-it' do
   version '2.9.1'
   sha256 '1ab3482f7568953899474397fa401342daec56d4efe4a856de8e387294f7c667'
   container :nested => 'MassReplaceIt.dmg'
diff --git a/Casks/master-key.rb b/Casks/master-key.rb
index a00ee329d24b..f1939370eabb 100644
--- a/Casks/master-key.rb
+++ b/Casks/master-key.rb
@@ -1,4 +1,4 @@
-class MasterKey < Cask
+cask :v1 => 'master-key' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/matplotlib.rb b/Casks/matplotlib.rb
index 3cc79229e485..41f01e07b348 100644
--- a/Casks/matplotlib.rb
+++ b/Casks/matplotlib.rb
@@ -1,4 +1,4 @@
-class Matplotlib < Cask
+cask :v1 => 'matplotlib' do
   version '1.3.1-2'
   sha256 'e90bef08b03c2526b85b669705fdc6b1ba95099e7524fdc52a79ab2081466b2d'
 
diff --git a/Casks/mauve.rb b/Casks/mauve.rb
index 3fd9c13528e4..1b65794b92cd 100644
--- a/Casks/mauve.rb
+++ b/Casks/mauve.rb
@@ -1,4 +1,4 @@
-class Mauve < Cask
+cask :v1 => 'mauve' do
   version '2.3.1'
   sha256 '586fe214eb6c430f2a98fd865856111b79502ff526ab2f6268dab1d99b337907'
 
diff --git a/Casks/mavensmate.rb b/Casks/mavensmate.rb
index 81ee932ecbdd..331e68f03177 100644
--- a/Casks/mavensmate.rb
+++ b/Casks/mavensmate.rb
@@ -1,4 +1,4 @@
-class Mavensmate < Cask
+cask :v1 => 'mavensmate' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/max.rb b/Casks/max.rb
index 2c0363a22bb4..8028721c9f36 100644
--- a/Casks/max.rb
+++ b/Casks/max.rb
@@ -1,4 +1,4 @@
-class Max < Cask
+cask :v1 => 'max' do
   version '0.9.1'
   sha256 '722bf714696d3d39329ba98ffddc9f117f8cc6863f71670507cd12f62a5e5f14'
 
diff --git a/Casks/maxthon.rb b/Casks/maxthon.rb
index fabc3fc2fbbb..4c50f7d7ae96 100644
--- a/Casks/maxthon.rb
+++ b/Casks/maxthon.rb
@@ -1,4 +1,4 @@
-class Maxthon < Cask
+cask :v1 => 'maxthon' do
   version '4.1.3.5000'
   sha256 '326a0c7076ff1d06474b217691ba5597343325158ddecd7fa17da53d8903f65d'
 
diff --git a/Casks/mcedit.rb b/Casks/mcedit.rb
index 1f63a8b3b5c8..a75ff303e3f5 100644
--- a/Casks/mcedit.rb
+++ b/Casks/mcedit.rb
@@ -1,4 +1,4 @@
-class Mcedit < Cask
+cask :v1 => 'mcedit' do
   version '0.1.7.1'
   sha256 '9ab4e66a3d4d898921cd38725da36567931fe4b8d0285c3a73dba6bef35fbea4'
 
diff --git a/Casks/mcs783x.rb b/Casks/mcs783x.rb
index 57199a708907..f1a9a1b01da1 100644
--- a/Casks/mcs783x.rb
+++ b/Casks/mcs783x.rb
@@ -1,4 +1,4 @@
-class Mcs783x < Cask
+cask :v1 => 'mcs783x' do
   version '1.1.0'
   sha256 'ea1d6245b5accabf041060886f16cc00b43d3e6e7e032f4154b487e96ab05569'
 
diff --git a/Casks/mdrp.rb b/Casks/mdrp.rb
index 81826530e949..ea908648c560 100644
--- a/Casks/mdrp.rb
+++ b/Casks/mdrp.rb
@@ -1,4 +1,4 @@
-class Mdrp < Cask
+cask :v1 => 'mdrp' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/media-converter.rb b/Casks/media-converter.rb
index 9866cb8435a3..c58fb4f54f48 100644
--- a/Casks/media-converter.rb
+++ b/Casks/media-converter.rb
@@ -1,4 +1,4 @@
-class MediaConverter < Cask
+cask :v1 => 'media-converter' do
   version '1.2'
   sha256 '4893e6e5bc18b9cb0f0d8e1bcb861f92595314e4f9768ef638affdfc866f37e1'
 
diff --git a/Casks/mediaelch.rb b/Casks/mediaelch.rb
index 210884caf5c9..448d6be324cc 100644
--- a/Casks/mediaelch.rb
+++ b/Casks/mediaelch.rb
@@ -1,4 +1,4 @@
-class Mediaelch < Cask
+cask :v1 => 'mediaelch' do
   version '2.1.2'
   sha256 '6387b815a81de7526521811b90cc9f7b3f56821f6c01b22f25cae3f3b5d46efe'
 
diff --git a/Casks/mediafire-desktop.rb b/Casks/mediafire-desktop.rb
index c14e84b1aba1..27bc0b414f79 100644
--- a/Casks/mediafire-desktop.rb
+++ b/Casks/mediafire-desktop.rb
@@ -1,4 +1,4 @@
-class MediafireDesktop < Cask
+cask :v1 => 'mediafire-desktop' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mediainfo.rb b/Casks/mediainfo.rb
index 21ed5ea0eb8f..7057aeca97f8 100644
--- a/Casks/mediainfo.rb
+++ b/Casks/mediainfo.rb
@@ -1,4 +1,4 @@
-class Mediainfo < Cask
+cask :v1 => 'mediainfo' do
   version '0.7.66'
   sha256 'c96dc8998fa323d04d82ee146a7aeee63b32a6e67c5750ba099f79900788a442'
 
diff --git a/Casks/mediathekview.rb b/Casks/mediathekview.rb
index 486765af824f..e0a6cf988b91 100644
--- a/Casks/mediathekview.rb
+++ b/Casks/mediathekview.rb
@@ -1,4 +1,4 @@
-class Mediathekview < Cask
+cask :v1 => 'mediathekview' do
   version '4'
   sha256 '41f53b86b6475fa0d8e347e9430597a975fb4f7c13eae70e82b723dace5b7c8a'
 
diff --git a/Casks/meerkat.rb b/Casks/meerkat.rb
index 8917b3acb5b8..983dccc8ffc0 100644
--- a/Casks/meerkat.rb
+++ b/Casks/meerkat.rb
@@ -1,4 +1,4 @@
-class Meerkat < Cask
+cask :v1 => 'meerkat' do
   version '1.5.3'
   sha256 'bf5a5e492463a7ec1c3e959a55227dd6fcec5bb902124f9bde819bf4f5933982'
 
diff --git a/Casks/memorytamer.rb b/Casks/memorytamer.rb
index 3180c3c4bd6f..51fb1e6dc534 100644
--- a/Casks/memorytamer.rb
+++ b/Casks/memorytamer.rb
@@ -1,4 +1,4 @@
-class Memorytamer < Cask
+cask :v1 => 'memorytamer' do
   version '0.8.1'
   sha256 '00f4b53d57e118e580b0b4be74198d0e2cc2d695f6ad63fb19ef4e385887d4fd'
 
diff --git a/Casks/mendeley-desktop.rb b/Casks/mendeley-desktop.rb
index 45502def055f..84c0e812c388 100644
--- a/Casks/mendeley-desktop.rb
+++ b/Casks/mendeley-desktop.rb
@@ -1,4 +1,4 @@
-class MendeleyDesktop < Cask
+cask :v1 => 'mendeley-desktop' do
   version '1.12.2'
   sha256 'b16cc04ae0d06bf95724a4aa063c7c09d26762058be86b905ac23bb99cb128c3'
 
diff --git a/Casks/mention.rb b/Casks/mention.rb
index e5b2c5ab0f4b..065b44c408d4 100644
--- a/Casks/mention.rb
+++ b/Casks/mention.rb
@@ -1,4 +1,4 @@
-class Mention < Cask
+cask :v1 => 'mention' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/menubar-countdown.rb b/Casks/menubar-countdown.rb
index d0c390b28b6d..ad875466fdaa 100644
--- a/Casks/menubar-countdown.rb
+++ b/Casks/menubar-countdown.rb
@@ -1,4 +1,4 @@
-class MenubarCountdown < Cask
+cask :v1 => 'menubar-countdown' do
   version '1.2'
   sha256 '4ee0a7a87dbd4013c461b59316c749a5f9a92160bdf6d90afb1ff029f9381c01'
 
diff --git a/Casks/menubarfilter.rb b/Casks/menubarfilter.rb
index 94b899d1aa53..30e1b978779b 100644
--- a/Casks/menubarfilter.rb
+++ b/Casks/menubarfilter.rb
@@ -1,4 +1,4 @@
-class Menubarfilter < Cask
+cask :v1 => 'menubarfilter' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/menucalendarclock-ical.rb b/Casks/menucalendarclock-ical.rb
index f4f4e5fe926d..1685e52835aa 100644
--- a/Casks/menucalendarclock-ical.rb
+++ b/Casks/menucalendarclock-ical.rb
@@ -1,4 +1,4 @@
-class MenucalendarclockIcal < Cask
+cask :v1 => 'menucalendarclock-ical' do
   version '4.5.2'
   sha256 '7c78428fd22d0a3fa02e5df4c92fbb45dad881a7ba09205dc47c4bfaaf7f7f9e'
 
diff --git a/Casks/menumeters.rb b/Casks/menumeters.rb
index 55c02451a97e..6e3b6faf0849 100644
--- a/Casks/menumeters.rb
+++ b/Casks/menumeters.rb
@@ -1,4 +1,4 @@
-class Menumeters < Cask
+cask :v1 => 'menumeters' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/menuola.rb b/Casks/menuola.rb
index 1dfcede13f3d..2f2d54b9a28d 100644
--- a/Casks/menuola.rb
+++ b/Casks/menuola.rb
@@ -1,4 +1,4 @@
-class Menuola < Cask
+cask :v1 => 'menuola' do
   version '2.0'
   sha256 'd97170adab805f1a52fef6c59287724783d80b5b23821dd97c0a85b4a72261dd'
 
diff --git a/Casks/meocloud.rb b/Casks/meocloud.rb
index 7e716c5d98f0..b940772ff646 100644
--- a/Casks/meocloud.rb
+++ b/Casks/meocloud.rb
@@ -1,4 +1,4 @@
-class Meocloud < Cask
+cask :v1 => 'meocloud' do
   version '0.1.115'
   sha256 '7ec0658eed5e77730275bf97e196ac3fea5ed4946e9632c0ae8458d8093768b1'
 
diff --git a/Casks/mercurymover.rb b/Casks/mercurymover.rb
index 082d276721a3..2f24f6b5eaa3 100644
--- a/Casks/mercurymover.rb
+++ b/Casks/mercurymover.rb
@@ -1,4 +1,4 @@
-class Mercurymover < Cask
+cask :v1 => 'mercurymover' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mesasqlite.rb b/Casks/mesasqlite.rb
index 9477b189a17d..ec893c3288de 100644
--- a/Casks/mesasqlite.rb
+++ b/Casks/mesasqlite.rb
@@ -1,4 +1,4 @@
-class Mesasqlite < Cask
+cask :v1 => 'mesasqlite' do
   version '4.0.8'
   sha256 '16741eb458127db0ce72e71824ddf938ee7b30a8b6ea4bc0e82357aab5b3359b'
 
diff --git a/Casks/meshlab.rb b/Casks/meshlab.rb
index 8f7866467d71..6a56320dc243 100644
--- a/Casks/meshlab.rb
+++ b/Casks/meshlab.rb
@@ -1,4 +1,4 @@
-class Meshlab < Cask
+cask :v1 => 'meshlab' do
   version '1.3.2'
   sha256 '4ea9f5d99bf1c55c870fe75919397e6788e441e0dcd564311089eb63f93ec989'
 
diff --git a/Casks/metanota.rb b/Casks/metanota.rb
index f06ae25aa41f..f2568b91bccb 100644
--- a/Casks/metanota.rb
+++ b/Casks/metanota.rb
@@ -1,4 +1,4 @@
-class Metanota < Cask
+cask :v1 => 'metanota' do
   version '2.4.1'
   sha256 'baac3496d1fe723ef6cb905aca9a718aac828c56ef4b64cde171bac340bbc124'
 
diff --git a/Casks/meteorologist.rb b/Casks/meteorologist.rb
index 93e253f0b0b3..8ee18083a745 100644
--- a/Casks/meteorologist.rb
+++ b/Casks/meteorologist.rb
@@ -1,4 +1,4 @@
-class Meteorologist < Cask
+cask :v1 => 'meteorologist' do
   version '1.6.1'
   sha256 '15243a845062d87bf67e6a26b8da011e00c50a5f24def460cc685532d7d720a4'
 
diff --git a/Casks/mi.rb b/Casks/mi.rb
index 65ea5acd8c70..0f006906fc9e 100644
--- a/Casks/mi.rb
+++ b/Casks/mi.rb
@@ -1,4 +1,4 @@
-class Mi < Cask
+cask :v1 => 'mi' do
   version '2.1.12r3'
   sha256 'e70fa0ee864d78848633acc332e96c20310f87ee50ee541a4b07eaa87cb2165b'
 
diff --git a/Casks/microsoft-intellipoint.rb b/Casks/microsoft-intellipoint.rb
index b512e613ec44..67123f026adb 100644
--- a/Casks/microsoft-intellipoint.rb
+++ b/Casks/microsoft-intellipoint.rb
@@ -1,4 +1,4 @@
-class MicrosoftIntellipoint < Cask
+cask :v1 => 'microsoft-intellipoint' do
   version '8.2'
   sha256 '1a4612d3237084d0502d947793c097575febc95442130e2384c8fbf4b52cac9e'
 
diff --git a/Casks/microsoft-intellitype.rb b/Casks/microsoft-intellitype.rb
index 71a63a6c3ee0..3f2dbb93cb93 100644
--- a/Casks/microsoft-intellitype.rb
+++ b/Casks/microsoft-intellitype.rb
@@ -1,4 +1,4 @@
-class MicrosoftIntellitype < Cask
+cask :v1 => 'microsoft-intellitype' do
   version '8.2'
   sha256 '8aaaef8fc2722f1e896facb23c69ef759f7ecd92d94031c51ca0a890d198cd58'
 
diff --git a/Casks/microsoft-lync-plugin.rb b/Casks/microsoft-lync-plugin.rb
index 4ac730b42a47..f263151f9a55 100644
--- a/Casks/microsoft-lync-plugin.rb
+++ b/Casks/microsoft-lync-plugin.rb
@@ -1,4 +1,4 @@
-class MicrosoftLyncPlugin < Cask
+cask :v1 => 'microsoft-lync-plugin' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/microsoft-office.rb b/Casks/microsoft-office.rb
index 1ff4f97ae6d3..1ffe4d9042cb 100644
--- a/Casks/microsoft-office.rb
+++ b/Casks/microsoft-office.rb
@@ -1,4 +1,4 @@
-class MicrosoftOffice < Cask
+cask :v1 => 'microsoft-office' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/middleclick.rb b/Casks/middleclick.rb
index eab85667d0cc..f747979b7048 100644
--- a/Casks/middleclick.rb
+++ b/Casks/middleclick.rb
@@ -1,4 +1,4 @@
-class Middleclick < Cask
+cask :v1 => 'middleclick' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/midikeys.rb b/Casks/midikeys.rb
index 5aefdbe986ef..2e39287636bc 100644
--- a/Casks/midikeys.rb
+++ b/Casks/midikeys.rb
@@ -1,4 +1,4 @@
-class Midikeys < Cask
+cask :v1 => 'midikeys' do
   version '1.8'
   sha256 '673a11c0317ec8930940cc18bf8eef3de0d3040845c635722e99907f866a9b80'
 
diff --git a/Casks/miditrail.rb b/Casks/miditrail.rb
index 990358109508..c913b336bdc5 100644
--- a/Casks/miditrail.rb
+++ b/Casks/miditrail.rb
@@ -1,4 +1,4 @@
-class Miditrail < Cask
+cask :v1 => 'miditrail' do
   version '1.2.1'
   sha256 '183070cf0c4e071ef5251979a27a75933e21855ebd3c346ce7f6be328d5e43a0'
 
diff --git a/Casks/mikogo.rb b/Casks/mikogo.rb
index 222399eb50bf..7693bd6e9ac2 100644
--- a/Casks/mikogo.rb
+++ b/Casks/mikogo.rb
@@ -1,4 +1,4 @@
-class Mikogo < Cask
+cask :v1 => 'mikogo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/milkytracker.rb b/Casks/milkytracker.rb
index 1d009fbcd046..8a23d36ba788 100644
--- a/Casks/milkytracker.rb
+++ b/Casks/milkytracker.rb
@@ -1,4 +1,4 @@
-class Milkytracker < Cask
+cask :v1 => 'milkytracker' do
   version '0.90.86'
   sha256 '0029fe9a5e62d2b0db11fcbedb3c13997a4199259d1f36c55f966b0417d818b0'
 
diff --git a/Casks/minbox.rb b/Casks/minbox.rb
index 848c577b16b1..47777324eb1a 100644
--- a/Casks/minbox.rb
+++ b/Casks/minbox.rb
@@ -1,4 +1,4 @@
-class Minbox < Cask
+cask :v1 => 'minbox' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/minco.rb b/Casks/minco.rb
index ff44373b16a5..2e9a6597136c 100644
--- a/Casks/minco.rb
+++ b/Casks/minco.rb
@@ -1,4 +1,4 @@
-class Minco < Cask
+cask :v1 => 'minco' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mindnode-pro.rb b/Casks/mindnode-pro.rb
index 06c4d637c03e..f0ecb67dac1e 100644
--- a/Casks/mindnode-pro.rb
+++ b/Casks/mindnode-pro.rb
@@ -1,4 +1,4 @@
-class MindnodePro < Cask
+cask :v1 => 'mindnode-pro' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/minecraft.rb b/Casks/minecraft.rb
index 8f35dc53b14a..12251e7de859 100644
--- a/Casks/minecraft.rb
+++ b/Casks/minecraft.rb
@@ -1,4 +1,4 @@
-class Minecraft < Cask
+cask :v1 => 'minecraft' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mini-metro.rb b/Casks/mini-metro.rb
index e05d136c5574..361c3ab486fa 100644
--- a/Casks/mini-metro.rb
+++ b/Casks/mini-metro.rb
@@ -1,4 +1,4 @@
-class MiniMetro < Cask
+cask :v1 => 'mini-metro' do
   version 'Alpha 13b'
   sha256 '77416668bc5c2a982642cb692b35b7f0b5854cb950750477aa6d362d2b68246b'
 
diff --git a/Casks/minilyrics.rb b/Casks/minilyrics.rb
index b3451920539d..fed4caf11182 100644
--- a/Casks/minilyrics.rb
+++ b/Casks/minilyrics.rb
@@ -1,4 +1,4 @@
-class Minilyrics < Cask
+cask :v1 => 'minilyrics' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/minimalclock.rb b/Casks/minimalclock.rb
index 4225b2242d7d..44cf3551b4e6 100644
--- a/Casks/minimalclock.rb
+++ b/Casks/minimalclock.rb
@@ -1,4 +1,4 @@
-class Minimalclock < Cask
+cask :v1 => 'minimalclock' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/minitimer.rb b/Casks/minitimer.rb
index 1d2c91b0e38a..c82b09d0a756 100644
--- a/Casks/minitimer.rb
+++ b/Casks/minitimer.rb
@@ -1,4 +1,4 @@
-class Minitimer < Cask
+cask :v1 => 'minitimer' do
   version '1.0'
   sha256 '848ef850f3bbe703a6d2f7e2513c8a60b82399a20f1ae11f7ee2592d0d55975c'
 
diff --git a/Casks/minitube.rb b/Casks/minitube.rb
index b0413b7e68a3..7d340735a5f4 100644
--- a/Casks/minitube.rb
+++ b/Casks/minitube.rb
@@ -1,4 +1,4 @@
-class Minitube < Cask
+cask :v1 => 'minitube' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mirador.rb b/Casks/mirador.rb
index 53350f2cd794..85a957f0c011 100644
--- a/Casks/mirador.rb
+++ b/Casks/mirador.rb
@@ -1,4 +1,4 @@
-class Mirador < Cask
+cask :v1 => 'mirador' do
   version '1.3beta'
   sha256 'c2c4e2b5c9a9723c99c65894db97fa008fa49def3ede3a2d32426877b5b89351'
 
diff --git a/Casks/miro-video-converter.rb b/Casks/miro-video-converter.rb
index 2db65940f8b1..617f96f1d201 100644
--- a/Casks/miro-video-converter.rb
+++ b/Casks/miro-video-converter.rb
@@ -1,4 +1,4 @@
-class MiroVideoConverter < Cask
+cask :v1 => 'miro-video-converter' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/miro.rb b/Casks/miro.rb
index dc3f32a99436..86904ee91a02 100644
--- a/Casks/miro.rb
+++ b/Casks/miro.rb
@@ -1,4 +1,4 @@
-class Miro < Cask
+cask :v1 => 'miro' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mirrordisplays.rb b/Casks/mirrordisplays.rb
index b4fc09382a83..86499f226dbf 100644
--- a/Casks/mirrordisplays.rb
+++ b/Casks/mirrordisplays.rb
@@ -1,4 +1,4 @@
-class Mirrordisplays < Cask
+cask :v1 => 'mirrordisplays' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mixlr.rb b/Casks/mixlr.rb
index e831f9248ad7..f3a469229c1b 100644
--- a/Casks/mixlr.rb
+++ b/Casks/mixlr.rb
@@ -1,4 +1,4 @@
-class Mixlr < Cask
+cask :v1 => 'mixlr' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mixture.rb b/Casks/mixture.rb
index 395bf87f6bf4..8910b1c585db 100644
--- a/Casks/mixture.rb
+++ b/Casks/mixture.rb
@@ -1,4 +1,4 @@
-class Mixture < Cask
+cask :v1 => 'mixture' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mixxx.rb b/Casks/mixxx.rb
index fbfa5a896422..fed3e57a0e47 100644
--- a/Casks/mixxx.rb
+++ b/Casks/mixxx.rb
@@ -1,4 +1,4 @@
-class Mixxx < Cask
+cask :v1 => 'mixxx' do
   version '1.11.0'
   sha256 '21fa06153a1a019c001f96024caa940ea6307a29f4cebd334fb2b7f071013314'
 
diff --git a/Casks/mjolnir.rb b/Casks/mjolnir.rb
index 0fdf870e629e..b79c89f14d20 100644
--- a/Casks/mjolnir.rb
+++ b/Casks/mjolnir.rb
@@ -1,4 +1,4 @@
-class Mjolnir < Cask
+cask :v1 => 'mjolnir' do
   version '0.4.3'
   sha256 '7f7a9579427f258a34663abed46845c81c35f676f63b2ae1acef2a7729745572'
 
diff --git a/Casks/mkvtools.rb b/Casks/mkvtools.rb
index fb6ba9218dcf..d9c177bdd439 100644
--- a/Casks/mkvtools.rb
+++ b/Casks/mkvtools.rb
@@ -1,4 +1,4 @@
-class Mkvtools < Cask
+cask :v1 => 'mkvtools' do
   version '3.4.4'
   sha256 '21fd96039cca22866fe9f75fc5275e2673e9fd2362cb8b54bd210fe8fd1f88d1'
 
diff --git a/Casks/mmex.rb b/Casks/mmex.rb
index 7494d12e644a..cf897c7900b4 100644
--- a/Casks/mmex.rb
+++ b/Casks/mmex.rb
@@ -1,4 +1,4 @@
-class Mmex < Cask
+cask :v1 => 'mmex' do
   version '1.1.0'
   sha256 '37042d0255e4bf89aecab1373e8c27597ad654f9164a1ee1d2773f021c79a925'
 
diff --git a/Casks/mnemosyne.rb b/Casks/mnemosyne.rb
index 5c79f08da4e3..43ad3e8bfefb 100644
--- a/Casks/mnemosyne.rb
+++ b/Casks/mnemosyne.rb
@@ -1,4 +1,4 @@
-class Mnemosyne < Cask
+cask :v1 => 'mnemosyne' do
   version '2.3'
   sha256 '094c4f6fb50de376a5190c3712b935089579717641ce90685aa48932bf0efa07'
 
diff --git a/Casks/mocksmtp.rb b/Casks/mocksmtp.rb
index cc4c0ec49e49..142ac2635bdc 100644
--- a/Casks/mocksmtp.rb
+++ b/Casks/mocksmtp.rb
@@ -1,4 +1,4 @@
-class Mocksmtp < Cask
+cask :v1 => 'mocksmtp' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/money.rb b/Casks/money.rb
index 0b9db1ac8b86..85b01343f990 100644
--- a/Casks/money.rb
+++ b/Casks/money.rb
@@ -1,4 +1,4 @@
-class Money < Cask
+cask :v1 => 'money' do
   version '4.5.5'
   sha256 '6676fcc086b7972a1a13c76b3b27898a1170d808cc570d262fe0bfb902c00582'
 
diff --git a/Casks/moneyguru.rb b/Casks/moneyguru.rb
index d878811f6187..b9ec8735df5b 100644
--- a/Casks/moneyguru.rb
+++ b/Casks/moneyguru.rb
@@ -1,4 +1,4 @@
-class Moneyguru < Cask
+cask :v1 => 'moneyguru' do
   version '2.7.2'
   sha256 '9fd0f1c57a4a0ccc1dae75cf1408aa9f25c5219eb58b294933bcea3b82705d59'
 
diff --git a/Casks/moneymoney.rb b/Casks/moneymoney.rb
index 86db69aebcd8..9e8038df6269 100644
--- a/Casks/moneymoney.rb
+++ b/Casks/moneymoney.rb
@@ -1,4 +1,4 @@
-class Moneymoney < Cask
+cask :v1 => 'moneymoney' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/moneyplex.rb b/Casks/moneyplex.rb
index 339137687bdd..5a1ed0384dff 100644
--- a/Casks/moneyplex.rb
+++ b/Casks/moneyplex.rb
@@ -1,4 +1,4 @@
-class Moneyplex < Cask
+cask :v1 => 'moneyplex' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/moneywell.rb b/Casks/moneywell.rb
index 44f1a32afbf7..6394e9e85d47 100644
--- a/Casks/moneywell.rb
+++ b/Casks/moneywell.rb
@@ -1,4 +1,4 @@
-class Moneywell < Cask
+cask :v1 => 'moneywell' do
   version '2.3.4'
   sha256 'f4b900576657c669a40481d7c2ad1ad6d48a4468d16963d4e9c8ddeca9c1548a'
 
diff --git a/Casks/mongodb.rb b/Casks/mongodb.rb
index ec07c7426cd6..f84700ec93c3 100644
--- a/Casks/mongodb.rb
+++ b/Casks/mongodb.rb
@@ -1,4 +1,4 @@
-class Mongodb < Cask
+cask :v1 => 'mongodb' do
   version '1.2'
   sha256 '9b7f6e8988a3169bf5f234ee10f93823a16750b3c1d4de524cd2e2f09452fd02'
 
diff --git a/Casks/mongodbpreferencepane.rb b/Casks/mongodbpreferencepane.rb
index 5c79e64d81a3..2d12f9975ae7 100644
--- a/Casks/mongodbpreferencepane.rb
+++ b/Casks/mongodbpreferencepane.rb
@@ -1,4 +1,4 @@
-class Mongodbpreferencepane < Cask
+cask :v1 => 'mongodbpreferencepane' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mongohub.rb b/Casks/mongohub.rb
index 8db57488aaf2..5ae15d47d82b 100644
--- a/Casks/mongohub.rb
+++ b/Casks/mongohub.rb
@@ -1,4 +1,4 @@
-class Mongohub < Cask
+cask :v1 => 'mongohub' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mono-mdk.rb b/Casks/mono-mdk.rb
index 71b4f86560a8..c10d98656e15 100644
--- a/Casks/mono-mdk.rb
+++ b/Casks/mono-mdk.rb
@@ -1,4 +1,4 @@
-class MonoMdk < Cask
+cask :v1 => 'mono-mdk' do
   version '3.10.0'
   sha256 'e71b558c2b7857c124ccbb5e73bc622733e1cd5da494a7b5d9d14a90f555c1b8'
 
diff --git a/Casks/mono-mre.rb b/Casks/mono-mre.rb
index 5e5123126032..eaaed3a3b49d 100644
--- a/Casks/mono-mre.rb
+++ b/Casks/mono-mre.rb
@@ -1,4 +1,4 @@
-class MonoMre < Cask
+cask :v1 => 'mono-mre' do
   version '3.10.0'
   sha256 'e5f7f42d9ba778aca6774921a0803d5ee73bc01d0674d058e557dcf19f792dd1'
 
diff --git a/Casks/monolingual.rb b/Casks/monolingual.rb
index 036e60dbebd7..a50fc93190c1 100644
--- a/Casks/monolingual.rb
+++ b/Casks/monolingual.rb
@@ -1,4 +1,4 @@
-class Monolingual < Cask
+cask :v1 => 'monolingual' do
   version '1.5.8'
   sha256 'bba2209c5047c69b1f8b3a692fa916c24a05b9bb098f9b6073b85f421d9be3b7'
 
diff --git a/Casks/monotype-skyfonts.rb b/Casks/monotype-skyfonts.rb
index be01d43efbe6..3585ad09ae8d 100644
--- a/Casks/monotype-skyfonts.rb
+++ b/Casks/monotype-skyfonts.rb
@@ -1,4 +1,4 @@
-class MonotypeSkyfonts < Cask
+cask :v1 => 'monotype-skyfonts' do
   version '4.6.0.0'
   sha256 '211f8f386c0ed84a19235a1cc64478c5f24d1cb0bbfb3947fa5cb5633f36484d'
 
diff --git a/Casks/moom.rb b/Casks/moom.rb
index 49fc13423c06..4e5e0511156b 100644
--- a/Casks/moom.rb
+++ b/Casks/moom.rb
@@ -1,4 +1,4 @@
-class Moom < Cask
+cask :v1 => 'moom' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/moreamp.rb b/Casks/moreamp.rb
index e05ad5d8bbc1..5275bf4477b2 100644
--- a/Casks/moreamp.rb
+++ b/Casks/moreamp.rb
@@ -1,4 +1,4 @@
-class Moreamp < Cask
+cask :v1 => 'moreamp' do
   version '0.1.28'
   sha256 '2f07c82bb5b29e12185cd35c3f3cd9c472e8cc837fe426af1c82af9428c89695'
 
diff --git a/Casks/moscow-ml.rb b/Casks/moscow-ml.rb
index f982c1919819..9c0c033fe659 100644
--- a/Casks/moscow-ml.rb
+++ b/Casks/moscow-ml.rb
@@ -1,4 +1,4 @@
-class MoscowMl < Cask
+cask :v1 => 'moscow-ml' do
   version '2.10.1'
   sha256 '4b3e2035b106c688e43e7d415ca74ca8970f74656cc2c17326c5fb7d1f948ca0'
 
diff --git a/Casks/mosh.rb b/Casks/mosh.rb
index e9ab09e55009..fcca2a08c4c5 100644
--- a/Casks/mosh.rb
+++ b/Casks/mosh.rb
@@ -1,4 +1,4 @@
-class Mosh < Cask
+cask :v1 => 'mosh' do
   version '1.2.4'
   sha256 '0722cd2fe9a0084f1736ba415cf2bb8efeb6377c1b51079127a3e7c847ad85a1'
 
diff --git a/Casks/mou.rb b/Casks/mou.rb
index 80016623e3ef..d9c83b8f1893 100644
--- a/Casks/mou.rb
+++ b/Casks/mou.rb
@@ -1,4 +1,4 @@
-class Mou < Cask
+cask :v1 => 'mou' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mountain.rb b/Casks/mountain.rb
index 9e7c6b50d94d..cd0e107bd040 100644
--- a/Casks/mountain.rb
+++ b/Casks/mountain.rb
@@ -1,4 +1,4 @@
-class Mountain < Cask
+cask :v1 => 'mountain' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mover.rb b/Casks/mover.rb
index d6ec97cfd021..d16b07b1f1bc 100644
--- a/Casks/mover.rb
+++ b/Casks/mover.rb
@@ -1,4 +1,4 @@
-class Mover < Cask
+cask :v1 => 'mover' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/movieply.rb b/Casks/movieply.rb
index cbee2e0a5800..d5ec515e8478 100644
--- a/Casks/movieply.rb
+++ b/Casks/movieply.rb
@@ -1,4 +1,4 @@
-class Movieply < Cask
+cask :v1 => 'movieply' do
   version '1.2'
   sha256 '30fde0ba565ec8f5bc15aed7fbfd9d24b3efba2b05835582cf0f5fdf730de822'
 
diff --git a/Casks/movist.rb b/Casks/movist.rb
index ef75940c1789..591d71919617 100644
--- a/Casks/movist.rb
+++ b/Casks/movist.rb
@@ -1,4 +1,4 @@
-class Movist < Cask
+cask :v1 => 'movist' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mozart.rb b/Casks/mozart.rb
index 7f8b1f2f72b3..611100a7c1ca 100644
--- a/Casks/mozart.rb
+++ b/Casks/mozart.rb
@@ -1,4 +1,4 @@
-class Mozart < Cask
+cask :v1 => 'mozart' do
   version '1.4.0.20120201'
   sha256 'df03e42ca0da5700f49d3ae036758bac762cbc3a95d4e69c4bc4aabb54e6f92b'
 
diff --git a/Casks/mp4tools.rb b/Casks/mp4tools.rb
index 3f3a59ecd3fd..aa66bb01a8e4 100644
--- a/Casks/mp4tools.rb
+++ b/Casks/mp4tools.rb
@@ -1,4 +1,4 @@
-class Mp4tools < Cask
+cask :v1 => 'mp4tools' do
   version '3.4.4'
   sha256 'faddeb243aedf2387abff39bfd86b538053045f53596cc0650df63b110f0c087'
 
diff --git a/Casks/mpeg-streamclip.rb b/Casks/mpeg-streamclip.rb
index 785c33c50ecc..04f93106500c 100644
--- a/Casks/mpeg-streamclip.rb
+++ b/Casks/mpeg-streamclip.rb
@@ -1,4 +1,4 @@
-class MpegStreamclip < Cask
+cask :v1 => 'mpeg-streamclip' do
   version '1.9.2'
   sha256 'f539e527a7232a9ac4398c0d3e7730010058b300c8d7fd33c4baf8c9ac232b85'
 
diff --git a/Casks/mpfreaker.rb b/Casks/mpfreaker.rb
index 0ce8987f894d..c8316432b1b0 100644
--- a/Casks/mpfreaker.rb
+++ b/Casks/mpfreaker.rb
@@ -1,4 +1,4 @@
-class Mpfreaker < Cask
+cask :v1 => 'mpfreaker' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/mplayer-osx-extended.rb b/Casks/mplayer-osx-extended.rb
index d8b23f177afe..c8e11d9f1848 100644
--- a/Casks/mplayer-osx-extended.rb
+++ b/Casks/mplayer-osx-extended.rb
@@ -1,4 +1,4 @@
-class MplayerOsxExtended < Cask
+cask :v1 => 'mplayer-osx-extended' do
   version 'rev15'
   sha256 '7979f2369730d389ceb4ec3082c65ffa3ec70f812f0699a2ef8acbae958a5c93'
 
diff --git a/Casks/mplayerx.rb b/Casks/mplayerx.rb
index 6f2c750aed20..5e1c60fd3d87 100644
--- a/Casks/mplayerx.rb
+++ b/Casks/mplayerx.rb
@@ -1,4 +1,4 @@
-class Mplayerx < Cask
+cask :v1 => 'mplayerx' do
   version '1.0.22.1'
   sha256 '08ce85671814e65b8c7ec8438b85be593b6deaf7d5c3b242e686a6b0176a2c77'
 
diff --git a/Casks/mpv.rb b/Casks/mpv.rb
index 48062162e6b6..18286eb405bb 100644
--- a/Casks/mpv.rb
+++ b/Casks/mpv.rb
@@ -1,4 +1,4 @@
-class Mpv < Cask
+cask :v1 => 'mpv' do
   version '0.5.3'
   sha256 'f0d89bec6265165b84279e200af2ad09e6784ed2966df91ce6d757f3cbe93bb9'
 
diff --git a/Casks/mucommander.rb b/Casks/mucommander.rb
index c3dda0dd4408..abfe925869d5 100644
--- a/Casks/mucommander.rb
+++ b/Casks/mucommander.rb
@@ -1,4 +1,4 @@
-class Mucommander < Cask
+cask :v1 => 'mucommander' do
   version '0.9.0'
   sha256 '24665a248bd0f027b399277c2e7096a57e75120048302f3ac2f89ce4f7f1acae'
 
diff --git a/Casks/mudlet.rb b/Casks/mudlet.rb
index 6eadb1fe7299..10ef488d1820 100644
--- a/Casks/mudlet.rb
+++ b/Casks/mudlet.rb
@@ -1,4 +1,4 @@
-class Mudlet < Cask
+cask :v1 => 'mudlet' do
   version '2.1'
   sha256 'c7c33cb0dba8223c094bed4caade243b0ae2fb70e71f0e18d2aa8434cc583bae'
 
diff --git a/Casks/multibit.rb b/Casks/multibit.rb
index bf6b225c0a7b..30074c3e618f 100644
--- a/Casks/multibit.rb
+++ b/Casks/multibit.rb
@@ -1,4 +1,4 @@
-class Multibit < Cask
+cask :v1 => 'multibit' do
   version '0.5.18'
   sha256 '0d2fe6fa68385c1ca964d9588272787dabffbc2061f29ebaab422317d0972257'
 
diff --git a/Casks/multibrowser.rb b/Casks/multibrowser.rb
index c0ac3917e7c8..81e423493803 100644
--- a/Casks/multibrowser.rb
+++ b/Casks/multibrowser.rb
@@ -1,4 +1,4 @@
-class Multibrowser < Cask
+cask :v1 => 'multibrowser' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/multidoge.rb b/Casks/multidoge.rb
index 1e2d260cb81b..7e7584834e44 100644
--- a/Casks/multidoge.rb
+++ b/Casks/multidoge.rb
@@ -1,4 +1,4 @@
-class Multidoge < Cask
+cask :v1 => 'multidoge' do
   version '0.1.2'
   sha256 'e6639dac77df7a6ea34ce086d68dedda98d8537bd31d32b17598243e26122bcc'
 
diff --git a/Casks/multifirefox.rb b/Casks/multifirefox.rb
index 601d9eb2e6ba..83f2dcd8b541 100644
--- a/Casks/multifirefox.rb
+++ b/Casks/multifirefox.rb
@@ -1,4 +1,4 @@
-class Multifirefox < Cask
+cask :v1 => 'multifirefox' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/multipatch.rb b/Casks/multipatch.rb
index c85f158b40e8..096dda28486f 100644
--- a/Casks/multipatch.rb
+++ b/Casks/multipatch.rb
@@ -1,4 +1,4 @@
-class Multipatch < Cask
+cask :v1 => 'multipatch' do
   version '1.4'
   sha256 'ce95baacf8d4d323e144fa31e52c80519c0f81a59a8f3239c25c0da4b927fcf5'
 
diff --git a/Casks/mumble.rb b/Casks/mumble.rb
index 074ee823d468..561629e7be75 100644
--- a/Casks/mumble.rb
+++ b/Casks/mumble.rb
@@ -1,4 +1,4 @@
-class Mumble < Cask
+cask :v1 => 'mumble' do
   version '1.2.8'
   sha256 '19ea209ed4a589ad0959f4c8b4af47f479efbf63d5efb0b170c3b31f98979e2f'
 
diff --git a/Casks/munki.rb b/Casks/munki.rb
index 9ebfc1c2149d..be2b8c50b425 100644
--- a/Casks/munki.rb
+++ b/Casks/munki.rb
@@ -1,4 +1,4 @@
-class Munki < Cask
+cask :v1 => 'munki' do
   version '2.0.1'
   sha256 'f4b586c254fcd47f54d4b58ea7c43308ee1472b41f03e7b59ceb9fd6605a54b8'
 
diff --git a/Casks/murasaki.rb b/Casks/murasaki.rb
index fee87ad3bd09..da30348cc76e 100644
--- a/Casks/murasaki.rb
+++ b/Casks/murasaki.rb
@@ -1,4 +1,4 @@
-class Murasaki < Cask
+cask :v1 => 'murasaki' do
   version '1.0.2'
   sha256 '2dd07c47d59aff053b8be804e08b087ce8d9e127365de43a206011a63ba42966'
 
diff --git a/Casks/musescore.rb b/Casks/musescore.rb
index 69c94fcd6302..57c9a12e90ab 100644
--- a/Casks/musescore.rb
+++ b/Casks/musescore.rb
@@ -1,4 +1,4 @@
-class Musescore < Cask
+cask :v1 => 'musescore' do
   version '1.3'
   sha256 'fcd106ec700f14053c9b4f3fd411d2335915c040f9071ea6da8d109e6827c3a5'
 
diff --git a/Casks/music-manager.rb b/Casks/music-manager.rb
index c1eb199f47cf..bf14ff5ddee6 100644
--- a/Casks/music-manager.rb
+++ b/Casks/music-manager.rb
@@ -1,4 +1,4 @@
-class MusicManager < Cask
+cask :v1 => 'music-manager' do
   version '1.0.104.6528'
   sha256 'a1e4e48e008958f9a725bfee1e2d8360dc8efad38ef2532fc1b3e4b9c3df8f0d'
 
diff --git a/Casks/musicbrainz-picard.rb b/Casks/musicbrainz-picard.rb
index 56e24e1e4568..2382c6d214c5 100644
--- a/Casks/musicbrainz-picard.rb
+++ b/Casks/musicbrainz-picard.rb
@@ -1,4 +1,4 @@
-class MusicbrainzPicard < Cask
+cask :v1 => 'musicbrainz-picard' do
   version '1.3'
   sha256 'fa4785ae157b6fb269eec7bcb3c3c8a6f93faa563336364aa31946b51ae39ecb'
 
diff --git a/Casks/musicplayer.rb b/Casks/musicplayer.rb
index 6b535fd44c92..32b860ca82b9 100644
--- a/Casks/musicplayer.rb
+++ b/Casks/musicplayer.rb
@@ -1,4 +1,4 @@
-class Musicplayer < Cask
+cask :v1 => 'musicplayer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/musictube.rb b/Casks/musictube.rb
index fa0371626b50..94965d1b8f1e 100644
--- a/Casks/musictube.rb
+++ b/Casks/musictube.rb
@@ -1,4 +1,4 @@
-class Musictube < Cask
+cask :v1 => 'musictube' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/musique.rb b/Casks/musique.rb
index 325d58d1ec64..277464ef2fa4 100644
--- a/Casks/musique.rb
+++ b/Casks/musique.rb
@@ -1,4 +1,4 @@
-class Musique < Cask
+cask :v1 => 'musique' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/myphonedesktop.rb b/Casks/myphonedesktop.rb
index b613e574304e..e3c556c3f616 100644
--- a/Casks/myphonedesktop.rb
+++ b/Casks/myphonedesktop.rb
@@ -1,4 +1,4 @@
-class Myphonedesktop < Cask
+cask :v1 => 'myphonedesktop' do
   version '2.0.3'
   sha256 '89cab32dcb91ea67a6627dba0690d54ab01ec1f74d322995c9d289ca016578a0'
 
diff --git a/Casks/mysqlworkbench.rb b/Casks/mysqlworkbench.rb
index 552da25cb22f..443acc74477e 100644
--- a/Casks/mysqlworkbench.rb
+++ b/Casks/mysqlworkbench.rb
@@ -1,4 +1,4 @@
-class Mysqlworkbench < Cask
+cask :v1 => 'mysqlworkbench' do
   version '6.2.3'
   sha256 '0a66707a03d83a70f1ced521ac0954ee56ff9a6e86f81e01d03df723755e9186'
 
diff --git a/Casks/nally.rb b/Casks/nally.rb
index eccc5ac98480..13655eb15cdb 100644
--- a/Casks/nally.rb
+++ b/Casks/nally.rb
@@ -1,4 +1,4 @@
-class Nally < Cask
+cask :v1 => 'nally' do
   version '1.4.9'
   sha256 '5b7835f8842aa33d0f40eebddda2686a39f2106dfacd0bde04c3f0911da625d1'
 
diff --git a/Casks/name-mangler.rb b/Casks/name-mangler.rb
index 519fd9be2cd9..e4cf8f1ec8a1 100644
--- a/Casks/name-mangler.rb
+++ b/Casks/name-mangler.rb
@@ -1,4 +1,4 @@
-class NameMangler < Cask
+cask :v1 => 'name-mangler' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/namebench.rb b/Casks/namebench.rb
index 1aeaacc35907..b022d1a2fdbd 100644
--- a/Casks/namebench.rb
+++ b/Casks/namebench.rb
@@ -1,4 +1,4 @@
-class Namebench < Cask
+cask :v1 => 'namebench' do
   version '1.3.1'
   sha256 '524fb534b1b5790433332feb993ab30688858f6d92b1d511c842b1c9a8887250'
 
diff --git a/Casks/namechanger.rb b/Casks/namechanger.rb
index 2d0d4cbc80ca..7b882f0aba55 100644
--- a/Casks/namechanger.rb
+++ b/Casks/namechanger.rb
@@ -1,4 +1,4 @@
-class Namechanger < Cask
+cask :v1 => 'namechanger' do
   version '2.3.3'
   sha256 '3731773e2be9af5c0cda15aa4368393ebe05084e6a29a03a38756b5f4049fc8d'
 
diff --git a/Casks/namely.rb b/Casks/namely.rb
index 751f012b2b98..826576e387c8 100644
--- a/Casks/namely.rb
+++ b/Casks/namely.rb
@@ -1,4 +1,4 @@
-class Namely < Cask
+cask :v1 => 'namely' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/nanostudio.rb b/Casks/nanostudio.rb
index bdfb6206ec17..f0d3b2fdf219 100644
--- a/Casks/nanostudio.rb
+++ b/Casks/nanostudio.rb
@@ -1,4 +1,4 @@
-class Nanostudio < Cask
+cask :v1 => 'nanostudio' do
   version '1.42'
   sha256 'f6f834116213d1d007b17063fc816197de90044b8bb286df5d9b42d807e1f3ab'
 
diff --git a/Casks/narrative-uploader.rb b/Casks/narrative-uploader.rb
index f9cc4b7505cf..772c3d2c6e61 100644
--- a/Casks/narrative-uploader.rb
+++ b/Casks/narrative-uploader.rb
@@ -1,4 +1,4 @@
-class NarrativeUploader < Cask
+cask :v1 => 'narrative-uploader' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/navicat-data-modeler.rb b/Casks/navicat-data-modeler.rb
index eb220359151c..0c310039c199 100644
--- a/Casks/navicat-data-modeler.rb
+++ b/Casks/navicat-data-modeler.rb
@@ -1,4 +1,4 @@
-class NavicatDataModeler < Cask
+cask :v1 => 'navicat-data-modeler' do
   version '1.0.5'
   sha256 'de0f1dbb450401f9ce29948886b60167508ccca621162a9ab9a805d54d574bbb'
 
diff --git a/Casks/navicat-for-mariadb.rb b/Casks/navicat-for-mariadb.rb
index 6cc163187b77..0879ac21f470 100644
--- a/Casks/navicat-for-mariadb.rb
+++ b/Casks/navicat-for-mariadb.rb
@@ -1,4 +1,4 @@
-class NavicatForMariadb < Cask
+cask :v1 => 'navicat-for-mariadb' do
   version '11.1.5'
   sha256 '84f156288bfa92a83f3af70d615617d0c8e255825ad35368b05550366dc5d8e8'
 
diff --git a/Casks/navicat-for-mysql.rb b/Casks/navicat-for-mysql.rb
index 736b90820707..5a77880f3504 100644
--- a/Casks/navicat-for-mysql.rb
+++ b/Casks/navicat-for-mysql.rb
@@ -1,4 +1,4 @@
-class NavicatForMysql < Cask
+cask :v1 => 'navicat-for-mysql' do
   version '11.1.5'
   sha256 '415ab48ff1f90fe090460a501ed1c1102d7e1876a7d54e815d57e3ec22a69eb2'
 
diff --git a/Casks/navicat-for-oracle.rb b/Casks/navicat-for-oracle.rb
index 1a5c05a047f9..785c80264fac 100644
--- a/Casks/navicat-for-oracle.rb
+++ b/Casks/navicat-for-oracle.rb
@@ -1,4 +1,4 @@
-class NavicatForOracle < Cask
+cask :v1 => 'navicat-for-oracle' do
   version '11.1.5'
   sha256 'e4e004e3e7442917aadbb5b80f179998cbd65c94b31250f210847b52c2ba9ed1'
 
diff --git a/Casks/navicat-for-postgresql.rb b/Casks/navicat-for-postgresql.rb
index c739bbab7fc5..746be63bc5dc 100644
--- a/Casks/navicat-for-postgresql.rb
+++ b/Casks/navicat-for-postgresql.rb
@@ -1,4 +1,4 @@
-class NavicatForPostgresql < Cask
+cask :v1 => 'navicat-for-postgresql' do
   version '11.1.5'
   sha256 'd266ae7584575ef24713bb03564e217a07996c5624af9c3890deab6c031f7b47'
 
diff --git a/Casks/navicat-for-sql-server.rb b/Casks/navicat-for-sql-server.rb
index be94770514e1..5769de584c58 100644
--- a/Casks/navicat-for-sql-server.rb
+++ b/Casks/navicat-for-sql-server.rb
@@ -1,4 +1,4 @@
-class NavicatForSqlServer < Cask
+cask :v1 => 'navicat-for-sql-server' do
   version '11.1.5'
   sha256 '6f7273798585129ba58a0d8f5eb8cb724f3f2dfd3f977ac408cd801c5be28bfc'
 
diff --git a/Casks/navicat-for-sqlite.rb b/Casks/navicat-for-sqlite.rb
index 5f50657fd9a1..63395bfec313 100644
--- a/Casks/navicat-for-sqlite.rb
+++ b/Casks/navicat-for-sqlite.rb
@@ -1,4 +1,4 @@
-class NavicatForSqlite < Cask
+cask :v1 => 'navicat-for-sqlite' do
   version '11.1.5'
   sha256 'c6f8331d5353a8f6527397fb4ec754e012bba7d39aeeecfeeedd9cc42b643ad1'
 
diff --git a/Casks/navicat-premium.rb b/Casks/navicat-premium.rb
index 047570a18102..dd3f4aa4731b 100644
--- a/Casks/navicat-premium.rb
+++ b/Casks/navicat-premium.rb
@@ -1,4 +1,4 @@
-class NavicatPremium < Cask
+cask :v1 => 'navicat-premium' do
   version '11.1.5'
   sha256 '31229725466814d7882059d0504fa14a467229a1beba772b91e152cc403b130e'
 
diff --git a/Casks/ncmeta.rb b/Casks/ncmeta.rb
index 15d6f9776c7b..1751b3d6894e 100644
--- a/Casks/ncmeta.rb
+++ b/Casks/ncmeta.rb
@@ -1,4 +1,4 @@
-class Ncmeta < Cask
+cask :v1 => 'ncmeta' do
   version '1.0'
   sha256 '42e61202705784dbdb16d0842d8b499fb311c3947b3456fccd046edcfa1b9727'
 
diff --git a/Casks/neofinder.rb b/Casks/neofinder.rb
index f40ec1c45057..b36319e5f040 100644
--- a/Casks/neofinder.rb
+++ b/Casks/neofinder.rb
@@ -1,4 +1,4 @@
-class Neofinder < Cask
+cask :v1 => 'neofinder' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/nestopia.rb b/Casks/nestopia.rb
index 3cc6ae1d660a..505a1346a518 100644
--- a/Casks/nestopia.rb
+++ b/Casks/nestopia.rb
@@ -1,4 +1,4 @@
-class Nestopia < Cask
+cask :v1 => 'nestopia' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/netbeans-cpp.rb b/Casks/netbeans-cpp.rb
index 8453fcaeb802..892801d80d74 100644
--- a/Casks/netbeans-cpp.rb
+++ b/Casks/netbeans-cpp.rb
@@ -1,4 +1,4 @@
-class NetbeansCpp < Cask
+cask :v1 => 'netbeans-cpp' do
   version '8.0.1'
   sha256 '724e3471329ae507dcd2127528cddbbdec5f0e104ee9a510fc49131196d6ab33'
 
diff --git a/Casks/netbeans-php.rb b/Casks/netbeans-php.rb
index b3622e5434c3..579168a3f42a 100644
--- a/Casks/netbeans-php.rb
+++ b/Casks/netbeans-php.rb
@@ -1,4 +1,4 @@
-class NetbeansPhp < Cask
+cask :v1 => 'netbeans-php' do
   version '8.0.1'
   sha256 '97b53f6881236a533cfac78b17124e26393eb0445f5e0336fbd765c9b0230482'
 
diff --git a/Casks/netbeans.rb b/Casks/netbeans.rb
index 7d0653437af0..4e415d86efc8 100644
--- a/Casks/netbeans.rb
+++ b/Casks/netbeans.rb
@@ -1,4 +1,4 @@
-class Netbeans < Cask
+cask :v1 => 'netbeans' do
   version '8.0.1'
   sha256 '701f057b9cb9d4f20054acbbe5298369c459827e86021de6a80738a1fc600f1f'
 
diff --git a/Casks/netease-music.rb b/Casks/netease-music.rb
index 19f208aa3db0..4d8c07f1c92f 100644
--- a/Casks/netease-music.rb
+++ b/Casks/netease-music.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-class NeteaseMusic < Cask
+cask :v1 => 'netease-music' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/nethackcocoa.rb b/Casks/nethackcocoa.rb
index 1daf3c9ff621..fe3e7a6174ce 100644
--- a/Casks/nethackcocoa.rb
+++ b/Casks/nethackcocoa.rb
@@ -1,4 +1,4 @@
-class Nethackcocoa < Cask
+cask :v1 => 'nethackcocoa' do
   version '0.3.4'
   sha256 '83a9db8f633996a563fbe939141404625f9cf66180612215484f391df0475e94'
 
diff --git a/Casks/netlogo.rb b/Casks/netlogo.rb
index 1c2ad4581798..3fbba98d4893 100644
--- a/Casks/netlogo.rb
+++ b/Casks/netlogo.rb
@@ -1,4 +1,4 @@
-class Netlogo < Cask
+cask :v1 => 'netlogo' do
   version '5.0.5'
   sha256 '317faad5fadff9bababce580d9c72d74a491ec81de5129529a5d2f4dd8241ebf'
 
diff --git a/Casks/netnewswire.rb b/Casks/netnewswire.rb
index f4c3a399ec4c..324886df05f1 100644
--- a/Casks/netnewswire.rb
+++ b/Casks/netnewswire.rb
@@ -1,4 +1,4 @@
-class Netnewswire < Cask
+cask :v1 => 'netnewswire' do
   version '4.0.0-166'
   sha256 '94bbf93cc820be06f32fc80ff1ce065e5e5e219a0587fee948355a72140d05f3'
 
diff --git a/Casks/netshade.rb b/Casks/netshade.rb
index 38fd67347ad2..df2a58411081 100644
--- a/Casks/netshade.rb
+++ b/Casks/netshade.rb
@@ -1,4 +1,4 @@
-class Netshade < Cask
+cask :v1 => 'netshade' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/netspot.rb b/Casks/netspot.rb
index f87d2a6fd7d0..4aa06251521b 100644
--- a/Casks/netspot.rb
+++ b/Casks/netspot.rb
@@ -1,4 +1,4 @@
-class Netspot < Cask
+cask :v1 => 'netspot' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/neu.rb b/Casks/neu.rb
index 5adeceedebba..8b4d1756e618 100644
--- a/Casks/neu.rb
+++ b/Casks/neu.rb
@@ -1,4 +1,4 @@
-class Neu < Cask
+cask :v1 => 'neu' do
   version '1.2.1'
   sha256 '7d46be5ae865882553887f0942fe7d441b71b70a4ad593d3f72c897c47642552'
 
diff --git a/Casks/ngrok.rb b/Casks/ngrok.rb
index 57784cb758f8..0bbe4a03d1a0 100644
--- a/Casks/ngrok.rb
+++ b/Casks/ngrok.rb
@@ -1,4 +1,4 @@
-class Ngrok < Cask
+cask :v1 => 'ngrok' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/nicecast.rb b/Casks/nicecast.rb
index b649c4fcaaf7..bc093f01105c 100644
--- a/Casks/nicecast.rb
+++ b/Casks/nicecast.rb
@@ -1,4 +1,4 @@
-class Nicecast < Cask
+cask :v1 => 'nicecast' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/nide.rb b/Casks/nide.rb
index 65e8c6d0bb09..518d2d0f15c3 100644
--- a/Casks/nide.rb
+++ b/Casks/nide.rb
@@ -1,4 +1,4 @@
-class Nide < Cask
+cask :v1 => 'nide' do
   version '0.2.0'
   sha256 '95a83ded032c26f0235924035efd1b345997b8fbb578d315099a918d03427b2b'
 
diff --git a/Casks/nightingale.rb b/Casks/nightingale.rb
index 6264d743bba5..a02dc33fde0f 100644
--- a/Casks/nightingale.rb
+++ b/Casks/nightingale.rb
@@ -1,4 +1,4 @@
-class Nightingale < Cask
+cask :v1 => 'nightingale' do
   version '1.12-2432'
   sha256 '854b02a22f2846284618dc8d3a64a766e8e7a34e65cf35934f6b357f4bc1000e'
 
diff --git a/Casks/nike-plus-connect.rb b/Casks/nike-plus-connect.rb
index f0082d663ef5..0ef165185256 100644
--- a/Casks/nike-plus-connect.rb
+++ b/Casks/nike-plus-connect.rb
@@ -1,4 +1,4 @@
-class NikePlusConnect < Cask
+cask :v1 => 'nike-plus-connect' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/nimbus.rb b/Casks/nimbus.rb
index 5b2b0f432f04..34edb0651985 100644
--- a/Casks/nimbus.rb
+++ b/Casks/nimbus.rb
@@ -1,4 +1,4 @@
-class Nimbus < Cask
+cask :v1 => 'nimbus' do
   version '0.7.3'
   sha256 '4915e57131db72e08c45e375e4a52a4441f70ef9cfb5a70e433d66949708e82b'
 
diff --git a/Casks/ninjablocks.rb b/Casks/ninjablocks.rb
index e4c4a83f9d84..a40bc512e683 100644
--- a/Casks/ninjablocks.rb
+++ b/Casks/ninjablocks.rb
@@ -1,4 +1,4 @@
-class Ninjablocks < Cask
+cask :v1 => 'ninjablocks' do
   version '0.2'
   sha256 'f0ed94bc767a7f0059d08904f71c4266b6045ce4f7c194678e48b02a2d85eaeb'
 
diff --git a/Casks/nitroshare.rb b/Casks/nitroshare.rb
index ffeae71dd2d3..4829e3ffa5b7 100644
--- a/Casks/nitroshare.rb
+++ b/Casks/nitroshare.rb
@@ -1,4 +1,4 @@
-class Nitroshare < Cask
+cask :v1 => 'nitroshare' do
   version '0.2'
   sha256 '9f208d4b86ca13c4136265fa4a4693c7ef9ba9f0d6a0a84966cfd5f9934abe12'
 
diff --git a/Casks/nitrous-desktop.rb b/Casks/nitrous-desktop.rb
index 49c5bff9ca63..e5da80616c98 100644
--- a/Casks/nitrous-desktop.rb
+++ b/Casks/nitrous-desktop.rb
@@ -1,4 +1,4 @@
-class NitrousDesktop < Cask
+cask :v1 => 'nitrous-desktop' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/nmap.rb b/Casks/nmap.rb
index 214fb90baca2..5b97c08bb988 100644
--- a/Casks/nmap.rb
+++ b/Casks/nmap.rb
@@ -1,4 +1,4 @@
-class Nmap < Cask
+cask :v1 => 'nmap' do
   version '6.47'
   sha256 'eb277f24d4d77d323400c23c5e0b4296143524dc2e4ddbe844cc3c4c7fc878d2'
 
diff --git a/Casks/no-ip-duc.rb b/Casks/no-ip-duc.rb
index 7a77305fe1f7..1b91183ded74 100644
--- a/Casks/no-ip-duc.rb
+++ b/Casks/no-ip-duc.rb
@@ -1,4 +1,4 @@
-class NoIpDuc < Cask
+cask :v1 => 'no-ip-duc' do
   version '3.2.1'
   sha256 'b59b159d1f9e2b64d6514577946b77f2c7f11767aa507a9c2bc2aa39ae9e4ffd'
 
diff --git a/Casks/nocturne.rb b/Casks/nocturne.rb
index b01195b43ee4..41acea723480 100644
--- a/Casks/nocturne.rb
+++ b/Casks/nocturne.rb
@@ -1,4 +1,4 @@
-class Nocturne < Cask
+cask :v1 => 'nocturne' do
   version '2.0.0'
   sha256 '062ae6b4619ab518650b2f502aaeb7a864bf69e45ce08dec8b5a3f34a027a347'
 
diff --git a/Casks/node-webkit.rb b/Casks/node-webkit.rb
index c7a82b1ad7e8..6f1d4ee1047b 100644
--- a/Casks/node-webkit.rb
+++ b/Casks/node-webkit.rb
@@ -1,4 +1,4 @@
-class NodeWebkit < Cask
+cask :v1 => 'node-webkit' do
   version '0.11.0'
   sha256 'ada386b7d7531c565b6f4a48d90d1fc2cb075f838536df60fbb7730bd2487d72'
 
diff --git a/Casks/node.rb b/Casks/node.rb
index 42b887c7f070..4512a8417a08 100644
--- a/Casks/node.rb
+++ b/Casks/node.rb
@@ -1,4 +1,4 @@
-class Node < Cask
+cask :v1 => 'node' do
   version '0.10.32'
   sha256 '3ce16fa81f47da38bcf726ef384e1bc0658d52f880d17aa17fd5b613bea035cf'
 
diff --git a/Casks/nodebox.rb b/Casks/nodebox.rb
index 65d70c391ac1..6f4a928e9deb 100644
--- a/Casks/nodebox.rb
+++ b/Casks/nodebox.rb
@@ -1,4 +1,4 @@
-class Nodebox < Cask
+cask :v1 => 'nodebox' do
   version '3.0.39'
   sha256 '44620d6554c467863c0d68d5e90ff3edf0c7f9ab6c5614cdef2fcb54f9044fb4'
 
diff --git a/Casks/nodeclipse.rb b/Casks/nodeclipse.rb
index 5c0a21f29f62..a098c38c5ead 100644
--- a/Casks/nodeclipse.rb
+++ b/Casks/nodeclipse.rb
@@ -1,4 +1,4 @@
-class Nodeclipse < Cask
+cask :v1 => 'nodeclipse' do
   version '0.11-preview'
   sha256 '01f630446313cb981ce2ee9b934977cfdbf318e09761dee244a3256f9a559003'
 
diff --git a/Casks/noejectdelay.rb b/Casks/noejectdelay.rb
index 0657711723e4..6ad1cfce985b 100644
--- a/Casks/noejectdelay.rb
+++ b/Casks/noejectdelay.rb
@@ -1,4 +1,4 @@
-class Noejectdelay < Cask
+cask :v1 => 'noejectdelay' do
   version '5.4.0'
   sha256 '7b480ade6537a2d98924ad1dabf87b8f3d396c2035addfd032839c2473659c21'
 
diff --git a/Casks/noisy.rb b/Casks/noisy.rb
index 0607a83b8a24..84a16c2dd716 100644
--- a/Casks/noisy.rb
+++ b/Casks/noisy.rb
@@ -1,4 +1,4 @@
-class Noisy < Cask
+cask :v1 => 'noisy' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/noiz2sa.rb b/Casks/noiz2sa.rb
index 931e1a2d99d8..6a4d043da62b 100644
--- a/Casks/noiz2sa.rb
+++ b/Casks/noiz2sa.rb
@@ -1,4 +1,4 @@
-class Noiz2sa < Cask
+cask :v1 => 'noiz2sa' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/nomachine.rb b/Casks/nomachine.rb
index 058864854b2f..cbb551d98e7a 100644
--- a/Casks/nomachine.rb
+++ b/Casks/nomachine.rb
@@ -1,4 +1,4 @@
-class Nomachine < Cask
+cask :v1 => 'nomachine' do
   version '4.2.27_1'
   sha256 'b210543612f9f99e120b356ef38754bd9b8f20c54d5d657e88a1d73b644cf145'
 
diff --git a/Casks/nomacs.rb b/Casks/nomacs.rb
index be4ba5a3c101..33283852c6c6 100644
--- a/Casks/nomacs.rb
+++ b/Casks/nomacs.rb
@@ -1,4 +1,4 @@
-class Nomacs < Cask
+cask :v1 => 'nomacs' do
   version '1.0.0'
   sha256 '2ec4bfd6390ab7c4b2a929a1e9d14f46f6f168608bf2aee8da67af797f73a54a'
 
diff --git a/Casks/noobproof.rb b/Casks/noobproof.rb
index 517cfd945bfb..d080bbaba6a4 100644
--- a/Casks/noobproof.rb
+++ b/Casks/noobproof.rb
@@ -1,4 +1,4 @@
-class Noobproof < Cask
+cask :v1 => 'noobproof' do
   version '1.5'
   sha256 '6e74a5aec8e9cf9102c160019990e90ae46486358959fa0d22517b4171f8209a'
 
diff --git a/Casks/nosleep.rb b/Casks/nosleep.rb
index 245ce98539ce..d0aafff5db53 100644
--- a/Casks/nosleep.rb
+++ b/Casks/nosleep.rb
@@ -1,4 +1,4 @@
-class Nosleep < Cask
+cask :v1 => 'nosleep' do
   version '1.3.3'
   sha256 '5fe90c54e975d3f1de9f7fdb66def0188c571eab083b18a7e94abaa5f0d41ba9'
 
diff --git a/Casks/not-pacman.rb b/Casks/not-pacman.rb
index e025bede269d..cecc8c9e7c51 100644
--- a/Casks/not-pacman.rb
+++ b/Casks/not-pacman.rb
@@ -1,4 +1,4 @@
-class NotPacman < Cask
+cask :v1 => 'not-pacman' do
   version '1004'
   sha256 '4a2c4d84ad713f505a89a14eea5184e76ea5378eb08698da41afc6c4021ead13'
 
diff --git a/Casks/not-tetris.rb b/Casks/not-tetris.rb
index fa493c53468d..2f87687f4342 100644
--- a/Casks/not-tetris.rb
+++ b/Casks/not-tetris.rb
@@ -1,4 +1,4 @@
-class NotTetris < Cask
+cask :v1 => 'not-tetris' do
   version '2'
   sha256 'ddb4df7f9169e1a03cb5f81e67b972cca4470e4925973af452f6e467830aaea8'
 
diff --git a/Casks/notational-velocity.rb b/Casks/notational-velocity.rb
index f096935d491b..719eb623d0e9 100644
--- a/Casks/notational-velocity.rb
+++ b/Casks/notational-velocity.rb
@@ -1,4 +1,4 @@
-class NotationalVelocity < Cask
+cask :v1 => 'notational-velocity' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/notedup.rb b/Casks/notedup.rb
index 0b0b8acd8fbc..57c940d72903 100644
--- a/Casks/notedup.rb
+++ b/Casks/notedup.rb
@@ -1,4 +1,4 @@
-class Notedup < Cask
+cask :v1 => 'notedup' do
   version '2014031401'
   sha256 '15080c58484a9f8c7a7a00a94eae777791ab75ecd0c257e73f76398fb5a8a96e'
 
diff --git a/Casks/nothing-to-hide.rb b/Casks/nothing-to-hide.rb
index 9d751e9dd5e0..7c68836f38da 100644
--- a/Casks/nothing-to-hide.rb
+++ b/Casks/nothing-to-hide.rb
@@ -1,4 +1,4 @@
-class NothingToHide < Cask
+cask :v1 => 'nothing-to-hide' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/notifyr.rb b/Casks/notifyr.rb
index 6952f7ab3292..27b1a800b235 100644
--- a/Casks/notifyr.rb
+++ b/Casks/notifyr.rb
@@ -1,4 +1,4 @@
-class Notifyr < Cask
+cask :v1 => 'notifyr' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/nottingham.rb b/Casks/nottingham.rb
index c8c69db1bcaa..c4f88cdbe4b8 100644
--- a/Casks/nottingham.rb
+++ b/Casks/nottingham.rb
@@ -1,4 +1,4 @@
-class Nottingham < Cask
+cask :v1 => 'nottingham' do
   version '2.1.3'
   sha256 'ccaceba0bc6566ba2850126ae2d456fd6d44b78122117b8e1f3e597ef812bd55'
 
diff --git a/Casks/nsregextester.rb b/Casks/nsregextester.rb
index 26c4550f81bd..9db99c497495 100644
--- a/Casks/nsregextester.rb
+++ b/Casks/nsregextester.rb
@@ -1,4 +1,4 @@
-class Nsregextester < Cask
+cask :v1 => 'nsregextester' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ntfs-free.rb b/Casks/ntfs-free.rb
index 106f7a83fa23..9f933ea27c13 100644
--- a/Casks/ntfs-free.rb
+++ b/Casks/ntfs-free.rb
@@ -1,4 +1,4 @@
-class NtfsFree < Cask
+cask :v1 => 'ntfs-free' do
   version '10.8.2'
   sha256 '1bc7122a2d869b740a35e2dba1fe29c380f21ad07481fc0a46b2f55bf79c574e'
 
diff --git a/Casks/ntfsmounter.rb b/Casks/ntfsmounter.rb
index 8a73537082c6..2aac124c4f75 100644
--- a/Casks/ntfsmounter.rb
+++ b/Casks/ntfsmounter.rb
@@ -1,4 +1,4 @@
-class Ntfsmounter < Cask
+cask :v1 => 'ntfsmounter' do
   version '0.4'
   sha256 'bfb8cfe17518513f8784f1a0389af8716b1ce319cc516cfc188de6226bbbbb4e'
 
diff --git a/Casks/nutstore.rb b/Casks/nutstore.rb
index a5797e4aceff..c6c13b831d6f 100644
--- a/Casks/nutstore.rb
+++ b/Casks/nutstore.rb
@@ -1,4 +1,4 @@
-class Nutstore < Cask
+cask :v1 => 'nutstore' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/nvalt.rb b/Casks/nvalt.rb
index 1197b70b106b..5595a1624359 100644
--- a/Casks/nvalt.rb
+++ b/Casks/nvalt.rb
@@ -1,4 +1,4 @@
-class Nvalt < Cask
+cask :v1 => 'nvalt' do
   version '2.2b111'
   sha256 'd787ddf92730bb03ba084e72bc6fb5f4fbd42731fa3531476af9eb3ce39e1cd0'
 
diff --git a/Casks/nzbvortex.rb b/Casks/nzbvortex.rb
index 09d6f143c827..1a94522c4efa 100644
--- a/Casks/nzbvortex.rb
+++ b/Casks/nzbvortex.rb
@@ -1,4 +1,4 @@
-class Nzbvortex < Cask
+cask :v1 => 'nzbvortex' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/objektiv.rb b/Casks/objektiv.rb
index dfb511f8f954..3edb33ac8c7c 100644
--- a/Casks/objektiv.rb
+++ b/Casks/objektiv.rb
@@ -1,4 +1,4 @@
-class Objektiv < Cask
+cask :v1 => 'objektiv' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/obs.rb b/Casks/obs.rb
index 664333b362f4..47ec4f471cbf 100644
--- a/Casks/obs.rb
+++ b/Casks/obs.rb
@@ -1,4 +1,4 @@
-class Obs < Cask
+cask :v1 => 'obs' do
   version '0.6.2'
   sha256 '871b73509008c3df1c3ba005ff290395d19e494266571fc0f7b14d73f813d605'
 
diff --git a/Casks/obsidian-menu-bar-mountain-lion.rb b/Casks/obsidian-menu-bar-mountain-lion.rb
index ed1f40aa24ae..5ee79a5da080 100644
--- a/Casks/obsidian-menu-bar-mountain-lion.rb
+++ b/Casks/obsidian-menu-bar-mountain-lion.rb
@@ -1,4 +1,4 @@
-class ObsidianMenuBarMountainLion < Cask
+cask :v1 => 'obsidian-menu-bar-mountain-lion' do
   version '10.8'
   sha256 '97c8545c623ec78a0a81c2b7bb6a7afa9d0dd517a64b74f5320e2e279a2786aa'
 
diff --git a/Casks/ocenaudio.rb b/Casks/ocenaudio.rb
index 0abe53c5234a..0b3fcca3d568 100644
--- a/Casks/ocenaudio.rb
+++ b/Casks/ocenaudio.rb
@@ -1,4 +1,4 @@
-class Ocenaudio < Cask
+cask :v1 => 'ocenaudio' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/oclint.rb b/Casks/oclint.rb
index 254b9292314d..201fd596329c 100644
--- a/Casks/oclint.rb
+++ b/Casks/oclint.rb
@@ -1,4 +1,4 @@
-class Oclint < Cask
+cask :v1 => 'oclint' do
   version '0.7'
   sha256 '697ea08fc7cd8945a40ed95e6f3d40c18ed15968b7b0c0519dce9d14873633a9'
 
diff --git a/Casks/octave.rb b/Casks/octave.rb
index 6d769ac7e841..95e401cac3eb 100644
--- a/Casks/octave.rb
+++ b/Casks/octave.rb
@@ -1,4 +1,4 @@
-class Octave < Cask
+cask :v1 => 'octave' do
   version '3.8.0-6'
   sha256 'b51c20b109e15928350624011885e658b45009da0acb8872a1347688f8f62963'
 
diff --git a/Casks/odesk.rb b/Casks/odesk.rb
index 832417762534..21d348140ca6 100644
--- a/Casks/odesk.rb
+++ b/Casks/odesk.rb
@@ -1,4 +1,4 @@
-class Odesk < Cask
+cask :v1 => 'odesk' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/odrive.rb b/Casks/odrive.rb
index 241bd17ca40d..49e33897a60e 100644
--- a/Casks/odrive.rb
+++ b/Casks/odrive.rb
@@ -1,4 +1,4 @@
-class Odrive < Cask
+cask :v1 => 'odrive' do
   version '2712'
   sha256 'd7782b822b057cdb8b7ff7883296c7c546601cfdf6647ce66bddd3ace89bbcc6'
 
diff --git a/Casks/omnidazzle.rb b/Casks/omnidazzle.rb
index c4fe676a0680..3a7fba491380 100644
--- a/Casks/omnidazzle.rb
+++ b/Casks/omnidazzle.rb
@@ -1,4 +1,4 @@
-class Omnidazzle < Cask
+cask :v1 => 'omnidazzle' do
   version '1.2'
   sha256 '47dfafb0740eeb164832804bd9ccf898f722057f919cd59197e04f9263f3a175'
 
diff --git a/Casks/omnidisksweeper.rb b/Casks/omnidisksweeper.rb
index 5f306532a6df..9d788f73bb39 100644
--- a/Casks/omnidisksweeper.rb
+++ b/Casks/omnidisksweeper.rb
@@ -1,4 +1,4 @@
-class Omnidisksweeper < Cask
+cask :v1 => 'omnidisksweeper' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/omnifocus-clip-o-tron.rb b/Casks/omnifocus-clip-o-tron.rb
index 803b91397e62..a0754579b16f 100644
--- a/Casks/omnifocus-clip-o-tron.rb
+++ b/Casks/omnifocus-clip-o-tron.rb
@@ -1,4 +1,4 @@
-class OmnifocusClipOTron < Cask
+cask :v1 => 'omnifocus-clip-o-tron' do
   version '1.0'
   sha256 '904e808ca65d1f2db4c1356255200ec73364ff7f23528fd4ff857edead39a312'
 
diff --git a/Casks/omnifocus.rb b/Casks/omnifocus.rb
index b963c002bf5a..8492006d2b21 100644
--- a/Casks/omnifocus.rb
+++ b/Casks/omnifocus.rb
@@ -1,4 +1,4 @@
-class Omnifocus < Cask
+cask :v1 => 'omnifocus' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/omnigraffle.rb b/Casks/omnigraffle.rb
index ce86d8b1b0e1..967501aa3331 100644
--- a/Casks/omnigraffle.rb
+++ b/Casks/omnigraffle.rb
@@ -1,4 +1,4 @@
-class Omnigraffle < Cask
+cask :v1 => 'omnigraffle' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/omnioutliner.rb b/Casks/omnioutliner.rb
index d4ae1477c891..c9e2f774ad91 100644
--- a/Casks/omnioutliner.rb
+++ b/Casks/omnioutliner.rb
@@ -1,4 +1,4 @@
-class Omnioutliner < Cask
+cask :v1 => 'omnioutliner' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/omniplan.rb b/Casks/omniplan.rb
index 86b47db3c79a..3d8a060a1ffb 100644
--- a/Casks/omniplan.rb
+++ b/Casks/omniplan.rb
@@ -1,4 +1,4 @@
-class Omniplan < Cask
+cask :v1 => 'omniplan' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/omnipresence.rb b/Casks/omnipresence.rb
index 7d5f8a60dda1..488a9507b5ae 100644
--- a/Casks/omnipresence.rb
+++ b/Casks/omnipresence.rb
@@ -1,4 +1,4 @@
-class Omnipresence < Cask
+cask :v1 => 'omnipresence' do
   version '1.1'
   sha256 '4b6304fffdeed85054379bde7b43776957b5061f0bd089f29fe3005ed19ca49f'
 
diff --git a/Casks/omniweb.rb b/Casks/omniweb.rb
index e58e441bd999..513aef4a1a64 100644
--- a/Casks/omniweb.rb
+++ b/Casks/omniweb.rb
@@ -1,4 +1,4 @@
-class Omniweb < Cask
+cask :v1 => 'omniweb' do
   version '5.11.2'
   sha256 'f1179f1dcf96ed7b2732a18049c79c4043131b267deabb06b5a10c19f1ce750f'
 
diff --git a/Casks/on-the-job.rb b/Casks/on-the-job.rb
index 36da20b52303..8c322ded3864 100644
--- a/Casks/on-the-job.rb
+++ b/Casks/on-the-job.rb
@@ -1,4 +1,4 @@
-class OnTheJob < Cask
+cask :v1 => 'on-the-job' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/onepassword.rb b/Casks/onepassword.rb
index ca49027b67c4..52756fc94640 100644
--- a/Casks/onepassword.rb
+++ b/Casks/onepassword.rb
@@ -1,4 +1,4 @@
-class Onepassword < Cask
+cask :v1 => 'onepassword' do
 
   if MacOS.version < :yosemite
     version '4.4.3'
diff --git a/Casks/oneswarm.rb b/Casks/oneswarm.rb
index 2718b33f01a9..cfa96230fc15 100644
--- a/Casks/oneswarm.rb
+++ b/Casks/oneswarm.rb
@@ -1,4 +1,4 @@
-class Oneswarm < Cask
+cask :v1 => 'oneswarm' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/onionshare.rb b/Casks/onionshare.rb
index 14d7f54d052f..34a49fbdd20f 100644
--- a/Casks/onionshare.rb
+++ b/Casks/onionshare.rb
@@ -1,4 +1,4 @@
-class Onionshare < Cask
+cask :v1 => 'onionshare' do
   version '0.4'
   sha256 '80c583f1dc280f08c11dc60b308e2f6d8fe31c554d59f795ccf0f3252733a6ce'
 
diff --git a/Casks/onlive-client.rb b/Casks/onlive-client.rb
index 6a1670abd7ad..d750e0fb9679 100644
--- a/Casks/onlive-client.rb
+++ b/Casks/onlive-client.rb
@@ -1,4 +1,4 @@
-class OnliveClient < Cask
+cask :v1 => 'onlive-client' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/onyx.rb b/Casks/onyx.rb
index 67a453395d34..845d6dc3be92 100644
--- a/Casks/onyx.rb
+++ b/Casks/onyx.rb
@@ -1,4 +1,4 @@
-class Onyx < Cask
+cask :v1 => 'onyx' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/oovoo.rb b/Casks/oovoo.rb
index 7ce172ef4f91..f5e4e4e902b8 100644
--- a/Casks/oovoo.rb
+++ b/Casks/oovoo.rb
@@ -1,4 +1,4 @@
-class Oovoo < Cask
+cask :v1 => 'oovoo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/opacity.rb b/Casks/opacity.rb
index ba77fc7be0ac..87cc11bbbe8b 100644
--- a/Casks/opacity.rb
+++ b/Casks/opacity.rb
@@ -1,4 +1,4 @@
-class Opacity < Cask
+cask :v1 => 'opacity' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/openarena.rb b/Casks/openarena.rb
index eb5c3fea6a60..c7e5d788f45e 100644
--- a/Casks/openarena.rb
+++ b/Casks/openarena.rb
@@ -1,4 +1,4 @@
-class Openarena < Cask
+cask :v1 => 'openarena' do
   version '0.8.8'
   sha256 '5a8faf7f5b51f351b0a1618c06b6b98a5f1a6758f1d39818de2c87df2a0bac4a'
 
diff --git a/Casks/opendns-updater.rb b/Casks/opendns-updater.rb
index 84f40c97e171..50c42bdd30bb 100644
--- a/Casks/opendns-updater.rb
+++ b/Casks/opendns-updater.rb
@@ -1,4 +1,4 @@
-class OpendnsUpdater < Cask
+cask :v1 => 'opendns-updater' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/openemu.rb b/Casks/openemu.rb
index a20c92168784..9d072e1736ad 100644
--- a/Casks/openemu.rb
+++ b/Casks/openemu.rb
@@ -1,4 +1,4 @@
-class Openemu < Cask
+cask :v1 => 'openemu' do
   version '1.0.4'
   sha256 'c9c3abc2acea4ed4c1e2b62fd6868feae1719251428a79803d9aa8a0de4474ef'
 
diff --git a/Casks/openlp.rb b/Casks/openlp.rb
index 658ff9850ace..3efcd76c8dab 100644
--- a/Casks/openlp.rb
+++ b/Casks/openlp.rb
@@ -1,4 +1,4 @@
-class Openlp < Cask
+cask :v1 => 'openlp' do
   version '2.0.5'
   sha256 '0ba5a37c359394c277e221f8ca74191d3425cf3cfbd70699d81346c77c93d746'
 
diff --git a/Casks/opennx.rb b/Casks/opennx.rb
index dcede89a86e9..ab2c94229529 100644
--- a/Casks/opennx.rb
+++ b/Casks/opennx.rb
@@ -1,4 +1,4 @@
-class Opennx < Cask
+cask :v1 => 'opennx' do
   version '0.16.0.729'
   sha256 '65dde1a3504a17ac58ed2a7178536347d829ee8c27cc90bebdae3e98c36fc6c6'
 
diff --git a/Casks/openoffice.rb b/Casks/openoffice.rb
index 9a34457863ba..eed01a4176e3 100644
--- a/Casks/openoffice.rb
+++ b/Casks/openoffice.rb
@@ -1,4 +1,4 @@
-class Openoffice < Cask
+cask :v1 => 'openoffice' do
   version '4.1.1'
   sha256 '7becbdbe2abbcfd9d27953d2e11dc07da308d80f208b5f27f6213d225dc95e64'
 
diff --git a/Casks/openra.rb b/Casks/openra.rb
index 7bc1f4b58eeb..3351d50f2c46 100644
--- a/Casks/openra.rb
+++ b/Casks/openra.rb
@@ -1,4 +1,4 @@
-class Openra < Cask
+cask :v1 => 'openra' do
   version '20140722'
   sha256 '0f9bc52de1e4569371ae643d505c66d5196a73537f6810fad2a1c49baad37995'
 
diff --git a/Casks/openscad.rb b/Casks/openscad.rb
index a5b3074a45c5..86433094de04 100644
--- a/Casks/openscad.rb
+++ b/Casks/openscad.rb
@@ -1,4 +1,4 @@
-class Openscad < Cask
+cask :v1 => 'openscad' do
   version '2014.03'
   sha256 'c324c19c2d36f21517b602f8ae2ec04fa14c90896c91fc8dbb37aed5b3ba16bd'
 
diff --git a/Casks/opensesame.rb b/Casks/opensesame.rb
index b89b315ec578..0b0f22e0f6b8 100644
--- a/Casks/opensesame.rb
+++ b/Casks/opensesame.rb
@@ -1,4 +1,4 @@
-class Opensesame < Cask
+cask :v1 => 'opensesame' do
 
   if MacOS.version < :lion
     version '0.26'
diff --git a/Casks/opensong.rb b/Casks/opensong.rb
index 157dcd06c3cb..3b353fd2a532 100644
--- a/Casks/opensong.rb
+++ b/Casks/opensong.rb
@@ -1,4 +1,4 @@
-class Opensong < Cask
+cask :v1 => 'opensong' do
   version '2.1.1'
   sha256 '7663e04a1ae46aec948fad9e80cd8966c5a006744b9da42bc85cca4bb4dda4bc'
 
diff --git a/Casks/openttd.rb b/Casks/openttd.rb
index a71381409087..1bb1c641d4b4 100644
--- a/Casks/openttd.rb
+++ b/Casks/openttd.rb
@@ -1,4 +1,4 @@
-class Openttd < Cask
+cask :v1 => 'openttd' do
   version '1.4.2'
   sha256 '4ea6b4fa1baf03edafa30c6475dc3f9f219239d04840bf5d4a3228bf3f6f33ff'
 
diff --git a/Casks/openvanilla.rb b/Casks/openvanilla.rb
index b01d23e33345..7e16a892fb4b 100644
--- a/Casks/openvanilla.rb
+++ b/Casks/openvanilla.rb
@@ -1,4 +1,4 @@
-class Openvanilla < Cask
+cask :v1 => 'openvanilla' do
   version '1.0.11'
   sha256 '15c10b53ad4919226b317ef347f726b53ade1423ae9491a6526bd160050061ac'
 
diff --git a/Casks/openzfs.rb b/Casks/openzfs.rb
index 3835a54d63c6..0653905b513e 100644
--- a/Casks/openzfs.rb
+++ b/Casks/openzfs.rb
@@ -1,4 +1,4 @@
-class Openzfs < Cask
+cask :v1 => 'openzfs' do
   version '1.3.0'
   sha256 'a0030181a91ecace2d31cfab26d10b2284602e2b442f71a344a9da11165cb6c7'
 
diff --git a/Casks/opera-mail.rb b/Casks/opera-mail.rb
index dfaa9e0f701f..f9b7f5268d46 100644
--- a/Casks/opera-mail.rb
+++ b/Casks/opera-mail.rb
@@ -1,4 +1,4 @@
-class OperaMail < Cask
+cask :v1 => 'opera-mail' do
   version '1.0'
   sha256 'afd192e308f8ea8ddb3d426fd6663d97078570417ee78b8e1fa15f515ae3d677'
 
diff --git a/Casks/opera-mobile-emulator.rb b/Casks/opera-mobile-emulator.rb
index d2d5f3eb3861..1d1b2de70113 100644
--- a/Casks/opera-mobile-emulator.rb
+++ b/Casks/opera-mobile-emulator.rb
@@ -1,4 +1,4 @@
-class OperaMobileEmulator < Cask
+cask :v1 => 'opera-mobile-emulator' do
   version '12.1'
   sha256 'de7e456dae31d140eefa25dae55e96b9dd773167d72c4e0ff407002922a05f1f'
 
diff --git a/Casks/opera.rb b/Casks/opera.rb
index 680b4875c0da..37743f19f7eb 100644
--- a/Casks/opera.rb
+++ b/Casks/opera.rb
@@ -1,4 +1,4 @@
-class Opera < Cask
+cask :v1 => 'opera' do
   version '25.0.1614.50'
   sha256 '289cbce26977ed7ef6b082d64392c1addfc94642752bc17ae9bf56fcc753dd69'
 
diff --git a/Casks/optimal-layout.rb b/Casks/optimal-layout.rb
index 66f133c9765e..a657fb21dbd5 100644
--- a/Casks/optimal-layout.rb
+++ b/Casks/optimal-layout.rb
@@ -1,4 +1,4 @@
-class OptimalLayout < Cask
+cask :v1 => 'optimal-layout' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/orange.rb b/Casks/orange.rb
index 9d0e20404efe..dc36c127991a 100644
--- a/Casks/orange.rb
+++ b/Casks/orange.rb
@@ -1,4 +1,4 @@
-class Orange < Cask
+cask :v1 => 'orange' do
   version '2.7.8-4456761'
   sha256 'afaa9f22c6950ba653f6122dbd00b3f542887a4985b695f8d9cbb53698999133'
 
diff --git a/Casks/orbit.rb b/Casks/orbit.rb
index 16cb96dac3d7..5ec0bfb73694 100644
--- a/Casks/orbit.rb
+++ b/Casks/orbit.rb
@@ -1,4 +1,4 @@
-class Orbit < Cask
+cask :v1 => 'orbit' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/order-of-twilight.rb b/Casks/order-of-twilight.rb
index 37c244fbe29d..7d7040237c08 100644
--- a/Casks/order-of-twilight.rb
+++ b/Casks/order-of-twilight.rb
@@ -1,4 +1,4 @@
-class OrderOfTwilight < Cask
+cask :v1 => 'order-of-twilight' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/origin.rb b/Casks/origin.rb
index e2cb16dad849..a7e2ca1e0040 100644
--- a/Casks/origin.rb
+++ b/Casks/origin.rb
@@ -1,4 +1,4 @@
-class Origin < Cask
+cask :v1 => 'origin' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ormr.rb b/Casks/ormr.rb
index 893615cf6f48..5dcffca0f0f3 100644
--- a/Casks/ormr.rb
+++ b/Casks/ormr.rb
@@ -1,4 +1,4 @@
-class Ormr < Cask
+cask :v1 => 'ormr' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ortho-robot.rb b/Casks/ortho-robot.rb
index c1809cede3b0..5f7494949672 100644
--- a/Casks/ortho-robot.rb
+++ b/Casks/ortho-robot.rb
@@ -1,4 +1,4 @@
-class OrthoRobot < Cask
+cask :v1 => 'ortho-robot' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/osculator.rb b/Casks/osculator.rb
index bb8ca89ad670..27521d827077 100644
--- a/Casks/osculator.rb
+++ b/Casks/osculator.rb
@@ -1,4 +1,4 @@
-class Osculator < Cask
+cask :v1 => 'osculator' do
   version '2.13.1'
   sha256 '3565e9044b541149630235326a441369012ac6d98c54231c23975a53dc69dca5'
 
diff --git a/Casks/osxfuse.rb b/Casks/osxfuse.rb
index 5d0990f1a3b2..47de30014d7d 100644
--- a/Casks/osxfuse.rb
+++ b/Casks/osxfuse.rb
@@ -1,4 +1,4 @@
-class Osxfuse < Cask
+cask :v1 => 'osxfuse' do
   version '2.7.2'
   sha256 '40ebab0919c6ae34221c51815830bc5eefe5f286619eeee85e2b7cb8df266d55'
 
diff --git a/Casks/outwit-hub.rb b/Casks/outwit-hub.rb
index a8ad2490d083..25b394b95eb3 100644
--- a/Casks/outwit-hub.rb
+++ b/Casks/outwit-hub.rb
@@ -1,4 +1,4 @@
-class OutwitHub < Cask
+cask :v1 => 'outwit-hub' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/owasp-zap.rb b/Casks/owasp-zap.rb
index 7c8f37fb7b45..3c5edccda24e 100644
--- a/Casks/owasp-zap.rb
+++ b/Casks/owasp-zap.rb
@@ -1,4 +1,4 @@
-class OwaspZap < Cask
+cask :v1 => 'owasp-zap' do
   version '2.2.2'
   sha256 'b83f9808bbda4b9c34c7aba8d62e49c12337457b5ffed423c2ad08c8bcd048fb'
 
diff --git a/Casks/owncloud.rb b/Casks/owncloud.rb
index 1d9f0009e027..7ac9da0582f2 100644
--- a/Casks/owncloud.rb
+++ b/Casks/owncloud.rb
@@ -1,4 +1,4 @@
-class Owncloud < Cask
+cask :v1 => 'owncloud' do
   version '1.7.0.1339'
   sha256 'baa848c46e0a1cc0e88cf78a2419bfdb7d55fd984100d9fe1babc4a97eb00d9a'
 
diff --git a/Casks/p4merge.rb b/Casks/p4merge.rb
index 2ac82c22bad5..2a391d1adee1 100644
--- a/Casks/p4merge.rb
+++ b/Casks/p4merge.rb
@@ -1,4 +1,4 @@
-class P4merge < Cask
+cask :v1 => 'p4merge' do
   version '2014.1'
   sha256 'c5d05d78596fe9b4f83193a11805a027b2652fdf87365de1321e671286fdca3f'
 
diff --git a/Casks/p4v.rb b/Casks/p4v.rb
index 3c3fb3434b35..76f3695c29cc 100644
--- a/Casks/p4v.rb
+++ b/Casks/p4v.rb
@@ -1,4 +1,4 @@
-class P4v < Cask
+cask :v1 => 'p4v' do
   version '2014.1-888424'
 
   if Hardware::CPU.is_32_bit?
diff --git a/Casks/p5.rb b/Casks/p5.rb
index 4903594ac23e..be8102082b19 100644
--- a/Casks/p5.rb
+++ b/Casks/p5.rb
@@ -1,4 +1,4 @@
-class P5 < Cask
+cask :v1 => 'p5' do
   version '0.1.8'
   sha256 '3a46a98995b43e792d7e7f7407aba1503084cf37339064711abcfad54dd5c094'
 
diff --git a/Casks/pacifist.rb b/Casks/pacifist.rb
index 5249a79b78cb..0094422d3c7e 100644
--- a/Casks/pacifist.rb
+++ b/Casks/pacifist.rb
@@ -1,4 +1,4 @@
-class Pacifist < Cask
+cask :v1 => 'pacifist' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/packages.rb b/Casks/packages.rb
index 6eb2338d95ba..97f77977f928 100644
--- a/Casks/packages.rb
+++ b/Casks/packages.rb
@@ -1,4 +1,4 @@
-class Packages < Cask
+cask :v1 => 'packages' do
   version '1.1.2'
   sha256 '8fa1aff087b5f82cbbec557a01a65998c4ca244925f778e559038fc82d9ab23d'
 
diff --git a/Casks/packer.rb b/Casks/packer.rb
index 254ef3ba40ab..28077105e829 100644
--- a/Casks/packer.rb
+++ b/Casks/packer.rb
@@ -1,4 +1,4 @@
-class Packer < Cask
+cask :v1 => 'packer' do
   version '0.7.2'
   sha256 'bed7ddc255b5b71b139de5e30d4221926cd314a87baf0b937ba7a97c196b1286'
 
diff --git a/Casks/packet-peeper.rb b/Casks/packet-peeper.rb
index 943f625a5fc6..6780c087a472 100644
--- a/Casks/packet-peeper.rb
+++ b/Casks/packet-peeper.rb
@@ -1,4 +1,4 @@
-class PacketPeeper < Cask
+cask :v1 => 'packet-peeper' do
   version '2014-05-11'
   sha256 'ed7d287b2dcd42ec9658c0623d97146821e386f59a67c0759252ea7d7e3f2ba3'
 
diff --git a/Casks/padre.rb b/Casks/padre.rb
index 6775079edfe5..12cb90679271 100644
--- a/Casks/padre.rb
+++ b/Casks/padre.rb
@@ -1,4 +1,4 @@
-class Padre < Cask
+cask :v1 => 'padre' do
   version '0.92.0'
   sha256 '481088a40bc71bd62d13ac23ed8fbfa3b8fc651587b9e47461795a9a78032d87'
 
diff --git a/Casks/pagico.rb b/Casks/pagico.rb
index 92195997325c..aec6a57dfca9 100644
--- a/Casks/pagico.rb
+++ b/Casks/pagico.rb
@@ -1,4 +1,4 @@
-class Pagico < Cask
+cask :v1 => 'pagico' do
   version '6.8.1637'
   sha256 '55df590853906fe6590f6526b2f8c2663f90f4b76c5baf2976f722d203383ddd'
 
diff --git a/Casks/paintbrush.rb b/Casks/paintbrush.rb
index 27e55a91e892..a2ae531969a9 100644
--- a/Casks/paintbrush.rb
+++ b/Casks/paintbrush.rb
@@ -1,4 +1,4 @@
-class Paintbrush < Cask
+cask :v1 => 'paintbrush' do
   version '2.1.1'
   sha256 '1832bfb62de7247c17c522b49a9c88e3613ba5686ff05abb9b7fb545003b577d'
 
diff --git a/Casks/paintcode.rb b/Casks/paintcode.rb
index 7ec7cad2bfef..cbb431177b54 100644
--- a/Casks/paintcode.rb
+++ b/Casks/paintcode.rb
@@ -1,4 +1,4 @@
-class Paintcode < Cask
+cask :v1 => 'paintcode' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pandoc.rb b/Casks/pandoc.rb
index f82a4b8c325c..5ca4d2bf37a1 100644
--- a/Casks/pandoc.rb
+++ b/Casks/pandoc.rb
@@ -1,4 +1,4 @@
-class Pandoc < Cask
+cask :v1 => 'pandoc' do
   version '1.13.1'
   sha256 'd82547f5a6838074381a8e97f0f27984bbdb527e211320fc78791d9a64479b2f'
 
diff --git a/Casks/pandora-one.rb b/Casks/pandora-one.rb
index 526a8c3391d4..a20e80bd05a7 100644
--- a/Casks/pandora-one.rb
+++ b/Casks/pandora-one.rb
@@ -1,4 +1,4 @@
-class PandoraOne < Cask
+cask :v1 => 'pandora-one' do
   version '2.0.8'
   sha256 '9ac216fd51bb063f020a86c6f5d250989dfa033a2d6a3d703124c2f4bfa510d8'
 
diff --git a/Casks/pangu.rb b/Casks/pangu.rb
index 96cef6b516f7..8bec0623e4d3 100644
--- a/Casks/pangu.rb
+++ b/Casks/pangu.rb
@@ -1,4 +1,4 @@
-class Pangu < Cask
+cask :v1 => 'pangu' do
   version '1.1'
   sha256 'aa09673355f11a2b0974757f88b61e497156020bf551afde556ce11d843e2a54'
 
diff --git a/Casks/panic-unison.rb b/Casks/panic-unison.rb
index 41dd9eef4b6b..053959ae8701 100644
--- a/Casks/panic-unison.rb
+++ b/Casks/panic-unison.rb
@@ -1,4 +1,4 @@
-class PanicUnison < Cask
+cask :v1 => 'panic-unison' do
   version '2.2'
   sha256 'b9d08af6ea52fbcf8fe0eebaec9b7b68c7a280d4455de030d99ca9731cca66d9'
 
diff --git a/Casks/panini.rb b/Casks/panini.rb
index 3947f38f90db..86200c124a33 100644
--- a/Casks/panini.rb
+++ b/Casks/panini.rb
@@ -1,4 +1,4 @@
-class Panini < Cask
+cask :v1 => 'panini' do
   version '0.71.104'
   sha256 '2a2836b0035bc1be8ada1e07138c72276a89624321dbfaa475fc4cd88fffe544'
 
diff --git a/Casks/paparazzi.rb b/Casks/paparazzi.rb
index 613bd4847f40..879f4d0028e8 100644
--- a/Casks/paparazzi.rb
+++ b/Casks/paparazzi.rb
@@ -1,4 +1,4 @@
-class Paparazzi < Cask
+cask :v1 => 'paparazzi' do
   version '0.6.7'
   sha256 '111c94994176a7690512aa5303bff14761f308c720b527b541e39edd054777bd'
 
diff --git a/Casks/papers.rb b/Casks/papers.rb
index 4dc4d7a459a2..f1f78e1f0ad7 100644
--- a/Casks/papers.rb
+++ b/Casks/papers.rb
@@ -1,4 +1,4 @@
-class Papers < Cask
+cask :v1 => 'papers' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/paragon-extfs.rb b/Casks/paragon-extfs.rb
index 17a61f7456b5..3ad283ef4c22 100644
--- a/Casks/paragon-extfs.rb
+++ b/Casks/paragon-extfs.rb
@@ -1,4 +1,4 @@
-class ParagonExtfs < Cask
+cask :v1 => 'paragon-extfs' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/paragon-ntfs.rb b/Casks/paragon-ntfs.rb
index 9a973614cee9..ef684e43f5fe 100644
--- a/Casks/paragon-ntfs.rb
+++ b/Casks/paragon-ntfs.rb
@@ -1,4 +1,4 @@
-class ParagonNtfs < Cask
+cask :v1 => 'paragon-ntfs' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/parallels.rb b/Casks/parallels.rb
index 96fea5c0c8b5..64565d88e7fa 100644
--- a/Casks/parallels.rb
+++ b/Casks/parallels.rb
@@ -1,4 +1,4 @@
-class Parallels < Cask
+cask :v1 => 'parallels' do
   version '10.1.1-28614'
   sha256 'd39780b42640c5de6198fb7434e24ac1cc983cc13b131c73cdba775964ec4e0d'
 
diff --git a/Casks/paraview.rb b/Casks/paraview.rb
index 4c577cc99d91..59e18c026892 100644
--- a/Casks/paraview.rb
+++ b/Casks/paraview.rb
@@ -1,4 +1,4 @@
-class Paraview < Cask
+cask :v1 => 'paraview' do
   version '4.1.0'
 
   if MacOS.version < :mavericks
diff --git a/Casks/parse.rb b/Casks/parse.rb
index 4699e0419c01..560f58fcc0c9 100644
--- a/Casks/parse.rb
+++ b/Casks/parse.rb
@@ -1,4 +1,4 @@
-class Parse < Cask
+cask :v1 => 'parse' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pashua.rb b/Casks/pashua.rb
index 8250408038cf..9826c15af8fb 100644
--- a/Casks/pashua.rb
+++ b/Casks/pashua.rb
@@ -1,4 +1,4 @@
-class Pashua < Cask
+cask :v1 => 'pashua' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/password-gorilla.rb b/Casks/password-gorilla.rb
index 699dd91d7f1e..f1fb449bf7b6 100644
--- a/Casks/password-gorilla.rb
+++ b/Casks/password-gorilla.rb
@@ -1,4 +1,4 @@
-class PasswordGorilla < Cask
+cask :v1 => 'password-gorilla' do
   version '1.5.3.7.2'
   sha256 '4d026a5fa088fe9622cbe00c5811da2f360949c7cfb46ce6e4899a09645cb83a'
 
diff --git a/Casks/password-practice.rb b/Casks/password-practice.rb
index 82b59c231219..692bbcc4a82c 100644
--- a/Casks/password-practice.rb
+++ b/Casks/password-practice.rb
@@ -1,4 +1,4 @@
-class PasswordPractice < Cask
+cask :v1 => 'password-practice' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pastebotsync-pane.rb b/Casks/pastebotsync-pane.rb
index b894151a84d3..b2a14ae759f9 100644
--- a/Casks/pastebotsync-pane.rb
+++ b/Casks/pastebotsync-pane.rb
@@ -1,4 +1,4 @@
-class PastebotsyncPane < Cask
+cask :v1 => 'pastebotsync-pane' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pastor.rb b/Casks/pastor.rb
index 0e4b6d482086..9cc516f50425 100644
--- a/Casks/pastor.rb
+++ b/Casks/pastor.rb
@@ -1,4 +1,4 @@
-class Pastor < Cask
+cask :v1 => 'pastor' do
   version '1.8.2'
   sha256 'ac41e7f300d722fcd9733a4f13a984d211b20f95c94db4dc07ab537fd45f8370'
 
diff --git a/Casks/path-finder.rb b/Casks/path-finder.rb
index 339a40af5764..e85f81d38c8d 100644
--- a/Casks/path-finder.rb
+++ b/Casks/path-finder.rb
@@ -1,4 +1,4 @@
-class PathFinder < Cask
+cask :v1 => 'path-finder' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/paw.rb b/Casks/paw.rb
index 0d5754b080d1..4d890117f9cc 100644
--- a/Casks/paw.rb
+++ b/Casks/paw.rb
@@ -1,4 +1,4 @@
-class Paw < Cask
+cask :v1 => 'paw' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/paye-tools.rb b/Casks/paye-tools.rb
index acbe491e7f4b..a114d7fa790a 100644
--- a/Casks/paye-tools.rb
+++ b/Casks/paye-tools.rb
@@ -1,4 +1,4 @@
-class PayeTools < Cask
+cask :v1 => 'paye-tools' do
   version '14.1.14168.197'
   sha256 'f8a7d7a4c2c7304b08bf342af1c093795a8717058471fe3da5ee8e43b7604719'
 
diff --git a/Casks/paymowidget.rb b/Casks/paymowidget.rb
index 189c7bfea5aa..80e1804dd331 100644
--- a/Casks/paymowidget.rb
+++ b/Casks/paymowidget.rb
@@ -1,4 +1,4 @@
-class Paymowidget < Cask
+cask :v1 => 'paymowidget' do
   version '4.0.16'
   sha256 '1b9c6485594d28a477ff115758780d22d25b1594963dadf3388239fa25f8fc78'
 
diff --git a/Casks/pcalc.rb b/Casks/pcalc.rb
index 116131091e93..a0b9df22e963 100644
--- a/Casks/pcalc.rb
+++ b/Casks/pcalc.rb
@@ -1,4 +1,4 @@
-class Pcalc < Cask
+cask :v1 => 'pcalc' do
   version '3.9'
   sha256 '3d0b3c034c944e2d007f95d201fd999d3c98c29fc7e65105bdaeb04c3b7b8310'
 
diff --git a/Casks/pd-extended.rb b/Casks/pd-extended.rb
index ca3e206152f3..446e57926dd1 100644
--- a/Casks/pd-extended.rb
+++ b/Casks/pd-extended.rb
@@ -1,4 +1,4 @@
-class PdExtended < Cask
+cask :v1 => 'pd-extended' do
   version '0.43.4'
   sha256 'abe7bd637b1495ad9d5a500f0a18550c1600e34ee17e60aa1a48e4dbdee59bb9'
 
diff --git a/Casks/pdfinfo.rb b/Casks/pdfinfo.rb
index 18b793c8336c..1d277cc3622b 100644
--- a/Casks/pdfinfo.rb
+++ b/Casks/pdfinfo.rb
@@ -1,4 +1,4 @@
-class Pdfinfo < Cask
+cask :v1 => 'pdfinfo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pdfmasher.rb b/Casks/pdfmasher.rb
index adb1b06f299e..e73f7cae32fa 100644
--- a/Casks/pdfmasher.rb
+++ b/Casks/pdfmasher.rb
@@ -1,4 +1,4 @@
-class Pdfmasher < Cask
+cask :v1 => 'pdfmasher' do
   version '0.7.4'
   sha256 '09940d6730d90bcf873e4d54262625ad566371258d14b0a6ac07a3b6dbcb9c30'
 
diff --git a/Casks/pdfpen.rb b/Casks/pdfpen.rb
index c39b7d71cd03..b7cfc37eaa94 100644
--- a/Casks/pdfpen.rb
+++ b/Casks/pdfpen.rb
@@ -1,4 +1,4 @@
-class Pdfpen < Cask
+cask :v1 => 'pdfpen' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pdfpenpro.rb b/Casks/pdfpenpro.rb
index 9c67fb347bf4..01835f8dab8f 100644
--- a/Casks/pdfpenpro.rb
+++ b/Casks/pdfpenpro.rb
@@ -1,4 +1,4 @@
-class Pdfpenpro < Cask
+cask :v1 => 'pdfpenpro' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pdfsam.rb b/Casks/pdfsam.rb
index ea1f32cd6325..a7fd7e853a98 100644
--- a/Casks/pdfsam.rb
+++ b/Casks/pdfsam.rb
@@ -1,4 +1,4 @@
-class Pdfsam < Cask
+cask :v1 => 'pdfsam' do
   version '2.2.2'
   sha256 '235635231c0e2428e9da1b126075d4cafe6b43625645350ff1491033dfc461a8'
 
diff --git a/Casks/pdfshaver.rb b/Casks/pdfshaver.rb
index 5419c7ae8ad9..9b2873736d75 100644
--- a/Casks/pdfshaver.rb
+++ b/Casks/pdfshaver.rb
@@ -1,4 +1,4 @@
-class Pdfshaver < Cask
+cask :v1 => 'pdfshaver' do
   version '1.0'
   sha256 'ebfacb5e30b0939c4549f36fe88be10c0d4bae1ffaa4616e70daf849d19df9d0'
 
diff --git a/Casks/pdftk.rb b/Casks/pdftk.rb
index 7e6a7d40c31b..fc041204480e 100644
--- a/Casks/pdftk.rb
+++ b/Casks/pdftk.rb
@@ -1,4 +1,4 @@
-class Pdftk < Cask
+cask :v1 => 'pdftk' do
   version '2.02'
   sha256 'c0679a7a12669480dd298c436b0e4d063966f95ed6a77b98d365bb8c86390d1b'
 
diff --git a/Casks/peepopen.rb b/Casks/peepopen.rb
index 39adaea7fab7..19abd7790392 100644
--- a/Casks/peepopen.rb
+++ b/Casks/peepopen.rb
@@ -1,4 +1,4 @@
-class Peepopen < Cask
+cask :v1 => 'peepopen' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pemdas-widget.rb b/Casks/pemdas-widget.rb
index 85413723acae..ee2d522a4531 100644
--- a/Casks/pemdas-widget.rb
+++ b/Casks/pemdas-widget.rb
@@ -1,4 +1,4 @@
-class PemdasWidget < Cask
+cask :v1 => 'pemdas-widget' do
   version '3.0'
   sha256 '7a5566d8a45a82fd64ecedc7fa5c00d9ec82f530f7065e18768d7da76b6e55af'
 
diff --git a/Casks/pencil.rb b/Casks/pencil.rb
index 232d13c3dfe9..c56c25ae3457 100644
--- a/Casks/pencil.rb
+++ b/Casks/pencil.rb
@@ -1,4 +1,4 @@
-class Pencil < Cask
+cask :v1 => 'pencil' do
   version '2.0.6'
   sha256 'dacd76c658b12101457d17a4ade0b3f9c6a012f8eddacd379c41e372545ffac6'
 
diff --git a/Casks/pentaho-data-integration.rb b/Casks/pentaho-data-integration.rb
index 32344436eac8..e94be39d4dcb 100644
--- a/Casks/pentaho-data-integration.rb
+++ b/Casks/pentaho-data-integration.rb
@@ -1,4 +1,4 @@
-class PentahoDataIntegration < Cask
+cask :v1 => 'pentaho-data-integration' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/perian.rb b/Casks/perian.rb
index d68d6fbd3637..ead4e7d78daf 100644
--- a/Casks/perian.rb
+++ b/Casks/perian.rb
@@ -1,4 +1,4 @@
-class Perian < Cask
+cask :v1 => 'perian' do
   version '1.2.3'
   sha256 '4d1738104613ab4a7322637584ce7b851e4ef85888895360ad827a5f27c62e08'
 
diff --git a/Casks/pester.rb b/Casks/pester.rb
index 4309681c9cd9..a4d613d4ba32 100644
--- a/Casks/pester.rb
+++ b/Casks/pester.rb
@@ -1,4 +1,4 @@
-class Pester < Cask
+cask :v1 => 'pester' do
   version '1.1b18'
   sha256 '50cddd6fa813e5e2935e0e66ea13ee0605ada711c0141498a4d19c93eb554c86'
 
diff --git a/Casks/petite-chez-scheme.rb b/Casks/petite-chez-scheme.rb
index e6b134a04149..49acba790fd0 100644
--- a/Casks/petite-chez-scheme.rb
+++ b/Casks/petite-chez-scheme.rb
@@ -1,4 +1,4 @@
-class PetiteChezScheme < Cask
+cask :v1 => 'petite-chez-scheme' do
   version '8.4'
   sha256 '3ed7200c3e265d36d03129569a78bfde8aedaea1ec7565d3c7a4daca26389701'
 
diff --git a/Casks/pflists.rb b/Casks/pflists.rb
index 2bce18bf9f94..9d36c138b910 100644
--- a/Casks/pflists.rb
+++ b/Casks/pflists.rb
@@ -1,4 +1,4 @@
-class Pflists < Cask
+cask :v1 => 'pflists' do
   version '1.0.1'
   sha256 '024cd972503df8b7b01602e092a9b900b6758b33ba040860fd46af3bb53f2856'
 
diff --git a/Casks/pg-commander.rb b/Casks/pg-commander.rb
index e7c7e75c194f..357b537cbbf9 100644
--- a/Casks/pg-commander.rb
+++ b/Casks/pg-commander.rb
@@ -1,4 +1,4 @@
-class PgCommander < Cask
+cask :v1 => 'pg-commander' do
   version '1.5.2'
   sha256 'a7e848ad20f38cc6f9c9fd6ebccb62390fe7c050aaae5b3670c40f94019757ee'
 
diff --git a/Casks/pgadmin3.rb b/Casks/pgadmin3.rb
index f0c24732bca4..7c397a6e1f49 100644
--- a/Casks/pgadmin3.rb
+++ b/Casks/pgadmin3.rb
@@ -1,4 +1,4 @@
-class Pgadmin3 < Cask
+cask :v1 => 'pgadmin3' do
   # note: "3" is not a version number, but indicates a different vendor
   version '1.18.1'
   sha256 '6fe924168c7a8ee9224527fcafc3e612de60c011a27dc44b8293401ff346627d'
diff --git a/Casks/pgloader.rb b/Casks/pgloader.rb
index d73fdff32985..65e27281a055 100644
--- a/Casks/pgloader.rb
+++ b/Casks/pgloader.rb
@@ -1,4 +1,4 @@
-class Pgloader < Cask
+cask :v1 => 'pgloader' do
   version '3.0.99'
   sha256 'df64c17a3b2aa62b9cdaab48c078e9a9ecb0580d660db036e11f1d63c4bee8ac'
 
diff --git a/Casks/pgweb.rb b/Casks/pgweb.rb
index 54074026085e..dee98eaff036 100644
--- a/Casks/pgweb.rb
+++ b/Casks/pgweb.rb
@@ -1,4 +1,4 @@
-class Pgweb < Cask
+cask :v1 => 'pgweb' do
   version '0.4.0'
   sha256 'dac59afaef75db663e0f2a30ec035806b205a9acbe1e2a7a156b3e58dc571ea7'
 
diff --git a/Casks/phantomjs.rb b/Casks/phantomjs.rb
index a2364e078dab..d8ba5bfb7695 100644
--- a/Casks/phantomjs.rb
+++ b/Casks/phantomjs.rb
@@ -1,4 +1,4 @@
-class Phantomjs < Cask
+cask :v1 => 'phantomjs' do
   version '1.9.8'
   sha256 '8f15043ae3031815dc5f884ea6ffa053d365491b1bc0dc3a0862d5ff1ac20a48'
 
diff --git a/Casks/pharo.rb b/Casks/pharo.rb
index 321f8f4b74e4..b5fc220be822 100644
--- a/Casks/pharo.rb
+++ b/Casks/pharo.rb
@@ -1,4 +1,4 @@
-class Pharo < Cask
+cask :v1 => 'pharo' do
   version '3.0'
   sha256 'a13577159336d3de7e71d71c0e0f58985060d2455bc8d40d501c81e97a75b5e7'
 
diff --git a/Casks/phoenix-slides.rb b/Casks/phoenix-slides.rb
index aecec37ae008..471e5a1e7536 100644
--- a/Casks/phoenix-slides.rb
+++ b/Casks/phoenix-slides.rb
@@ -1,4 +1,4 @@
-class PhoenixSlides < Cask
+cask :v1 => 'phoenix-slides' do
   version '1.3.1'
   sha256 '6e5df9e586bb33b79249d9917f99f50395f255b85bf39c5fafca64fe66aef758'
 
diff --git a/Casks/phoenix.rb b/Casks/phoenix.rb
index e147c140c6b5..0db22c500268 100644
--- a/Casks/phoenix.rb
+++ b/Casks/phoenix.rb
@@ -1,4 +1,4 @@
-class Phoenix < Cask
+cask :v1 => 'phoenix' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/phoneclean.rb b/Casks/phoneclean.rb
index d5af03b79cad..ee8bac5f5a2e 100644
--- a/Casks/phoneclean.rb
+++ b/Casks/phoneclean.rb
@@ -1,4 +1,4 @@
-class Phoneclean < Cask
+cask :v1 => 'phoneclean' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/photoninja.rb b/Casks/photoninja.rb
index caca4fd7f29e..3a446e4fe90e 100644
--- a/Casks/photoninja.rb
+++ b/Casks/photoninja.rb
@@ -1,4 +1,4 @@
-class Photoninja < Cask
+cask :v1 => 'photoninja' do
   version '1.2.1'
   sha256 '81f62282865c53d2ed653ea2494f44d9e4d82cce623e85c651bb9aa8ccb26794'
 
diff --git a/Casks/phpstorm.rb b/Casks/phpstorm.rb
index 42363f9176f0..b65b88b96d7f 100644
--- a/Casks/phpstorm.rb
+++ b/Casks/phpstorm.rb
@@ -1,4 +1,4 @@
-class Phpstorm < Cask
+cask :v1 => 'phpstorm' do
   version '8.0.1'
   sha256 'ff8af437d96befd475744e08b1d663df778db8711e2671551fc797cd30b0cdc7'
 
diff --git a/Casks/pi-filler.rb b/Casks/pi-filler.rb
index 68e13a5ebc31..9dcd74374053 100644
--- a/Casks/pi-filler.rb
+++ b/Casks/pi-filler.rb
@@ -1,4 +1,4 @@
-class PiFiller < Cask
+cask :v1 => 'pi-filler' do
   version '1.1.1'
   sha256 '566eb386dd48993bceb6d170f563adb1ff45342e42044023161631e7b17e25cb'
 
diff --git a/Casks/pianopub.rb b/Casks/pianopub.rb
index f9b614097f0c..6fa57aae6a28 100644
--- a/Casks/pianopub.rb
+++ b/Casks/pianopub.rb
@@ -1,4 +1,4 @@
-class Pianopub < Cask
+cask :v1 => 'pianopub' do
   version '1.5.7'
   sha256 '62abcd753983b9241672a757a5d718c77e7f4dbdac1347dbeb190d0b831bee68'
 
diff --git a/Casks/picasa.rb b/Casks/picasa.rb
index 796e82167b1e..bbd983da981c 100644
--- a/Casks/picasa.rb
+++ b/Casks/picasa.rb
@@ -1,4 +1,4 @@
-class Picasa < Cask
+cask :v1 => 'picasa' do
   version '3.9'
   sha256 '189f57b3dd13fb40fc473c2569400744e82c51221de0d360be513ba0fdeb911e'
 
diff --git a/Casks/picturesque.rb b/Casks/picturesque.rb
index 7c529e9eed98..e70c617bf760 100644
--- a/Casks/picturesque.rb
+++ b/Casks/picturesque.rb
@@ -1,4 +1,4 @@
-class Picturesque < Cask
+cask :v1 => 'picturesque' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/piezo.rb b/Casks/piezo.rb
index 99ec0e8a64e2..e838247eaa84 100644
--- a/Casks/piezo.rb
+++ b/Casks/piezo.rb
@@ -1,4 +1,4 @@
-class Piezo < Cask
+cask :v1 => 'piezo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pinegrow-web-designer.rb b/Casks/pinegrow-web-designer.rb
index 43c8eb6888c8..a38e680379d4 100644
--- a/Casks/pinegrow-web-designer.rb
+++ b/Casks/pinegrow-web-designer.rb
@@ -1,4 +1,4 @@
-class PinegrowWebDesigner < Cask
+cask :v1 => 'pinegrow-web-designer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pingendo.rb b/Casks/pingendo.rb
index cfce87f9387b..b182d1be0470 100644
--- a/Casks/pingendo.rb
+++ b/Casks/pingendo.rb
@@ -1,4 +1,4 @@
-class Pingendo < Cask
+cask :v1 => 'pingendo' do
   version '0.9.8'
   sha256 '225fff0bdcceba47f2a070f288e9cd050457b4c0fd6338ca6ae0ed39704652cf'
 
diff --git a/Casks/pingmenu.rb b/Casks/pingmenu.rb
index 0308a5e59e48..cb4e7db16a02 100644
--- a/Casks/pingmenu.rb
+++ b/Casks/pingmenu.rb
@@ -1,4 +1,4 @@
-class Pingmenu < Cask
+cask :v1 => 'pingmenu' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pins.rb b/Casks/pins.rb
index 13719e37b568..2427cf2c5183 100644
--- a/Casks/pins.rb
+++ b/Casks/pins.rb
@@ -1,4 +1,4 @@
-class Pins < Cask
+cask :v1 => 'pins' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pinta.rb b/Casks/pinta.rb
index e57cf6aaa2e4..7cfa104dbd47 100644
--- a/Casks/pinta.rb
+++ b/Casks/pinta.rb
@@ -1,4 +1,4 @@
-class Pinta < Cask
+cask :v1 => 'pinta' do
   version '1.4'
   sha256 'ebe9e8c271e5c445144ecbbce62d0e5bb20a27b75f34b90bf1a898e1cc452edf'
 
diff --git a/Casks/pivotalbooster.rb b/Casks/pivotalbooster.rb
index c6fb4b21c9ab..6c215db72949 100644
--- a/Casks/pivotalbooster.rb
+++ b/Casks/pivotalbooster.rb
@@ -1,4 +1,4 @@
-class Pivotalbooster < Cask
+cask :v1 => 'pivotalbooster' do
   version '1.1.4.beta'
   sha256 'c32ca0eecd595340f255485ec6cff0c975d3549c2db58b3ddc7b736922a5e159'
 
diff --git a/Casks/pixate.rb b/Casks/pixate.rb
index 85d9b7a4b552..07b4988dc543 100644
--- a/Casks/pixate.rb
+++ b/Casks/pixate.rb
@@ -1,4 +1,4 @@
-class Pixate < Cask
+cask :v1 => 'pixate' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pixel-check.rb b/Casks/pixel-check.rb
index 6e8c6ccb1d75..2af2c20d4053 100644
--- a/Casks/pixel-check.rb
+++ b/Casks/pixel-check.rb
@@ -1,4 +1,4 @@
-class PixelCheck < Cask
+cask :v1 => 'pixel-check' do
   version '1.3'
   sha256 '99da44c4538463c6476be2f7d6584a4e5a9bfa175895d72e5baf1f3271316b02'
 
diff --git a/Casks/pixel-winch.rb b/Casks/pixel-winch.rb
index 5c9df320aceb..99570317cf86 100644
--- a/Casks/pixel-winch.rb
+++ b/Casks/pixel-winch.rb
@@ -1,4 +1,4 @@
-class PixelWinch < Cask
+cask :v1 => 'pixel-winch' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pixelapse.rb b/Casks/pixelapse.rb
index e8666136ffdf..795e9c4034f4 100644
--- a/Casks/pixelapse.rb
+++ b/Casks/pixelapse.rb
@@ -1,4 +1,4 @@
-class Pixelapse < Cask
+cask :v1 => 'pixelapse' do
   version '2.0.0'
   sha256 '6822de800b29b02f7ff6f94ef28bbbb3c38aef05fad0cf6c5cb293623227547c'
 
diff --git a/Casks/pixelpeeper.rb b/Casks/pixelpeeper.rb
index 27ae68aa9a61..1adc2452dedf 100644
--- a/Casks/pixelpeeper.rb
+++ b/Casks/pixelpeeper.rb
@@ -1,4 +1,4 @@
-class Pixelpeeper < Cask
+cask :v1 => 'pixelpeeper' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pixelstick.rb b/Casks/pixelstick.rb
index f36883406747..4fe56ddd9d62 100644
--- a/Casks/pixelstick.rb
+++ b/Casks/pixelstick.rb
@@ -1,4 +1,4 @@
-class Pixelstick < Cask
+cask :v1 => 'pixelstick' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pixi-paint.rb b/Casks/pixi-paint.rb
index cc7ff35f7c2d..5440400b55ed 100644
--- a/Casks/pixi-paint.rb
+++ b/Casks/pixi-paint.rb
@@ -1,4 +1,4 @@
-class PixiPaint < Cask
+cask :v1 => 'pixi-paint' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pixlr.rb b/Casks/pixlr.rb
index 018981d47d70..a2c28de85eff 100644
--- a/Casks/pixlr.rb
+++ b/Casks/pixlr.rb
@@ -1,4 +1,4 @@
-class Pixlr < Cask
+cask :v1 => 'pixlr' do
   version '1.0.1_26'
   sha256 'a68fb58bd8f10eaa31bafcdee1c6004fcae12f750830cf8a7b7399bf23ba8087'
 
diff --git a/Casks/pl2303.rb b/Casks/pl2303.rb
index 28e52f18d0f1..e3464cbaba33 100644
--- a/Casks/pl2303.rb
+++ b/Casks/pl2303.rb
@@ -1,4 +1,4 @@
-class Pl2303 < Cask 
+cask :v1 => 'pl2303' do
   version '1.5.1'
   sha256 'b6658605409e9aa63bca7a1ac94c989cc01cdf375f6881ade0ed5bb9694c22cc'
 
diff --git a/Casks/placeit.rb b/Casks/placeit.rb
index fab54d20bb33..4f0a06adc988 100644
--- a/Casks/placeit.rb
+++ b/Casks/placeit.rb
@@ -1,4 +1,4 @@
-class Placeit < Cask
+cask :v1 => 'placeit' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/plain-clip.rb b/Casks/plain-clip.rb
index a86dd3058ac1..63520e68e83b 100644
--- a/Casks/plain-clip.rb
+++ b/Casks/plain-clip.rb
@@ -1,4 +1,4 @@
-class PlainClip < Cask
+cask :v1 => 'plain-clip' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/plainview.rb b/Casks/plainview.rb
index 37f4831c4a5b..f66f3ee91739 100644
--- a/Casks/plainview.rb
+++ b/Casks/plainview.rb
@@ -1,4 +1,4 @@
-class Plainview < Cask
+cask :v1 => 'plainview' do
   version '1.0.178'
   sha256 'ff442b3e8995ab42c0908e2fafe07d14233bad72fff677a83cf9cf09b18a2e2c'
 
diff --git a/Casks/platypus.rb b/Casks/platypus.rb
index 6efe37df0d6e..8daae786918c 100644
--- a/Casks/platypus.rb
+++ b/Casks/platypus.rb
@@ -1,4 +1,4 @@
-class Platypus < Cask
+cask :v1 => 'platypus' do
   version '4.8'
   sha256 '754d9153b92e32faf7e56a4e181de59c6f0b72b3208663042a22e1767d87cb05'
 
diff --git a/Casks/playonmac.rb b/Casks/playonmac.rb
index 65304651757c..efaf34485b74 100644
--- a/Casks/playonmac.rb
+++ b/Casks/playonmac.rb
@@ -1,4 +1,4 @@
-class Playonmac < Cask
+cask :v1 => 'playonmac' do
   version '4.2.5'
   sha256 '641733ccaf45d3fafcddf4e1f4e7a4f94c3b34b941936460d277ced1d7a27548'
 
diff --git a/Casks/pleasesleep.rb b/Casks/pleasesleep.rb
index e8d230fcb8a9..c66f0d2cd0a3 100644
--- a/Casks/pleasesleep.rb
+++ b/Casks/pleasesleep.rb
@@ -1,4 +1,4 @@
-class Pleasesleep < Cask
+cask :v1 => 'pleasesleep' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/plex-home-theater.rb b/Casks/plex-home-theater.rb
index c5bc2a2ca21b..48d4788e9ce0 100644
--- a/Casks/plex-home-theater.rb
+++ b/Casks/plex-home-theater.rb
@@ -1,4 +1,4 @@
-class PlexHomeTheater < Cask
+cask :v1 => 'plex-home-theater' do
   version '1.2.3.378-0c92ed32'
 
   if Hardware::CPU.is_32_bit?
diff --git a/Casks/plex-media-server.rb b/Casks/plex-media-server.rb
index 38548557cc75..57857d6cb627 100644
--- a/Casks/plex-media-server.rb
+++ b/Casks/plex-media-server.rb
@@ -1,4 +1,4 @@
-class PlexMediaServer < Cask
+cask :v1 => 'plex-media-server' do
   version '0.9.9.14.531-7eef8c6'
   sha256 '7cd91e89f74569409b12f8151d66c731ca8658e6df61aaaac41accf6e6cba337'
 
diff --git a/Casks/pliny.rb b/Casks/pliny.rb
index f513daaa7510..304ff21b1877 100644
--- a/Casks/pliny.rb
+++ b/Casks/pliny.rb
@@ -1,4 +1,4 @@
-class Pliny < Cask
+cask :v1 => 'pliny' do
   version '1.1.0'
   sha256 '1c263c181988e3cbbc110aa2802470272d7d3969cd6aa309af98b63a2680b215'
 
diff --git a/Casks/plotdevice.rb b/Casks/plotdevice.rb
index 084658e3db25..b3427f6c97b2 100644
--- a/Casks/plotdevice.rb
+++ b/Casks/plotdevice.rb
@@ -1,4 +1,4 @@
-class Plotdevice < Cask
+cask :v1 => 'plotdevice' do
   version '0.9.4'
   sha256 '70c7e484aa6de254095dce7ff1005e9b778b1fc02d4f8d27f0ee20ecdebba5c2'
 
diff --git a/Casks/plover.rb b/Casks/plover.rb
index b7627d0e2399..f3605d168588 100644
--- a/Casks/plover.rb
+++ b/Casks/plover.rb
@@ -1,4 +1,4 @@
-class Plover < Cask
+cask :v1 => 'plover' do
   version '2.5.8'
   sha256 'a8bbeddb5d6fb8d4499844257035edd62e431a4f1eb7959bdf17a15c1cbe12de'
 
diff --git a/Casks/plug.rb b/Casks/plug.rb
index 2dc5ebc98797..31eef2c034ed 100644
--- a/Casks/plug.rb
+++ b/Casks/plug.rb
@@ -1,4 +1,4 @@
-class Plug < Cask
+cask :v1 => 'plug' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/plycounter.rb b/Casks/plycounter.rb
index 558dc1aae8a2..45e9996f93d8 100644
--- a/Casks/plycounter.rb
+++ b/Casks/plycounter.rb
@@ -1,4 +1,4 @@
-class Plycounter < Cask
+cask :v1 => 'plycounter' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pngcommentator.rb b/Casks/pngcommentator.rb
index d4de22bb3d26..92795948e42b 100644
--- a/Casks/pngcommentator.rb
+++ b/Casks/pngcommentator.rb
@@ -1,4 +1,4 @@
-class Pngcommentator < Cask
+cask :v1 => 'pngcommentator' do
   version '1.3.2'
   sha256 '066f11b8e9ee406e1395380cbb602e6f6241b0137606d30f97237311f7aaa227'
 
diff --git a/Casks/pngyu.rb b/Casks/pngyu.rb
index 469d1b041a13..1fa53c8be68d 100644
--- a/Casks/pngyu.rb
+++ b/Casks/pngyu.rb
@@ -1,4 +1,4 @@
-class Pngyu < Cask
+cask :v1 => 'pngyu' do
   version '1.0.1'
   sha256 'f853a3566236200391a40d12df9519b39f4d30053ab6ed6f60670b7eacca6217'
 
diff --git a/Casks/poedit.rb b/Casks/poedit.rb
index 489158ca0f2b..cc09ff9a5fe3 100644
--- a/Casks/poedit.rb
+++ b/Casks/poedit.rb
@@ -1,4 +1,4 @@
-class Poedit < Cask
+cask :v1 => 'poedit' do
   version '1.6.10'
   sha256 'd6b6d07a10099c3a31ee21622764ed6d3d007a437dab33a00b0f15e42b2dfa76'
 
diff --git a/Casks/poison.rb b/Casks/poison.rb
index 57cf2059a7a3..5f0b6b8758d3 100644
--- a/Casks/poison.rb
+++ b/Casks/poison.rb
@@ -1,4 +1,4 @@
-class Poison < Cask
+cask :v1 => 'poison' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pokemon-showdown.rb b/Casks/pokemon-showdown.rb
index 183ceebffc47..57dd4d39e2e8 100644
--- a/Casks/pokemon-showdown.rb
+++ b/Casks/pokemon-showdown.rb
@@ -1,4 +1,4 @@
-class PokemonShowdown < Cask
+cask :v1 => 'pokemon-showdown' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pokerstars.rb b/Casks/pokerstars.rb
index b8c8634b9873..8d4ab2887b57 100644
--- a/Casks/pokerstars.rb
+++ b/Casks/pokerstars.rb
@@ -1,4 +1,4 @@
-class Pokerstars < Cask
+cask :v1 => 'pokerstars' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pokertracker.rb b/Casks/pokertracker.rb
index dc26d0ff8eeb..484802f7d66d 100644
--- a/Casks/pokertracker.rb
+++ b/Casks/pokertracker.rb
@@ -1,4 +1,4 @@
-class Pokertracker < Cask
+cask :v1 => 'pokertracker' do
   version '4.10.6'
   sha256 '913b47d2593dab9ecde628a754677acdeff2992e1f20d428ce6913f3a74af4d9'
 
diff --git a/Casks/pomotodo.rb b/Casks/pomotodo.rb
index baeff093f587..91ed8d3992e8 100644
--- a/Casks/pomotodo.rb
+++ b/Casks/pomotodo.rb
@@ -1,4 +1,4 @@
-class Pomotodo < Cask
+cask :v1 => 'pomotodo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/port-map.rb b/Casks/port-map.rb
index a7f6c9368f34..5bfaed47f37f 100644
--- a/Casks/port-map.rb
+++ b/Casks/port-map.rb
@@ -1,4 +1,4 @@
-class PortMap < Cask
+cask :v1 => 'port-map' do
   version '1.3.1-r46'
   sha256 '50e29f121139ee2f68ad978cb3921ef52f2dbfb5a0131c417516e4e5f1fa64af'
 
diff --git a/Casks/porthole.rb b/Casks/porthole.rb
index a6ed8f183012..a80be0d0484b 100644
--- a/Casks/porthole.rb
+++ b/Casks/porthole.rb
@@ -1,4 +1,4 @@
-class Porthole < Cask
+cask :v1 => 'porthole' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/postbox.rb b/Casks/postbox.rb
index 06158f02eb47..aa2cc07cca6d 100644
--- a/Casks/postbox.rb
+++ b/Casks/postbox.rb
@@ -1,4 +1,4 @@
-class Postbox < Cask
+cask :v1 => 'postbox' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/postgres.rb b/Casks/postgres.rb
index b527c0c0389b..31601f330095 100644
--- a/Casks/postgres.rb
+++ b/Casks/postgres.rb
@@ -1,4 +1,4 @@
-class Postgres < Cask
+cask :v1 => 'postgres' do
   version '9.3.5.2'
   sha256 '8b7ddc0e721960fa0f50903d5f7d47a29de308d981e93ee3af0664547e3f322d'
 
diff --git a/Casks/powder.rb b/Casks/powder.rb
index 407d5aa22fad..8a959752e17d 100644
--- a/Casks/powder.rb
+++ b/Casks/powder.rb
@@ -1,4 +1,4 @@
-class Powder < Cask
+cask :v1 => 'powder' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/power-manager-pro.rb b/Casks/power-manager-pro.rb
index 7123e391535e..2d7ecaf7d55a 100644
--- a/Casks/power-manager-pro.rb
+++ b/Casks/power-manager-pro.rb
@@ -1,4 +1,4 @@
-class PowerManagerPro < Cask
+cask :v1 => 'power-manager-pro' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/power-manager.rb b/Casks/power-manager.rb
index 2db75a0c0e34..9fa011dd501d 100644
--- a/Casks/power-manager.rb
+++ b/Casks/power-manager.rb
@@ -1,4 +1,4 @@
-class PowerManager < Cask
+cask :v1 => 'power-manager' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/powerkey.rb b/Casks/powerkey.rb
index c17365a9345e..4a2f43c91ca7 100644
--- a/Casks/powerkey.rb
+++ b/Casks/powerkey.rb
@@ -1,4 +1,4 @@
-class Powerkey < Cask
+cask :v1 => 'powerkey' do
   version '1.2'
   sha256 '47bfb13458883218cab6106bd948b8516c3a42a733180b49c410f26d4d465ca1'
 
diff --git a/Casks/powerword.rb b/Casks/powerword.rb
index 9c3c94e56930..53a25027b62d 100644
--- a/Casks/powerword.rb
+++ b/Casks/powerword.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-class Powerword < Cask
+cask :v1 => 'powerword' do
   version '1.0.0'
   sha256 '8bee28fa52bc967f91f6700d9642e00fc5e275cc41e0c15e5bf288fcac537c07'
 
diff --git a/Casks/praat.rb b/Casks/praat.rb
index 6b33f07687ab..b63455a58763 100644
--- a/Casks/praat.rb
+++ b/Casks/praat.rb
@@ -1,4 +1,4 @@
-class Praat < Cask
+cask :v1 => 'praat' do
   version '5.4.00'
 
   if Hardware::CPU.is_32_bit?
diff --git a/Casks/preen.rb b/Casks/preen.rb
index af62c8883ced..cbc73661a2f4 100644
--- a/Casks/preen.rb
+++ b/Casks/preen.rb
@@ -1,4 +1,4 @@
-class Preen < Cask
+cask :v1 => 'preen' do
   version '1.61'
   sha256 '04d10c5e06cd22704c8fb53ee2d9f67692bacdeb1cd90e44e08e3dff8afe15e3'
 
diff --git a/Casks/pref-setter.rb b/Casks/pref-setter.rb
index b909b6ed06bb..a91077b87e47 100644
--- a/Casks/pref-setter.rb
+++ b/Casks/pref-setter.rb
@@ -1,4 +1,4 @@
-class PrefSetter < Cask
+cask :v1 => 'pref-setter' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/preference-manager.rb b/Casks/preference-manager.rb
index a12af7e9eb36..cd1f54edb037 100644
--- a/Casks/preference-manager.rb
+++ b/Casks/preference-manager.rb
@@ -1,4 +1,4 @@
-class PreferenceManager < Cask
+cask :v1 => 'preference-manager' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/preferencecleaner.rb b/Casks/preferencecleaner.rb
index 97511b191518..04b00560aacc 100644
--- a/Casks/preferencecleaner.rb
+++ b/Casks/preferencecleaner.rb
@@ -1,4 +1,4 @@
-class Preferencecleaner < Cask
+cask :v1 => 'preferencecleaner' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/preform.rb b/Casks/preform.rb
index a65fd63c0a64..b782a2f7afd4 100644
--- a/Casks/preform.rb
+++ b/Casks/preform.rb
@@ -1,4 +1,4 @@
-class Preform < Cask
+cask :v1 => 'preform' do
   version '1.7.5'
   sha256 '1cba63d07ac8d872d76e7df7a3a3c727cfbcdd42e77260ffc47b636d315a5b83'
 
diff --git a/Casks/prefs-editor.rb b/Casks/prefs-editor.rb
index 258d8b8e181d..289a3909bf52 100644
--- a/Casks/prefs-editor.rb
+++ b/Casks/prefs-editor.rb
@@ -1,4 +1,4 @@
-class PrefsEditor < Cask
+cask :v1 => 'prefs-editor' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/prepros.rb b/Casks/prepros.rb
index 9cbc0eea5953..143484f4bdea 100644
--- a/Casks/prepros.rb
+++ b/Casks/prepros.rb
@@ -1,4 +1,4 @@
-class Prepros < Cask
+cask :v1 => 'prepros' do
   version '4.0.1'
   sha256 '84510d1252274898b0fc4f95828b60e29a2c946a158bbf7d3188611c62dcd3b1'
 
diff --git a/Casks/prey.rb b/Casks/prey.rb
index 08452d671c17..3bdbab32a90b 100644
--- a/Casks/prey.rb
+++ b/Casks/prey.rb
@@ -1,4 +1,4 @@
-class Prey < Cask
+cask :v1 => 'prey' do
   version '0.6.4'
   sha256 '361996d067539da7881aa3618b737ba4a0846df13ca8c9b8b07151d42f81fb86'
 
diff --git a/Casks/prezi.rb b/Casks/prezi.rb
index 451cdcae97d5..6c17c63e3f18 100644
--- a/Casks/prezi.rb
+++ b/Casks/prezi.rb
@@ -1,4 +1,4 @@
-class Prezi < Cask
+cask :v1 => 'prezi' do
   version '5.1.1'
   sha256 'cd77adf228b237f24407a4a7c8e57463b27ad98d9885451e42cc7416484cce56'
 
diff --git a/Casks/printrun.rb b/Casks/printrun.rb
index 85ee8b2e1c4b..70dfe295389c 100644
--- a/Casks/printrun.rb
+++ b/Casks/printrun.rb
@@ -1,4 +1,4 @@
-class Printrun < Cask
+cask :v1 => 'printrun' do
   version '1.2'
   sha256 'b270edb951cbee3e957eab3ecd3bbd4fe25e93ce478393c61f029bfff4e3b902'
 
diff --git a/Casks/prismatik.rb b/Casks/prismatik.rb
index 87df20530d21..269130bdc710 100644
--- a/Casks/prismatik.rb
+++ b/Casks/prismatik.rb
@@ -1,4 +1,4 @@
-class Prismatik < Cask
+cask :v1 => 'prismatik' do
   version '5.11.1'
   sha256 '178ea51c143c2cb005199f5cfaf24695324b951ba98c55cec83c7882e6420903'
 
diff --git a/Casks/private-eye.rb b/Casks/private-eye.rb
index c47d2ac27452..dc0a649f9d7a 100644
--- a/Casks/private-eye.rb
+++ b/Casks/private-eye.rb
@@ -1,4 +1,4 @@
-class PrivateEye < Cask
+cask :v1 => 'private-eye' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/private-internet-access.rb b/Casks/private-internet-access.rb
index 3e3a4fc92eb3..0a6980c2cbd7 100644
--- a/Casks/private-internet-access.rb
+++ b/Casks/private-internet-access.rb
@@ -1,4 +1,4 @@
-class PrivateInternetAccess < Cask
+cask :v1 => 'private-internet-access' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/prizmo.rb b/Casks/prizmo.rb
index 431a6e32e08a..02ff6598820a 100644
--- a/Casks/prizmo.rb
+++ b/Casks/prizmo.rb
@@ -1,4 +1,4 @@
-class Prizmo < Cask
+cask :v1 => 'prizmo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/processing.rb b/Casks/processing.rb
index d9c810ad1fbe..24668395d6eb 100644
--- a/Casks/processing.rb
+++ b/Casks/processing.rb
@@ -1,4 +1,4 @@
-class Processing < Cask
+cask :v1 => 'processing' do
   version '2.2.1'
   sha256 '8c237b3eb50626e8ffc648bfdeddaa18ceffbd6a48f8fec77a8eab5b774971fc'
 
diff --git a/Casks/programmer-dvorak.rb b/Casks/programmer-dvorak.rb
index 7883780ea87b..5ef86a0147ee 100644
--- a/Casks/programmer-dvorak.rb
+++ b/Casks/programmer-dvorak.rb
@@ -1,4 +1,4 @@
-class ProgrammerDvorak < Cask
+cask :v1 => 'programmer-dvorak' do
   version '1.2b9'
   sha256 '36e51a0ee3ece99de99f2983e14beb415f74d9ae4726093cb60463cc206295e9'
 
diff --git a/Casks/progressive-downloader.rb b/Casks/progressive-downloader.rb
index 296d0629a8a9..16a1e3ee8d91 100644
--- a/Casks/progressive-downloader.rb
+++ b/Casks/progressive-downloader.rb
@@ -1,4 +1,4 @@
-class ProgressiveDownloader < Cask
+cask :v1 => 'progressive-downloader' do
   version '1.7.2'
   sha256 '84cb20dbb3fa1be6d3e7ba0d4563f9001f210030010b56a9e5b4c3419264f13e'
 
diff --git a/Casks/projectlibre.rb b/Casks/projectlibre.rb
index 8fab7fc6b075..05eb2b3d3d33 100644
--- a/Casks/projectlibre.rb
+++ b/Casks/projectlibre.rb
@@ -1,4 +1,4 @@
-class Projectlibre < Cask
+cask :v1 => 'projectlibre' do
   version '1.5.8'
   sha256 'efd7d228d2e71a2a5af185d2fe1ddcea4abc55af32188344e06e1871facd0c6b'
 
diff --git a/Casks/prolific-usb-serial-driver.rb b/Casks/prolific-usb-serial-driver.rb
index 84ec6f2244c9..f329237fca4a 100644
--- a/Casks/prolific-usb-serial-driver.rb
+++ b/Casks/prolific-usb-serial-driver.rb
@@ -1,4 +1,4 @@
-class ProlificUsbSerialDriver < Cask
+cask :v1 => 'prolific-usb-serial-driver' do
   version '1.5.1'
   sha256 'b6658605409e9aa63bca7a1ac94c989cc01cdf375f6881ade0ed5bb9694c22cc'
 
diff --git a/Casks/propane.rb b/Casks/propane.rb
index a31cbac96530..c48fd5e5a1f2 100644
--- a/Casks/propane.rb
+++ b/Casks/propane.rb
@@ -1,4 +1,4 @@
-class Propane < Cask
+cask :v1 => 'propane' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/propresenter.rb b/Casks/propresenter.rb
index ee0bc1ed7b1c..87c4bf81b95d 100644
--- a/Casks/propresenter.rb
+++ b/Casks/propresenter.rb
@@ -1,4 +1,4 @@
-class Propresenter < Cask
+cask :v1 => 'propresenter' do
   version '5.2.8'
   sha256 '47981ded0b025db373897b0103e9fa2894f4f0a073596da3725a739d33716e11'
 
diff --git a/Casks/protege.rb b/Casks/protege.rb
index 8e04b07b1358..a76b2f6a28cc 100644
--- a/Casks/protege.rb
+++ b/Casks/protege.rb
@@ -1,4 +1,4 @@
-class Protege < Cask
+cask :v1 => 'protege' do
   version '4.3.0'
   sha256 '45f5acb42b8bb78074af6e192a2dc12e5c2b8238ac20e6c96a4bca7b2acaf598'
 
diff --git a/Casks/prott.rb b/Casks/prott.rb
index 3464a7066e54..4ef8c6cc19a9 100644
--- a/Casks/prott.rb
+++ b/Casks/prott.rb
@@ -1,4 +1,4 @@
-class Prott < Cask
+cask :v1 => 'prott' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/provisioning.rb b/Casks/provisioning.rb
index 346a2444f367..28b3d83ba475 100644
--- a/Casks/provisioning.rb
+++ b/Casks/provisioning.rb
@@ -1,4 +1,4 @@
-class Provisioning < Cask
+cask :v1 => 'provisioning' do
   version '1.0.4'
   sha256 '554590ab653776babbc453892653d052f1ec09c6473fc91f4a071f1a7a953144'
 
diff --git a/Casks/provisionql.rb b/Casks/provisionql.rb
index 981ceb1b74d7..d3c598c16799 100644
--- a/Casks/provisionql.rb
+++ b/Casks/provisionql.rb
@@ -1,4 +1,4 @@
-class Provisionql < Cask
+cask :v1 => 'provisionql' do
   version '1.0.0'
   sha256 'fc21f2996050711a2496351092f3ffe88d9d017594ae913cce6ef059d1cf2c2a'
 
diff --git a/Casks/proxifier.rb b/Casks/proxifier.rb
index 1438830a5bcd..8348a8230dc5 100644
--- a/Casks/proxifier.rb
+++ b/Casks/proxifier.rb
@@ -1,4 +1,4 @@
-class Proxifier < Cask
+cask :v1 => 'proxifier' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/proximity.rb b/Casks/proximity.rb
index 99967a63db68..21770420814a 100644
--- a/Casks/proximity.rb
+++ b/Casks/proximity.rb
@@ -1,4 +1,4 @@
-class Proximity < Cask
+cask :v1 => 'proximity' do
   version '1.5'
   sha256 '3ac0e90ffee62a6fadf2bb697393442f3cd87f4084ffdccf9cccf10cb86b3203'
 
diff --git a/Casks/proxpn.rb b/Casks/proxpn.rb
index b3a56dfb7945..ccdd9c859d95 100644
--- a/Casks/proxpn.rb
+++ b/Casks/proxpn.rb
@@ -1,4 +1,4 @@
-class Proxpn < Cask
+cask :v1 => 'proxpn' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ps3-media-server.rb b/Casks/ps3-media-server.rb
index f11c301af714..dbe41cea3999 100644
--- a/Casks/ps3-media-server.rb
+++ b/Casks/ps3-media-server.rb
@@ -1,4 +1,4 @@
-class Ps3MediaServer < Cask
+cask :v1 => 'ps3-media-server' do
   version '1.90.1'
   sha256 '3ebe75ce0dbdc1313c10fb901f845564cc343dc3b7487f07e15db9d757850df5'
 
diff --git a/Casks/psi.rb b/Casks/psi.rb
index 13d620923984..538f579c5a06 100644
--- a/Casks/psi.rb
+++ b/Casks/psi.rb
@@ -1,4 +1,4 @@
-class Psi < Cask
+cask :v1 => 'psi' do
   version '0.15'
   sha256 '76d50b5314d0a7d9f9a0a71d90e0f806f2da25436135dbd90bd1959286747742'
 
diff --git a/Casks/psychopy.rb b/Casks/psychopy.rb
index a49df603f52e..ddd8a8baee51 100644
--- a/Casks/psychopy.rb
+++ b/Casks/psychopy.rb
@@ -1,4 +1,4 @@
-class Psychopy < Cask
+cask :v1 => 'psychopy' do
   version '1.79.01'
   sha256 'a2b174aee30ca4a8858238404adfd9271da9ec14243aa30be0b7f9a6abb047b8'
 
diff --git a/Casks/punto-switcher.rb b/Casks/punto-switcher.rb
index 3eac62e2d17d..e1b7854937ee 100644
--- a/Casks/punto-switcher.rb
+++ b/Casks/punto-switcher.rb
@@ -1,4 +1,4 @@
-class PuntoSwitcher < Cask
+cask :v1 => 'punto-switcher' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pupil.rb b/Casks/pupil.rb
index 08cf928abda3..b58b03cf69aa 100644
--- a/Casks/pupil.rb
+++ b/Casks/pupil.rb
@@ -1,4 +1,4 @@
-class Pupil < Cask
+cask :v1 => 'pupil' do
   version '1.1'
   sha256 'd30e0cf8b45ab0a7ccd4ae9e99a788bb810ccf18c856ab446fc6d230d1159a03'
 
diff --git a/Casks/pusher.rb b/Casks/pusher.rb
index fed3c940c614..16f2fe757c3d 100644
--- a/Casks/pusher.rb
+++ b/Casks/pusher.rb
@@ -1,4 +1,4 @@
-class Pusher < Cask
+cask :v1 => 'pusher' do
   version '0.5.3'
   sha256 'f2a2c6a39f105c10d5653fa1afe364aa8e930a9cb411c738197e5dc97f378edb'
 
diff --git a/Casks/putio-adder.rb b/Casks/putio-adder.rb
index 865dfa544fb5..d7fd2072c537 100644
--- a/Casks/putio-adder.rb
+++ b/Casks/putio-adder.rb
@@ -1,4 +1,4 @@
-class PutioAdder < Cask
+cask :v1 => 'putio-adder' do
   version '2.7'
   sha256 'b4ac5fc97da0a8b83e56bd5cac0e1795ce7102aae3a69fb77fa64d9ed2f22c14'
 
diff --git a/Casks/puush.rb b/Casks/puush.rb
index b6ed1d1dae78..0968f6c3fc8e 100644
--- a/Casks/puush.rb
+++ b/Casks/puush.rb
@@ -1,4 +1,4 @@
-class Puush < Cask
+cask :v1 => 'puush' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/puzzles.rb b/Casks/puzzles.rb
index e1c2769a7c7f..09be58f4f2a7 100644
--- a/Casks/puzzles.rb
+++ b/Casks/puzzles.rb
@@ -1,4 +1,4 @@
-class Puzzles < Cask
+cask :v1 => 'puzzles' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/pwnagetool.rb b/Casks/pwnagetool.rb
index cb8db7441bdd..803decebdcc6 100644
--- a/Casks/pwnagetool.rb
+++ b/Casks/pwnagetool.rb
@@ -1,4 +1,4 @@
-class Pwnagetool < Cask
+cask :v1 => 'pwnagetool' do
   version '5.1.1'
   sha256 '84262734ad9f9186bce14a4f939d7ea290ed187782fdfa549a82c28bf837c808'
 
diff --git a/Casks/pycharm-ce.rb b/Casks/pycharm-ce.rb
index 33e15b5c66fc..30522a637ea4 100644
--- a/Casks/pycharm-ce.rb
+++ b/Casks/pycharm-ce.rb
@@ -1,4 +1,4 @@
-class PycharmCe < Cask
+cask :v1 => 'pycharm-ce' do
   version '3.4.1'
   sha256 '18b4d2d61badb81feaf22a51a7c76b85618e5a7a01f4f4c5e46079d134c64002'
 
diff --git a/Casks/pycharm.rb b/Casks/pycharm.rb
index 602e7478fafe..c475743be195 100644
--- a/Casks/pycharm.rb
+++ b/Casks/pycharm.rb
@@ -1,4 +1,4 @@
-class Pycharm < Cask
+cask :v1 => 'pycharm' do
   version '3.4.1'
   sha256 'f2af3859b0376927f591d5eac3b8d2c8196d712af811f27cc269965a03324a78'
 
diff --git a/Casks/qbittorrent.rb b/Casks/qbittorrent.rb
index faa7952f3097..9bd53ef2ca20 100644
--- a/Casks/qbittorrent.rb
+++ b/Casks/qbittorrent.rb
@@ -1,4 +1,4 @@
-class Qbittorrent < Cask
+cask :v1 => 'qbittorrent' do
   version '3.1.3'
   sha256 'eaa13313fd2f88b7cbc6dd9ad2c63871c2a58a8f0177349618bbc853e56783c7'
 
diff --git a/Casks/qdesktop.rb b/Casks/qdesktop.rb
index 6c70bf44f28c..a0023a4b8cae 100644
--- a/Casks/qdesktop.rb
+++ b/Casks/qdesktop.rb
@@ -1,4 +1,4 @@
-class Qdesktop < Cask
+cask :v1 => 'qdesktop' do
   version '0.1.1'
   sha256 '1eddd3513cca892fb8e53452d79d4589ef5b1e3cd885a1f52748b6df64588094'
 
diff --git a/Casks/qgis.rb b/Casks/qgis.rb
index 8b91f4bd6256..c3c52e1a0933 100644
--- a/Casks/qgis.rb
+++ b/Casks/qgis.rb
@@ -1,4 +1,4 @@
-class Qgis < Cask
+cask :v1 => 'qgis' do
   version '2.4.0-1'
   sha256 '785c268997651b547dd1261a86aa3b805a3d66c9706c0afb42758e1a2bb9ae0a'
 
diff --git a/Casks/qgroundcontrol.rb b/Casks/qgroundcontrol.rb
index 6f467d61d9cc..3da6eea4901a 100644
--- a/Casks/qgroundcontrol.rb
+++ b/Casks/qgroundcontrol.rb
@@ -1,4 +1,4 @@
-class Qgroundcontrol < Cask
+cask :v1 => 'qgroundcontrol' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/qiyimedia.rb b/Casks/qiyimedia.rb
index c529a2a01f11..68a50337ab41 100644
--- a/Casks/qiyimedia.rb
+++ b/Casks/qiyimedia.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-class Qiyimedia < Cask
+cask :v1 => 'qiyimedia' do
   version '3.1.14'
   sha256 'bab6c18060eabb2ae3326c562de6e33041ab6a0476817ae7fc1f39d2265734b5'
 
diff --git a/Casks/qlcolorcode.rb b/Casks/qlcolorcode.rb
index 3fb26e9ade74..eb026de31253 100644
--- a/Casks/qlcolorcode.rb
+++ b/Casks/qlcolorcode.rb
@@ -1,4 +1,4 @@
-class Qlcolorcode < Cask
+cask :v1 => 'qlcolorcode' do
   version '2.0.2'
   sha256 '317eda251ea5af8412401562395d2fbedb2dd915a7d927479cf09ac7251c4074'
 
diff --git a/Casks/qlimagesize.rb b/Casks/qlimagesize.rb
index ceebd2eaf80a..6741a504ab6f 100644
--- a/Casks/qlimagesize.rb
+++ b/Casks/qlimagesize.rb
@@ -1,4 +1,4 @@
-class Qlimagesize < Cask
+cask :v1 => 'qlimagesize' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/qlmarkdown.rb b/Casks/qlmarkdown.rb
index 5145a981fcac..fb741e476981 100644
--- a/Casks/qlmarkdown.rb
+++ b/Casks/qlmarkdown.rb
@@ -1,4 +1,4 @@
-class Qlmarkdown < Cask
+cask :v1 => 'qlmarkdown' do
   version '1.3.3'
   sha256 '045712562665673924397bbbef1ee1157b44e23c9744feda6feda27e107802d3'
 
diff --git a/Casks/qlnetcdf.rb b/Casks/qlnetcdf.rb
index bcbfb9634f4f..7c7811a85bc4 100644
--- a/Casks/qlnetcdf.rb
+++ b/Casks/qlnetcdf.rb
@@ -1,4 +1,4 @@
-class Qlnetcdf < Cask
+cask :v1 => 'qlnetcdf' do
   version '0.0.3'
   sha256 'a02db25dab9795d75fb13a155c465678f940a3586d7a0521cc7005590bf9898a'
 
diff --git a/Casks/qlprettypatch.rb b/Casks/qlprettypatch.rb
index 997d95fc4312..29d55fc665bd 100644
--- a/Casks/qlprettypatch.rb
+++ b/Casks/qlprettypatch.rb
@@ -1,4 +1,4 @@
-class Qlprettypatch < Cask
+cask :v1 => 'qlprettypatch' do
   version '1.0'
   sha256 'ae2cb623cc741bf053fdfad0b5f1435c3bbad6d4b3f37d43b407296c46462182'
 
diff --git a/Casks/qlrest.rb b/Casks/qlrest.rb
index be4475a7dce6..d6fef3a5ed06 100644
--- a/Casks/qlrest.rb
+++ b/Casks/qlrest.rb
@@ -1,4 +1,4 @@
-class Qlrest < Cask
+cask :v1 => 'qlrest' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/qlstephen.rb b/Casks/qlstephen.rb
index 5bde417377f8..1495b54847e0 100644
--- a/Casks/qlstephen.rb
+++ b/Casks/qlstephen.rb
@@ -1,4 +1,4 @@
-class Qlstephen < Cask
+cask :v1 => 'qlstephen' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/qlvideo.rb b/Casks/qlvideo.rb
index 23db6cbaf6fb..a121e5c61b74 100644
--- a/Casks/qlvideo.rb
+++ b/Casks/qlvideo.rb
@@ -1,4 +1,4 @@
-class Qlvideo < Cask
+cask :v1 => 'qlvideo' do
   version '1.5.0'
   sha256 '48edc2259fd554f536aa4a99ffac6389f7b17c5ce8a0c8e0075d934a074ca430'
 
diff --git a/Casks/qmind.rb b/Casks/qmind.rb
index 9edb12f59f0e..81913239a3ea 100644
--- a/Casks/qmind.rb
+++ b/Casks/qmind.rb
@@ -1,4 +1,4 @@
-class Qmind < Cask
+cask :v1 => 'qmind' do
   version '0.3.4'
   sha256 '498dc5b753804d25cbf15afbdb8641af1ddcf53b65ab04d3188c7a8b669f6695'
 
diff --git a/Casks/qq.rb b/Casks/qq.rb
index db4ee93736bd..756568914b32 100644
--- a/Casks/qq.rb
+++ b/Casks/qq.rb
@@ -1,4 +1,4 @@
-class Qq < Cask
+cask :v1 => 'qq' do
   version '3.1.2'
   sha256 'e74ec441a95d36e22e5e78a7ecc5a3d0d02cf749b413f88198ff74bc3bb85da0'
 
diff --git a/Casks/qqbrowser.rb b/Casks/qqbrowser.rb
index 7df16122aa3f..d6010d4f03d6 100644
--- a/Casks/qqbrowser.rb
+++ b/Casks/qqbrowser.rb
@@ -1,4 +1,4 @@
-class Qqbrowser < Cask
+cask :v1 => 'qqbrowser' do
   version '2.3.2160'
   sha256 '6e0a3cf5d889f733cc5a4b38c8441bb32201ad1634c038d599be6e0864a65d14'
 
diff --git a/Casks/qqinput.rb b/Casks/qqinput.rb
index bfff75d2d775..7d8b47c14c0c 100644
--- a/Casks/qqinput.rb
+++ b/Casks/qqinput.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-class Qqinput < Cask
+cask :v1 => 'qqinput' do
   version '2.8.86.400'
   sha256 '5b90cf604230013d5afa974b5b4835c0d6faf55da932cebce4f72478b5665a4d'
 
diff --git a/Casks/qqmusic.rb b/Casks/qqmusic.rb
index c69379d21789..741d3b80d40c 100644
--- a/Casks/qqmusic.rb
+++ b/Casks/qqmusic.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-class Qqmusic < Cask
+cask :v1 => 'qqmusic' do
   version '1.3.0'
   sha256 '2f1198f9b3e1407822a771fcdfdd643b65f35f6b51cc0af8c6b11fa11fc30a0d'
 
diff --git a/Casks/qrfcview.rb b/Casks/qrfcview.rb
index 64d5ebf071de..8514efc21956 100644
--- a/Casks/qrfcview.rb
+++ b/Casks/qrfcview.rb
@@ -1,4 +1,4 @@
-class Qrfcview < Cask
+cask :v1 => 'qrfcview' do
   version '20121106'
   sha256 '925cc6afc143f234a32e2f088cf3e4de6357e196edd38df30bc3f9b34074dccc'
 
diff --git a/Casks/qrq.rb b/Casks/qrq.rb
index e3eae7c1f6d2..fc31f51d19b2 100644
--- a/Casks/qrq.rb
+++ b/Casks/qrq.rb
@@ -1,4 +1,4 @@
-class Qrq < Cask
+cask :v1 => 'qrq' do
   version '0.3.1'
   sha256 '76712d07f2d61b5d382c4c0c02a0c067e752c745db6b931717b3eb1e42e5076a'
 
diff --git a/Casks/qsync.rb b/Casks/qsync.rb
index 740e5ceb96ad..106106f66ca4 100644
--- a/Casks/qsync.rb
+++ b/Casks/qsync.rb
@@ -1,4 +1,4 @@
-class Qsync < Cask
+cask :v1 => 'qsync' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/qt-creator.rb b/Casks/qt-creator.rb
index d3a4fc45152a..e727ece0bc96 100644
--- a/Casks/qt-creator.rb
+++ b/Casks/qt-creator.rb
@@ -1,4 +1,4 @@
-class QtCreator < Cask
+cask :v1 => 'qt-creator' do
   version '3.2.2'
   sha256 'ca3cca6ed88bdec0eac48e0fa0005702e9924498b0fbb9ad2250978384f24f7a'
 
diff --git a/Casks/qtspim.rb b/Casks/qtspim.rb
index 3abfebf9b38a..32d5a73f7dce 100644
--- a/Casks/qtspim.rb
+++ b/Casks/qtspim.rb
@@ -1,4 +1,4 @@
-class Qtspim < Cask
+cask :v1 => 'qtspim' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/quassel-client.rb b/Casks/quassel-client.rb
index cb86bc5fa9fb..710ca62ef8fb 100644
--- a/Casks/quassel-client.rb
+++ b/Casks/quassel-client.rb
@@ -1,4 +1,4 @@
-class QuasselClient < Cask
+cask :v1 => 'quassel-client' do
   version '0.11.0'
   sha256 '00e1a1b7a3fc0b5c1c382c488ab93d533a183896ca236d6170cc11e1fc28ac96'
 
diff --git a/Casks/querious.rb b/Casks/querious.rb
index c60858fe7423..6c49fdbf1eb9 100644
--- a/Casks/querious.rb
+++ b/Casks/querious.rb
@@ -1,4 +1,4 @@
-class Querious < Cask
+cask :v1 => 'querious' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/quick-search-box.rb b/Casks/quick-search-box.rb
index d7b20a23571a..60654e356eba 100644
--- a/Casks/quick-search-box.rb
+++ b/Casks/quick-search-box.rb
@@ -1,4 +1,4 @@
-class QuickSearchBox < Cask
+cask :v1 => 'quick-search-box' do
   version '2.0.0.1447'
   sha256 '3fec80343c50a5b492e140fef13bd1bc4cce835beb3952591e8b4638e5940470'
 
diff --git a/Casks/quickcast.rb b/Casks/quickcast.rb
index 03e930d55e5a..43b9e7883c73 100644
--- a/Casks/quickcast.rb
+++ b/Casks/quickcast.rb
@@ -1,4 +1,4 @@
-class Quickcast < Cask
+cask :v1 => 'quickcast' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/quickhue.rb b/Casks/quickhue.rb
index 63e090d82124..2867b1a6cf20 100644
--- a/Casks/quickhue.rb
+++ b/Casks/quickhue.rb
@@ -1,4 +1,4 @@
-class Quickhue < Cask
+cask :v1 => 'quickhue' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/quicklook-csv.rb b/Casks/quicklook-csv.rb
index fe9f57f9d536..3d2e3327ed6f 100644
--- a/Casks/quicklook-csv.rb
+++ b/Casks/quicklook-csv.rb
@@ -1,4 +1,4 @@
-class QuicklookCsv < Cask
+cask :v1 => 'quicklook-csv' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/quicklook-json.rb b/Casks/quicklook-json.rb
index e4c9ca8dd9ed..efc62f24107f 100644
--- a/Casks/quicklook-json.rb
+++ b/Casks/quicklook-json.rb
@@ -1,4 +1,4 @@
-class QuicklookJson < Cask
+cask :v1 => 'quicklook-json' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/quicklook-pfm.rb b/Casks/quicklook-pfm.rb
index 3bb89ef16516..606b1dcf2434 100644
--- a/Casks/quicklook-pfm.rb
+++ b/Casks/quicklook-pfm.rb
@@ -1,4 +1,4 @@
-class QuicklookPfm < Cask
+cask :v1 => 'quicklook-pfm' do
   version '1.1'
   sha256 '53308ac3d7f0f8ed02adb2feff282764fdeadb32352b0776caeaec3d6a514333'
 
diff --git a/Casks/quicknfo.rb b/Casks/quicknfo.rb
index 19d17d30fb9b..373ed20a7136 100644
--- a/Casks/quicknfo.rb
+++ b/Casks/quicknfo.rb
@@ -1,4 +1,4 @@
-class Quicknfo < Cask
+cask :v1 => 'quicknfo' do
   version '1.2'
   sha256 'ee5c03f78ff60e69e776bec39896ac48496915de35fcb3e2bd0d9c20ad92b5bb'
 
diff --git a/Casks/quickradar.rb b/Casks/quickradar.rb
index 695b36c77778..f8e907174456 100644
--- a/Casks/quickradar.rb
+++ b/Casks/quickradar.rb
@@ -1,4 +1,4 @@
-class Quickradar < Cask
+cask :v1 => 'quickradar' do
   version '1.0b1'
   sha256 '4b40450a5710d9b6efc33051bc2f611b0c88e3d5f387a5fdd1a90773d28d90a8'
 
diff --git a/Casks/quicksilver.rb b/Casks/quicksilver.rb
index 728ea5b9e8bd..92401e0b4a61 100644
--- a/Casks/quicksilver.rb
+++ b/Casks/quicksilver.rb
@@ -1,4 +1,4 @@
-class Quicksilver < Cask
+cask :v1 => 'quicksilver' do
   version '1.2.0'
   sha256 '08c5aeaa7fe89427bcec30a9700eb0b7484bd68b647776b2c82c95355d1679d4'
 
diff --git a/Casks/quiterss.rb b/Casks/quiterss.rb
index 54bcecd9d8bc..124d84543a10 100644
--- a/Casks/quiterss.rb
+++ b/Casks/quiterss.rb
@@ -1,4 +1,4 @@
-class Quiterss < Cask
+cask :v1 => 'quiterss' do
   version '0.16.1'
   sha256 'b452fe75c3b825ae3074d4cc70ee29e18b445fb9a7cbccc2901b076bdfe41a07'
 
diff --git a/Casks/quotefixformac.rb b/Casks/quotefixformac.rb
index ccf8f4eb92f6..72896367dde6 100644
--- a/Casks/quotefixformac.rb
+++ b/Casks/quotefixformac.rb
@@ -1,4 +1,4 @@
-class Quotefixformac < Cask
+cask :v1 => 'quotefixformac' do
   version '2.5.2'
   sha256 '8d914ae553b84fe5f246ab1eb030d25792ca8d626b3bbac57acee857135e85a9'
 
diff --git a/Casks/qvod-player.rb b/Casks/qvod-player.rb
index 0b2b548766ec..0d9212a50f07 100644
--- a/Casks/qvod-player.rb
+++ b/Casks/qvod-player.rb
@@ -1,4 +1,4 @@
-class QvodPlayer < Cask
+cask :v1 => 'qvod-player' do
   version '1.1.26'
   sha256 'e824084e6a0539be3f30da795938b45c0f88bdb49794f61615a5753aedd92c4e'
 
diff --git a/Casks/r-name.rb b/Casks/r-name.rb
index 2eb4697b8b50..5f6da15c6686 100644
--- a/Casks/r-name.rb
+++ b/Casks/r-name.rb
@@ -1,4 +1,4 @@
-class RName < Cask
+cask :v1 => 'r-name' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/r.rb b/Casks/r.rb
index 167c70849421..9912e7676e7d 100644
--- a/Casks/r.rb
+++ b/Casks/r.rb
@@ -1,4 +1,4 @@
-class R < Cask
+cask :v1 => 'r' do
   version '3.1.2'
 
   if MacOS.version < :mavericks
diff --git a/Casks/race-for-the-galaxy.rb b/Casks/race-for-the-galaxy.rb
index 12ea7687ca2c..746a461dc4fc 100644
--- a/Casks/race-for-the-galaxy.rb
+++ b/Casks/race-for-the-galaxy.rb
@@ -1,4 +1,4 @@
-class RaceForTheGalaxy < Cask
+cask :v1 => 'race-for-the-galaxy' do
   version '0.9.4'
   sha256 'f60585e3f47cf09df77c578bb1c7dad31dfe4dbe223da35f190b2573a2803bd7'
 
diff --git a/Casks/racket.rb b/Casks/racket.rb
index 9a4970d21034..a8a9edb631ce 100644
--- a/Casks/racket.rb
+++ b/Casks/racket.rb
@@ -1,4 +1,4 @@
-class Racket < Cask
+cask :v1 => 'racket' do
   version '6.1.1'
   sha256 '4939fda695b3e7ac2c55675824be949dcade066ba5e2fcac9554914a9fe33934'
 
diff --git a/Casks/radbeacon.rb b/Casks/radbeacon.rb
index a360bb305018..c7e9bc4187eb 100644
--- a/Casks/radbeacon.rb
+++ b/Casks/radbeacon.rb
@@ -1,4 +1,4 @@
-class Radbeacon < Cask
+cask :v1 => 'radbeacon' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/radi.rb b/Casks/radi.rb
index 86faee172b99..bf9dcdb3bf22 100644
--- a/Casks/radi.rb
+++ b/Casks/radi.rb
@@ -1,4 +1,4 @@
-class Radi < Cask
+cask :v1 => 'radi' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/radiant-player.rb b/Casks/radiant-player.rb
index a597de8fcccd..f4d424b7a8b1 100644
--- a/Casks/radiant-player.rb
+++ b/Casks/radiant-player.rb
@@ -1,4 +1,4 @@
-class RadiantPlayer < Cask
+cask :v1 => 'radiant-player' do
   version '1.3.1'
   sha256 'eed8d2c0d5457938b65ad41fd01ff9ea3745518e7951e62f68974b2884016dbf'
 
diff --git a/Casks/rapidweaver.rb b/Casks/rapidweaver.rb
index d7f78d462190..7a099860720e 100644
--- a/Casks/rapidweaver.rb
+++ b/Casks/rapidweaver.rb
@@ -1,4 +1,4 @@
-class Rapidweaver < Cask
+cask :v1 => 'rapidweaver' do
   version '6'
   sha256 'e7b72daffa9c7809b713e05a1b518873a71a73afdd6a97f300b8bb9ab35a9361'
 
diff --git a/Casks/raw-photo-processor.rb b/Casks/raw-photo-processor.rb
index 75c722f67f7b..9d248b184b3f 100644
--- a/Casks/raw-photo-processor.rb
+++ b/Casks/raw-photo-processor.rb
@@ -1,4 +1,4 @@
-class RawPhotoProcessor < Cask
+cask :v1 => 'raw-photo-processor' do
   version '4.7.2'
   sha256 'ef300adaaf3399f43741a51f06c062a34c4e809eecdbbffce2cd15af414fbd7f'
 
diff --git a/Casks/raw-therapee.rb b/Casks/raw-therapee.rb
index e8069b4e8ad0..e4f38a21f54e 100644
--- a/Casks/raw-therapee.rb
+++ b/Casks/raw-therapee.rb
@@ -1,4 +1,4 @@
-class RawTherapee < Cask
+cask :v1 => 'raw-therapee' do
   version '4.1.26'
   sha256 'b8afa0978050621bc10ddead6f4d0b7a79f54f4d06c608af63948c4e53122255'
 
diff --git a/Casks/razer-synapse.rb b/Casks/razer-synapse.rb
index 814ec857918d..6709607f0dca 100644
--- a/Casks/razer-synapse.rb
+++ b/Casks/razer-synapse.rb
@@ -1,4 +1,4 @@
-class RazerSynapse < Cask
+cask :v1 => 'razer-synapse' do
   version '1.29'
   sha256 'c37266bb55df1f0344d797419ff10e498bbbb90cdf15b769487e245728f2eb43'
 
diff --git a/Casks/razorsql.rb b/Casks/razorsql.rb
index 2dcea0ad0185..e56a2544091c 100644
--- a/Casks/razorsql.rb
+++ b/Casks/razorsql.rb
@@ -1,4 +1,4 @@
-class Razorsql < Cask
+cask :v1 => 'razorsql' do
   version '6.3.9'
   sha256 'ff77e7c8d3b0e1ecb626a69d6f03a6c4e46edae64f6b130199639e8de33652ff'
 
diff --git a/Casks/rcdefaultapp.rb b/Casks/rcdefaultapp.rb
index e61f840396d9..5e31bfb08614 100644
--- a/Casks/rcdefaultapp.rb
+++ b/Casks/rcdefaultapp.rb
@@ -1,4 +1,4 @@
-class Rcdefaultapp < Cask
+cask :v1 => 'rcdefaultapp' do
   version '2.1'
   sha256 'eb940bf74628f94ac3bfe39e360cb8fb8bbbc9a3c314d2214d5f1476b5d8b6a4'
 
diff --git a/Casks/rcenvironment.rb b/Casks/rcenvironment.rb
index 4d040716c3dc..25dd607f9e8c 100644
--- a/Casks/rcenvironment.rb
+++ b/Casks/rcenvironment.rb
@@ -1,4 +1,4 @@
-class Rcenvironment < Cask
+cask :v1 => 'rcenvironment' do
   version '1.4'
   sha256 '8c2db3e0e2493393cad70ba55157ce5b4aed2d718dff792a7249b118a8f51456'
 
diff --git a/Casks/rdio.rb b/Casks/rdio.rb
index 64ebb0ff6b3d..e67c853237e9 100644
--- a/Casks/rdio.rb
+++ b/Casks/rdio.rb
@@ -1,4 +1,4 @@
-class Rdio < Cask
+cask :v1 => 'rdio' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/rdm.rb b/Casks/rdm.rb
index 7a5b039e4b56..1e6133032e51 100644
--- a/Casks/rdm.rb
+++ b/Casks/rdm.rb
@@ -1,4 +1,4 @@
-class Rdm < Cask
+cask :v1 => 'rdm' do
   version '0.7.6.8'
   sha256 '7f5bb2ac47c7a01f99a5d3fd7ed1019d7cc9fb6230c617bf2eff9336f0eb8a16'
 
diff --git a/Casks/readefine-desktop.rb b/Casks/readefine-desktop.rb
index 3ab42bbbdc4d..42735eabc40a 100644
--- a/Casks/readefine-desktop.rb
+++ b/Casks/readefine-desktop.rb
@@ -1,4 +1,4 @@
-class ReadefineDesktop < Cask
+cask :v1 => 'readefine-desktop' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/readytalk.rb b/Casks/readytalk.rb
index 5ca98967dc9f..7b5f911e7b2e 100644
--- a/Casks/readytalk.rb
+++ b/Casks/readytalk.rb
@@ -1,4 +1,4 @@
-class Readytalk < Cask
+cask :v1 => 'readytalk' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/reaper.rb b/Casks/reaper.rb
index af2a31357c80..3c2e636b57ec 100644
--- a/Casks/reaper.rb
+++ b/Casks/reaper.rb
@@ -1,4 +1,4 @@
-class Reaper < Cask
+cask :v1 => 'reaper' do
   version '4.71'
 
   if Hardware::CPU.is_32_bit?
diff --git a/Casks/recordit.rb b/Casks/recordit.rb
index 6e9738f83795..f8471504fa2b 100644
--- a/Casks/recordit.rb
+++ b/Casks/recordit.rb
@@ -1,4 +1,4 @@
-class Recordit < Cask
+cask :v1 => 'recordit' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/recovery-disk-assistant.rb b/Casks/recovery-disk-assistant.rb
index e48faf592404..6e0c7476960e 100644
--- a/Casks/recovery-disk-assistant.rb
+++ b/Casks/recovery-disk-assistant.rb
@@ -1,4 +1,4 @@
-class RecoveryDiskAssistant < Cask
+cask :v1 => 'recovery-disk-assistant' do
   version '1.0'
   sha256 '4991086d733ceff060b1e2aedf7788c17be407db5f5a6bf6dde0c23f10db26c2'
 
diff --git a/Casks/redcine-x-pro.rb b/Casks/redcine-x-pro.rb
index c21a401dd4b3..319bf016c12a 100644
--- a/Casks/redcine-x-pro.rb
+++ b/Casks/redcine-x-pro.rb
@@ -1,4 +1,4 @@
-class RedcineXPro < Cask
+cask :v1 => 'redcine-x-pro' do
   version '31.0.0'
   sha256 '9393f84d839214ef4b692434ced8f4f9ecd12f8f49d8230d84c1bef9fe44d4db'
 
diff --git a/Casks/reeddit.rb b/Casks/reeddit.rb
index b5d183f7ffd8..04cd6c3f1bfb 100644
--- a/Casks/reeddit.rb
+++ b/Casks/reeddit.rb
@@ -1,4 +1,4 @@
-class Reeddit < Cask
+cask :v1 => 'reeddit' do
   version '1.9'
   sha256 '7bb465aa5a8c80adfb6f73430caee9cc977afae77d2a55be97371b9516aa01a7'
 
diff --git a/Casks/reflector.rb b/Casks/reflector.rb
index 5abaa1a194fe..7d85c2a73998 100644
--- a/Casks/reflector.rb
+++ b/Casks/reflector.rb
@@ -1,4 +1,4 @@
-class Reflector < Cask
+cask :v1 => 'reflector' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/refresh-finder.rb b/Casks/refresh-finder.rb
index 0f8d3a02041b..198cc3d97046 100644
--- a/Casks/refresh-finder.rb
+++ b/Casks/refresh-finder.rb
@@ -1,4 +1,4 @@
-class RefreshFinder < Cask
+cask :v1 => 'refresh-finder' do
   version '1.5.0'
   sha256 'd7e5faec85b3910776ca77f09c98b1b90e540cc3d493853e46eaeb8c7332472e'
 
diff --git a/Casks/reggy.rb b/Casks/reggy.rb
index e6f12aa065e4..12e456ae6a22 100644
--- a/Casks/reggy.rb
+++ b/Casks/reggy.rb
@@ -1,4 +1,4 @@
-class Reggy < Cask
+cask :v1 => 'reggy' do
   version '1.3'
   sha256 '5a4d72158bc524ab2f21c6cfad7b703f413707d9d078ec1923c268b110ff8dda'
 
diff --git a/Casks/rekordbox.rb b/Casks/rekordbox.rb
index 9408de49bb94..9ed090a0e77b 100644
--- a/Casks/rekordbox.rb
+++ b/Casks/rekordbox.rb
@@ -1,4 +1,4 @@
-class Rekordbox < Cask
+cask :v1 => 'rekordbox' do
   version '3.0.3'
   sha256 '65e165e0c385142be825806c85e330d4636bab17e1a8a5c1f9bd5784d9ef721b'
 
diff --git a/Casks/remonit.rb b/Casks/remonit.rb
index 4964b5aaba6a..2bb0474ab382 100644
--- a/Casks/remonit.rb
+++ b/Casks/remonit.rb
@@ -1,4 +1,4 @@
-class Remonit < Cask
+cask :v1 => 'remonit' do
   version '0.2.0'
   sha256 'fb8e51c7d68d83274b2acff107e7ef4857d28c9daf4d5ac2599c14cb3d6516fe'
 
diff --git a/Casks/remote-desktop-connection.rb b/Casks/remote-desktop-connection.rb
index 00e102a78927..e1788d4636a5 100644
--- a/Casks/remote-desktop-connection.rb
+++ b/Casks/remote-desktop-connection.rb
@@ -1,4 +1,4 @@
-class RemoteDesktopConnection < Cask
+cask :v1 => 'remote-desktop-connection' do
   version '2.1.1'
   sha256 '4ebe551c9ee0e2da6b8f746be13c2df342c6f14cd3fbedbf2ab490f09b44616f'
 
diff --git a/Casks/remote-desktop-manager.rb b/Casks/remote-desktop-manager.rb
index 73a85053290e..1cb0ea81d345 100644
--- a/Casks/remote-desktop-manager.rb
+++ b/Casks/remote-desktop-manager.rb
@@ -1,4 +1,4 @@
-class RemoteDesktopManager < Cask
+cask :v1 => 'remote-desktop-manager' do
   version '1.0.2.0'
   sha256 'd724df0195169b4b3bac4db6273433f4d64b1877dd50c1745ff1bc3b6115a258'
 
diff --git a/Casks/renamer.rb b/Casks/renamer.rb
index 91a9ea890eca..873f440164ec 100644
--- a/Casks/renamer.rb
+++ b/Casks/renamer.rb
@@ -1,4 +1,4 @@
-class Renamer < Cask
+cask :v1 => 'renamer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/repetier-host.rb b/Casks/repetier-host.rb
index b8c897a0cfa6..14ed006906fb 100644
--- a/Casks/repetier-host.rb
+++ b/Casks/repetier-host.rb
@@ -1,4 +1,4 @@
-class RepetierHost < Cask
+cask :v1 => 'repetier-host' do
   version '0.56'
   sha256 '0d4b43ec7bec5ac85133d00e1a2cf61956ef90abc255c253029e0ef26160adfa'
 
diff --git a/Casks/rescuetime.rb b/Casks/rescuetime.rb
index ea480e968265..c8004ccfab98 100644
--- a/Casks/rescuetime.rb
+++ b/Casks/rescuetime.rb
@@ -1,4 +1,4 @@
-class Rescuetime < Cask
+cask :v1 => 'rescuetime' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/rethinkdb.rb b/Casks/rethinkdb.rb
index 6fdeb1c18530..9ebd4c8b608b 100644
--- a/Casks/rethinkdb.rb
+++ b/Casks/rethinkdb.rb
@@ -1,4 +1,4 @@
-class Rethinkdb < Cask
+cask :v1 => 'rethinkdb' do
   version '1.15.1'
   sha256 'f16ec6cd619d704913e93ac3800d1c7ce1fe7390dd9ae81fb7a964d3b58a04f2'
 
diff --git a/Casks/retinacapture.rb b/Casks/retinacapture.rb
index 47eebcfd1bba..b0e64ced3056 100644
--- a/Casks/retinacapture.rb
+++ b/Casks/retinacapture.rb
@@ -1,4 +1,4 @@
-class Retinacapture < Cask
+cask :v1 => 'retinacapture' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/retinizer.rb b/Casks/retinizer.rb
index 6d260395149a..3cbf201b30d0 100644
--- a/Casks/retinizer.rb
+++ b/Casks/retinizer.rb
@@ -1,4 +1,4 @@
-class Retinizer < Cask
+cask :v1 => 'retinizer' do
   version '0.5.0'
   sha256 '34d82f6beeb934ebd73ac231c364298456374d8e52f5e3826077999507832922'
 
diff --git a/Casks/retroarch.rb b/Casks/retroarch.rb
index bcc83477ef87..e066e50e6daa 100644
--- a/Casks/retroarch.rb
+++ b/Casks/retroarch.rb
@@ -1,4 +1,4 @@
-class Retroarch < Cask
+cask :v1 => 'retroarch' do
   version '1.0.0.2'
 
   if MacOS.version < :lion
diff --git a/Casks/retroshare.rb b/Casks/retroshare.rb
index 8eccb6306f47..a2f699d65679 100644
--- a/Casks/retroshare.rb
+++ b/Casks/retroshare.rb
@@ -1,4 +1,4 @@
-class Retroshare < Cask
+cask :v1 => 'retroshare' do
   version '0.5.5b'
   sha256 '24beb2e1087e7a93ba996030c0785cd9f3a575d3adc5dcfda0d58aab3b40aebe'
 
diff --git a/Casks/reveal.rb b/Casks/reveal.rb
index 46dc51541e51..566f0439ff59 100644
--- a/Casks/reveal.rb
+++ b/Casks/reveal.rb
@@ -1,4 +1,4 @@
-class Reveal < Cask
+cask :v1 => 'reveal' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ricochet.rb b/Casks/ricochet.rb
index 5684304cb92a..640a99325e36 100644
--- a/Casks/ricochet.rb
+++ b/Casks/ricochet.rb
@@ -1,4 +1,4 @@
-class Ricochet < Cask
+cask :v1 => 'ricochet' do
   version '1.0.4'
   sha256 '089e8b8d177ee2b5aeb50b62447a27994a432ffd8fe1893e071c4df4bc5e1993'
 
diff --git a/Casks/ridibooks.rb b/Casks/ridibooks.rb
index e59ba6cfaa77..8c71e865247f 100644
--- a/Casks/ridibooks.rb
+++ b/Casks/ridibooks.rb
@@ -1,4 +1,4 @@
-class Ridibooks < Cask
+cask :v1 => 'ridibooks' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/riffworkst4.rb b/Casks/riffworkst4.rb
index 9fc06d11e786..ed1887c46c89 100644
--- a/Casks/riffworkst4.rb
+++ b/Casks/riffworkst4.rb
@@ -1,4 +1,4 @@
-class Riffworkst4 < Cask
+cask :v1 => 'riffworkst4' do
   # note: "4" is not a version number, but an intrinsic part of product name "T4"
   version '2.6'
   sha256 '83c51fa4a08ad19f92418572e11b09ebb33f9a0341ff9e0173d0eb0c7709cddb'
diff --git a/Casks/rightzoom.rb b/Casks/rightzoom.rb
index 603a60c06e96..65b2f10496e0 100644
--- a/Casks/rightzoom.rb
+++ b/Casks/rightzoom.rb
@@ -1,4 +1,4 @@
-class Rightzoom < Cask
+cask :v1 => 'rightzoom' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ringtones.rb b/Casks/ringtones.rb
index c844d637d85a..af404ca78a57 100644
--- a/Casks/ringtones.rb
+++ b/Casks/ringtones.rb
@@ -1,4 +1,4 @@
-class Ringtones < Cask
+cask :v1 => 'ringtones' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ripit.rb b/Casks/ripit.rb
index ccd31c835c96..cf8aeb475f60 100644
--- a/Casks/ripit.rb
+++ b/Casks/ripit.rb
@@ -1,4 +1,4 @@
-class Ripit < Cask
+cask :v1 => 'ripit' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/robomongo.rb b/Casks/robomongo.rb
index db7afdc1f839..f6ca77def31d 100644
--- a/Casks/robomongo.rb
+++ b/Casks/robomongo.rb
@@ -1,4 +1,4 @@
-class Robomongo < Cask
+cask :v1 => 'robomongo' do
   version '0.8.4'
   sha256 '52976b139e9221c2d1bd888ca2e87e14c134d324523973921123c3fe59821108'
 
diff --git a/Casks/rocks-n-diamonds.rb b/Casks/rocks-n-diamonds.rb
index 5595b3e0b6b0..0ffd6a4a389b 100644
--- a/Casks/rocks-n-diamonds.rb
+++ b/Casks/rocks-n-diamonds.rb
@@ -1,4 +1,4 @@
-class RocksNDiamonds < Cask
+cask :v1 => 'rocks-n-diamonds' do
   version '3.3.1.2'
   sha256 '5405786ac296e4052e25f26a2a200a01d49e9c0ae77070a9b94ecbce893ae543'
 
diff --git a/Casks/rowmote-helper.rb b/Casks/rowmote-helper.rb
index 0cbb21fbc3e8..d786f27ee25c 100644
--- a/Casks/rowmote-helper.rb
+++ b/Casks/rowmote-helper.rb
@@ -1,4 +1,4 @@
-class RowmoteHelper < Cask
+cask :v1 => 'rowmote-helper' do
   version '3.9.4'
   sha256 'ea0b33ef5e5572892985b6abe07b214efe29483f36a1aa903339b75fb3c3028d'
 
diff --git a/Casks/royal-tsx.rb b/Casks/royal-tsx.rb
index 890e9beecb6f..2aab0abe1138 100644
--- a/Casks/royal-tsx.rb
+++ b/Casks/royal-tsx.rb
@@ -1,4 +1,4 @@
-class RoyalTsx < Cask
+cask :v1 => 'royal-tsx' do
   version '1.4.6.0'
   sha256 'e67580fcf344302d81df00a6c43559a9d27dc1cc90428663059a6675d5d09355'
 
diff --git a/Casks/rrootage.rb b/Casks/rrootage.rb
index ce8f1fa57615..202537ad3160 100644
--- a/Casks/rrootage.rb
+++ b/Casks/rrootage.rb
@@ -1,4 +1,4 @@
-class Rrootage < Cask
+cask :v1 => 'rrootage' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/rss.rb b/Casks/rss.rb
index edfb759fa2d9..c77944d06cdd 100644
--- a/Casks/rss.rb
+++ b/Casks/rss.rb
@@ -1,4 +1,4 @@
-class Rss < Cask
+cask :v1 => 'rss' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/rstudio.rb b/Casks/rstudio.rb
index 5c906a28d096..c0b7bb353b18 100644
--- a/Casks/rstudio.rb
+++ b/Casks/rstudio.rb
@@ -1,4 +1,4 @@
-class Rstudio < Cask
+cask :v1 => 'rstudio' do
   version '0.98.1087'
   sha256 'c7832ad0c1ec0fc4ed7e0617cca8a840a413c0e5eccc50734b27cb4f76ae8a4d'
 
diff --git a/Casks/rtx.rb b/Casks/rtx.rb
index 6ff97f79651a..f29c4aa6665d 100644
--- a/Casks/rtx.rb
+++ b/Casks/rtx.rb
@@ -1,4 +1,4 @@
-class Rtx < Cask
+cask :v1 => 'rtx' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/rubitrack.rb b/Casks/rubitrack.rb
index d7163e0d8ffb..0f0db0f7f1fd 100644
--- a/Casks/rubitrack.rb
+++ b/Casks/rubitrack.rb
@@ -1,4 +1,4 @@
-class Rubitrack < Cask
+cask :v1 => 'rubitrack' do
   version '3.4.5'
   sha256 '1069a99e1c5faa5565fa89fa6f886298ab6e695f2942a3fc91895c5792d20be6'
 
diff --git a/Casks/rubymine.rb b/Casks/rubymine.rb
index 89e9608eddfc..d00439b681d4 100644
--- a/Casks/rubymine.rb
+++ b/Casks/rubymine.rb
@@ -1,4 +1,4 @@
-class Rubymine < Cask
+cask :v1 => 'rubymine' do
   version '7.0'
   sha256 '60ceca89231a9756e682d754aaba409c9120266f20478e51f7b6004f82919478'
 
diff --git a/Casks/runtastic-connect.rb b/Casks/runtastic-connect.rb
index 982aded4db61..b8b5f9439902 100644
--- a/Casks/runtastic-connect.rb
+++ b/Casks/runtastic-connect.rb
@@ -1,4 +1,4 @@
-class RuntasticConnect < Cask
+cask :v1 => 'runtastic-connect' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/runtimebrowser.rb b/Casks/runtimebrowser.rb
index 1b8fd56045e4..d059227d1e0d 100644
--- a/Casks/runtimebrowser.rb
+++ b/Casks/runtimebrowser.rb
@@ -1,4 +1,4 @@
-class Runtimebrowser < Cask
+cask :v1 => 'runtimebrowser' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/rust.rb b/Casks/rust.rb
index e8252267a15f..31943a3ef384 100644
--- a/Casks/rust.rb
+++ b/Casks/rust.rb
@@ -1,4 +1,4 @@
-class Rust < Cask
+cask :v1 => 'rust' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/rythem.rb b/Casks/rythem.rb
index f2275aab3bf1..82105c966e94 100644
--- a/Casks/rythem.rb
+++ b/Casks/rythem.rb
@@ -1,4 +1,4 @@
-class Rythem < Cask
+cask :v1 => 'rythem' do
   version '2014-02-21'
   sha256 'd4c5c578fb0f4d155cc07af22184f88a9b190a7453d0dc45962fd179f72da34d'
 
diff --git a/Casks/sabnzbd.rb b/Casks/sabnzbd.rb
index 97d9a0b52b2c..a3d878809aa8 100644
--- a/Casks/sabnzbd.rb
+++ b/Casks/sabnzbd.rb
@@ -1,4 +1,4 @@
-class Sabnzbd < Cask
+cask :v1 => 'sabnzbd' do
   version '0.7.19'
   sha256 '193ec185540c884e85106c608de2bb9e92e2daae8a3b4309072be927d70ae7ca'
 
diff --git a/Casks/safaritabswitching.rb b/Casks/safaritabswitching.rb
index 6b166d0b315c..944574862ce6 100644
--- a/Casks/safaritabswitching.rb
+++ b/Casks/safaritabswitching.rb
@@ -1,4 +1,4 @@
-class Safaritabswitching < Cask
+cask :v1 => 'safaritabswitching' do
   version '1.2.7'
   sha256 'cda2d24dd7f273d5e26bf3ee32c1e711ebf28c0c44c619fa9f4e7f8efea488ca'
 
diff --git a/Casks/safe-in-cloud.rb b/Casks/safe-in-cloud.rb
index ce94c2420a2d..4bf1a95937c4 100644
--- a/Casks/safe-in-cloud.rb
+++ b/Casks/safe-in-cloud.rb
@@ -1,4 +1,4 @@
-class SafeInCloud < Cask
+cask :v1 => 'safe-in-cloud' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/safemonk.rb b/Casks/safemonk.rb
index dbf5aee1aaca..85c553f08f18 100644
--- a/Casks/safemonk.rb
+++ b/Casks/safemonk.rb
@@ -1,4 +1,4 @@
-class Safemonk < Cask
+cask :v1 => 'safemonk' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sage.rb b/Casks/sage.rb
index 65d0a2c0a423..1628ea26819a 100644
--- a/Casks/sage.rb
+++ b/Casks/sage.rb
@@ -1,4 +1,4 @@
-class Sage < Cask
+cask :v1 => 'sage' do
   version '6.3'
   sha256 '024a326d51b6a5878d8e60512172199ee5d3db35d850d7a784f42935beeeb540'
 
diff --git a/Casks/sandbox.rb b/Casks/sandbox.rb
index cd2510623376..e99c413e816c 100644
--- a/Casks/sandbox.rb
+++ b/Casks/sandbox.rb
@@ -1,4 +1,4 @@
-class Sandbox < Cask
+cask :v1 => 'sandbox' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sandvox.rb b/Casks/sandvox.rb
index c97dde2817b0..20059e0ae1fc 100644
--- a/Casks/sandvox.rb
+++ b/Casks/sandvox.rb
@@ -1,4 +1,4 @@
-class Sandvox < Cask
+cask :v1 => 'sandvox' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/satellite-eyes.rb b/Casks/satellite-eyes.rb
index b025ad47fc72..e2ce0f78a9b8 100644
--- a/Casks/satellite-eyes.rb
+++ b/Casks/satellite-eyes.rb
@@ -1,4 +1,4 @@
-class SatelliteEyes < Cask
+cask :v1 => 'satellite-eyes' do
   version '1.2.4'
   sha256 'adc1554c9095e3f316474e0f3712fa2a086d9405d126eca6359b8ebdc7451902'
 
diff --git a/Casks/sauce.rb b/Casks/sauce.rb
index 27953862b0d2..726906286572 100644
--- a/Casks/sauce.rb
+++ b/Casks/sauce.rb
@@ -1,4 +1,4 @@
-class Sauce < Cask
+cask :v1 => 'sauce' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sauerbraten.rb b/Casks/sauerbraten.rb
index 823b1feb0495..8a86fdf2d1c4 100644
--- a/Casks/sauerbraten.rb
+++ b/Casks/sauerbraten.rb
@@ -1,4 +1,4 @@
-class Sauerbraten < Cask
+cask :v1 => 'sauerbraten' do
   version '2013.01.26'
   sha256 'c6807484fa0d2c42ac774b97f9b21e9eace720e4403abc11b0321b2645d3589d'
 
diff --git a/Casks/save-as-wwf.rb b/Casks/save-as-wwf.rb
index 9cb2fcdf1a9f..41f42dda58b0 100644
--- a/Casks/save-as-wwf.rb
+++ b/Casks/save-as-wwf.rb
@@ -1,4 +1,4 @@
-class SaveAsWwf < Cask
+cask :v1 => 'save-as-wwf' do
   version '1.0'
   sha256 'a11a39ec95e694ddca3af2f505c6a2f958cb2f96471ac8c700ff0d676a1d68d6'
 
diff --git a/Casks/scala-ide.rb b/Casks/scala-ide.rb
index 040157f70ca8..838ca4991b0f 100644
--- a/Casks/scala-ide.rb
+++ b/Casks/scala-ide.rb
@@ -1,4 +1,4 @@
-class ScalaIde < Cask
+cask :v1 => 'scala-ide' do
   version '3.0.3'
   sha256 '74c0ed0a2ca9d5b7cad39142d436bf88db55e75f85f885c74a4b8a164e814ee1'
 
diff --git a/Casks/scansnap-manager.rb b/Casks/scansnap-manager.rb
index 0121d1675adc..63f0351701b1 100644
--- a/Casks/scansnap-manager.rb
+++ b/Casks/scansnap-manager.rb
@@ -1,4 +1,4 @@
-class ScansnapManager < Cask
+cask :v1 => 'scansnap-manager' do
   version '6.2L10'
   sha256 '7273034398e9a57eb0fa89167c9e801ad2bf9fe56b52b3d9591628e978168afb'
 
diff --git a/Casks/scapple.rb b/Casks/scapple.rb
index fbec8faa18ad..6f30d7f4de80 100644
--- a/Casks/scapple.rb
+++ b/Casks/scapple.rb
@@ -1,4 +1,4 @@
-class Scapple < Cask
+cask :v1 => 'scapple' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/schnapps.rb b/Casks/schnapps.rb
index 18c2b763ba40..c4697bb35864 100644
--- a/Casks/schnapps.rb
+++ b/Casks/schnapps.rb
@@ -1,4 +1,4 @@
-class Schnapps < Cask
+cask :v1 => 'schnapps' do
   version '1.0'
   sha256 '93beb5d29311f692e1eb1b2843d0ae8cce8a8b7beb200bea50d021f163190cc5'
 
diff --git a/Casks/scilab.rb b/Casks/scilab.rb
index ac38be07ff00..57a728d9fc91 100644
--- a/Casks/scilab.rb
+++ b/Casks/scilab.rb
@@ -1,4 +1,4 @@
-class Scilab < Cask
+cask :v1 => 'scilab' do
   version '5.5.1'
   sha256 '5c9455c10be9fceab63ef65231ad01a0ba68c5985481ae260a8db0a71637a3c0'
 
diff --git a/Casks/scout.rb b/Casks/scout.rb
index 225aea622f4c..5ca8e6487a39 100644
--- a/Casks/scout.rb
+++ b/Casks/scout.rb
@@ -1,4 +1,4 @@
-class Scout < Cask
+cask :v1 => 'scout' do
   version '0.7.1'
   sha256 '09b89f28a16a30751f86b173ec33a0b50d0f1c5202e9737463f0bdf8d76668fe'
 
diff --git a/Casks/scratch.rb b/Casks/scratch.rb
index 7f8180ac17fa..d31e820bc570 100644
--- a/Casks/scratch.rb
+++ b/Casks/scratch.rb
@@ -1,4 +1,4 @@
-class Scratch < Cask
+cask :v1 => 'scratch' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/screencloud.rb b/Casks/screencloud.rb
index 979d2acac1c8..cfb0b9279a20 100644
--- a/Casks/screencloud.rb
+++ b/Casks/screencloud.rb
@@ -1,4 +1,4 @@
-class Screencloud < Cask
+cask :v1 => 'screencloud' do
   version '1.1.6'
   sha256 '0858d973388be02514a7756233d06fabd8d9d44fb2d17a2859129337c03dc0d1'
 
diff --git a/Casks/screenflick.rb b/Casks/screenflick.rb
index 2ec9dcd35af8..f1bba1ac050e 100644
--- a/Casks/screenflick.rb
+++ b/Casks/screenflick.rb
@@ -1,4 +1,4 @@
-class Screenflick < Cask
+cask :v1 => 'screenflick' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/screenflow.rb b/Casks/screenflow.rb
index e450d0940913..7d128ccb9bf4 100644
--- a/Casks/screenflow.rb
+++ b/Casks/screenflow.rb
@@ -1,4 +1,4 @@
-class Screenflow < Cask
+cask :v1 => 'screenflow' do
   version '4.5.3'
   sha256 '48209b7fd5387e07c63bd4502ad073dde96460ee30e1a8b19fe2977e8b274914'
 
diff --git a/Casks/screenhero.rb b/Casks/screenhero.rb
index 5fec2aea9de2..2237f06cc526 100644
--- a/Casks/screenhero.rb
+++ b/Casks/screenhero.rb
@@ -1,4 +1,4 @@
-class Screenhero < Cask
+cask :v1 => 'screenhero' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/screenmailer.rb b/Casks/screenmailer.rb
index 04b82bac594f..f15d75983b7f 100644
--- a/Casks/screenmailer.rb
+++ b/Casks/screenmailer.rb
@@ -1,4 +1,4 @@
-class Screenmailer < Cask
+cask :v1 => 'screenmailer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/screens-connect.rb b/Casks/screens-connect.rb
index 27e128791628..6d2ce4f26cce 100644
--- a/Casks/screens-connect.rb
+++ b/Casks/screens-connect.rb
@@ -1,4 +1,4 @@
-class ScreensConnect < Cask
+cask :v1 => 'screens-connect' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/screenstagram.rb b/Casks/screenstagram.rb
index 70ceb279451c..32537af317ae 100644
--- a/Casks/screenstagram.rb
+++ b/Casks/screenstagram.rb
@@ -1,4 +1,4 @@
-class Screenstagram < Cask
+cask :v1 => 'screenstagram' do
   version '2.01'
   sha256 '5cb9f7be247fdec897248f5091818bf7b25153fa99782e96f9d9b2c2431cdbb1'
 
diff --git a/Casks/screensteps.rb b/Casks/screensteps.rb
index f2087f084530..97f887c7ccf8 100644
--- a/Casks/screensteps.rb
+++ b/Casks/screensteps.rb
@@ -1,4 +1,4 @@
-class Screensteps < Cask
+cask :v1 => 'screensteps' do
   version '2.9.6'
   sha256 'e48082731531198d8c22e5218a7aa59500843e4fd4fd7f44161688aebcfc621b'
 
diff --git a/Casks/scribbleton.rb b/Casks/scribbleton.rb
index 0c4e80e3ba37..96e1eb7e5200 100644
--- a/Casks/scribbleton.rb
+++ b/Casks/scribbleton.rb
@@ -1,4 +1,4 @@
-class Scribbleton < Cask
+cask :v1 => 'scribbleton' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/scribus.rb b/Casks/scribus.rb
index 8d92fa86c478..e3e627008f0f 100644
--- a/Casks/scribus.rb
+++ b/Casks/scribus.rb
@@ -1,4 +1,4 @@
-class Scribus < Cask
+cask :v1 => 'scribus' do
   version '1.4.4'
   sha256 '57cdfacbfa6c60c035b746ac40ea8c46718fdfd4a9ac382b3b6c56a318fa162c'
 
diff --git a/Casks/scriptql.rb b/Casks/scriptql.rb
index 3580f3bfdd6e..d45e022aba3b 100644
--- a/Casks/scriptql.rb
+++ b/Casks/scriptql.rb
@@ -1,4 +1,4 @@
-class Scriptql < Cask
+cask :v1 => 'scriptql' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/scrivener.rb b/Casks/scrivener.rb
index 220ebe65d74a..e908c48b063d 100644
--- a/Casks/scrivener.rb
+++ b/Casks/scrivener.rb
@@ -1,4 +1,4 @@
-class Scrivener < Cask
+cask :v1 => 'scrivener' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/scroll-reverser.rb b/Casks/scroll-reverser.rb
index d8304c3cbcb1..f5b31c48b42e 100644
--- a/Casks/scroll-reverser.rb
+++ b/Casks/scroll-reverser.rb
@@ -1,4 +1,4 @@
-class ScrollReverser < Cask
+cask :v1 => 'scroll-reverser' do
   version '1.6.1'
   sha256 'babce7e360ec76a797ac8843e20d5b75a0475807c487df87c01bc29cd8050584'
 
diff --git a/Casks/scrup.rb b/Casks/scrup.rb
index 9e6a8d1dfe0e..5dd1d0e532de 100644
--- a/Casks/scrup.rb
+++ b/Casks/scrup.rb
@@ -1,4 +1,4 @@
-class Scrup < Cask
+cask :v1 => 'scrup' do
   version '1.3.3'
   sha256 '5004222db9a6ddd4e6cb525d00e95f8a38e9fb623bc1397e5258b2ef2c4bd3b0'
 
diff --git a/Casks/scummvm.rb b/Casks/scummvm.rb
index 79f5bea60fd9..dd8eb587edf5 100644
--- a/Casks/scummvm.rb
+++ b/Casks/scummvm.rb
@@ -1,4 +1,4 @@
-class Scummvm < Cask
+cask :v1 => 'scummvm' do
   version '1.7.0'
   sha256 'c382c231680011e7def2349baa666e142570ac833d9f4a1ca56e8f1efc5156c5'
 
diff --git a/Casks/sdformatter.rb b/Casks/sdformatter.rb
index b73257a55d3c..6324d62cdc6f 100644
--- a/Casks/sdformatter.rb
+++ b/Casks/sdformatter.rb
@@ -1,4 +1,4 @@
-class Sdformatter < Cask
+cask :v1 => 'sdformatter' do
   version '4.0'
   sha256 '5b88a851d375ef471523a0f8371edda144c4650d40cfc94902440fece77aa27e'
 
diff --git a/Casks/sdrdx.rb b/Casks/sdrdx.rb
index ee38db29f7e6..8b6f1de089b5 100644
--- a/Casks/sdrdx.rb
+++ b/Casks/sdrdx.rb
@@ -1,4 +1,4 @@
-class Sdrdx < Cask
+cask :v1 => 'sdrdx' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/seafile-client.rb b/Casks/seafile-client.rb
index 3f98afbb598e..5528a9217b20 100644
--- a/Casks/seafile-client.rb
+++ b/Casks/seafile-client.rb
@@ -1,4 +1,4 @@
-class SeafileClient < Cask
+cask :v1 => 'seafile-client' do
   version '3.1.5'
   sha256 '25eedd712d57bcf94fd19ba2783d5f0278c3e95403ee07f300e17dabbd6bb75a'
 
diff --git a/Casks/seamonkey.rb b/Casks/seamonkey.rb
index 19c24bae8761..cd060260cdb3 100644
--- a/Casks/seamonkey.rb
+++ b/Casks/seamonkey.rb
@@ -1,4 +1,4 @@
-class Seamonkey < Cask
+cask :v1 => 'seamonkey' do
   version '2.25'
   sha256 '3217e3d1fb94376d01ca38cc926b1b23306579c96e96adfdd50f0f66fc71c5e8'
 
diff --git a/Casks/seashore.rb b/Casks/seashore.rb
index 936345dd6205..54be9323b4ab 100644
--- a/Casks/seashore.rb
+++ b/Casks/seashore.rb
@@ -1,4 +1,4 @@
-class Seashore < Cask
+cask :v1 => 'seashore' do
   version '0.5.1'
   sha256 '96463a3642f162a20b160d8df273e9b27a5fdbf9708bee6ebf6a6c8528047765'
 
diff --git a/Casks/second-life-viewer.rb b/Casks/second-life-viewer.rb
index ec942ead793f..8aa6eda0f622 100644
--- a/Casks/second-life-viewer.rb
+++ b/Casks/second-life-viewer.rb
@@ -1,4 +1,4 @@
-class SecondLifeViewer < Cask
+cask :v1 => 'second-life-viewer' do
   version '3.6.13.284995'
   sha256 '8aa1bc39077452c3006390d4a888ca4113c087e8cdc78f5008dc85091015627d'
 
diff --git a/Casks/secondbar.rb b/Casks/secondbar.rb
index 64c2a04434fa..f20a7223e05e 100644
--- a/Casks/secondbar.rb
+++ b/Casks/secondbar.rb
@@ -1,4 +1,4 @@
-class Secondbar < Cask
+cask :v1 => 'secondbar' do
   version '1.1'
   sha256 '1f2a9d837bc66c93ed2f7a1d83ef95c44888cd266ffb7982ade14f91d996d6a6'
 
diff --git a/Casks/secrets.rb b/Casks/secrets.rb
index d1f4a7c2443f..69afcc2e72d2 100644
--- a/Casks/secrets.rb
+++ b/Casks/secrets.rb
@@ -1,4 +1,4 @@
-class Secrets < Cask
+cask :v1 => 'secrets' do
   version '1.0.6'
   sha256 '9604bc37a52fe32cd5146715fe5f401512b214847284151155d28c43413e0d25'
 
diff --git a/Casks/seil.rb b/Casks/seil.rb
index df593dbd1077..726859226156 100644
--- a/Casks/seil.rb
+++ b/Casks/seil.rb
@@ -1,4 +1,4 @@
-class Seil < Cask
+cask :v1 => 'seil' do
   version '10.11.0'
   sha256 '4ee777bf0a7f023abadb1f6a836b08484cfc2db2a19dd0b28d8942a2b638f8e5'
 
diff --git a/Casks/selfcontrol.rb b/Casks/selfcontrol.rb
index 4fc821571450..5d0251aeb28e 100644
--- a/Casks/selfcontrol.rb
+++ b/Casks/selfcontrol.rb
@@ -1,4 +1,4 @@
-class Selfcontrol < Cask
+cask :v1 => 'selfcontrol' do
   version '2.0.2'
   sha256 'cd1fb7bd5524d81e784ad67f8639cfb836261f07d7e6db75458a398b17f9a1f9'
 
diff --git a/Casks/selflanguage-self-control.rb b/Casks/selflanguage-self-control.rb
index 90246161be1f..d59d631b9619 100644
--- a/Casks/selflanguage-self-control.rb
+++ b/Casks/selflanguage-self-control.rb
@@ -1,4 +1,4 @@
-class SelflanguageSelfControl < Cask
+cask :v1 => 'selflanguage-self-control' do
   version '4.5.0'
   sha256 'fa5edc50ec517c06547e8c57246075f1fcd4ad98b5b9c681b9a60e357f4d3f04'
 
diff --git a/Casks/semulov.rb b/Casks/semulov.rb
index 5d104c1879d6..173395e6c853 100644
--- a/Casks/semulov.rb
+++ b/Casks/semulov.rb
@@ -1,4 +1,4 @@
-class Semulov < Cask
+cask :v1 => 'semulov' do
   version '2.0'
   sha256 'de2b9d4e874885a6421c17fb716e2072827c4d111c946d15ada2b4d31392e803'
 
diff --git a/Casks/send-to-kindle.rb b/Casks/send-to-kindle.rb
index 4dde318c1bbc..047a893ad868 100644
--- a/Casks/send-to-kindle.rb
+++ b/Casks/send-to-kindle.rb
@@ -1,4 +1,4 @@
-class SendToKindle < Cask
+cask :v1 => 'send-to-kindle' do
   version '1.0.0.220'
   sha256 'f43009bb0e48ed7e5a750a90163a6362f49e6518c698c5c49be0dce0d01fe3af'
 
diff --git a/Casks/sensiolabsdesktop.rb b/Casks/sensiolabsdesktop.rb
index 6bfdc2c36d3c..2f2217de350c 100644
--- a/Casks/sensiolabsdesktop.rb
+++ b/Casks/sensiolabsdesktop.rb
@@ -1,4 +1,4 @@
-class Sensiolabsdesktop < Cask
+cask :v1 => 'sensiolabsdesktop' do
   version '1.0.0'
   sha256 'c486439a87c7e1445f3e7dd168b7c212e27119437a94e603179c890204d90473'
 
diff --git a/Casks/sente.rb b/Casks/sente.rb
index a318d1694db5..a9dc09a69d41 100644
--- a/Casks/sente.rb
+++ b/Casks/sente.rb
@@ -1,4 +1,4 @@
-class Sente < Cask
+cask :v1 => 'sente' do
   version '6.7.6'
   sha256 'b8c6c2ad8b95810fd7107a606a1ce08013bc217b3d2a13a51599ccb3cd29c631'
 
diff --git a/Casks/sequel-pro.rb b/Casks/sequel-pro.rb
index 2a20dfd1557b..6a97e9d26447 100644
--- a/Casks/sequel-pro.rb
+++ b/Casks/sequel-pro.rb
@@ -1,4 +1,4 @@
-class SequelPro < Cask
+cask :v1 => 'sequel-pro' do
   version '1.0.2'
   sha256 'facd99344d0124cf4444acbef9006d947eadc6f96127b09e7380f014c7775f85'
 
diff --git a/Casks/sequential.rb b/Casks/sequential.rb
index 02da4387862d..91a2cf874f73 100644
--- a/Casks/sequential.rb
+++ b/Casks/sequential.rb
@@ -1,4 +1,4 @@
-class Sequential < Cask
+cask :v1 => 'sequential' do
   version '2.1.2'
   sha256 '7a9247e8623da5b6c74b65ad6d9e0be7667b832816134393e871e584c00eee64'
 
diff --git a/Casks/serf.rb b/Casks/serf.rb
index 343060633969..e3f056bba53d 100644
--- a/Casks/serf.rb
+++ b/Casks/serf.rb
@@ -1,4 +1,4 @@
-class Serf < Cask
+cask :v1 => 'serf' do
   version '0.6.3'
   sha256 'c406463486282ae9c6dc974a5d8688b8908a1fb6af46a2c1aca3785c16ac590b'
 
diff --git a/Casks/serial-tools.rb b/Casks/serial-tools.rb
index 9a8d4844af00..fa71415c92b7 100644
--- a/Casks/serial-tools.rb
+++ b/Casks/serial-tools.rb
@@ -1,4 +1,4 @@
-class SerialTools < Cask
+cask :v1 => 'serial-tools' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/serialcloner.rb b/Casks/serialcloner.rb
index 3f737f6191f6..90eeb158252a 100644
--- a/Casks/serialcloner.rb
+++ b/Casks/serialcloner.rb
@@ -1,4 +1,4 @@
-class Serialcloner < Cask
+cask :v1 => 'serialcloner' do
   version '2.6.1'
   sha256 '8027731f0ed031bb0c40009d9f5237fb73d66a3ef97029024811aa41ae873aae'
 
diff --git a/Casks/servetome.rb b/Casks/servetome.rb
index 623a60540063..cb58cc719914 100644
--- a/Casks/servetome.rb
+++ b/Casks/servetome.rb
@@ -1,4 +1,4 @@
-class Servetome < Cask
+cask :v1 => 'servetome' do
   version '3.9.0.3053'
   sha256 '87bf1184b7656a96088b25880e7e1c772f30d8dfa1e602f9b43ccbdd0608fdf2'
 
diff --git a/Casks/serviio.rb b/Casks/serviio.rb
index 269500a0d7dd..36b359294b3a 100644
--- a/Casks/serviio.rb
+++ b/Casks/serviio.rb
@@ -1,4 +1,4 @@
-class Serviio < Cask
+cask :v1 => 'serviio' do
   version '1.4.1.2'
   sha256 '132ed6ba9baf466eec5d89789cd8d50163fa5b534899f10a9232e00f711707aa'
 
diff --git a/Casks/servus.rb b/Casks/servus.rb
index a5ac2b3fc7f5..43268332a553 100644
--- a/Casks/servus.rb
+++ b/Casks/servus.rb
@@ -1,4 +1,4 @@
-class Servus < Cask
+cask :v1 => 'servus' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sevenzx.rb b/Casks/sevenzx.rb
index 9b17a4705290..88675e89b702 100644
--- a/Casks/sevenzx.rb
+++ b/Casks/sevenzx.rb
@@ -1,4 +1,4 @@
-class Sevenzx < Cask
+cask :v1 => 'sevenzx' do
   version '1.7.1'
   sha256 '6be03312017fdd6e360293f94d7a529aba65dc1d86b561fd2c3f35dc3e815247'
 
diff --git a/Casks/shades.rb b/Casks/shades.rb
index ea2d04b86f0f..9c5a209f9c9d 100644
--- a/Casks/shades.rb
+++ b/Casks/shades.rb
@@ -1,4 +1,4 @@
-class Shades < Cask
+cask :v1 => 'shades' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/shadowsocksx.rb b/Casks/shadowsocksx.rb
index 4f4c1b974820..06e72ac19758 100644
--- a/Casks/shadowsocksx.rb
+++ b/Casks/shadowsocksx.rb
@@ -1,4 +1,4 @@
-class Shadowsocksx < Cask
+cask :v1 => 'shadowsocksx' do
   version '2.3'
   sha256 '6aab97a8f5801d20ec779bce6e86349655b27bc6acd8ad70c939b89007be92c5'
 
diff --git a/Casks/shadowsweeper.rb b/Casks/shadowsweeper.rb
index be3456170d6f..50fbca8c835f 100644
--- a/Casks/shadowsweeper.rb
+++ b/Casks/shadowsweeper.rb
@@ -1,4 +1,4 @@
-class Shadowsweeper < Cask
+cask :v1 => 'shadowsweeper' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/shady.rb b/Casks/shady.rb
index 5e0481b51a3e..7303a76f68dd 100644
--- a/Casks/shady.rb
+++ b/Casks/shady.rb
@@ -1,4 +1,4 @@
-class Shady < Cask
+cask :v1 => 'shady' do
   version '1.0.3'
   sha256 '5905e8738af657bdb21b27a9615996a72b6080e502ca28fa328139aadc00277c'
 
diff --git a/Casks/sharetool.rb b/Casks/sharetool.rb
index da881c50c0fb..d288b2faa200 100644
--- a/Casks/sharetool.rb
+++ b/Casks/sharetool.rb
@@ -1,4 +1,4 @@
-class Sharetool < Cask
+cask :v1 => 'sharetool' do
   version '2.4.1'
   sha256 'd6c19e082f9d96b1831692d308a4d5512608e6ca8d58c52d7e95bb2da0832a8c'
 
diff --git a/Casks/shelf-leveler.rb b/Casks/shelf-leveler.rb
index e7bc1a706511..7b648ddafa58 100644
--- a/Casks/shelf-leveler.rb
+++ b/Casks/shelf-leveler.rb
@@ -1,4 +1,4 @@
-class ShelfLeveler < Cask
+cask :v1 => 'shelf-leveler' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/shiftit.rb b/Casks/shiftit.rb
index bf9bf8bf8068..44575445ae2c 100644
--- a/Casks/shiftit.rb
+++ b/Casks/shiftit.rb
@@ -1,4 +1,4 @@
-class Shiftit < Cask
+cask :v1 => 'shiftit' do
   version '1.6'
   sha256 '538e0628d6fc99c3562694c0722cb41699d6a802f0032678ef05fa2b53711955'
 
diff --git a/Casks/shimo.rb b/Casks/shimo.rb
index ac62c977b487..ce73ee97da62 100644
--- a/Casks/shimo.rb
+++ b/Casks/shimo.rb
@@ -1,4 +1,4 @@
-class Shimo < Cask
+cask :v1 => 'shimo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/shiori.rb b/Casks/shiori.rb
index f423b993ca95..25e9902e4af5 100644
--- a/Casks/shiori.rb
+++ b/Casks/shiori.rb
@@ -1,4 +1,4 @@
-class Shiori < Cask
+cask :v1 => 'shiori' do
   version '1.0.2'
   sha256 'c832edc2762fdaadc80bfe042ee6f7bd128955e3d7b27bdc5baf5806a0c8a719'
 
diff --git a/Casks/shoes.rb b/Casks/shoes.rb
index ea687d44ceae..d34a0e559f39 100644
--- a/Casks/shoes.rb
+++ b/Casks/shoes.rb
@@ -1,4 +1,4 @@
-class Shoes < Cask
+cask :v1 => 'shoes' do
   version '3.2.16'
   sha256 'dab8e717bc49e5c33654fde487cf1f0bef9dc6832df31dc54d084e8c5843532a'
 
diff --git a/Casks/shortcat.rb b/Casks/shortcat.rb
index cccf79fd1f79..d3b5923d881b 100644
--- a/Casks/shortcat.rb
+++ b/Casks/shortcat.rb
@@ -1,4 +1,4 @@
-class Shortcat < Cask
+cask :v1 => 'shortcat' do
   version '0.7.4'
   sha256 '2f637b6ca13d7ea7f2635d617045695125a5a0ad6c20e913e9ea148ff9bed242'
 
diff --git a/Casks/shotcut.rb b/Casks/shotcut.rb
index f1f4dc984f1c..ccba335109b5 100644
--- a/Casks/shotcut.rb
+++ b/Casks/shotcut.rb
@@ -1,4 +1,4 @@
-class Shotcut < Cask
+cask :v1 => 'shotcut' do
   version '14.10.05'
   sha256 '8d2dc72bde1fd9cd2646a9bf93fd3e9c0a91c56a5274a046cb21706ba9a490a6'
 
diff --git a/Casks/shuttle.rb b/Casks/shuttle.rb
index d280ecc9fa7e..f73d486fe497 100644
--- a/Casks/shuttle.rb
+++ b/Casks/shuttle.rb
@@ -1,4 +1,4 @@
-class Shuttle < Cask
+cask :v1 => 'shuttle' do
   version '1.2.0'
   sha256 'a6a20b461556e54c99f14eaaaa4ee8e41cb0250561525be87340f0fda635d2b3'
 
diff --git a/Casks/sickbeard-anime.rb b/Casks/sickbeard-anime.rb
index c6c747441497..c8ff91bfd76b 100644
--- a/Casks/sickbeard-anime.rb
+++ b/Casks/sickbeard-anime.rb
@@ -1,4 +1,4 @@
-class SickbeardAnime < Cask
+cask :v1 => 'sickbeard-anime' do
   version '13.05.25'
   sha256 '402d6eb6df5d0c75f190cfe23e0d59cacaa857f94a902f2728fb20cae64d2f36'
 
diff --git a/Casks/sickbeard.rb b/Casks/sickbeard.rb
index 8383287308cf..059c4d54faaf 100644
--- a/Casks/sickbeard.rb
+++ b/Casks/sickbeard.rb
@@ -1,4 +1,4 @@
-class Sickbeard < Cask
+cask :v1 => 'sickbeard' do
   version '13.05.25'
   sha256 'c6ce8b987447d074622d5ee0c96ee6a6da121f5a43252a552e0fc6f5d1cc0550'
 
diff --git a/Casks/sidekick.rb b/Casks/sidekick.rb
index dcd0c4800fd1..49f980d06781 100644
--- a/Casks/sidekick.rb
+++ b/Casks/sidekick.rb
@@ -1,4 +1,4 @@
-class Sidekick < Cask
+cask :v1 => 'sidekick' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sidestep.rb b/Casks/sidestep.rb
index db4997dccbeb..744790de994f 100644
--- a/Casks/sidestep.rb
+++ b/Casks/sidestep.rb
@@ -1,4 +1,4 @@
-class Sidestep < Cask
+cask :v1 => 'sidestep' do
   version '1.4.1'
   sha256 'c25f7748d73b6f915aff268070ef85ca69f2902de98b044b77c49d1e1341d84e'
 
diff --git a/Casks/sidplay.rb b/Casks/sidplay.rb
index 5dda537dd001..cd495a94e76a 100644
--- a/Casks/sidplay.rb
+++ b/Casks/sidplay.rb
@@ -1,4 +1,4 @@
-class Sidplay < Cask
+cask :v1 => 'sidplay' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sigil.rb b/Casks/sigil.rb
index c38fffd46509..98bfa6c8031f 100644
--- a/Casks/sigil.rb
+++ b/Casks/sigil.rb
@@ -1,4 +1,4 @@
-class Sigil < Cask
+cask :v1 => 'sigil' do
   version '0.8.0'
   sha256 'cafe9a942f787d4588445bf9fc5cbbd62531724e955cb7eec2f714a745fa82b3'
 
diff --git a/Casks/silo.rb b/Casks/silo.rb
index 45511c4a44a2..fe88326bd2de 100644
--- a/Casks/silo.rb
+++ b/Casks/silo.rb
@@ -1,4 +1,4 @@
-class Silo < Cask
+cask :v1 => 'silo' do
   version '2.3.02'
   sha256 '7d84001382c3d12ad2f436fdb5572a60335a9e1dbac6505fd959fc776efaf365'
 
diff --git a/Casks/silverback.rb b/Casks/silverback.rb
index 5b49f75ea8e1..6474543a6191 100644
--- a/Casks/silverback.rb
+++ b/Casks/silverback.rb
@@ -1,4 +1,4 @@
-class Silverback < Cask
+cask :v1 => 'silverback' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/silverlight.rb b/Casks/silverlight.rb
index 39d8b2f3b902..2196fca979e2 100644
--- a/Casks/silverlight.rb
+++ b/Casks/silverlight.rb
@@ -1,4 +1,4 @@
-class Silverlight < Cask
+cask :v1 => 'silverlight' do
   version '5.1.30514.0'
   sha256 '469a7b19cf4a87a1248caa850c7de61c88e67c0c5511fe77032817cd79df9dea'
 
diff --git a/Casks/simon.rb b/Casks/simon.rb
index a3d47d619d1c..5ea176c06894 100644
--- a/Casks/simon.rb
+++ b/Casks/simon.rb
@@ -1,4 +1,4 @@
-class Simon < Cask
+cask :v1 => 'simon' do
   version '3.6.1'
   sha256 '19a3395bdfd0c8c400c4e489e6d6ff192415661033e91023fc4c9297b28b4168'
 
diff --git a/Casks/simpholders.rb b/Casks/simpholders.rb
index 3cd74fd5415d..c5c8f4ec50d8 100644
--- a/Casks/simpholders.rb
+++ b/Casks/simpholders.rb
@@ -1,4 +1,4 @@
-class Simpholders < Cask
+cask :v1 => 'simpholders' do
   version '1.5.0'
   sha256 '2f4fb58a20d94a858c4d53648ee37fd082e23f50ef3f367fbaef4d6cea840cd6'
 
diff --git a/Casks/simple-comic.rb b/Casks/simple-comic.rb
index e4a20e54c022..6a1e6015bf3f 100644
--- a/Casks/simple-comic.rb
+++ b/Casks/simple-comic.rb
@@ -1,4 +1,4 @@
-class SimpleComic < Cask
+cask :v1 => 'simple-comic' do
   version '1.7_252'
   sha256 '4ddd18a02a79fc8201824e6ab99291c6d4c8680f79f94bc372bf71f0535def35'
 
diff --git a/Casks/simple-css.rb b/Casks/simple-css.rb
index 05a07f124211..4148ee6560fb 100644
--- a/Casks/simple-css.rb
+++ b/Casks/simple-css.rb
@@ -1,4 +1,4 @@
-class SimpleCss < Cask
+cask :v1 => 'simple-css' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/simplecap.rb b/Casks/simplecap.rb
index 3871526a01b2..6019699b419b 100644
--- a/Casks/simplecap.rb
+++ b/Casks/simplecap.rb
@@ -1,4 +1,4 @@
-class Simplecap < Cask
+cask :v1 => 'simplecap' do
   version '1.2.1'
   sha256 'e15f7ac1c9c07821aee2c6e091185f57e49d99f42f992cf3c27bfd059daa3d7f'
 
diff --git a/Casks/simplefloatingclock.rb b/Casks/simplefloatingclock.rb
index 44379785d5c5..f07bed8df2f9 100644
--- a/Casks/simplefloatingclock.rb
+++ b/Casks/simplefloatingclock.rb
@@ -1,4 +1,4 @@
-class Simplefloatingclock < Cask
+cask :v1 => 'simplefloatingclock' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/simpless.rb b/Casks/simpless.rb
index 966d6521c511..d1cc90e8198e 100644
--- a/Casks/simpless.rb
+++ b/Casks/simpless.rb
@@ -1,4 +1,4 @@
-class Simpless < Cask
+cask :v1 => 'simpless' do
   version '1.4'
   sha256 '424b1b8b56f0568beef107bea2c81d4cc9576f850a3ba84f8b5b5abbc0715886'
 
diff --git a/Casks/simplesynth.rb b/Casks/simplesynth.rb
index 6c489191926a..485691b835c2 100644
--- a/Casks/simplesynth.rb
+++ b/Casks/simplesynth.rb
@@ -1,4 +1,4 @@
-class Simplesynth < Cask
+cask :v1 => 'simplesynth' do
   version '1.1'
   sha256 '5d70295d5a72075a26b158f5a92b1488170e8ff569f0a52c4e5e5bcfe7ffcdb2'
 
diff --git a/Casks/simpletag.rb b/Casks/simpletag.rb
index 030b3049435c..05bcd9fff98a 100644
--- a/Casks/simpletag.rb
+++ b/Casks/simpletag.rb
@@ -1,4 +1,4 @@
-class Simpletag < Cask
+cask :v1 => 'simpletag' do
   version '1.5.8'
   sha256 'dcd183808fa09dd15d7ec9c1050fee7588e59b9bbaa8cd0fd49e337d2ed2028a'
 
diff --git a/Casks/simulator-folders.rb b/Casks/simulator-folders.rb
index 5244d2f743bf..f6e3fdf2759c 100644
--- a/Casks/simulator-folders.rb
+++ b/Casks/simulator-folders.rb
@@ -1,4 +1,4 @@
-class SimulatorFolders < Cask
+cask :v1 => 'simulator-folders' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sitesucker.rb b/Casks/sitesucker.rb
index 7c472c76cee3..96fefeabbd19 100644
--- a/Casks/sitesucker.rb
+++ b/Casks/sitesucker.rb
@@ -1,4 +1,4 @@
-class Sitesucker < Cask
+cask :v1 => 'sitesucker' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sixtyforce.rb b/Casks/sixtyforce.rb
index 9647b75645b5..9a5cc0ae615c 100644
--- a/Casks/sixtyforce.rb
+++ b/Casks/sixtyforce.rb
@@ -1,4 +1,4 @@
-class Sixtyforce < Cask
+cask :v1 => 'sixtyforce' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sizeup.rb b/Casks/sizeup.rb
index 089aebee3d9f..f1241b4ea17f 100644
--- a/Casks/sizeup.rb
+++ b/Casks/sizeup.rb
@@ -1,4 +1,4 @@
-class Sizeup < Cask
+cask :v1 => 'sizeup' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sizzlingkeys.rb b/Casks/sizzlingkeys.rb
index 3c4090108a59..fc758e078f3d 100644
--- a/Casks/sizzlingkeys.rb
+++ b/Casks/sizzlingkeys.rb
@@ -1,4 +1,4 @@
-class Sizzlingkeys < Cask
+cask :v1 => 'sizzlingkeys' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sketch-tool.rb b/Casks/sketch-tool.rb
index 7dfaa9ac78cc..6b6737145139 100644
--- a/Casks/sketch-tool.rb
+++ b/Casks/sketch-tool.rb
@@ -1,4 +1,4 @@
-class SketchTool < Cask
+cask :v1 => 'sketch-tool' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sketch-toolbox.rb b/Casks/sketch-toolbox.rb
index d4fd848fe869..095d420101f4 100644
--- a/Casks/sketch-toolbox.rb
+++ b/Casks/sketch-toolbox.rb
@@ -1,4 +1,4 @@
-class SketchToolbox < Cask
+cask :v1 => 'sketch-toolbox' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sketch.rb b/Casks/sketch.rb
index f47eedd37a91..fa44313d387f 100644
--- a/Casks/sketch.rb
+++ b/Casks/sketch.rb
@@ -1,4 +1,4 @@
-class Sketch < Cask
+cask :v1 => 'sketch' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sketchup.rb b/Casks/sketchup.rb
index 94e08248c69b..8a22e42293aa 100644
--- a/Casks/sketchup.rb
+++ b/Casks/sketchup.rb
@@ -1,4 +1,4 @@
-class Sketchup < Cask
+cask :v1 => 'sketchup' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sketchupviewer.rb b/Casks/sketchupviewer.rb
index f09481b38d1f..db2b65254808 100644
--- a/Casks/sketchupviewer.rb
+++ b/Casks/sketchupviewer.rb
@@ -1,4 +1,4 @@
-class Sketchupviewer < Cask
+cask :v1 => 'sketchupviewer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/skim.rb b/Casks/skim.rb
index 5bc2857e55c6..707217ced4fc 100644
--- a/Casks/skim.rb
+++ b/Casks/skim.rb
@@ -1,4 +1,4 @@
-class Skim < Cask
+cask :v1 => 'skim' do
   version '1.4.9'
   sha256 'b8964263e06b37b81443659d4c96385866d5b0af6e65ce393095b46e95591546'
 
diff --git a/Casks/skitch.rb b/Casks/skitch.rb
index 82ded5e0881d..99642de97cae 100644
--- a/Casks/skitch.rb
+++ b/Casks/skitch.rb
@@ -1,4 +1,4 @@
-class Skitch < Cask
+cask :v1 => 'skitch' do
   version '2.7.6'
   sha256 '9734154ad202152f24de7730a43cf463a93606623a6e992508724542c9de8178'
 
diff --git a/Casks/skreenics.rb b/Casks/skreenics.rb
index f0917e0b7aee..31db0e1e8ee0 100644
--- a/Casks/skreenics.rb
+++ b/Casks/skreenics.rb
@@ -1,4 +1,4 @@
-class Skreenics < Cask
+cask :v1 => 'skreenics' do
   version '1.0.1'
   sha256 'c4edd3cb8d066c5b5ce8ab78fe476776d04ad5b8e28eb7128bb183903f7dd8b9'
 
diff --git a/Casks/skydrive.rb b/Casks/skydrive.rb
index a772596323b4..04c38be83d77 100644
--- a/Casks/skydrive.rb
+++ b/Casks/skydrive.rb
@@ -1,4 +1,4 @@
-class Skydrive < Cask
+cask :v1 => 'skydrive' do
   version '17.0'
   sha256 '02fd7450e501228dc94108068636c3085a970d039198472fa8eb4bbbf3ee3722'
 
diff --git a/Casks/skype.rb b/Casks/skype.rb
index 3b286ffca643..760297bfa63f 100644
--- a/Casks/skype.rb
+++ b/Casks/skype.rb
@@ -1,4 +1,4 @@
-class Skype < Cask
+cask :v1 => 'skype' do
 
   if MacOS.version < :mavericks
     version '6.15.0.335'
diff --git a/Casks/slack.rb b/Casks/slack.rb
index 3befe089f0c1..0062a813717b 100644
--- a/Casks/slack.rb
+++ b/Casks/slack.rb
@@ -1,4 +1,4 @@
-class Slack < Cask
+cask :v1 => 'slack' do
   version '1.0'
   sha256 '3cb5c52077388042006104d18ec1b7c230ededcf9f9691df2a42687e86f3b40c'
 
diff --git a/Casks/slate.rb b/Casks/slate.rb
index 2a2a185f5c62..8247c9e59e49 100644
--- a/Casks/slate.rb
+++ b/Casks/slate.rb
@@ -1,4 +1,4 @@
-class Slate < Cask
+cask :v1 => 'slate' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sleep-monitor.rb b/Casks/sleep-monitor.rb
index 3db4ddde2558..fa514f3ed72b 100644
--- a/Casks/sleep-monitor.rb
+++ b/Casks/sleep-monitor.rb
@@ -1,4 +1,4 @@
-class SleepMonitor < Cask
+cask :v1 => 'sleep-monitor' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/slender.rb b/Casks/slender.rb
index b6655d147a94..18df9c3a542e 100644
--- a/Casks/slender.rb
+++ b/Casks/slender.rb
@@ -1,4 +1,4 @@
-class Slender < Cask
+cask :v1 => 'slender' do
   version '2.1.1'
   sha256 '6235751e4510df2095ebae8e3588ed32d858d2f4612b5f020aea7efd4ff60cf0'
 
diff --git a/Casks/slic3r.rb b/Casks/slic3r.rb
index be5f2e559dc7..4166cd7af7ff 100644
--- a/Casks/slic3r.rb
+++ b/Casks/slic3r.rb
@@ -1,4 +1,4 @@
-class Slic3r < Cask
+cask :v1 => 'slic3r' do
   version '1.1.7'
   sha256 '41ae1c3c5ee7ddeb2431698b63f6e4112c68b830de9f024730388a1eb062f80b'
 
diff --git a/Casks/slice.rb b/Casks/slice.rb
index be625b4322e2..32bb51d39a99 100644
--- a/Casks/slice.rb
+++ b/Casks/slice.rb
@@ -1,4 +1,4 @@
-class Slice < Cask
+cask :v1 => 'slice' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/slicy.rb b/Casks/slicy.rb
index 41cbe1fbbf0b..92f7a0cc64ee 100644
--- a/Casks/slicy.rb
+++ b/Casks/slicy.rb
@@ -1,4 +1,4 @@
-class Slicy < Cask
+cask :v1 => 'slicy' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/slidemode.rb b/Casks/slidemode.rb
index 3c5de3db9507..b9153275aa0a 100644
--- a/Casks/slidemode.rb
+++ b/Casks/slidemode.rb
@@ -1,4 +1,4 @@
-class Slidemode < Cask
+cask :v1 => 'slidemode' do
   version '0.0.5'
   sha256 '0c417eb7c4ca57da318260ad1d023ed8ad06deab74d3c0ae0a5d9658b34ab68c'
 
diff --git a/Casks/slimbatterymonitor.rb b/Casks/slimbatterymonitor.rb
index 9eead02a6704..838333e881b6 100644
--- a/Casks/slimbatterymonitor.rb
+++ b/Casks/slimbatterymonitor.rb
@@ -1,4 +1,4 @@
-class Slimbatterymonitor < Cask
+cask :v1 => 'slimbatterymonitor' do
   version '1.5'
   sha256 '587ce35b534c26b489b60d7f4ca71a96c1dcd83193a30c58676ae8d4665c6aff'
 
diff --git a/Casks/slimboat.rb b/Casks/slimboat.rb
index 9589e5b63f14..505273d980da 100644
--- a/Casks/slimboat.rb
+++ b/Casks/slimboat.rb
@@ -1,4 +1,4 @@
-class Slimboat < Cask
+cask :v1 => 'slimboat' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/slingshot.rb b/Casks/slingshot.rb
index 270a3f276a52..74f3c7a3387b 100644
--- a/Casks/slingshot.rb
+++ b/Casks/slingshot.rb
@@ -1,4 +1,4 @@
-class Slingshot < Cask
+cask :v1 => 'slingshot' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sloth.rb b/Casks/sloth.rb
index 5d4f9ae16a80..88b0aaaec82d 100644
--- a/Casks/sloth.rb
+++ b/Casks/sloth.rb
@@ -1,4 +1,4 @@
-class Sloth < Cask
+cask :v1 => 'sloth' do
   version '1.5'
   sha256 '01f8f9fec88d5bc0cb0edcf7391d5ed0ac085f7fa8dcb6682059a238d7786165'
 
diff --git a/Casks/slowy.rb b/Casks/slowy.rb
index 2359ffe67d09..dd6a9dc1847c 100644
--- a/Casks/slowy.rb
+++ b/Casks/slowy.rb
@@ -1,4 +1,4 @@
-class Slowy < Cask
+cask :v1 => 'slowy' do
   version '1.7'
   sha256 '0b2c6414c01d4e940e1df26034258a8401f0f302278a00ff13adeecada582c81'
 
diff --git a/Casks/smaller.rb b/Casks/smaller.rb
index e870d6d90b63..82a8a3f6ab5f 100644
--- a/Casks/smaller.rb
+++ b/Casks/smaller.rb
@@ -1,4 +1,4 @@
-class Smaller < Cask
+cask :v1 => 'smaller' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/smartgithg.rb b/Casks/smartgithg.rb
index 6348ee91c552..413ee85a83c3 100644
--- a/Casks/smartgithg.rb
+++ b/Casks/smartgithg.rb
@@ -1,4 +1,4 @@
-class Smartgithg < Cask
+cask :v1 => 'smartgithg' do
   version '6.0.8'
   sha256 '6540fe06e4a23438afd5d397af48bb95b7bf8befbc0d6809b7fe16d418b0e03b'
 
diff --git a/Casks/smartloader.rb b/Casks/smartloader.rb
index d2063ffcb256..9a95aae1895b 100644
--- a/Casks/smartloader.rb
+++ b/Casks/smartloader.rb
@@ -1,4 +1,4 @@
-class Smartloader < Cask
+cask :v1 => 'smartloader' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/smartsynchronize.rb b/Casks/smartsynchronize.rb
index 28dfc5750474..1554e1d564d5 100644
--- a/Casks/smartsynchronize.rb
+++ b/Casks/smartsynchronize.rb
@@ -1,4 +1,4 @@
-class Smartsynchronize < Cask
+cask :v1 => 'smartsynchronize' do
   version '3.4'
   sha256 'f7d30bae37c835ea208ff60b5b99c2668e3406c06f1321862495a425a9389322'
 
diff --git a/Casks/smcfancontrol.rb b/Casks/smcfancontrol.rb
index 575ccf160e77..467fab981598 100644
--- a/Casks/smcfancontrol.rb
+++ b/Casks/smcfancontrol.rb
@@ -1,4 +1,4 @@
-class Smcfancontrol < Cask
+cask :v1 => 'smcfancontrol' do
   version '2.5.1'
   sha256 'ed6dcee1cff9cff3def1b9d98c7bb868b12b9e26205f81915a95187e0d4ed826'
 
diff --git a/Casks/smlnj.rb b/Casks/smlnj.rb
index 0629a2877fa1..33b4cf501d70 100644
--- a/Casks/smlnj.rb
+++ b/Casks/smlnj.rb
@@ -1,4 +1,4 @@
-class Smlnj < Cask
+cask :v1 => 'smlnj' do
   version '110.77'
   sha256 '77265ce1bdbca3e9c9b3053195503bf2bffafbba196596679fb64d9ceb4e25ee'
 
diff --git a/Casks/smoothmouse.rb b/Casks/smoothmouse.rb
index cf67d71357f9..a4c58b43febe 100644
--- a/Casks/smoothmouse.rb
+++ b/Casks/smoothmouse.rb
@@ -1,4 +1,4 @@
-class Smoothmouse < Cask
+cask :v1 => 'smoothmouse' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/snagit.rb b/Casks/snagit.rb
index 97ebacc39feb..595332fd3417 100644
--- a/Casks/snagit.rb
+++ b/Casks/snagit.rb
@@ -1,4 +1,4 @@
-class Snagit < Cask
+cask :v1 => 'snagit' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/snapped.rb b/Casks/snapped.rb
index 0faf9d32bb20..a67598ea46e5 100644
--- a/Casks/snapped.rb
+++ b/Casks/snapped.rb
@@ -1,4 +1,4 @@
-class Snapped < Cask
+cask :v1 => 'snapped' do
   version '0.1.5'
   sha256 '8cec22bd0c88b1fb0680e018a6706aeaf925688b84bdd2c7a2e5fdb99d20bd52'
 
diff --git a/Casks/snes9x.rb b/Casks/snes9x.rb
index ca56595763a7..da48b9a37729 100644
--- a/Casks/snes9x.rb
+++ b/Casks/snes9x.rb
@@ -1,4 +1,4 @@
-class Snes9x < Cask
+cask :v1 => 'snes9x' do
   version '1.53'
   sha256 '48b0cbec848e7c2a24de1b30819dc150b62e354600cbcc0a6a5e2cf8e1de48ff'
 
diff --git a/Casks/snip.rb b/Casks/snip.rb
index fefec91706d8..b403584975fb 100644
--- a/Casks/snip.rb
+++ b/Casks/snip.rb
@@ -1,4 +1,4 @@
-class Snip < Cask
+cask :v1 => 'snip' do
   version '2.0_5771'
   sha256 '2e9c2863d4412dbfa1323c1f2cb056c6a81b77d520c8b2a732cade1e7b40df00'
 
diff --git a/Casks/snippet-edit.rb b/Casks/snippet-edit.rb
index ca0b50ad7343..2283d1af243b 100644
--- a/Casks/snippet-edit.rb
+++ b/Casks/snippet-edit.rb
@@ -1,4 +1,4 @@
-class SnippetEdit < Cask
+cask :v1 => 'snippet-edit' do
   version '1.2.1'
   sha256 '2a6ee1b3ecd5d5d84743be9d81b36e969f05fe40209d8877008dc6f60d95d37c'
 
diff --git a/Casks/snippets.rb b/Casks/snippets.rb
index 6398a9336a35..31ac976d6bd0 100644
--- a/Casks/snippets.rb
+++ b/Casks/snippets.rb
@@ -1,4 +1,4 @@
-class Snippets < Cask
+cask :v1 => 'snippets' do
   version '0.8.2'
   sha256 '32167664dacd3301dd89e618093c3ce7a7dcd0204061d34f7759bad3c9a7cc78'
 
diff --git a/Casks/snowtape.rb b/Casks/snowtape.rb
index 4b6ec3aaf159..e7c6a0035d1e 100644
--- a/Casks/snowtape.rb
+++ b/Casks/snowtape.rb
@@ -1,4 +1,4 @@
-class Snowtape < Cask
+cask :v1 => 'snowtape' do
   version '2.1-1076'
   sha256 '85d30c9b77ab926efa1954fe86f32cd7d3723aad1da62c91f4b88322582e5952'
 
diff --git a/Casks/sococo.rb b/Casks/sococo.rb
index 5d64177d2b04..bfd365771b3d 100644
--- a/Casks/sococo.rb
+++ b/Casks/sococo.rb
@@ -1,4 +1,4 @@
-class Sococo < Cask
+cask :v1 => 'sococo' do
   version '3.2.7'
   sha256 '6772f2c2ef5c7b046612de408b79a71ed0936041fb9286785af69d862f653d1f'
 
diff --git a/Casks/sofortbild.rb b/Casks/sofortbild.rb
index bfdc3651c452..9056232bdeec 100644
--- a/Casks/sofortbild.rb
+++ b/Casks/sofortbild.rb
@@ -1,4 +1,4 @@
-class Sofortbild < Cask
+cask :v1 => 'sofortbild' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sogouinput.rb b/Casks/sogouinput.rb
index 66618b20ecfb..823834bf4385 100644
--- a/Casks/sogouinput.rb
+++ b/Casks/sogouinput.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-class Sogouinput < Cask
+cask :v1 => 'sogouinput' do
   version '3.0.0'
   sha256 'a11ef502efc364cce4191a0d2e6fb375fe9636438045b522431ac8829b40eae5'
 
diff --git a/Casks/soleol.rb b/Casks/soleol.rb
index 0c3b0fec35fa..76ad3aa103fa 100644
--- a/Casks/soleol.rb
+++ b/Casks/soleol.rb
@@ -1,4 +1,4 @@
-class Soleol < Cask
+cask :v1 => 'soleol' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sonic-pi.rb b/Casks/sonic-pi.rb
index fac2ceae87ae..5a90ba03fbc3 100644
--- a/Casks/sonic-pi.rb
+++ b/Casks/sonic-pi.rb
@@ -1,4 +1,4 @@
-class SonicPi < Cask
+cask :v1 => 'sonic-pi' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sonic-visualiser.rb b/Casks/sonic-visualiser.rb
index 933cfb04341f..c612afa32fea 100644
--- a/Casks/sonic-visualiser.rb
+++ b/Casks/sonic-visualiser.rb
@@ -1,4 +1,4 @@
-class SonicVisualiser < Cask
+cask :v1 => 'sonic-visualiser' do
   version '2.3'
   sha256 '8a8c6c5268f10dd6614afeabd40a4fa962a31d55db0aed1ddf369c5a5b8b4981'
 
diff --git a/Casks/sonora.rb b/Casks/sonora.rb
index cee780200b2b..a6723b75ceea 100644
--- a/Casks/sonora.rb
+++ b/Casks/sonora.rb
@@ -1,4 +1,4 @@
-class Sonora < Cask
+cask :v1 => 'sonora' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sonos.rb b/Casks/sonos.rb
index 7411ed7b8cf5..0ba8ce3d1fc3 100644
--- a/Casks/sonos.rb
+++ b/Casks/sonos.rb
@@ -1,4 +1,4 @@
-class Sonos < Cask
+cask :v1 => 'sonos' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sopcast.rb b/Casks/sopcast.rb
index 01a111d42549..d4ba243c5e96 100644
--- a/Casks/sopcast.rb
+++ b/Casks/sopcast.rb
@@ -1,4 +1,4 @@
-class Sopcast < Cask
+cask :v1 => 'sopcast' do
   version '1.3.5'
   sha256 'aa463ff35f3a920d03615d44fc27003c7cdc79880910a9f8eebd9e8a97e26532'
 
diff --git a/Casks/sophos-anti-virus-home-edition.rb b/Casks/sophos-anti-virus-home-edition.rb
index a91114e7c3b8..a34cc3400d78 100644
--- a/Casks/sophos-anti-virus-home-edition.rb
+++ b/Casks/sophos-anti-virus-home-edition.rb
@@ -1,4 +1,4 @@
-class SophosAntiVirusHomeEdition < Cask
+cask :v1 => 'sophos-anti-virus-home-edition' do
   version '9.0'
   sha256 '86bcd0a10de1dc2455f3f1e9330c0b083e30ce435822daaa7ea10f04f63f5f10'
 
diff --git a/Casks/soqlxplorer.rb b/Casks/soqlxplorer.rb
index 66d5794a0297..20e41d2b7ca6 100644
--- a/Casks/soqlxplorer.rb
+++ b/Casks/soqlxplorer.rb
@@ -1,4 +1,4 @@
-class Soqlxplorer < Cask
+cask :v1 => 'soqlxplorer' do
   version '2.00'
   sha256 '72c5d9dc582bc30d757c5199cdebdc79ffee479a3435252906554d52b236217d'
 
diff --git a/Casks/soulseek.rb b/Casks/soulseek.rb
index d27dc6f27553..2a46612305ef 100644
--- a/Casks/soulseek.rb
+++ b/Casks/soulseek.rb
@@ -1,4 +1,4 @@
-class Soulseek < Cask
+cask :v1 => 'soulseek' do
   version '2014-8-31'
   sha256 'd62206bdd11a6ff9b63e648e6dafe3e52e100b26677b58b4a9c40ef9d73e4b8a'
 
diff --git a/Casks/soulver.rb b/Casks/soulver.rb
index 2041124cb785..adb6791d97d9 100644
--- a/Casks/soulver.rb
+++ b/Casks/soulver.rb
@@ -1,4 +1,4 @@
-class Soulver < Cask
+cask :v1 => 'soulver' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/soundcleod.rb b/Casks/soundcleod.rb
index da62d6402a6d..4cfdab701e9d 100644
--- a/Casks/soundcleod.rb
+++ b/Casks/soundcleod.rb
@@ -1,4 +1,4 @@
-class Soundcleod < Cask
+cask :v1 => 'soundcleod' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/soundflower.rb b/Casks/soundflower.rb
index 5633cf0d25e3..cd98c0387563 100644
--- a/Casks/soundflower.rb
+++ b/Casks/soundflower.rb
@@ -1,4 +1,4 @@
-class Soundflower < Cask
+cask :v1 => 'soundflower' do
   version '1.6.6b'
   sha256 '61ca31d7478d057e32caaeac3c739f965ba9eb2a27570b3cc715e706d4740dfb'
 
diff --git a/Casks/soundnote.rb b/Casks/soundnote.rb
index 9bbf6728630f..1db7160e8aaf 100644
--- a/Casks/soundnote.rb
+++ b/Casks/soundnote.rb
@@ -1,4 +1,4 @@
-class Soundnote < Cask
+cask :v1 => 'soundnote' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sourcetree.rb b/Casks/sourcetree.rb
index f554275628e4..d3b53f06d20f 100644
--- a/Casks/sourcetree.rb
+++ b/Casks/sourcetree.rb
@@ -1,4 +1,4 @@
-class Sourcetree < Cask
+cask :v1 => 'sourcetree' do
   version '2.0.3'
   sha256 '66f7f8186ff8afa1e8d26fc26bd55ad73380de3d5d9aa5985dfa6b7d143dd0ec'
 
diff --git a/Casks/spacemonkey.rb b/Casks/spacemonkey.rb
index c2d0a8547b4a..e3817ad098d3 100644
--- a/Casks/spacemonkey.rb
+++ b/Casks/spacemonkey.rb
@@ -1,4 +1,4 @@
-class Spacemonkey < Cask
+cask :v1 => 'spacemonkey' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/spacious.rb b/Casks/spacious.rb
index 4243a2e89e07..fa77d13df78a 100644
--- a/Casks/spacious.rb
+++ b/Casks/spacious.rb
@@ -1,4 +1,4 @@
-class Spacious < Cask
+cask :v1 => 'spacious' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/spark-inspector.rb b/Casks/spark-inspector.rb
index f2ad7e49fc2f..9785a6845b99 100644
--- a/Casks/spark-inspector.rb
+++ b/Casks/spark-inspector.rb
@@ -1,4 +1,4 @@
-class SparkInspector < Cask
+cask :v1 => 'spark-inspector' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/spark.rb b/Casks/spark.rb
index 759271b72149..e869b161749f 100644
--- a/Casks/spark.rb
+++ b/Casks/spark.rb
@@ -1,4 +1,4 @@
-class Spark < Cask
+cask :v1 => 'spark' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sparkbox.rb b/Casks/sparkbox.rb
index c7c06ba77eb2..181a27586bdf 100644
--- a/Casks/sparkbox.rb
+++ b/Casks/sparkbox.rb
@@ -1,4 +1,4 @@
-class Sparkbox < Cask
+cask :v1 => 'sparkbox' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sparkle.rb b/Casks/sparkle.rb
index fbe47ec5c677..cab0d6f62797 100644
--- a/Casks/sparkle.rb
+++ b/Casks/sparkle.rb
@@ -1,4 +1,4 @@
-class Sparkle < Cask
+cask :v1 => 'sparkle' do
   version '1.8.0'
   sha256 '882f2e414d2d8a3e776f9a9888cbfcb744df88f3b061325c2aad3c965af5ac1a'
 
diff --git a/Casks/sparkleshare.rb b/Casks/sparkleshare.rb
index 7a08d096f30d..bd818c1dc136 100644
--- a/Casks/sparkleshare.rb
+++ b/Casks/sparkleshare.rb
@@ -1,4 +1,4 @@
-class Sparkleshare < Cask
+cask :v1 => 'sparkleshare' do
   version '1.4'
   sha256 '571a8e39591883f0af6fb9056db8c1a0835cc0babb73b07050a188165552c038'
 
diff --git a/Casks/sparrow.rb b/Casks/sparrow.rb
index 530fe10d50a7..13344d1b8bc6 100644
--- a/Casks/sparrow.rb
+++ b/Casks/sparrow.rb
@@ -1,4 +1,4 @@
-class Sparrow < Cask
+cask :v1 => 'sparrow' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/spectacle.rb b/Casks/spectacle.rb
index abe821cea60f..4174c08a91b6 100644
--- a/Casks/spectacle.rb
+++ b/Casks/spectacle.rb
@@ -1,4 +1,4 @@
-class Spectacle < Cask
+cask :v1 => 'spectacle' do
   if MacOS.version < :mavericks
     version '0.8.6'
     sha256 '3e367d2d7e6fe7d5f41d717d49cb087ba7432624b71ddd91c0cfa9d5a5459b7c'
diff --git a/Casks/speedcrunch.rb b/Casks/speedcrunch.rb
index 91ec762645f3..c32b0afd5578 100644
--- a/Casks/speedcrunch.rb
+++ b/Casks/speedcrunch.rb
@@ -1,4 +1,4 @@
-class Speedcrunch < Cask
+cask :v1 => 'speedcrunch' do
   version '0.11'
   sha256 '1ce5ef9d167614a2e63daad43a23bd8df60b8ea641df6be9aabdf826bbb5a826'
 
diff --git a/Casks/speedlimit.rb b/Casks/speedlimit.rb
index 6f2477f084f7..a7c83f4c0e5a 100644
--- a/Casks/speedlimit.rb
+++ b/Casks/speedlimit.rb
@@ -1,4 +1,4 @@
-class Speedlimit < Cask
+cask :v1 => 'speedlimit' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/speedtao.rb b/Casks/speedtao.rb
index 7df782e11bc8..354da06115e3 100644
--- a/Casks/speedtao.rb
+++ b/Casks/speedtao.rb
@@ -1,4 +1,4 @@
-class Speedtao < Cask
+cask :v1 => 'speedtao' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/spek.rb b/Casks/spek.rb
index 235c8cf05068..6060c0756fb6 100644
--- a/Casks/spek.rb
+++ b/Casks/spek.rb
@@ -1,4 +1,4 @@
-class Spek < Cask
+cask :v1 => 'spek' do
   version '0.8.3'
   sha256 '648ffe37a4605d76b8d63ca677503ba63338b84c5df73961d9a5335ff144cc54'
 
diff --git a/Casks/spideroak.rb b/Casks/spideroak.rb
index 6b7e28dde56a..cd2561030aca 100644
--- a/Casks/spideroak.rb
+++ b/Casks/spideroak.rb
@@ -1,4 +1,4 @@
-class Spideroak < Cask
+cask :v1 => 'spideroak' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/spillo.rb b/Casks/spillo.rb
index 88165fb49d6b..3cf8c0f077cd 100644
--- a/Casks/spillo.rb
+++ b/Casks/spillo.rb
@@ -1,4 +1,4 @@
-class Spillo < Cask
+cask :v1 => 'spillo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/splashtop-personal.rb b/Casks/splashtop-personal.rb
index 18126e3815c6..039ef86bd5ec 100644
--- a/Casks/splashtop-personal.rb
+++ b/Casks/splashtop-personal.rb
@@ -1,4 +1,4 @@
-class SplashtopPersonal < Cask
+cask :v1 => 'splashtop-personal' do
   version '2.4.3.1'
   sha256 'a0167ad134b3134e9b3e5e0a26238aed04ef230f3cabcddd7fd0fef9d82687aa'
 
diff --git a/Casks/splashtop-streamer.rb b/Casks/splashtop-streamer.rb
index 7e5524dc9b82..b7ecb640fd05 100644
--- a/Casks/splashtop-streamer.rb
+++ b/Casks/splashtop-streamer.rb
@@ -1,4 +1,4 @@
-class SplashtopStreamer < Cask
+cask :v1 => 'splashtop-streamer' do
   version '2.4.5.3'
   sha256 '07fd11f7c19ce0c7c29e65d5182532940f74e6e4512b696c19e58389d5e86357'
 
diff --git a/Casks/splayerx.rb b/Casks/splayerx.rb
index e3c4cf574df2..53c15a575175 100644
--- a/Casks/splayerx.rb
+++ b/Casks/splayerx.rb
@@ -1,4 +1,4 @@
-class Splayerx < Cask
+cask :v1 => 'splayerx' do
   version '1.1.8'
   sha256 '75a3decacd5a8efe5b6f5638999281159cb7ddf598d158a89f3d6e157c276433'
 
diff --git a/Casks/splitshow.rb b/Casks/splitshow.rb
index a02678c0e0fc..bdbc517e304f 100644
--- a/Casks/splitshow.rb
+++ b/Casks/splitshow.rb
@@ -1,4 +1,4 @@
-class Splitshow < Cask
+cask :v1 => 'splitshow' do
   version '0.9.1'
   sha256 'd82b4f4d69dec6307901747018841e4617bfaa411acc83e43af75ca7d8b80a04'
 
diff --git a/Casks/spotdox.rb b/Casks/spotdox.rb
index cb35d6d5a677..33632991d6bc 100644
--- a/Casks/spotdox.rb
+++ b/Casks/spotdox.rb
@@ -1,4 +1,4 @@
-class Spotdox < Cask
+cask :v1 => 'spotdox' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/spotifree.rb b/Casks/spotifree.rb
index 37a62586c3ca..32847fe70aa0 100644
--- a/Casks/spotifree.rb
+++ b/Casks/spotifree.rb
@@ -1,4 +1,4 @@
-class Spotifree < Cask
+cask :v1 => 'spotifree' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/spotify-menubar.rb b/Casks/spotify-menubar.rb
index ce401ec0b8b5..1c094d4e0550 100644
--- a/Casks/spotify-menubar.rb
+++ b/Casks/spotify-menubar.rb
@@ -1,4 +1,4 @@
-class SpotifyMenubar < Cask
+cask :v1 => 'spotify-menubar' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/spotify-notifications.rb b/Casks/spotify-notifications.rb
index 64ba61a53976..3e41d3132b97 100644
--- a/Casks/spotify-notifications.rb
+++ b/Casks/spotify-notifications.rb
@@ -1,4 +1,4 @@
-class SpotifyNotifications < Cask
+cask :v1 => 'spotify-notifications' do
   version '0.4.8'
   sha256 '953028e9a1aad445005869598050cb8612980821a796563936f557e03b319f50'
 
diff --git a/Casks/spotify.rb b/Casks/spotify.rb
index dafb3aa66db5..a853acebfe8b 100644
--- a/Casks/spotify.rb
+++ b/Casks/spotify.rb
@@ -1,4 +1,4 @@
-class Spotify < Cask
+cask :v1 => 'spotify' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sputnik.rb b/Casks/sputnik.rb
index 4ffca58fdec5..6358a095e4e6 100644
--- a/Casks/sputnik.rb
+++ b/Casks/sputnik.rb
@@ -1,4 +1,4 @@
-class Sputnik < Cask
+cask :v1 => 'sputnik' do
   version '1.0.7'
   sha256 'f35342dcb780647749631597990989bb55c3df03a57fd76457ddf40237fcf750'
 
diff --git a/Casks/spyder.rb b/Casks/spyder.rb
index 62620f32c9f6..18f90b887bb9 100644
--- a/Casks/spyder.rb
+++ b/Casks/spyder.rb
@@ -1,4 +1,4 @@
-class Spyder < Cask
+cask :v1 => 'spyder' do
   version '2.3.1'
   sha256 '4e5a755a98da444343d52d8ae3273eb3dd36c1114e12f0b77de6ade387477a81'
 
diff --git a/Casks/sqleditor.rb b/Casks/sqleditor.rb
index 16253e3c4b8b..1968c7fcf766 100644
--- a/Casks/sqleditor.rb
+++ b/Casks/sqleditor.rb
@@ -1,4 +1,4 @@
-class Sqleditor < Cask
+cask :v1 => 'sqleditor' do
   version '2.7'
   sha256 '38f9d93d0ff7d680eff64949601ee4693eb91c38f89bd2f42a7e86809b36e9b5'
 
diff --git a/Casks/sqlexplorer.rb b/Casks/sqlexplorer.rb
index e6970381c24b..928a4784fc65 100644
--- a/Casks/sqlexplorer.rb
+++ b/Casks/sqlexplorer.rb
@@ -1,4 +1,4 @@
-class Sqlexplorer < Cask
+cask :v1 => 'sqlexplorer' do
   version '3.6.1'
   sha256 '57b40bf7f06d8ea125126de9c370bbd0415f5d9c68ce5200765e146acac0b05e'
 
diff --git a/Casks/sqlite-database-browser.rb b/Casks/sqlite-database-browser.rb
index 697d392e5bbb..274068cd7b87 100644
--- a/Casks/sqlite-database-browser.rb
+++ b/Casks/sqlite-database-browser.rb
@@ -1,4 +1,4 @@
-class SqliteDatabaseBrowser < Cask
+cask :v1 => 'sqlite-database-browser' do
   version '3.4.0'
   sha256 '8347deff7680fba86fcc21abb442a05a1526896d2701ed27d8aa8c38284a41ff'
 
diff --git a/Casks/sqlite-professional.rb b/Casks/sqlite-professional.rb
index 1aafeb7b0a40..50ed952dad19 100644
--- a/Casks/sqlite-professional.rb
+++ b/Casks/sqlite-professional.rb
@@ -1,4 +1,4 @@
-class SqliteProfessional < Cask
+cask :v1 => 'sqlite-professional' do
   version '1.0.39'
   sha256 '1df9746a6d936fb98d3f095973f9a65ef74494a8a9a2925ba49e9cc8e400afda'
 
diff --git a/Casks/sqlitestudio.rb b/Casks/sqlitestudio.rb
index 2f2556dec47c..3b91e251ea81 100644
--- a/Casks/sqlitestudio.rb
+++ b/Casks/sqlitestudio.rb
@@ -1,4 +1,4 @@
-class Sqlitestudio < Cask
+cask :v1 => 'sqlitestudio' do
   version '2.1.5'
   sha256 '7df2d3bc8a4aafac738b7b412f2bde82f2b1114dc30f173363ec28ae5514f882'
 
diff --git a/Casks/squidman.rb b/Casks/squidman.rb
index d1917ef8a14e..edb07d6bc6a9 100644
--- a/Casks/squidman.rb
+++ b/Casks/squidman.rb
@@ -1,4 +1,4 @@
-class Squidman < Cask
+cask :v1 => 'squidman' do
   version '3.51'
   sha256 '0bbbe1c8f26902450e62fe47e17f68f278b033355311ef295d52951feb3b6820'
 
diff --git a/Casks/squire.rb b/Casks/squire.rb
index f6f65ba05603..5d93765b63ae 100644
--- a/Casks/squire.rb
+++ b/Casks/squire.rb
@@ -1,4 +1,4 @@
-class Squire < Cask
+cask :v1 => 'squire' do
   version '0.91'
   sha256 'd37f2cdf5f08ed85e5a1f10a66c70a964e51e3a64e7c7335d97c50b1a7a1691e'
 
diff --git a/Casks/squirrel.rb b/Casks/squirrel.rb
index 0a84ace48b1f..966c92952e9d 100644
--- a/Casks/squirrel.rb
+++ b/Casks/squirrel.rb
@@ -1,4 +1,4 @@
-class Squirrel < Cask
+cask :v1 => 'squirrel' do
   version '0.9.25'
   sha256 'ec9028e097ec5130c79c6e8353c88d50729cd3f8bb15832d498fc679c4391021'
 
diff --git a/Casks/sqwiggle.rb b/Casks/sqwiggle.rb
index b9ceb9182c06..502f266e2949 100644
--- a/Casks/sqwiggle.rb
+++ b/Casks/sqwiggle.rb
@@ -1,4 +1,4 @@
-class Sqwiggle < Cask
+cask :v1 => 'sqwiggle' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/srclib.rb b/Casks/srclib.rb
index eb3d2ae09aaa..804ca9011975 100644
--- a/Casks/srclib.rb
+++ b/Casks/srclib.rb
@@ -1,4 +1,4 @@
-class Srclib < Cask
+cask :v1 => 'srclib' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/srware-iron.rb b/Casks/srware-iron.rb
index 09f66b1fe285..1c90adbe9f07 100644
--- a/Casks/srware-iron.rb
+++ b/Casks/srware-iron.rb
@@ -1,4 +1,4 @@
-class SrwareIron < Cask
+cask :v1 => 'srware-iron' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/sshfs.rb b/Casks/sshfs.rb
index ac31a936eb68..22b459b1c382 100644
--- a/Casks/sshfs.rb
+++ b/Casks/sshfs.rb
@@ -1,4 +1,4 @@
-class Sshfs < Cask
+cask :v1 => 'sshfs' do
   version '2.5.0'
   sha256 'f8f4f71814273ea42dbe6cd92199f7cff418571ffd1b10c0608878d3472d2162'
 
diff --git a/Casks/sslmate.rb b/Casks/sslmate.rb
index 488c24c82c2f..9a23227eb5e6 100644
--- a/Casks/sslmate.rb
+++ b/Casks/sslmate.rb
@@ -1,4 +1,4 @@
-class Sslmate < Cask
+cask :v1 => 'sslmate' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ssx.rb b/Casks/ssx.rb
index 004f47e77ed4..d7c98ce7206e 100644
--- a/Casks/ssx.rb
+++ b/Casks/ssx.rb
@@ -1,4 +1,4 @@
-class Ssx < Cask
+cask :v1 => 'ssx' do
   version '06082006-2216'
   sha256 '34d904e909191e60e0b84ea43f177871ac4310c91af53e5c4cbff28c5dd29fcb'
 
diff --git a/Casks/stackato.rb b/Casks/stackato.rb
index d4b327690ef0..cb1864f5cab3 100644
--- a/Casks/stackato.rb
+++ b/Casks/stackato.rb
@@ -1,4 +1,4 @@
-class Stackato < Cask
+cask :v1 => 'stackato' do
   version '3.1.1'
   sha256 '79b34288416e2adac24c30c8eacd0b1177f8c3985d355af16e13b7b9dd17259d'
 
diff --git a/Casks/stackroom.rb b/Casks/stackroom.rb
index 8b7002d0f082..e7353463fbe0 100644
--- a/Casks/stackroom.rb
+++ b/Casks/stackroom.rb
@@ -1,4 +1,4 @@
-class Stackroom < Cask
+cask :v1 => 'stackroom' do
   version '2.0b'
   sha256 'b5904f8c39a3941a827cea31e77dc9c62b12025cccddc5b42869615392a543ce'
 
diff --git a/Casks/startninja.rb b/Casks/startninja.rb
index 73754a090d81..dc1a4ff98786 100644
--- a/Casks/startninja.rb
+++ b/Casks/startninja.rb
@@ -1,4 +1,4 @@
-class Startninja < Cask
+cask :v1 => 'startninja' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/stattransfer.rb b/Casks/stattransfer.rb
index 0027e43392b8..4d176e22105b 100644
--- a/Casks/stattransfer.rb
+++ b/Casks/stattransfer.rb
@@ -1,4 +1,4 @@
-class Stattransfer < Cask
+cask :v1 => 'stattransfer' do
   version '12'
   sha256 '2559dffffd73f996604860e6fbdf2fd3ef4903bf8a37acc6016b6ea52affebd2'
 
diff --git a/Casks/stay.rb b/Casks/stay.rb
index 23dc79ac52bc..457d142091a3 100644
--- a/Casks/stay.rb
+++ b/Casks/stay.rb
@@ -1,4 +1,4 @@
-class Stay < Cask
+cask :v1 => 'stay' do
   version '1.2.3'
   sha256 'afe5abc2757bcee547a0d9ad8ebae55744ac197bc28c9fa28fc7987b9b512464'
 
diff --git a/Casks/steam.rb b/Casks/steam.rb
index ef16747d4020..f32771a39546 100644
--- a/Casks/steam.rb
+++ b/Casks/steam.rb
@@ -1,4 +1,4 @@
-class Steam < Cask
+cask :v1 => 'steam' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/steermouse.rb b/Casks/steermouse.rb
index adb85e816267..9f0e56594b55 100644
--- a/Casks/steermouse.rb
+++ b/Casks/steermouse.rb
@@ -1,4 +1,4 @@
-class Steermouse < Cask
+cask :v1 => 'steermouse' do
   version '4.1.9'
   sha256 '4704aa8b01842c2e619db546fa045e515ee7e3a94d9d339f4650f2f8684b1280'
 
diff --git a/Casks/stella.rb b/Casks/stella.rb
index 9da287414777..e7df52487a20 100644
--- a/Casks/stella.rb
+++ b/Casks/stella.rb
@@ -1,4 +1,4 @@
-class Stella < Cask
+cask :v1 => 'stella' do
   version '3.9.3'
   sha256 '83870088368be20224ed51f52e9babe53a75575495279adc596203f123e8477c'
 
diff --git a/Casks/stellarium.rb b/Casks/stellarium.rb
index d8824338b607..067a2a43c9cf 100644
--- a/Casks/stellarium.rb
+++ b/Casks/stellarium.rb
@@ -1,4 +1,4 @@
-class Stellarium < Cask
+cask :v1 => 'stellarium' do
   version '0.13.0'
   sha256 '0f626233007449b8fb2524be022ae2c70667294da8494064b459094b3bdd2afb'
 
diff --git a/Casks/stepmania.rb b/Casks/stepmania.rb
index a7e7e95119c4..8131920796b8 100644
--- a/Casks/stepmania.rb
+++ b/Casks/stepmania.rb
@@ -1,4 +1,4 @@
-class Stepmania < Cask
+cask :v1 => 'stepmania' do
   version '5beta4a'
   sha256 'a87148a15e8507080ae03e42b07b35bb601e622d63c142da8a08dcdb9f9e42cd'
 
diff --git a/Casks/stockbarjp.rb b/Casks/stockbarjp.rb
index a55b8cd5277e..d28b3ea82718 100644
--- a/Casks/stockbarjp.rb
+++ b/Casks/stockbarjp.rb
@@ -1,4 +1,4 @@
-class Stockbarjp < Cask
+cask :v1 => 'stockbarjp' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/streamtools.rb b/Casks/streamtools.rb
index 854cb1e521d3..8caf3f3c5bec 100644
--- a/Casks/streamtools.rb
+++ b/Casks/streamtools.rb
@@ -1,4 +1,4 @@
-class Streamtools < Cask
+cask :v1 => 'streamtools' do
   version '0.2.8'
 
   if Hardware::CPU.is_32_bit?
diff --git a/Casks/strongvpn-client.rb b/Casks/strongvpn-client.rb
index 16cfb56215a3..7db7646eb410 100644
--- a/Casks/strongvpn-client.rb
+++ b/Casks/strongvpn-client.rb
@@ -1,4 +1,4 @@
-class StrongvpnClient < Cask
+cask :v1 => 'strongvpn-client' do
   version '1.0.4'
   sha256 'cacf4f7a94b1601bae2cf19fe94b6dbae827ed531e05ff0f91723aea5b3845b9'
 
diff --git a/Casks/sts.rb b/Casks/sts.rb
index faf79effde9d..1253d5753bd1 100644
--- a/Casks/sts.rb
+++ b/Casks/sts.rb
@@ -1,4 +1,4 @@
-class Sts < Cask
+cask :v1 => 'sts' do
   version '3.5.1'
   sha256 'f71274c9f946d2af6bbd12e811d7c8d371d3031415839b9aa6ed35347d2980f8'
 
diff --git a/Casks/subclassed-mnemosyne.rb b/Casks/subclassed-mnemosyne.rb
index 0f29403eff89..a1f0dee8a0b8 100644
--- a/Casks/subclassed-mnemosyne.rb
+++ b/Casks/subclassed-mnemosyne.rb
@@ -1,4 +1,4 @@
-class SubclassedMnemosyne < Cask
+cask :v1 => 'subclassed-mnemosyne' do
   version '1.1'
   sha256 'c641f423f449104615f614bedc7a54938ae67b63a97842351a3258b0a283f6b3'
 
diff --git a/Casks/subl.rb b/Casks/subl.rb
index 36ce0456213c..4dc2774694d3 100644
--- a/Casks/subl.rb
+++ b/Casks/subl.rb
@@ -1,4 +1,4 @@
-class Subl < Cask
+cask :v1 => 'subl' do
   version '1.2'
   sha256 '2f66cd6f873b51fa7bf31a6fe0bff1af4ac2cf0d9fff21a4b0f647c1cdcd6eef'
 
diff --git a/Casks/subler.rb b/Casks/subler.rb
index 45f3d0c9da55..8253f951c5ed 100644
--- a/Casks/subler.rb
+++ b/Casks/subler.rb
@@ -1,4 +1,4 @@
-class Subler < Cask
+cask :v1 => 'subler' do
   version '0.25'
   sha256 '7b93d8a6afc1db00ea86b3bb2f6f8927012e66f1d74d7bfc7293d87cc8565f86'
 
diff --git a/Casks/sublercli.rb b/Casks/sublercli.rb
index c053ff74bd46..ea71b61e4cd3 100644
--- a/Casks/sublercli.rb
+++ b/Casks/sublercli.rb
@@ -1,4 +1,4 @@
-class Sublercli < Cask
+cask :v1 => 'sublercli' do
   version '0.19'
   sha256 '968c6c0ff530ee603a5a3deec93911cc1c5c1fd8b100883cb485278fccc79104'
 
diff --git a/Casks/sublime-text.rb b/Casks/sublime-text.rb
index d760f08ba7a0..db4baa7bb37c 100644
--- a/Casks/sublime-text.rb
+++ b/Casks/sublime-text.rb
@@ -1,4 +1,4 @@
-class SublimeText < Cask
+cask :v1 => 'sublime-text' do
   version '2.0.2'
   sha256 '906e71e19ae5321f80e7cf42eab8355146d8f2c3fd55be1f7fe5c62c57165add'
 
diff --git a/Casks/subnetcalc.rb b/Casks/subnetcalc.rb
index e09291ace97b..b8afff88c163 100644
--- a/Casks/subnetcalc.rb
+++ b/Casks/subnetcalc.rb
@@ -1,4 +1,4 @@
-class Subnetcalc < Cask
+cask :v1 => 'subnetcalc' do
   version '1.1'
   sha256 '19157baacac0cede6849356cb305a0ed2e4290e1e9e8ac4b691fd1d7ce1920cf'
 
diff --git a/Casks/subsmarine.rb b/Casks/subsmarine.rb
index a1d5223240c5..9eb23f315817 100644
--- a/Casks/subsmarine.rb
+++ b/Casks/subsmarine.rb
@@ -1,4 +1,4 @@
-class Subsmarine < Cask
+cask :v1 => 'subsmarine' do
   version '1.2'
   sha256 '337722dedb0682d34f11f2decc3ad827849032f9a0e795d2f89c5c4bd0c32286'
 
diff --git a/Casks/subsurface.rb b/Casks/subsurface.rb
index aa62cbde1dd5..e55b5f8d592d 100644
--- a/Casks/subsurface.rb
+++ b/Casks/subsurface.rb
@@ -1,4 +1,4 @@
-class Subsurface < Cask
+cask :v1 => 'subsurface' do
   version '4.1'
   sha256 'b4eef933e507ffb5a56501a249c1dfcf389edd3cdfb82f5ac0448183c4b8113c'
 
diff --git a/Casks/subtitle-master.rb b/Casks/subtitle-master.rb
index 7568073cf4e3..9d52e6bc9261 100644
--- a/Casks/subtitle-master.rb
+++ b/Casks/subtitle-master.rb
@@ -1,4 +1,4 @@
-class SubtitleMaster < Cask
+cask :v1 => 'subtitle-master' do
   version '0.6'
   sha256 'c2a4fe372f0840cdbb4fb8d6ae9d689b516d97a04ea082773308d6a65dc75f60'
 
diff --git a/Casks/subtitles.rb b/Casks/subtitles.rb
index b141abb6732a..ae76e6689fcd 100644
--- a/Casks/subtitles.rb
+++ b/Casks/subtitles.rb
@@ -1,4 +1,4 @@
-class Subtitles < Cask
+cask :v1 => 'subtitles' do
   version '2.2'
   sha256 'c8f00cd00a85f16b7a74de846b9f03fcd0cd0e144336438aa09aef50d527ce0f'
 
diff --git a/Casks/sumbolon.rb b/Casks/sumbolon.rb
index b1c3d4c0da2c..c4871a4be162 100644
--- a/Casks/sumbolon.rb
+++ b/Casks/sumbolon.rb
@@ -1,4 +1,4 @@
-class Sumbolon < Cask
+cask :v1 => 'sumbolon' do
   version '1.0.5'
   sha256 '9127c381dc19916f91a834dca76b237d43a5fe0ca92a79a1c7ed0a8dd791692d'
 
diff --git a/Casks/sunlogin-remote.rb b/Casks/sunlogin-remote.rb
index 1f3d625c36c2..49bdbc3786fd 100644
--- a/Casks/sunlogin-remote.rb
+++ b/Casks/sunlogin-remote.rb
@@ -1,4 +1,4 @@
-class SunloginRemote < Cask
+cask :v1 => 'sunlogin-remote' do
   version '1.1'
   sha256 '81cf6e9b088cf7d05489228fd9f7c84388ab44dbaba5821865089a4d1a1d6a18'
 
diff --git a/Casks/supaview.rb b/Casks/supaview.rb
index 871efa1ea747..6bea09e92bfc 100644
--- a/Casks/supaview.rb
+++ b/Casks/supaview.rb
@@ -1,4 +1,4 @@
-class Supaview < Cask
+cask :v1 => 'supaview' do
   version '1.3.2'
   sha256 'd0940ea48223ce138260a25a8a070365d619acb0adbe96288e70e5b19ed10ff0'
 
diff --git a/Casks/super-otr.rb b/Casks/super-otr.rb
index 515113bc9b60..d00191d9b140 100644
--- a/Casks/super-otr.rb
+++ b/Casks/super-otr.rb
@@ -1,4 +1,4 @@
-class SuperOtr < Cask
+cask :v1 => 'super-otr' do
   version '0.9.6.0b79'
   sha256 '610d74c43d2fa38527b66fa677c6eff07543f8a853950160954e59cb251b066b'
 
diff --git a/Casks/supercollider.rb b/Casks/supercollider.rb
index 6b94a3e54df5..8dded193243e 100644
--- a/Casks/supercollider.rb
+++ b/Casks/supercollider.rb
@@ -1,4 +1,4 @@
-class Supercollider < Cask
+cask :v1 => 'supercollider' do
   version '3.6.6'
   sha256 '4cc59a3ab70cbac60ce64b0fb7b6b86e070456e8f597229b05057ea6c4e1edb9'
 
diff --git a/Casks/superduper.rb b/Casks/superduper.rb
index 2161cd2d103d..41db9d8da1ee 100644
--- a/Casks/superduper.rb
+++ b/Casks/superduper.rb
@@ -1,4 +1,4 @@
-class Superduper < Cask
+cask :v1 => 'superduper' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/supersync.rb b/Casks/supersync.rb
index 5b18e9ee0732..e4c1a5c91f73 100644
--- a/Casks/supersync.rb
+++ b/Casks/supersync.rb
@@ -1,4 +1,4 @@
-class Supersync < Cask
+cask :v1 => 'supersync' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/supertuxkart.rb b/Casks/supertuxkart.rb
index f672a693f699..7abdbd9ba342 100644
--- a/Casks/supertuxkart.rb
+++ b/Casks/supertuxkart.rb
@@ -1,4 +1,4 @@
-class Supertuxkart < Cask
+cask :v1 => 'supertuxkart' do
   version '0.8.1'
   sha256 'e3205788a42dd830cc1fb2deb100e305bd247d730ddd53bbd9e6601ea0e2a0d0'
 
diff --git a/Casks/surplusmeter.rb b/Casks/surplusmeter.rb
index 1521e755c75a..f534c4034759 100644
--- a/Casks/surplusmeter.rb
+++ b/Casks/surplusmeter.rb
@@ -1,4 +1,4 @@
-class Surplusmeter < Cask
+cask :v1 => 'surplusmeter' do
   version '2.0.3'
   sha256 'a4e5fb6114983964ac4d91c3038f018a97a39f88134c776844ea27271286c375'
 
diff --git a/Casks/suspicious-package.rb b/Casks/suspicious-package.rb
index 949437fe6b61..35c36bc5d4fd 100644
--- a/Casks/suspicious-package.rb
+++ b/Casks/suspicious-package.rb
@@ -1,4 +1,4 @@
-class SuspiciousPackage < Cask
+cask :v1 => 'suspicious-package' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/svnx.rb b/Casks/svnx.rb
index cd85bf663fa2..70339f3689a9 100644
--- a/Casks/svnx.rb
+++ b/Casks/svnx.rb
@@ -1,4 +1,4 @@
-class Svnx < Cask
+cask :v1 => 'svnx' do
   version '1.3.4'
   sha256 'b687a0bc62de9f21b4c34dd94dbcfd282fd38184764e05e03e59dd5a19d1a3e8'
 
diff --git a/Casks/sweet-home3d.rb b/Casks/sweet-home3d.rb
index 17e20083a4cb..9a2babce87e1 100644
--- a/Casks/sweet-home3d.rb
+++ b/Casks/sweet-home3d.rb
@@ -1,4 +1,4 @@
-class SweetHome3d < Cask
+cask :v1 => 'sweet-home3d' do
   version '4.5'
   sha256 'f1d341046fbf066d92cc625b44bb201e905017c72e9755151587a01539f5242b'
 
diff --git a/Casks/swift-publisher.rb b/Casks/swift-publisher.rb
index c08a7bc9aeb7..f099a0f6d944 100644
--- a/Casks/swift-publisher.rb
+++ b/Casks/swift-publisher.rb
@@ -1,4 +1,4 @@
-class SwiftPublisher < Cask
+cask :v1 => 'swift-publisher' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/swingfish.rb b/Casks/swingfish.rb
index 4a475f830de3..163594bdbc47 100644
--- a/Casks/swingfish.rb
+++ b/Casks/swingfish.rb
@@ -1,4 +1,4 @@
-class Swingfish < Cask
+cask :v1 => 'swingfish' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/swinsian.rb b/Casks/swinsian.rb
index bd93bf9574e0..32a4fa242d97 100644
--- a/Casks/swinsian.rb
+++ b/Casks/swinsian.rb
@@ -1,4 +1,4 @@
-class Swinsian < Cask
+cask :v1 => 'swinsian' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/switchresx.rb b/Casks/switchresx.rb
index 9158b2679fc4..e9110be40417 100644
--- a/Casks/switchresx.rb
+++ b/Casks/switchresx.rb
@@ -1,4 +1,4 @@
-class Switchresx < Cask
+cask :v1 => 'switchresx' do
   version '4.4.1'
   sha256 'a7fd24312ab65a1d3da00da4fc9fb1d15a463f5d93c922bffa4ecfbe87b8e3cf'
 
diff --git a/Casks/switchup.rb b/Casks/switchup.rb
index e5fc80b13743..243b05f1343e 100644
--- a/Casks/switchup.rb
+++ b/Casks/switchup.rb
@@ -1,4 +1,4 @@
-class Switchup < Cask
+cask :v1 => 'switchup' do
   version '1.6.3'
   sha256 'dd269749385090bec6bbf30e917b78f07cf0424c5e94c3602a41dbf7718597b3'
 
diff --git a/Casks/synalyze-it-pro.rb b/Casks/synalyze-it-pro.rb
index 70d4d803b733..18d471b3e4f4 100644
--- a/Casks/synalyze-it-pro.rb
+++ b/Casks/synalyze-it-pro.rb
@@ -1,4 +1,4 @@
-class SynalyzeItPro < Cask
+cask :v1 => 'synalyze-it-pro' do
   version '1.9'
   sha256 '5c772168f98df6cdf3797be94d7603145998f6899fd2f7c841a504a9136687ef'
 
diff --git a/Casks/synergy.rb b/Casks/synergy.rb
index 16ed52213c9d..b3cdb924445c 100644
--- a/Casks/synergy.rb
+++ b/Casks/synergy.rb
@@ -1,4 +1,4 @@
-class Synergy < Cask
+cask :v1 => 'synergy' do
   version '1.5.1-r2398'
   sha256 'd787031705b0123d36f07e7639fd8882d1969bc8f7ddad25a3326c873385dfe2'
 
diff --git a/Casks/synology-assistant.rb b/Casks/synology-assistant.rb
index 23faa0809b43..f21e73d7c13d 100644
--- a/Casks/synology-assistant.rb
+++ b/Casks/synology-assistant.rb
@@ -1,4 +1,4 @@
-class SynologyAssistant < Cask
+cask :v1 => 'synology-assistant' do
   version '5.0-4448'
   sha256 'b4e23a43c2b11bd41596809fa84dfad1d17832140145ddf1b79cb8301f2f2014'
 
diff --git a/Casks/synology-cloud-station.rb b/Casks/synology-cloud-station.rb
index 61f06b5e1fca..224bae59db8a 100644
--- a/Casks/synology-cloud-station.rb
+++ b/Casks/synology-cloud-station.rb
@@ -1,4 +1,4 @@
-class SynologyCloudStation < Cask
+cask :v1 => 'synology-cloud-station' do
   version '3317'
   sha256 'd3305b5f2b4d47cf84e18cdbdb86a58578bff396fbe4664c4c778745098a362d'
 
diff --git a/Casks/synology-photo-station-uploader.rb b/Casks/synology-photo-station-uploader.rb
index 1a2ced78495d..c608975e256d 100644
--- a/Casks/synology-photo-station-uploader.rb
+++ b/Casks/synology-photo-station-uploader.rb
@@ -1,4 +1,4 @@
-class SynologyPhotoStationUploader < Cask
+cask :v1 => 'synology-photo-station-uploader' do
   version '046'
   sha256 'd8f3462c2590c9a302ec3ea091c779682f37bbacdae7c8038dcccddc9f920bc6'
 
diff --git a/Casks/synologyeiauthenticator.rb b/Casks/synologyeiauthenticator.rb
index 57859854a54f..669eed08a059 100644
--- a/Casks/synologyeiauthenticator.rb
+++ b/Casks/synologyeiauthenticator.rb
@@ -1,4 +1,4 @@
-class Synologyeiauthenticator < Cask
+cask :v1 => 'synologyeiauthenticator' do
   version '1.1-013'
   sha256 'cc38db617f309ca5c7d8ea67cafb63d5509a07e43186d87ab19461366ea30691'
 
diff --git a/Casks/synthesia.rb b/Casks/synthesia.rb
index 87bf97cd3073..5f8ef6ff0adc 100644
--- a/Casks/synthesia.rb
+++ b/Casks/synthesia.rb
@@ -1,4 +1,4 @@
-class Synthesia < Cask
+cask :v1 => 'synthesia' do
   version '9.0'
   sha256 '4b3ed729994c4a76ca0bb777516f0737f218eb033d9e02e8af2a5a1a531f6ce8'
 
diff --git a/Casks/tableau-public.rb b/Casks/tableau-public.rb
index 755c004f9826..788040798553 100644
--- a/Casks/tableau-public.rb
+++ b/Casks/tableau-public.rb
@@ -1,4 +1,4 @@
-class TableauPublic < Cask
+cask :v1 => 'tableau-public' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tableau.rb b/Casks/tableau.rb
index 74c72227e98b..35eb334f5965 100644
--- a/Casks/tableau.rb
+++ b/Casks/tableau.rb
@@ -1,4 +1,4 @@
-class Tableau < Cask
+cask :v1 => 'tableau' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tabula.rb b/Casks/tabula.rb
index 0df37770a8c1..11a6397782f8 100644
--- a/Casks/tabula.rb
+++ b/Casks/tabula.rb
@@ -1,4 +1,4 @@
-class Tabula < Cask
+cask :v1 => 'tabula' do
   version '0.9.5.2'
   sha256 'b6a2663cbf440d27cc94ac9ac05ac1875136e81f63980a25e1acaf6a3250e131'
 
diff --git a/Casks/tactor.rb b/Casks/tactor.rb
index 816d4bf5c116..546f1c336112 100644
--- a/Casks/tactor.rb
+++ b/Casks/tactor.rb
@@ -1,4 +1,4 @@
-class Tactor < Cask
+cask :v1 => 'tactor' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tag.rb b/Casks/tag.rb
index 4df31856fbe3..0f16d222aedb 100644
--- a/Casks/tag.rb
+++ b/Casks/tag.rb
@@ -1,4 +1,4 @@
-class Tag < Cask
+cask :v1 => 'tag' do
   version '0.4.1'
   sha256 '165631a76db33cbe5200ff64a64f5e1dad6606ae815c7609d59b7367f9344360'
 
diff --git a/Casks/tagaini-jisho.rb b/Casks/tagaini-jisho.rb
index 1e8eb3cdf0c8..8c08c4290d94 100644
--- a/Casks/tagaini-jisho.rb
+++ b/Casks/tagaini-jisho.rb
@@ -1,4 +1,4 @@
-class TagainiJisho < Cask
+cask :v1 => 'tagaini-jisho' do
   version '1.0.1'
   sha256 'fda5a6da2f2854e5497329b81e6bd1eb210cd89aab50e373e120d687653edb27'
 
diff --git a/Casks/tagalicious.rb b/Casks/tagalicious.rb
index 96488fa93d98..0079a4b97e59 100644
--- a/Casks/tagalicious.rb
+++ b/Casks/tagalicious.rb
@@ -1,4 +1,4 @@
-class Tagalicious < Cask
+cask :v1 => 'tagalicious' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tagger.rb b/Casks/tagger.rb
index 790670c35a76..882032457b6b 100644
--- a/Casks/tagger.rb
+++ b/Casks/tagger.rb
@@ -1,4 +1,4 @@
-class Tagger < Cask
+cask :v1 => 'tagger' do
   version '1.8.0.7'
   sha256 'a4745dcf88f1691d2c681a87e6cfb6326200b6a2d9dfb53c2c62c67905a09e16'
 
diff --git a/Casks/tagoman.rb b/Casks/tagoman.rb
index ed3dda9654cb..1a314cf06466 100644
--- a/Casks/tagoman.rb
+++ b/Casks/tagoman.rb
@@ -1,4 +1,4 @@
-class Tagoman < Cask
+cask :v1 => 'tagoman' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tagr.rb b/Casks/tagr.rb
index c2218a7cc64f..53483e8f5eaf 100644
--- a/Casks/tagr.rb
+++ b/Casks/tagr.rb
@@ -1,4 +1,4 @@
-class Tagr < Cask
+cask :v1 => 'tagr' do
   version '3.1.2'
   sha256 '65c6c7296e091aec46acfe2f3ba147e4f77c6437fe9c4b7261d791f1b335a109'
 
diff --git a/Casks/tagspaces.rb b/Casks/tagspaces.rb
index 2e3f144e3833..86f61a5d2c15 100644
--- a/Casks/tagspaces.rb
+++ b/Casks/tagspaces.rb
@@ -1,4 +1,4 @@
-class Tagspaces < Cask
+cask :v1 => 'tagspaces' do
   version '1.8.1'
   sha256 '1a6d63598b5689b7fee4cb0c469a5f87251f43008f208c08020ded64c8fbcf66'
 
diff --git a/Casks/tal-chorus-lx.rb b/Casks/tal-chorus-lx.rb
index abf88c67644b..1ef290f0dfd8 100644
--- a/Casks/tal-chorus-lx.rb
+++ b/Casks/tal-chorus-lx.rb
@@ -1,4 +1,4 @@
-class TalChorusLx < Cask
+cask :v1 => 'tal-chorus-lx' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tangerine.rb b/Casks/tangerine.rb
index 3378beee2a23..36ebe114ef70 100644
--- a/Casks/tangerine.rb
+++ b/Casks/tangerine.rb
@@ -1,4 +1,4 @@
-class Tangerine < Cask
+cask :v1 => 'tangerine' do
   version '1.4.8'
   sha256 'dea00674331b1aa663cf00f64b0ce208638a136575987e1a7f50bd135117f2d9'
 
diff --git a/Casks/tapaal.rb b/Casks/tapaal.rb
index 540112d081f6..d806cf680a9e 100644
--- a/Casks/tapaal.rb
+++ b/Casks/tapaal.rb
@@ -1,4 +1,4 @@
-class Tapaal < Cask
+cask :v1 => 'tapaal' do
   version '3.1.0'
   sha256 '62314055445808d5ae2074623625c9ac38174aa294abd0d43590fe886c16fc46'
 
diff --git a/Casks/taskpaper.rb b/Casks/taskpaper.rb
index bb721410cada..ef4cc0809e87 100644
--- a/Casks/taskpaper.rb
+++ b/Casks/taskpaper.rb
@@ -1,4 +1,4 @@
-class Taskpaper < Cask
+cask :v1 => 'taskpaper' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tau.rb b/Casks/tau.rb
index b8fa874a96d3..dc6a616b5036 100644
--- a/Casks/tau.rb
+++ b/Casks/tau.rb
@@ -1,4 +1,4 @@
-class Tau < Cask
+cask :v1 => 'tau' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tcpblock.rb b/Casks/tcpblock.rb
index 71c14fbcceff..9c0451765ad3 100644
--- a/Casks/tcpblock.rb
+++ b/Casks/tcpblock.rb
@@ -1,4 +1,4 @@
-class Tcpblock < Cask
+cask :v1 => 'tcpblock' do
   version '4.2'
   sha256 '06e2d57c36c30581a856c98b288833d3f31c9626561dac9e0cbf76a760f38725'
 
diff --git a/Casks/td-agent.rb b/Casks/td-agent.rb
index c1344e147da9..0b32fefdc415 100644
--- a/Casks/td-agent.rb
+++ b/Casks/td-agent.rb
@@ -1,4 +1,4 @@
-class TdAgent < Cask
+cask :v1 => 'td-agent' do
   version '2.0.3'
   sha256 '7e730682879dc199cc712205f22ba93fb9bee20a5dad16b113c8f32d11109cb8'
 
diff --git a/Casks/td-toolbelt.rb b/Casks/td-toolbelt.rb
index 1b702bbe20a9..575e2b9068d7 100644
--- a/Casks/td-toolbelt.rb
+++ b/Casks/td-toolbelt.rb
@@ -1,4 +1,4 @@
-class TdToolbelt < Cask
+cask :v1 => 'td-toolbelt' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/teamspeak-client.rb b/Casks/teamspeak-client.rb
index 7dda20bcbfe8..376879dcc05f 100644
--- a/Casks/teamspeak-client.rb
+++ b/Casks/teamspeak-client.rb
@@ -1,4 +1,4 @@
-class TeamspeakClient < Cask
+cask :v1 => 'teamspeak-client' do
   version '3.0.16'
   sha256 'ff0bece49ca1d7b129775e7fb492a005e0a9d2ece78b9f117cbae991a8ca8910'
 
diff --git a/Casks/teamviewer.rb b/Casks/teamviewer.rb
index 05afb5c81d48..ae972862152f 100644
--- a/Casks/teamviewer.rb
+++ b/Casks/teamviewer.rb
@@ -1,4 +1,4 @@
-class Teamviewer < Cask
+cask :v1 => 'teamviewer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/teamviz.rb b/Casks/teamviz.rb
index 595d6c47fd0f..2cce480af2b6 100644
--- a/Casks/teamviz.rb
+++ b/Casks/teamviz.rb
@@ -1,4 +1,4 @@
-class Teamviz < Cask
+cask :v1 => 'teamviz' do
   version '3.2'
   sha256 '58bbff611e1344c1a0ccb555400c212d0969ad4035469b654437f1adeafa7d37'
 
diff --git a/Casks/teensy.rb b/Casks/teensy.rb
index 3d6e2e953284..e2eb0fca1db3 100644
--- a/Casks/teensy.rb
+++ b/Casks/teensy.rb
@@ -1,4 +1,4 @@
-class Teensy < Cask
+cask :v1 => 'teensy' do
   version '1.17'
   sha256 'da5a499303fb8f7ba95ff9f9a69b96f65280870ccff8f71d4dded00a5770f502'
 
diff --git a/Casks/teeworlds.rb b/Casks/teeworlds.rb
index c22df8d8ac15..49326ce30fe9 100644
--- a/Casks/teeworlds.rb
+++ b/Casks/teeworlds.rb
@@ -1,4 +1,4 @@
-class Teeworlds < Cask
+cask :v1 => 'teeworlds' do
   version '0.6.2'
   sha256 '954e8f213f22b0c47c529d6e4d92f5bc1008a6a1ee54229dc62e706ffd1cab64'
 
diff --git a/Casks/telegram.rb b/Casks/telegram.rb
index 3ba7b47f6eed..8246b68b4bd8 100644
--- a/Casks/telegram.rb
+++ b/Casks/telegram.rb
@@ -1,4 +1,4 @@
-class Telegram < Cask
+cask :v1 => 'telegram' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/telephone.rb b/Casks/telephone.rb
index 721ead256d05..e6f394640a0e 100644
--- a/Casks/telephone.rb
+++ b/Casks/telephone.rb
@@ -1,4 +1,4 @@
-class Telephone < Cask
+cask :v1 => 'telephone' do
   version '0.15.2'
   sha256 '21191c1d72b425a2aa5a065678bf862c235974727aa6184c51eec540f41cb43d'
 
diff --git a/Casks/teleport.rb b/Casks/teleport.rb
index a4af0a60a2a7..33b8cecaf43f 100644
--- a/Casks/teleport.rb
+++ b/Casks/teleport.rb
@@ -1,4 +1,4 @@
-class Teleport < Cask
+cask :v1 => 'teleport' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/terraform.rb b/Casks/terraform.rb
index 1e9744cc47bf..d1a6653e1d62 100644
--- a/Casks/terraform.rb
+++ b/Casks/terraform.rb
@@ -1,4 +1,4 @@
-class Terraform < Cask
+cask :v1 => 'terraform' do
   version '0.3.1'
   sha256 'dda41425c7eb06c5e8b3f5ad4904e993aa8a9ab6b61f954ee2e259667cb6ff57'
 
diff --git a/Casks/testflight.rb b/Casks/testflight.rb
index 4f420492e835..b4c816dbab00 100644
--- a/Casks/testflight.rb
+++ b/Casks/testflight.rb
@@ -1,4 +1,4 @@
-class Testflight < Cask
+cask :v1 => 'testflight' do
   version '1.0_beta313'
   sha256 'a8f643b66682f7ec9d710b7452dd9fdc9332edc59bc2c92d10683635c80c861f'
 
diff --git a/Casks/tex-live-utility.rb b/Casks/tex-live-utility.rb
index 409b14bfba83..e32417583423 100644
--- a/Casks/tex-live-utility.rb
+++ b/Casks/tex-live-utility.rb
@@ -1,4 +1,4 @@
-class TexLiveUtility < Cask
+cask :v1 => 'tex-live-utility' do
   version '1.17'
   sha256 '9a913cbf0e158258c513fc0905f65632b36d372d1b4b9afe6b6f08dd005ff232'
 
diff --git a/Casks/texmacs.rb b/Casks/texmacs.rb
index c4dc7854dde4..d5d377608ffa 100644
--- a/Casks/texmacs.rb
+++ b/Casks/texmacs.rb
@@ -1,4 +1,4 @@
-class Texmacs < Cask
+cask :v1 => 'texmacs' do
   version '1.99.1'
   sha256 'b6aab5bcb263e847c97062824b8852380cab4159306b035fcca199f92d243d51'
 
diff --git a/Casks/texmaker.rb b/Casks/texmaker.rb
index 43f30547a728..2eb776aaddb4 100644
--- a/Casks/texmaker.rb
+++ b/Casks/texmaker.rb
@@ -1,4 +1,4 @@
-class Texmaker < Cask
+cask :v1 => 'texmaker' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/texnicle.rb b/Casks/texnicle.rb
index c7bccfb8e7c5..fb240bfd7ec2 100644
--- a/Casks/texnicle.rb
+++ b/Casks/texnicle.rb
@@ -1,4 +1,4 @@
-class Texnicle < Cask
+cask :v1 => 'texnicle' do
   version '2.2.11'
   sha256 'b522e551220bfc98ff3d3c09db224c0db2a31c1dff4c73353a26d1f13217733b'
 
diff --git a/Casks/texpad.rb b/Casks/texpad.rb
index 8c933663f139..a0805aa987bd 100644
--- a/Casks/texpad.rb
+++ b/Casks/texpad.rb
@@ -1,4 +1,4 @@
-class Texpad < Cask
+cask :v1 => 'texpad' do
   version '1.6.14'
   sha256 '18fcbe93e77e5b5bc848172546962fcde397a26fd543efcc1054004369192f7e'
 
diff --git a/Casks/texshop.rb b/Casks/texshop.rb
index b694d7f2c2cb..af6e4c463222 100644
--- a/Casks/texshop.rb
+++ b/Casks/texshop.rb
@@ -1,4 +1,4 @@
-class Texshop < Cask
+cask :v1 => 'texshop' do
   version '3.45'
   sha256 '63afb1141ae41277dc40c3f6f8130e104d89cac2be85c21373a2087aaa25a4eb'
 
diff --git a/Casks/texstudio.rb b/Casks/texstudio.rb
index 2a9d50538666..ab0d81b0ec24 100644
--- a/Casks/texstudio.rb
+++ b/Casks/texstudio.rb
@@ -1,4 +1,4 @@
-class Texstudio < Cask
+cask :v1 => 'texstudio' do
   version '2.8.4'
   sha256 'a4257563d557fb66b35c562322852b969bb7768624bf02e7bf2cc2c31a5e1fbb'
 
diff --git a/Casks/textadept.rb b/Casks/textadept.rb
index 3851c8ca661b..69d011733e24 100644
--- a/Casks/textadept.rb
+++ b/Casks/textadept.rb
@@ -1,4 +1,4 @@
-class Textadept < Cask
+cask :v1 => 'textadept' do
   version '7.7'
   sha256 '4e684ffdca2e22d11ce8ea721a3510a2a4b0aef2ec905ecf566ee2f9c1346098'
 
diff --git a/Casks/textexpander.rb b/Casks/textexpander.rb
index 4ec906cb809a..7e0cec389384 100644
--- a/Casks/textexpander.rb
+++ b/Casks/textexpander.rb
@@ -1,4 +1,4 @@
-class Textexpander < Cask
+cask :v1 => 'textexpander' do
   version '4.3.4'
   sha256 'f5862333a3c9da5292c9c91bff55a3c7a1358481aa6871237b9661a22694eda1'
 
diff --git a/Casks/textmate.rb b/Casks/textmate.rb
index 6367edcc5c7f..d800bfc93096 100644
--- a/Casks/textmate.rb
+++ b/Casks/textmate.rb
@@ -1,4 +1,4 @@
-class Textmate < Cask
+cask :v1 => 'textmate' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/textroom.rb b/Casks/textroom.rb
index db1d02865395..131f1c538e51 100644
--- a/Casks/textroom.rb
+++ b/Casks/textroom.rb
@@ -1,4 +1,4 @@
-class Textroom < Cask
+cask :v1 => 'textroom' do
   version '0.6.5'
   sha256 'f220ca66340bb8b72416461d87504278b41b518ea35bd6b49c9aa195d4ccea3f'
 
diff --git a/Casks/texts.rb b/Casks/texts.rb
index ce74198d417d..52be5c8fcf4b 100644
--- a/Casks/texts.rb
+++ b/Casks/texts.rb
@@ -1,4 +1,4 @@
-class Texts < Cask
+cask :v1 => 'texts' do
   version '0.21'
   sha256 '45bc3294716e7f8624495ee370e949ddc5f0d9bd11d01acf8e6b9c1435ebb989'
 
diff --git a/Casks/textsoap.rb b/Casks/textsoap.rb
index 220fc5b90521..c264761e95f3 100644
--- a/Casks/textsoap.rb
+++ b/Casks/textsoap.rb
@@ -1,4 +1,4 @@
-class Textsoap < Cask
+cask :v1 => 'textsoap' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/texturepacker.rb b/Casks/texturepacker.rb
index 80d74a354f8f..e511ecdbd7d4 100644
--- a/Casks/texturepacker.rb
+++ b/Casks/texturepacker.rb
@@ -1,4 +1,4 @@
-class Texturepacker < Cask
+cask :v1 => 'texturepacker' do
   version '3.3.1'
   sha256 '00f922d036bd7ec991bbe5ee5fcad1431c3c4884bc2b371fdff92cecdaa11339'
 
diff --git a/Casks/textwrangler.rb b/Casks/textwrangler.rb
index 8ea35fab505b..e4c87a48550a 100644
--- a/Casks/textwrangler.rb
+++ b/Casks/textwrangler.rb
@@ -1,4 +1,4 @@
-class Textwrangler < Cask
+cask :v1 => 'textwrangler' do
   version '4.5.11'
   sha256 'a4c5dbdaa8f9211372fb21cc4c7d54b44d89e70a8537bb02034de27ec5e95039'
 
diff --git a/Casks/tftpserver.rb b/Casks/tftpserver.rb
index 393844445d80..c48f4b059b28 100644
--- a/Casks/tftpserver.rb
+++ b/Casks/tftpserver.rb
@@ -1,4 +1,4 @@
-class Tftpserver < Cask
+cask :v1 => 'tftpserver' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/thaiwitter.rb b/Casks/thaiwitter.rb
index 316f79868040..6d8e77e4a2c9 100644
--- a/Casks/thaiwitter.rb
+++ b/Casks/thaiwitter.rb
@@ -1,4 +1,4 @@
-class Thaiwitter < Cask
+cask :v1 => 'thaiwitter' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/the-archive-browser.rb b/Casks/the-archive-browser.rb
index 0ea9501e7669..61b7cbf4de07 100644
--- a/Casks/the-archive-browser.rb
+++ b/Casks/the-archive-browser.rb
@@ -1,4 +1,4 @@
-class TheArchiveBrowser < Cask
+cask :v1 => 'the-archive-browser' do
   version '1.9.1'
   sha256 'c658cc67fde3773b20731394c3ca2829285b3e02efa10c4efb360b2bf053f26e'
 
diff --git a/Casks/the-brain.rb b/Casks/the-brain.rb
index f26607c242f7..c0755202bcaa 100644
--- a/Casks/the-brain.rb
+++ b/Casks/the-brain.rb
@@ -1,4 +1,4 @@
-class TheBrain < Cask
+cask :v1 => 'the-brain' do
   version '8.0.1.2'
   sha256 '2ac492c6defc6d1156de434e84272daf9deb26edf7581da737ac077b244ad7f7'
 
diff --git a/Casks/the-cheat.rb b/Casks/the-cheat.rb
index 76dabf11e79e..808f2f75b28a 100644
--- a/Casks/the-cheat.rb
+++ b/Casks/the-cheat.rb
@@ -1,4 +1,4 @@
-class TheCheat < Cask
+cask :v1 => 'the-cheat' do
   version '1.2.5'
   sha256 '24ed774cc21adc2355077123d04c2657295a41183fd5555c41a2342063c3dedc'
 
diff --git a/Casks/the-escapers-flux.rb b/Casks/the-escapers-flux.rb
index e721320aeee0..092c8b370609 100644
--- a/Casks/the-escapers-flux.rb
+++ b/Casks/the-escapers-flux.rb
@@ -1,4 +1,4 @@
-class TheEscapersFlux < Cask
+cask :v1 => 'the-escapers-flux' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/the-hit-list.rb b/Casks/the-hit-list.rb
index b63afa9f7d82..3e6243d2f122 100644
--- a/Casks/the-hit-list.rb
+++ b/Casks/the-hit-list.rb
@@ -1,4 +1,4 @@
-class TheHitList < Cask
+cask :v1 => 'the-hit-list' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/the-unarchiver.rb b/Casks/the-unarchiver.rb
index 3ecfca6756cb..6f5afe9fab0b 100644
--- a/Casks/the-unarchiver.rb
+++ b/Casks/the-unarchiver.rb
@@ -1,4 +1,4 @@
-class TheUnarchiver < Cask
+cask :v1 => 'the-unarchiver' do
   version '3.9.1'
   sha256 '34fa3410237e17b2cdceb801a84ed8db93c74ac0db551ffe65913c2134ebbf05'
 
diff --git a/Casks/theremin.rb b/Casks/theremin.rb
index 5b893dfcedcf..53d8912fe1a5 100644
--- a/Casks/theremin.rb
+++ b/Casks/theremin.rb
@@ -1,4 +1,4 @@
-class Theremin < Cask
+cask :v1 => 'theremin' do
   version '0.7'
   sha256 '809d0f7527d072a43f33b9e1088dc2387e08bb1a3696bb60bfd8e82b8853102d'
 
diff --git a/Casks/thetube.rb b/Casks/thetube.rb
index 9d0f09ad26d0..6c8f372905ad 100644
--- a/Casks/thetube.rb
+++ b/Casks/thetube.rb
@@ -1,4 +1,4 @@
-class Thetube < Cask
+cask :v1 => 'thetube' do
   version '2.11.3'
   sha256 '8ca81ca68d5ddca04a9fa8d53e9b8ba542e1b3c9806b3cd500172abd316bf277'
 
diff --git a/Casks/things.rb b/Casks/things.rb
index ae415c68c3b0..2098661623c0 100644
--- a/Casks/things.rb
+++ b/Casks/things.rb
@@ -1,4 +1,4 @@
-class Things < Cask
+cask :v1 => 'things' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/thinkorswim.rb b/Casks/thinkorswim.rb
index 6508d0b5c5a9..2a57ed86d949 100644
--- a/Casks/thinkorswim.rb
+++ b/Casks/thinkorswim.rb
@@ -1,4 +1,4 @@
-class Thinkorswim < Cask
+cask :v1 => 'thinkorswim' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/thirty-three-rpm.rb b/Casks/thirty-three-rpm.rb
index 200c708c8fbf..2884f4528809 100644
--- a/Casks/thirty-three-rpm.rb
+++ b/Casks/thirty-three-rpm.rb
@@ -1,4 +1,4 @@
-class ThirtyThreeRpm < Cask
+cask :v1 => 'thirty-three-rpm' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/thisservice.rb b/Casks/thisservice.rb
index 1ab476df25d3..360c2766dfbe 100644
--- a/Casks/thisservice.rb
+++ b/Casks/thisservice.rb
@@ -1,4 +1,4 @@
-class Thisservice < Cask
+cask :v1 => 'thisservice' do
   version '3.0.1'
   sha256 'ddf9635421834f1d6bd9fb257ad164f7b59ec2d2b65590d691ec5d2699ec8da2'
 
diff --git a/Casks/thong.rb b/Casks/thong.rb
index c3e0243dfae8..3702ccaa9edb 100644
--- a/Casks/thong.rb
+++ b/Casks/thong.rb
@@ -1,4 +1,4 @@
-class Thong < Cask
+cask :v1 => 'thong' do
   version '1.1'
   sha256 '87e5f3dc6fa85d039d761507aba13e5bc90578940412420d24fb621cfd4fc2b6'
 
diff --git a/Casks/thumbsup.rb b/Casks/thumbsup.rb
index 7eb8d6339461..b0e56b9a5623 100644
--- a/Casks/thumbsup.rb
+++ b/Casks/thumbsup.rb
@@ -1,4 +1,4 @@
-class Thumbsup < Cask
+cask :v1 => 'thumbsup' do
   version '4.5'
   sha256 '7a8e4fa4aaeb8ead174853b64cfcd32a1320d9fdb4d1ca8f0eb9baba18ee625d'
 
diff --git a/Casks/thunder.rb b/Casks/thunder.rb
index f77e8a9a8297..f0a8031189cc 100644
--- a/Casks/thunder.rb
+++ b/Casks/thunder.rb
@@ -1,4 +1,4 @@
-class Thunder < Cask
+cask :v1 => 'thunder' do
   version '2.6.6.1684'
   sha256 'ae19d8fd03d10a20c10ac82071b6f65e8d371cc5fe91cd3a062e7bad370b7772'
 
diff --git a/Casks/thunderbird.rb b/Casks/thunderbird.rb
index 809851b92a4c..2457af4c8fa0 100644
--- a/Casks/thunderbird.rb
+++ b/Casks/thunderbird.rb
@@ -1,4 +1,4 @@
-class Thunderbird < Cask
+cask :v1 => 'thunderbird' do
   version '31.2.0'
   sha256 '4d6a9bedacda5e31ae40c2dfc6885fffa9283b052f25507313b25d87bb83daca'
 
diff --git a/Casks/thyme.rb b/Casks/thyme.rb
index a49efdf0c3ff..79e0e635fdbf 100644
--- a/Casks/thyme.rb
+++ b/Casks/thyme.rb
@@ -1,4 +1,4 @@
-class Thyme < Cask
+cask :v1 => 'thyme' do
   version '0.4.2'
   sha256 '5963d199ff9d64f3cc6966ed532b949fa500c9887d391aef8eedba68ae469a45'
 
diff --git a/Casks/tickets.rb b/Casks/tickets.rb
index 8960d5b86e28..e283dce0f50b 100644
--- a/Casks/tickets.rb
+++ b/Casks/tickets.rb
@@ -1,4 +1,4 @@
-class Tickets < Cask
+cask :v1 => 'tickets' do
   version '2.5'
   sha256 '8f2d7879581fb2604158367fb6e7eda8bc9ebf15e97781b69b64355f2832af6e'
 
diff --git a/Casks/tiddlywiki.rb b/Casks/tiddlywiki.rb
index dbc4743869ec..08d56f46ae38 100644
--- a/Casks/tiddlywiki.rb
+++ b/Casks/tiddlywiki.rb
@@ -1,4 +1,4 @@
-class Tiddlywiki < Cask
+cask :v1 => 'tiddlywiki' do
   version '0.0.3'
   sha256 'b96e44b88d6ff421b0d35644862c4e474ba7099f597f0dc8d530f467d31abd5c'
 
diff --git a/Casks/tikz-editor.rb b/Casks/tikz-editor.rb
index f650aca6dddf..18d99e80e9f6 100644
--- a/Casks/tikz-editor.rb
+++ b/Casks/tikz-editor.rb
@@ -1,4 +1,4 @@
-class TikzEditor < Cask
+cask :v1 => 'tikz-editor' do
   version '1.0'
   sha256 '0462af2994a5d2c3f495eb922e3cf989e3f4cff27bc545426ddc83da4a5f82db'
 
diff --git a/Casks/tiled.rb b/Casks/tiled.rb
index c5e0b9bbcc55..2c12186f854e 100644
--- a/Casks/tiled.rb
+++ b/Casks/tiled.rb
@@ -1,4 +1,4 @@
-class Tiled < Cask
+cask :v1 => 'tiled' do
   version '0.10.1'
   sha256 'ace859c2f821aca117af9bb72d5cc4313816d25500666fe0a153c8667ead91a3'
 
diff --git a/Casks/tilemill.rb b/Casks/tilemill.rb
index 1d82f8a9222d..0f6937f9fd53 100644
--- a/Casks/tilemill.rb
+++ b/Casks/tilemill.rb
@@ -1,4 +1,4 @@
-class Tilemill < Cask
+cask :v1 => 'tilemill' do
   version '0.10.1'
   sha256 '4d3c9c0a8f7b530d08598b8c245b128c982529a39127fab9dfabd6a2a92ba08f'
 
diff --git a/Casks/time-out.rb b/Casks/time-out.rb
index d34e979c33c2..8d73e6663df8 100644
--- a/Casks/time-out.rb
+++ b/Casks/time-out.rb
@@ -1,4 +1,4 @@
-class TimeOut < Cask
+cask :v1 => 'time-out' do
   version '1.7.1'
   sha256 '3c9892344c8313b8ccf0a76cceb00834ddbe26e5114bcd674c4fd53aeb44e310'
 
diff --git a/Casks/time-sink.rb b/Casks/time-sink.rb
index 5a8f448130d3..2fa3932c2bd7 100644
--- a/Casks/time-sink.rb
+++ b/Casks/time-sink.rb
@@ -1,4 +1,4 @@
-class TimeSink < Cask
+cask :v1 => 'time-sink' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/time-tracker.rb b/Casks/time-tracker.rb
index a23d4943c738..299f66b339c7 100644
--- a/Casks/time-tracker.rb
+++ b/Casks/time-tracker.rb
@@ -1,4 +1,4 @@
-class TimeTracker < Cask
+cask :v1 => 'time-tracker' do
   version '1.3.13'
   sha256 'a6c982ee82f8babcf0f42d49950e5b3a1d613946736a7ee4a272b05916271aeb'
 
diff --git a/Casks/timemachineeditor.rb b/Casks/timemachineeditor.rb
index 30749a030266..1642ee83724a 100644
--- a/Casks/timemachineeditor.rb
+++ b/Casks/timemachineeditor.rb
@@ -1,4 +1,4 @@
-class Timemachineeditor < Cask
+cask :v1 => 'timemachineeditor' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/timemachinescheduler.rb b/Casks/timemachinescheduler.rb
index 6ca4ad0d76c1..b99e571a8966 100644
--- a/Casks/timemachinescheduler.rb
+++ b/Casks/timemachinescheduler.rb
@@ -1,4 +1,4 @@
-class Timemachinescheduler < Cask
+cask :v1 => 'timemachinescheduler' do
   version '3.1.4'
   sha256 '22b0976139c42d163aa7d905d845594af41d4f3d4254a21b334f0232b3815f0a'
 
diff --git a/Casks/timings.rb b/Casks/timings.rb
index 03b07e0a554a..be73c009b2dd 100644
--- a/Casks/timings.rb
+++ b/Casks/timings.rb
@@ -1,4 +1,4 @@
-class Timings < Cask
+cask :v1 => 'timings' do
   version '1.0.4'
   sha256 'e7601405312bd6142514aef98154b2ebe8e06a3154c7afa7bcc03edf0090ddff'
 
diff --git a/Casks/tinkertool.rb b/Casks/tinkertool.rb
index 921e1e0fbe96..f2bf6ef0ca14 100644
--- a/Casks/tinkertool.rb
+++ b/Casks/tinkertool.rb
@@ -1,4 +1,4 @@
-class Tinkertool < Cask
+cask :v1 => 'tinkertool' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tinygrab.rb b/Casks/tinygrab.rb
index d39a2e04284c..b18c140a63f0 100644
--- a/Casks/tinygrab.rb
+++ b/Casks/tinygrab.rb
@@ -1,4 +1,4 @@
-class Tinygrab < Cask
+cask :v1 => 'tinygrab' do
   version '2.5.1'
   sha256 '783a2a739233d715d18c05faa2efdbf4c0360e3a420507ca1c4a50e5f5a731c1'
 
diff --git a/Casks/tinyumbrella.rb b/Casks/tinyumbrella.rb
index 80752160ba58..a9554741a11c 100644
--- a/Casks/tinyumbrella.rb
+++ b/Casks/tinyumbrella.rb
@@ -1,4 +1,4 @@
-class Tinyumbrella < Cask
+cask :v1 => 'tinyumbrella' do
   version '7.04'
   sha256 '2ce5ea70bbdf216aaff9fc30c1a33a58a6fc19a5ad5e4f0029aafae61c622db1'
 
diff --git a/Casks/titanium-studio.rb b/Casks/titanium-studio.rb
index 578651e33458..ab57f832cc3d 100644
--- a/Casks/titanium-studio.rb
+++ b/Casks/titanium-studio.rb
@@ -1,4 +1,4 @@
-class TitaniumStudio < Cask
+cask :v1 => 'titanium-studio' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tk-suite-client.rb b/Casks/tk-suite-client.rb
index 751f5a10efc7..a1db7367e926 100644
--- a/Casks/tk-suite-client.rb
+++ b/Casks/tk-suite-client.rb
@@ -1,4 +1,4 @@
-class TkSuiteClient < Cask
+cask :v1 => 'tk-suite-client' do
   version '4.4.25'
   sha256 '2d6679ccb7225e212288f46a6c0239ab3305de829895e297590e78864b1150ce'
 
diff --git a/Casks/toad.rb b/Casks/toad.rb
index d52e0fcc504c..52bab1994d37 100644
--- a/Casks/toad.rb
+++ b/Casks/toad.rb
@@ -1,4 +1,4 @@
-class Toad < Cask
+cask :v1 => 'toad' do
   version '1.0.8'
   sha256 'd02861e2319197730b16d112134f46f75b263d79ba6be29f6d9e33837c031fb9'
 
diff --git a/Casks/toau.rb b/Casks/toau.rb
index e74c7cb83c67..1dca293635d3 100644
--- a/Casks/toau.rb
+++ b/Casks/toau.rb
@@ -1,4 +1,4 @@
-class Toau < Cask
+cask :v1 => 'toau' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/today-scripts.rb b/Casks/today-scripts.rb
index 2a93964d0fee..39995a6050d2 100644
--- a/Casks/today-scripts.rb
+++ b/Casks/today-scripts.rb
@@ -1,4 +1,4 @@
-class TodayScripts < Cask
+cask :v1 => 'today-scripts' do
   version '1.1'
   sha256 'e9e1136e787347f257e9554efdd546c4fd92a6b2a6ae28d23f0065b3d7b96bc4'
 
diff --git a/Casks/todoist.rb b/Casks/todoist.rb
index 9a96153c7d16..78c415369ed6 100644
--- a/Casks/todoist.rb
+++ b/Casks/todoist.rb
@@ -1,4 +1,4 @@
-class Todoist < Cask
+cask :v1 => 'todoist' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/todos.rb b/Casks/todos.rb
index 3f255251ca18..2bcefeeb25ba 100644
--- a/Casks/todos.rb
+++ b/Casks/todos.rb
@@ -1,4 +1,4 @@
-class Todos < Cask
+cask :v1 => 'todos' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/todotxtmac.rb b/Casks/todotxtmac.rb
index 6919c1284ee1..b65771105ae9 100644
--- a/Casks/todotxtmac.rb
+++ b/Casks/todotxtmac.rb
@@ -1,4 +1,4 @@
-class Todotxtmac < Cask
+cask :v1 => 'todotxtmac' do
   version '1.2.4'
   sha256 '368010bec057387bdc6ee9cef4646f90d8eb1af8e1b4ec1666045e7e2166db4a'
 
diff --git a/Casks/tofu.rb b/Casks/tofu.rb
index 24b7c0b41ae8..6c2b7b14d08c 100644
--- a/Casks/tofu.rb
+++ b/Casks/tofu.rb
@@ -1,4 +1,4 @@
-class Tofu < Cask
+cask :v1 => 'tofu' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/toggldesktop.rb b/Casks/toggldesktop.rb
index aafd862ca5b5..871ec9f0962c 100644
--- a/Casks/toggldesktop.rb
+++ b/Casks/toggldesktop.rb
@@ -1,4 +1,4 @@
-class Toggldesktop < Cask
+cask :v1 => 'toggldesktop' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tokaido.rb b/Casks/tokaido.rb
index 461c7a914bf9..7fc63a83172a 100644
--- a/Casks/tokaido.rb
+++ b/Casks/tokaido.rb
@@ -1,4 +1,4 @@
-class Tokaido  < Cask
+cask :v1 => 'tokaido' do
   version '1.0'
   sha256 '72752b8e4e9f0e554661d8fb58879a82cac6dc5d19762367c89ca191f497d258'
 
diff --git a/Casks/tokens.rb b/Casks/tokens.rb
index 6c19abf069ee..34a511ef7a83 100644
--- a/Casks/tokens.rb
+++ b/Casks/tokens.rb
@@ -1,4 +1,4 @@
-class Tokens < Cask
+cask :v1 => 'tokens' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tomahawk.rb b/Casks/tomahawk.rb
index c18d2000aa6e..a6c73ec18bb4 100644
--- a/Casks/tomahawk.rb
+++ b/Casks/tomahawk.rb
@@ -1,4 +1,4 @@
-class Tomahawk < Cask
+cask :v1 => 'tomahawk' do
   version '0.8.0'
   sha256 'd1399948c23ad2bdb96e974ddbb302f385a30044dec3e0a947153b0d617c4568'
 
diff --git a/Casks/tomighty.rb b/Casks/tomighty.rb
index 4a0029cef547..b871406fe35b 100644
--- a/Casks/tomighty.rb
+++ b/Casks/tomighty.rb
@@ -1,4 +1,4 @@
-class Tomighty < Cask
+cask :v1 => 'tomighty' do
   version '1.0.1'
   sha256 '14ba9d4bc6e910e1c5bc256de4136db1e3e8d0671318b20c78f586a136a78793'
 
diff --git a/Casks/tonality-pro.rb b/Casks/tonality-pro.rb
index b0b86d308c92..0fb0ab505240 100644
--- a/Casks/tonality-pro.rb
+++ b/Casks/tonality-pro.rb
@@ -1,4 +1,4 @@
-class TonalityPro < Cask
+cask :v1 => 'tonality-pro' do
   version '1.1.0-800'
   sha256 '8adefcfa7ab2b1f3cda3287f133db15dc7d33191dc92ce5d5e129f575b50f482'
 
diff --git a/Casks/tongbu.rb b/Casks/tongbu.rb
index ca29fc44b199..a75c4837b05e 100644
--- a/Casks/tongbu.rb
+++ b/Casks/tongbu.rb
@@ -1,4 +1,4 @@
-class Tongbu < Cask
+cask :v1 => 'tongbu' do
   version '1.1.4'
   sha256 'b8c30ad109d1005fbcd865ceef67b8bb224595b8b40fc1e0b084d039e1d6ce50'
 
diff --git a/Casks/tonido.rb b/Casks/tonido.rb
index 0da580ebb722..7b9fe6ba7a6c 100644
--- a/Casks/tonido.rb
+++ b/Casks/tonido.rb
@@ -1,4 +1,4 @@
-class Tonido < Cask
+cask :v1 => 'tonido' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/toodledo.rb b/Casks/toodledo.rb
index a1bd13e604d0..e4a4a026ff36 100644
--- a/Casks/toodledo.rb
+++ b/Casks/toodledo.rb
@@ -1,4 +1,4 @@
-class Toodledo < Cask
+cask :v1 => 'toodledo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/torbrowser.rb b/Casks/torbrowser.rb
index 131f769a82cc..fb4b8b6aa9a6 100644
--- a/Casks/torbrowser.rb
+++ b/Casks/torbrowser.rb
@@ -1,4 +1,4 @@
-class Torbrowser < Cask
+cask :v1 => 'torbrowser' do
   version '4.0.1'
   sha256 '2388eaabbe81bdc767ce3fbbbe0247853eb4b0f018b341fc9d5017791f00f02b'
 
diff --git a/Casks/torpedo.rb b/Casks/torpedo.rb
index 43609c2f3083..e34f88b101c7 100644
--- a/Casks/torpedo.rb
+++ b/Casks/torpedo.rb
@@ -1,4 +1,4 @@
-class Torpedo < Cask
+cask :v1 => 'torpedo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tortoisehg.rb b/Casks/tortoisehg.rb
index 250fd3cfb63b..acdf4b0f7f2e 100644
--- a/Casks/tortoisehg.rb
+++ b/Casks/tortoisehg.rb
@@ -1,4 +1,4 @@
-class Tortoisehg < Cask
+cask :v1 => 'tortoisehg' do
   version '3.1.0'
   sha256 '5e8d1b70b9d3089977fb5a731c93e2e6c8ae7a089f908eb51d34c65ae599f45c'
 
diff --git a/Casks/torustrooper.rb b/Casks/torustrooper.rb
index 964edc8aadcf..44a794b132e4 100644
--- a/Casks/torustrooper.rb
+++ b/Casks/torustrooper.rb
@@ -1,4 +1,4 @@
-class Torustrooper < Cask
+cask :v1 => 'torustrooper' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/totalfinder.rb b/Casks/totalfinder.rb
index 5f2937fd33a9..90e80ee6e192 100644
--- a/Casks/totalfinder.rb
+++ b/Casks/totalfinder.rb
@@ -1,4 +1,4 @@
-class Totalfinder < Cask
+cask :v1 => 'totalfinder' do
   version '1.6.17'
   sha256 'f2badde257b54c5dad8c3cce46afc5f4511f1d91ef6ad4a80e3522faa2331106'
 
diff --git a/Casks/totals.rb b/Casks/totals.rb
index 50d87e0e6dbc..d5a4e42fbc38 100644
--- a/Casks/totals.rb
+++ b/Casks/totals.rb
@@ -1,4 +1,4 @@
-class Totals < Cask
+cask :v1 => 'totals' do
   version '2.2.11'
   sha256 '594c58ea110bef590b03aa03a495f7e086cdda9f7fa8a9e6fe4c5af1fb892d09'
 
diff --git a/Casks/totalspaces.rb b/Casks/totalspaces.rb
index 68807014bd1c..c29f403ad5f8 100644
--- a/Casks/totalspaces.rb
+++ b/Casks/totalspaces.rb
@@ -1,4 +1,4 @@
-class Totalspaces < Cask
+cask :v1 => 'totalspaces' do
 
   if MacOS.version < :mavericks
     version '1.2.11'
diff --git a/Casks/totalterminal.rb b/Casks/totalterminal.rb
index ba628acfc708..6c7a030b40df 100644
--- a/Casks/totalterminal.rb
+++ b/Casks/totalterminal.rb
@@ -1,4 +1,4 @@
-class Totalterminal < Cask
+cask :v1 => 'totalterminal' do
   version '1.5.4'
   sha256 '159475ff641a05cbce2ca4463eac4ae98006b62396b9f1f59d396d68d71d7d87'
 
diff --git a/Casks/tower.rb b/Casks/tower.rb
index 2a9051bc9fea..0ea383935957 100644
--- a/Casks/tower.rb
+++ b/Casks/tower.rb
@@ -1,4 +1,4 @@
-class Tower < Cask
+cask :v1 => 'tower' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/track-o-bot.rb b/Casks/track-o-bot.rb
index 610603f638f4..d85db67914f1 100644
--- a/Casks/track-o-bot.rb
+++ b/Casks/track-o-bot.rb
@@ -1,4 +1,4 @@
-class TrackOBot < Cask
+cask :v1 => 'track-o-bot' do
   version '0.4.2'
   sha256 '3746f662cda62047c8b9e870997bfc8d4f04040b72e1573177c4da2cfc5e8cb3'
 
diff --git a/Casks/trailer.rb b/Casks/trailer.rb
index 31ec239d10aa..e6db6e072b3c 100644
--- a/Casks/trailer.rb
+++ b/Casks/trailer.rb
@@ -1,4 +1,4 @@
-class Trailer < Cask
+cask :v1 => 'trailer' do
   version '1.1.3'
   sha256 '5f59c927658ea1adfde83b5214438b485117f32024b8f73eaa4da7538d2bc95f'
 
diff --git a/Casks/trailrunner.rb b/Casks/trailrunner.rb
index 8ac720c1ab77..ec8ffe2b950f 100644
--- a/Casks/trailrunner.rb
+++ b/Casks/trailrunner.rb
@@ -1,4 +1,4 @@
-class Trailrunner < Cask
+cask :v1 => 'trailrunner' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/traktable.rb b/Casks/traktable.rb
index 39a8267fe9db..e0ff1f69f3f4 100644
--- a/Casks/traktable.rb
+++ b/Casks/traktable.rb
@@ -1,4 +1,4 @@
-class Traktable < Cask
+cask :v1 => 'traktable' do
   version '0.5.2'
   sha256 '77d3800f02f2b5a2aef8a56e7986b731831738673e35c633d743df87bc556225'
 
diff --git a/Casks/transmission-remote-gui.rb b/Casks/transmission-remote-gui.rb
index 9127784d7f4e..510bce474606 100644
--- a/Casks/transmission-remote-gui.rb
+++ b/Casks/transmission-remote-gui.rb
@@ -1,4 +1,4 @@
-class TransmissionRemoteGui < Cask
+cask :v1 => 'transmission-remote-gui' do
   version '5.0.1'
   sha256 'b961aeb244b2519563837745f3475d21379e3da32bae2b3cbb20ca91d1a90d75'
 
diff --git a/Casks/transmission.rb b/Casks/transmission.rb
index 5e807afdcd25..d2312a4623a7 100644
--- a/Casks/transmission.rb
+++ b/Casks/transmission.rb
@@ -1,4 +1,4 @@
-class Transmission < Cask
+cask :v1 => 'transmission' do
   version '2.84'
   sha256 '53d08a55a5ca55010d409acb10f0285a649b8879085cad83f2cbcb7faa489ad5'
 
diff --git a/Casks/transmit.rb b/Casks/transmit.rb
index dfc5b13251ff..34e868cf43fb 100644
--- a/Casks/transmit.rb
+++ b/Casks/transmit.rb
@@ -1,4 +1,4 @@
-class Transmit < Cask
+cask :v1 => 'transmit' do
   version '4.4.8'
   sha256 '3547a5e8baabffd18c4e21c766362cd4295d878d391ce48bb8f8f4d6eabd9ef9'
 
diff --git a/Casks/transporter-desktop.rb b/Casks/transporter-desktop.rb
index 807fa7fd53e9..f20793e981bf 100644
--- a/Casks/transporter-desktop.rb
+++ b/Casks/transporter-desktop.rb
@@ -1,4 +1,4 @@
-class TransporterDesktop < Cask
+cask :v1 => 'transporter-desktop' do
   version '2.8.1_16078'
   sha256 '43d0f47993d233fee6209b040b77f42e1b909cfedcbe873b7fb4700782af4c75'
 
diff --git a/Casks/treemaker.rb b/Casks/treemaker.rb
index a5d28be4e5ed..e3801686bf31 100644
--- a/Casks/treemaker.rb
+++ b/Casks/treemaker.rb
@@ -1,4 +1,4 @@
-class Treemaker < Cask
+cask :v1 => 'treemaker' do
   version '5.0.1'
   sha256 '2377c8c4277890de9f746eaa9d021f89fdd52cabfe9ab82fdfa741a47ed1f554'
 
diff --git a/Casks/treesheets.rb b/Casks/treesheets.rb
index 165fc906523b..73bc72f63e9b 100644
--- a/Casks/treesheets.rb
+++ b/Casks/treesheets.rb
@@ -1,4 +1,4 @@
-class Treesheets < Cask
+cask :v1 => 'treesheets' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tresorit.rb b/Casks/tresorit.rb
index e033cc96b989..7dd77dc67102 100644
--- a/Casks/tresorit.rb
+++ b/Casks/tresorit.rb
@@ -1,4 +1,4 @@
-class Tresorit < Cask
+cask :v1 => 'tresorit' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tribler.rb b/Casks/tribler.rb
index 4c0ed06580a9..2f8d546116ca 100644
--- a/Casks/tribler.rb
+++ b/Casks/tribler.rb
@@ -1,4 +1,4 @@
-class Tribler < Cask
+cask :v1 => 'tribler' do
   version '6.3.2'
   sha256 'd82c29349f70f7bb260012299f8d60a5da0f5a474c75e2bb74c37133f45878b2'
 
diff --git a/Casks/trickster.rb b/Casks/trickster.rb
index 14046bacae29..75876f6a18f8 100644
--- a/Casks/trickster.rb
+++ b/Casks/trickster.rb
@@ -1,4 +1,4 @@
-class Trickster < Cask
+cask :v1 => 'trickster' do
   version '2.2.1'
   sha256 '6a6531e8c8c7672bf422c496a478ee26f184f1c63036d7f1125913d69a067292'
 
diff --git a/Casks/trim-enabler.rb b/Casks/trim-enabler.rb
index a1f228df0769..359bdb93f497 100644
--- a/Casks/trim-enabler.rb
+++ b/Casks/trim-enabler.rb
@@ -1,4 +1,4 @@
-class TrimEnabler < Cask
+cask :v1 => 'trim-enabler' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/trim-ios-screenshots.rb b/Casks/trim-ios-screenshots.rb
index dd431756ad4d..11fa01f56e14 100644
--- a/Casks/trim-ios-screenshots.rb
+++ b/Casks/trim-ios-screenshots.rb
@@ -1,4 +1,4 @@
-class TrimIosScreenshots < Cask
+cask :v1 => 'trim-ios-screenshots' do
   version '1.0.1'
   sha256 '08be76899e40a99183cde27639ae44329096dd01f8c90619e4decc6243af6ed1'
 
diff --git a/Casks/triumph.rb b/Casks/triumph.rb
index c31117bb0527..732df4f4b1a8 100644
--- a/Casks/triumph.rb
+++ b/Casks/triumph.rb
@@ -1,4 +1,4 @@
-class Triumph < Cask
+cask :v1 => 'triumph' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/truecrypt.rb b/Casks/truecrypt.rb
index 2127d2fb91a1..52c873a4ce8f 100644
--- a/Casks/truecrypt.rb
+++ b/Casks/truecrypt.rb
@@ -1,4 +1,4 @@
-class Truecrypt < Cask
+cask :v1 => 'truecrypt' do
   version '7.2'
   sha256 '01acf85be9b23a1c718193c40f3ecaaf6551695e0dc67c28345e560cca56c94e'
 
diff --git a/Casks/tubbler.rb b/Casks/tubbler.rb
index 45289bf9589a..01f77c13fb4e 100644
--- a/Casks/tubbler.rb
+++ b/Casks/tubbler.rb
@@ -1,4 +1,4 @@
-class Tubbler < Cask
+cask :v1 => 'tubbler' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tuneinstructor.rb b/Casks/tuneinstructor.rb
index bd288cecfd1f..80f784705029 100644
--- a/Casks/tuneinstructor.rb
+++ b/Casks/tuneinstructor.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-class Tuneinstructor < Cask
+cask :v1 => 'tuneinstructor' do
   version '3.4'
   sha256 '7909eeaf0b3cbe41c511f2c450a6249c9d8a311a482547cf8fc11537b11ecbd4'
 
diff --git a/Casks/tuneup.rb b/Casks/tuneup.rb
index 1ddf5e69202d..21072f838378 100644
--- a/Casks/tuneup.rb
+++ b/Casks/tuneup.rb
@@ -1,4 +1,4 @@
-class Tuneup < Cask
+cask :v1 => 'tuneup' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tunewiki.rb b/Casks/tunewiki.rb
index a554facf0df0..5c0b684f0587 100644
--- a/Casks/tunewiki.rb
+++ b/Casks/tunewiki.rb
@@ -1,4 +1,4 @@
-class Tunewiki < Cask
+cask :v1 => 'tunewiki' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tunnelbear.rb b/Casks/tunnelbear.rb
index 95f418890c0d..1d79676a4e38 100644
--- a/Casks/tunnelbear.rb
+++ b/Casks/tunnelbear.rb
@@ -1,4 +1,4 @@
-class Tunnelbear < Cask
+cask :v1 => 'tunnelbear' do
   version '2.4.4'
   sha256 '0b1e9798b6b395ce5ee9a7713ea2f57460226e76de131c76004d8e761e4eed92'
 
diff --git a/Casks/tunnelblick.rb b/Casks/tunnelblick.rb
index 6d8eb8a90b2b..dcee553e5e7c 100644
--- a/Casks/tunnelblick.rb
+++ b/Casks/tunnelblick.rb
@@ -1,4 +1,4 @@
-class Tunnelblick < Cask
+cask :v1 => 'tunnelblick' do
   version '3.4.1_r3054'
   sha256 '44a9b1986c100698c82186c4ce404d5acf34f292d08c5f8528c33e22646f955a'
 
diff --git a/Casks/tuxguitar.rb b/Casks/tuxguitar.rb
index c0b041319254..cf3f684c0ab0 100644
--- a/Casks/tuxguitar.rb
+++ b/Casks/tuxguitar.rb
@@ -1,4 +1,4 @@
-class Tuxguitar < Cask
+cask :v1 => 'tuxguitar' do
   version '1.2'
   sha256 '2d79ffdfdde9205073fdaa1c34701ea8f1961f822709b5270dc57555eb926d16'
 
diff --git a/Casks/tv-browser.rb b/Casks/tv-browser.rb
index d860ef164647..e743d4de6cce 100644
--- a/Casks/tv-browser.rb
+++ b/Casks/tv-browser.rb
@@ -1,4 +1,4 @@
-class TvBrowser < Cask
+cask :v1 => 'tv-browser' do
   version '3.3.3'
   sha256 '951fe8478fa2efa5f7784c23f153bcc8b0a6fcb8a7405c4990c44b3c967e73cc'
 
diff --git a/Casks/tv-show-tracker.rb b/Casks/tv-show-tracker.rb
index 6808b4612434..3d9ae27dc8fd 100644
--- a/Casks/tv-show-tracker.rb
+++ b/Casks/tv-show-tracker.rb
@@ -1,4 +1,4 @@
-class TvShowTracker < Cask
+cask :v1 => 'tv-show-tracker' do
   version '1.3.3'
   sha256 '7e489d50083acc217a7587d800d3f708f0ba586397656cce529e8f40a8a612f9'
 
diff --git a/Casks/tvmobili.rb b/Casks/tvmobili.rb
index 2b3e0870b523..bc4da70bee43 100644
--- a/Casks/tvmobili.rb
+++ b/Casks/tvmobili.rb
@@ -1,4 +1,4 @@
-class Tvmobili < Cask
+cask :v1 => 'tvmobili' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/tvrenamer.rb b/Casks/tvrenamer.rb
index 5c3e7ec60ccd..9eeb55568b5b 100644
--- a/Casks/tvrenamer.rb
+++ b/Casks/tvrenamer.rb
@@ -1,4 +1,4 @@
-class Tvrenamer < Cask
+cask :v1 => 'tvrenamer' do
   version '0.6'
   sha256 'fe38d8f7fab69bc54673ef9822b01401d5d72453865842f27023ecd7de4a531a'
 
diff --git a/Casks/tvshows.rb b/Casks/tvshows.rb
index 12ecb4ade160..131ad85b635f 100644
--- a/Casks/tvshows.rb
+++ b/Casks/tvshows.rb
@@ -1,4 +1,4 @@
-class Tvshows < Cask
+cask :v1 => 'tvshows' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/twelf.rb b/Casks/twelf.rb
index 56a2eaa9e262..30d6d3bff05a 100644
--- a/Casks/twelf.rb
+++ b/Casks/twelf.rb
@@ -1,4 +1,4 @@
-class Twelf < Cask
+cask :v1 => 'twelf' do
   version '1.7.1'
   sha256 'be9e638d0c1dca17d70b06218084b6012fe74aecae09183db457c1c25f7cf3a0'
 
diff --git a/Casks/twentytwo.rb b/Casks/twentytwo.rb
index ae20de07317f..9b585fb37969 100644
--- a/Casks/twentytwo.rb
+++ b/Casks/twentytwo.rb
@@ -1,4 +1,4 @@
-class Twentytwo < Cask
+cask :v1 => 'twentytwo' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/twindocs.rb b/Casks/twindocs.rb
index adae18ae0ebe..255e6aac28f8 100644
--- a/Casks/twindocs.rb
+++ b/Casks/twindocs.rb
@@ -1,4 +1,4 @@
-class Twindocs < Cask
+cask :v1 => 'twindocs' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/twine.rb b/Casks/twine.rb
index 72b3bd7fee57..34729ea3a601 100644
--- a/Casks/twine.rb
+++ b/Casks/twine.rb
@@ -1,4 +1,4 @@
-class Twine < Cask
+cask :v1 => 'twine' do
   version '1.4.1'
   sha256 '717e0f7849f8216a7bae68c66656cf0e3cd0496c8a9d95e3c61e175d56f010e4'
 
diff --git a/Casks/twitterrific.rb b/Casks/twitterrific.rb
index 2807ff090707..acdce057736c 100644
--- a/Casks/twitterrific.rb
+++ b/Casks/twitterrific.rb
@@ -1,4 +1,4 @@
-class Twitterrific < Cask
+cask :v1 => 'twitterrific' do
   version '4.5.1'
   sha256 '1b43504307e8a541c97a93ecd4c56bc443f66cdd622d319db965e7e0eb760b46'
 
diff --git a/Casks/typewriter.rb b/Casks/typewriter.rb
index 8ff2efdfa3dc..ee5efea70aa5 100644
--- a/Casks/typewriter.rb
+++ b/Casks/typewriter.rb
@@ -1,4 +1,4 @@
-class Typewriter < Cask
+cask :v1 => 'typewriter' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/typinator.rb b/Casks/typinator.rb
index b4f46ccf156b..2faed70945a3 100644
--- a/Casks/typinator.rb
+++ b/Casks/typinator.rb
@@ -1,4 +1,4 @@
-class Typinator < Cask
+cask :v1 => 'typinator' do
   version '6.2'
   sha256 '4b9b3acc26716dbf01951043f0102489ffd32436cdad6820e382dbb5b1fa0eb6'
 
diff --git a/Casks/ubar.rb b/Casks/ubar.rb
index 9ac747110a6b..e0e3168c4c84 100644
--- a/Casks/ubar.rb
+++ b/Casks/ubar.rb
@@ -1,4 +1,4 @@
-class Ubar < Cask
+cask :v1 => 'ubar' do
   version '2.2.6'
   sha256 '3c44cbdcaa99658d2b12e50756668e3b60beea90667c35bccde3412f80cf65c9'
 
diff --git a/Casks/uber-network-fuser.rb b/Casks/uber-network-fuser.rb
index 0431629ef9eb..3d67efbae0ce 100644
--- a/Casks/uber-network-fuser.rb
+++ b/Casks/uber-network-fuser.rb
@@ -1,4 +1,4 @@
-class UberNetworkFuser < Cask
+cask :v1 => 'uber-network-fuser' do
   version '1.701'
   sha256 'd2f919a466d093da30e66a664d716a96ea0e1167c887ace8fb30d2e55c6c3c7d'
 
diff --git a/Casks/uberpov.rb b/Casks/uberpov.rb
index c696c8ed8c15..ff4c09938d96 100644
--- a/Casks/uberpov.rb
+++ b/Casks/uberpov.rb
@@ -1,4 +1,4 @@
-class Uberpov < Cask
+cask :v1 => 'uberpov' do
   version '3.7-Beta3'
   sha256 '5e3e8ba5b257ad4e058c2f7735776e271f32c02e9cc02f71b1ece6b8c950c8d0'
 
diff --git a/Casks/ubersicht.rb b/Casks/ubersicht.rb
index 1a652a0a2240..03e9615a48ca 100644
--- a/Casks/ubersicht.rb
+++ b/Casks/ubersicht.rb
@@ -1,4 +1,4 @@
-class Ubersicht < Cask
+cask :v1 => 'ubersicht' do
   version '0.3.13'
   sha256 'a5cf3d806392fcb275c4d6709799ddf8de5c19ef6ab1dfb0d5aeac150eed59d4'
 
diff --git a/Casks/ubuntu-one.rb b/Casks/ubuntu-one.rb
index 4bbdbfbf2866..9846075d30b0 100644
--- a/Casks/ubuntu-one.rb
+++ b/Casks/ubuntu-one.rb
@@ -1,4 +1,4 @@
-class UbuntuOne < Cask
+cask :v1 => 'ubuntu-one' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ukelele.rb b/Casks/ukelele.rb
index 3d44070cd453..4ab50861ce8b 100644
--- a/Casks/ukelele.rb
+++ b/Casks/ukelele.rb
@@ -1,4 +1,4 @@
-class Ukelele < Cask
+cask :v1 => 'ukelele' do
   version '2.2.8'
   sha256 'e6200f418dee4ad10fa126536218086273ef8e896b95ede8ba73ddb42ed02ec3'
 
diff --git a/Casks/ultrastardeluxe.rb b/Casks/ultrastardeluxe.rb
index 67d5c2d2f258..6268022cb523 100644
--- a/Casks/ultrastardeluxe.rb
+++ b/Casks/ultrastardeluxe.rb
@@ -1,4 +1,4 @@
-class Ultrastardeluxe < Cask
+cask :v1 => 'ultrastardeluxe' do
   version '1.1'
   sha256 '18e36476ec6994b1dd54e6272c08ceb86b10abf4984a18d834003e696153ca9b'
 
diff --git a/Casks/uncrustifyx.rb b/Casks/uncrustifyx.rb
index 15a3fae63f30..532d4f22ddcd 100644
--- a/Casks/uncrustifyx.rb
+++ b/Casks/uncrustifyx.rb
@@ -1,4 +1,4 @@
-class Uncrustifyx < Cask
+cask :v1 => 'uncrustifyx' do
   version '0.4.3'
   sha256 '017c0781ce05db59c1a3fe52a140166df55aa2d87286a7cf5ba5e3eb6b06c7df'
 
diff --git a/Casks/undercover.rb b/Casks/undercover.rb
index 87e1c72bbcae..3dbfcbad840c 100644
--- a/Casks/undercover.rb
+++ b/Casks/undercover.rb
@@ -1,4 +1,4 @@
-class Undercover < Cask
+cask :v1 => 'undercover' do
   version '6.0'
   sha256 '07d9b20eba2a873e538e4f2ae4c1dcafafd282fb8af01f3374b08e54069d9932'
 
diff --git a/Casks/unetbootin.rb b/Casks/unetbootin.rb
index 87bd408fc001..8fc06f146a78 100644
--- a/Casks/unetbootin.rb
+++ b/Casks/unetbootin.rb
@@ -1,4 +1,4 @@
-class Unetbootin < Cask
+cask :v1 => 'unetbootin' do
   version '608'
   sha256 '6348a25607b08426759063a77719b208f3efef3cf0721c3dbcc521b32e6a5ad5'
 
diff --git a/Casks/unicodechecker.rb b/Casks/unicodechecker.rb
index 0392d408d99c..a7d443b42d6b 100644
--- a/Casks/unicodechecker.rb
+++ b/Casks/unicodechecker.rb
@@ -1,4 +1,4 @@
-class Unicodechecker < Cask
+cask :v1 => 'unicodechecker' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/unified-remote.rb b/Casks/unified-remote.rb
index 2cb4ab9de4c0..87530d85d591 100644
--- a/Casks/unified-remote.rb
+++ b/Casks/unified-remote.rb
@@ -1,4 +1,4 @@
-class UnifiedRemote < Cask
+cask :v1 => 'unified-remote' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/uninstallpkg.rb b/Casks/uninstallpkg.rb
index 943b46adca4c..ce069314460b 100644
--- a/Casks/uninstallpkg.rb
+++ b/Casks/uninstallpkg.rb
@@ -1,4 +1,4 @@
-class Uninstallpkg < Cask
+cask :v1 => 'uninstallpkg' do
   version '1.0.5'
   sha256 '199cbae47644572aade93bb81a152934178016da7cf90f3c7136b36d4819e752'
 
diff --git a/Casks/unison.rb b/Casks/unison.rb
index 7f3ef5a255c2..dd1e6ff2394d 100644
--- a/Casks/unison.rb
+++ b/Casks/unison.rb
@@ -1,4 +1,4 @@
-class Unison < Cask
+cask :v1 => 'unison' do
   version '2.40.69'
   sha256 '2bcc460511f2b43fa1613cc5f9ba4dd59bb12d40b5b9fb2e9f21adaf854bcf3b'
 
diff --git a/Casks/unity-web-player.rb b/Casks/unity-web-player.rb
index 8f83e1004258..75a9c941e08d 100644
--- a/Casks/unity-web-player.rb
+++ b/Casks/unity-web-player.rb
@@ -1,4 +1,4 @@
-class UnityWebPlayer < Cask
+cask :v1 => 'unity-web-player' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/unity.rb b/Casks/unity.rb
index a21dcafaaafc..bf3d4d5c43fe 100644
--- a/Casks/unity.rb
+++ b/Casks/unity.rb
@@ -1,4 +1,4 @@
-class Unity < Cask
+cask :v1 => 'unity' do
   version '4.5.5'
   sha256 'e42d3b8e3bc3fbc7448bb06b5210c1c0687ba3f784eb947b4586b9f129c6b0d4'
 
diff --git a/Casks/universal-media-server.rb b/Casks/universal-media-server.rb
index 5e72d78cf2a8..ae6b6e47952d 100644
--- a/Casks/universal-media-server.rb
+++ b/Casks/universal-media-server.rb
@@ -1,4 +1,4 @@
-class UniversalMediaServer < Cask
+cask :v1 => 'universal-media-server' do
   version '4.2.1'
   sha256 '9219b5d041b374e8d297536c06e0afa4ea3216ff1484493a849a8fa32e2b57b0'
 
diff --git a/Casks/unpkg.rb b/Casks/unpkg.rb
index 2fba8098ebff..5ac112533ad6 100644
--- a/Casks/unpkg.rb
+++ b/Casks/unpkg.rb
@@ -1,4 +1,4 @@
-class Unpkg < Cask
+cask :v1 => 'unpkg' do
   version '4.5'
   sha256 'e32754b07073b383320d2bc0ce4ba9bd83a3f352043bd6f500741901f00c8c17'
 
diff --git a/Casks/unrarx.rb b/Casks/unrarx.rb
index 9a93ac6bef15..1084c020fd08 100644
--- a/Casks/unrarx.rb
+++ b/Casks/unrarx.rb
@@ -1,4 +1,4 @@
-class Unrarx < Cask
+cask :v1 => 'unrarx' do
   version '2.2'
   sha256 '616c5c536efb29a35fe45c8171874592cc28b269e5d7ed6947c19c8cbb686955'
 
diff --git a/Casks/usb-overdrive.rb b/Casks/usb-overdrive.rb
index a1f9ee47e5bc..016646ef607f 100644
--- a/Casks/usb-overdrive.rb
+++ b/Casks/usb-overdrive.rb
@@ -1,4 +1,4 @@
-class UsbOverdrive < Cask
+cask :v1 => 'usb-overdrive' do
   version '3.0.2'
   sha256 'd6bed831521a5ab2b82d7eede7be46953e1c010cc6e02ff11f3dd2532d7b0b13'
 
diff --git a/Casks/utc-menu-clock.rb b/Casks/utc-menu-clock.rb
index c35f24959079..f42d85f5723b 100644
--- a/Casks/utc-menu-clock.rb
+++ b/Casks/utc-menu-clock.rb
@@ -1,4 +1,4 @@
-class UtcMenuClock < Cask
+cask :v1 => 'utc-menu-clock' do
   version '1.2'
   sha256 '8a6d26228495aa802b3f9f80e43ee58bff92097e7de41de86dae994a9350d9b2'
 
diff --git a/Casks/utopia.rb b/Casks/utopia.rb
index 697c92a42813..82da8e1b4463 100644
--- a/Casks/utopia.rb
+++ b/Casks/utopia.rb
@@ -1,4 +1,4 @@
-class Utopia < Cask
+cask :v1 => 'utopia' do
   version '2.4.2'
   sha256 'c9c0f76a0a9035fe9a8405c6e32368ddf594aac86d742cd6aefdfa64d699e20a'
 
diff --git a/Casks/utorrent.rb b/Casks/utorrent.rb
index 287d1edefa29..8054ddbc7d64 100644
--- a/Casks/utorrent.rb
+++ b/Casks/utorrent.rb
@@ -1,4 +1,4 @@
-class Utorrent < Cask
+cask :v1 => 'utorrent' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/vagrant-bar.rb b/Casks/vagrant-bar.rb
index f8dc86fb6846..a67e807c62c1 100644
--- a/Casks/vagrant-bar.rb
+++ b/Casks/vagrant-bar.rb
@@ -1,4 +1,4 @@
-class VagrantBar < Cask
+cask :v1 => 'vagrant-bar' do
   version '1.13'
   sha256 '161ad4f4b7acbeaa76352e7a19849dd5275e4b1811caba8b853fa7964812169a'
 
diff --git a/Casks/vagrant-manager.rb b/Casks/vagrant-manager.rb
index 132e7415fdcf..6bc194402f08 100644
--- a/Casks/vagrant-manager.rb
+++ b/Casks/vagrant-manager.rb
@@ -1,4 +1,4 @@
-class VagrantManager < Cask
+cask :v1 => 'vagrant-manager' do
   version '2.1.1'
   sha256 'bd4a44c82c4d2ffa2d9de3d9f924eb5eeb76ac133648de939668501a2deb021b'
 
diff --git a/Casks/vagrant.rb b/Casks/vagrant.rb
index cb08cee027d7..cebeae9ddc1e 100644
--- a/Casks/vagrant.rb
+++ b/Casks/vagrant.rb
@@ -1,4 +1,4 @@
-class Vagrant < Cask
+cask :v1 => 'vagrant' do
   version '1.6.5'
   sha256 'a94a16b9ed5f63460f64110738067aea029238f8d826c8dd90c5c34615a5be1e'
 
diff --git a/Casks/valentina-studio.rb b/Casks/valentina-studio.rb
index 2ef26530ce85..85296e42af54 100644
--- a/Casks/valentina-studio.rb
+++ b/Casks/valentina-studio.rb
@@ -1,4 +1,4 @@
-class ValentinaStudio < Cask
+cask :v1 => 'valentina-studio' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/validator-sac.rb b/Casks/validator-sac.rb
index e7f13c333591..3fc8b15ef0ce 100644
--- a/Casks/validator-sac.rb
+++ b/Casks/validator-sac.rb
@@ -1,4 +1,4 @@
-class ValidatorSac < Cask
+cask :v1 => 'validator-sac' do
   version '0.10.4'
   sha256 '45ed10a41d49cdce8c048dae50f96abc78d9a45d5d0137d5757ed69de333a67f'
 
diff --git a/Casks/vassal.rb b/Casks/vassal.rb
index 53d110515f6c..98697e39dcee 100644
--- a/Casks/vassal.rb
+++ b/Casks/vassal.rb
@@ -1,4 +1,4 @@
-class Vassal < Cask
+cask :v1 => 'vassal' do
   version '3.2.13'
   sha256 'f9840fe23a48611307a1e42919fc4dcd6ff79165eeda2da61b834f81ab7bf7f6'
 
diff --git a/Casks/versions.rb b/Casks/versions.rb
index 327828a18223..197c20b27d32 100644
--- a/Casks/versions.rb
+++ b/Casks/versions.rb
@@ -1,4 +1,4 @@
-class Versions < Cask
+cask :v1 => 'versions' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/vessel.rb b/Casks/vessel.rb
index e093feb733ab..a2442380eb88 100644
--- a/Casks/vessel.rb
+++ b/Casks/vessel.rb
@@ -1,4 +1,4 @@
-class Vessel < Cask
+cask :v1 => 'vessel' do
   version '0.3.0'
   sha256 'd53717d6de3f9d216585af56fd7e61f7a89abcd0436017f5861a17389c7a169a'
 
diff --git a/Casks/viber.rb b/Casks/viber.rb
index 01e69d9ea17a..77df7a1c7cbb 100644
--- a/Casks/viber.rb
+++ b/Casks/viber.rb
@@ -1,4 +1,4 @@
-class Viber < Cask
+cask :v1 => 'viber' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/vico.rb b/Casks/vico.rb
index 410a6be1caa6..22538e2390bc 100644
--- a/Casks/vico.rb
+++ b/Casks/vico.rb
@@ -1,4 +1,4 @@
-class Vico < Cask
+cask :v1 => 'vico' do
   version 'r3132'
   sha256 'f5c82f320a1e3929492ecb30ba6b50d48af413b33b8e14dac06c75cd06cb809f'
 
diff --git a/Casks/videobox.rb b/Casks/videobox.rb
index 19dc549b7111..514e9887d98c 100644
--- a/Casks/videobox.rb
+++ b/Casks/videobox.rb
@@ -1,4 +1,4 @@
-class Videobox < Cask
+cask :v1 => 'videobox' do
   version '4.1.2'
   sha256 'bd9e6ae942b729b02c40ad076814be7c5e2f966325c9c5e982070d03443408c5'
 
diff --git a/Casks/videomonkey.rb b/Casks/videomonkey.rb
index 24d1edd8a5ac..db38c8e67937 100644
--- a/Casks/videomonkey.rb
+++ b/Casks/videomonkey.rb
@@ -1,4 +1,4 @@
-class Videomonkey < Cask
+cask :v1 => 'videomonkey' do
   version '0.16'
   sha256 'ab09a3bb98a78d32ae48c55b6572e4d1e10ead0f26d5ba895a9a2ee5c105088c'
 
diff --git a/Casks/videospec.rb b/Casks/videospec.rb
index c9b0a002ddb2..1857cb3b81ec 100644
--- a/Casks/videospec.rb
+++ b/Casks/videospec.rb
@@ -1,4 +1,4 @@
-class Videospec < Cask
+cask :v1 => 'videospec' do
   version '0.9.8'
   sha256 '3f1c0bee41512e1d728db693038c394fb2537ede64b79ece63fb7af6fa71676a'
 
diff --git a/Casks/vienna.rb b/Casks/vienna.rb
index 54dca607e0e6..2da531fb8261 100644
--- a/Casks/vienna.rb
+++ b/Casks/vienna.rb
@@ -1,4 +1,4 @@
-class Vienna < Cask
+cask :v1 => 'vienna' do
   version '3.0.0_rc9'
   sha256 '5d6c85ab3e59d581efe37aa0e7a035ebeae1688a4d7e283bb9eed72c8c2bb606'
 
diff --git a/Casks/viewit.rb b/Casks/viewit.rb
index 797bd357634a..bbcb9000be36 100644
--- a/Casks/viewit.rb
+++ b/Casks/viewit.rb
@@ -1,4 +1,4 @@
-class Viewit < Cask
+cask :v1 => 'viewit' do
   version '2.50'
   sha256 '188f82c1294a2b63f817c3cd1897ff2c43af71d29305a4db614a9378994e7014'
 
diff --git a/Casks/vimediamanager.rb b/Casks/vimediamanager.rb
index 98323fbf66d6..c0f6c9e722e0 100644
--- a/Casks/vimediamanager.rb
+++ b/Casks/vimediamanager.rb
@@ -1,4 +1,4 @@
-class Vimediamanager < Cask
+cask :v1 => 'vimediamanager' do
   version '0.7a11c'
   sha256 '3642a38fdc4d995943e42bad538eb117ab225fb564c05701850fe01d9c99a035'
 
diff --git a/Casks/vimr.rb b/Casks/vimr.rb
index 806c5ce1a39e..b18683917f86 100644
--- a/Casks/vimr.rb
+++ b/Casks/vimr.rb
@@ -1,4 +1,4 @@
-class Vimr < Cask
+cask :v1 => 'vimr' do
   version '0.2.0-20'
   sha256 '393d757bff0b6b9a0f94b468084ad88ff151619c2c917a3d64c2b16c87419d40'
 
diff --git a/Casks/vine-server.rb b/Casks/vine-server.rb
index 13af44f0f60b..a3b698b15a88 100644
--- a/Casks/vine-server.rb
+++ b/Casks/vine-server.rb
@@ -1,4 +1,4 @@
-class VineServer < Cask
+cask :v1 => 'vine-server' do
   version '4.01'
   sha256 '10e32d9594614b5169261b5b9bbeadb6f5adf2cc1c4bf2fdce68be3ccd7ca4a9'
 
diff --git a/Casks/vinoteka.rb b/Casks/vinoteka.rb
index fbc5bdb3251d..6112e2f7e591 100644
--- a/Casks/vinoteka.rb
+++ b/Casks/vinoteka.rb
@@ -1,4 +1,4 @@
-class Vinoteka < Cask
+cask :v1 => 'vinoteka' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/virtaal.rb b/Casks/virtaal.rb
index f49eec560e46..cf21885228c6 100644
--- a/Casks/virtaal.rb
+++ b/Casks/virtaal.rb
@@ -1,4 +1,4 @@
-class Virtaal < Cask
+cask :v1 => 'virtaal' do
   version '0.7.1b2'
   sha256 '41fec069ca06eb627c75b8d66460110b7970b0894e19df4f41510ac7b91bdbd0'
 
diff --git a/Casks/virtualbox.rb b/Casks/virtualbox.rb
index a1f86d53236f..d490d002e4eb 100644
--- a/Casks/virtualbox.rb
+++ b/Casks/virtualbox.rb
@@ -1,4 +1,4 @@
-class Virtualbox < Cask
+cask :v1 => 'virtualbox' do
   version '4.3.18-96516'
   sha256 'a0c6a9a9455397a929150065b2883714a1dd630f63ef88b8d8cf527944becfc6'
 
diff --git a/Casks/virtualhostx.rb b/Casks/virtualhostx.rb
index a5200e15ef04..4d60da48ff07 100644
--- a/Casks/virtualhostx.rb
+++ b/Casks/virtualhostx.rb
@@ -1,4 +1,4 @@
-class Virtualhostx < Cask
+cask :v1 => 'virtualhostx' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/virustotaluploader.rb b/Casks/virustotaluploader.rb
index 5fa0dd540545..ccddd64dc354 100644
--- a/Casks/virustotaluploader.rb
+++ b/Casks/virustotaluploader.rb
@@ -1,4 +1,4 @@
-class Virustotaluploader < Cask
+cask :v1 => 'virustotaluploader' do
   version '1.1'
   sha256 'e757f8eb49592dfe67169a5582bcc3cca01c8ecc6634853398813a2aa92f24a7'
 
diff --git a/Casks/viscosity.rb b/Casks/viscosity.rb
index ca8751b32a88..ac7460f5daba 100644
--- a/Casks/viscosity.rb
+++ b/Casks/viscosity.rb
@@ -1,4 +1,4 @@
-class Viscosity < Cask
+cask :v1 => 'viscosity' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/visit.rb b/Casks/visit.rb
index 1bd27a62cf8d..2a5d09fb43b0 100644
--- a/Casks/visit.rb
+++ b/Casks/visit.rb
@@ -1,4 +1,4 @@
-class Visit < Cask
+cask :v1 => 'visit' do
   version '2.7.2'
   sha256 '3c1f1b201358876c1b23717a1b3a2c5a1777755e3fc7f242c08b53a033402fbc'
 
diff --git a/Casks/vistrails.rb b/Casks/vistrails.rb
index 459f85e47828..937a1550e56d 100644
--- a/Casks/vistrails.rb
+++ b/Casks/vistrails.rb
@@ -1,4 +1,4 @@
-class Vistrails < Cask
+cask :v1 => 'vistrails' do
   version '2.1.1'
   sha256 '38ac9da9af7a557cee6eb703517e38ea1bcc430706a436a182eec6f976275b02'
 
diff --git a/Casks/visualack.rb b/Casks/visualack.rb
index 4df00fc7c40e..1060faa9adfe 100644
--- a/Casks/visualack.rb
+++ b/Casks/visualack.rb
@@ -1,4 +1,4 @@
-class Visualack < Cask
+cask :v1 => 'visualack' do
   version '0.3.3'
   sha256 'bb9c9563003da7075deecc833546796a8da9abbadbde7600434c52c227da347b'
 
diff --git a/Casks/visualvm.rb b/Casks/visualvm.rb
index 384ae9badc73..e81061765e8b 100644
--- a/Casks/visualvm.rb
+++ b/Casks/visualvm.rb
@@ -1,4 +1,4 @@
-class Visualvm < Cask
+cask :v1 => 'visualvm' do
   version '1.3.8'
   sha256 'dae23a7625f543f14f86f846e590dae308df4c27dd64eda4ab8d85b9078e35bd'
 
diff --git a/Casks/vitamin-r.rb b/Casks/vitamin-r.rb
index 69f045ef1528..5ff212b79c8a 100644
--- a/Casks/vitamin-r.rb
+++ b/Casks/vitamin-r.rb
@@ -1,4 +1,4 @@
-class VitaminR < Cask
+cask :v1 => 'vitamin-r' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/vlc-remote.rb b/Casks/vlc-remote.rb
index b8370dd0808d..c3ca8aef82ec 100644
--- a/Casks/vlc-remote.rb
+++ b/Casks/vlc-remote.rb
@@ -1,4 +1,4 @@
-class VlcRemote < Cask
+cask :v1 => 'vlc-remote' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/vlc.rb b/Casks/vlc.rb
index 9c9e888c66b3..51641cf5296c 100644
--- a/Casks/vlc.rb
+++ b/Casks/vlc.rb
@@ -1,4 +1,4 @@
-class Vlc < Cask
+cask :v1 => 'vlc' do
   version '2.1.5'
   sha256 '923504e296829f4253af8276b992636f72e56232ecdbdcf6003647ee662257f2'
 
diff --git a/Casks/vlcstreamer.rb b/Casks/vlcstreamer.rb
index 033b25d6001d..971c6e332e72 100644
--- a/Casks/vlcstreamer.rb
+++ b/Casks/vlcstreamer.rb
@@ -1,4 +1,4 @@
-class Vlcstreamer < Cask
+cask :v1 => 'vlcstreamer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/vmware-fusion.rb b/Casks/vmware-fusion.rb
index 6a25e7633439..54854ef930a1 100644
--- a/Casks/vmware-fusion.rb
+++ b/Casks/vmware-fusion.rb
@@ -1,4 +1,4 @@
-class VmwareFusion < Cask
+cask :v1 => 'vmware-fusion' do
   version '7.0.1-2235595'
   sha256 '212e25cefe3a30f0ab0ffe5975566bcc63422d370f6b647b83b4084524f36970'
 
diff --git a/Casks/vmware-horizon-view-client.rb b/Casks/vmware-horizon-view-client.rb
index 39e30be5c51d..88c4013d20e9 100644
--- a/Casks/vmware-horizon-view-client.rb
+++ b/Casks/vmware-horizon-view-client.rb
@@ -1,4 +1,4 @@
-class VmwareHorizonViewClient < Cask
+cask :v1 => 'vmware-horizon-view-client' do
   version '3.0.0-1887158'
   sha256 'c29568142e942b58bb9ab16882b80e7e19df975a07a613ed8abdcf43e2349ced'
 
diff --git a/Casks/vocabulist.rb b/Casks/vocabulist.rb
index a12aaa820c1b..dee442f4b9b2 100644
--- a/Casks/vocabulist.rb
+++ b/Casks/vocabulist.rb
@@ -1,4 +1,4 @@
-class Vocabulist < Cask
+cask :v1 => 'vocabulist' do
   version '2.2'
   sha256 '414e77ea72c9caead1b5d7e389ed2541408350cd0a87d1e7e40c0d807ec577be'
 
diff --git a/Casks/voicemac.rb b/Casks/voicemac.rb
index 17c97157022e..2d595caf126d 100644
--- a/Casks/voicemac.rb
+++ b/Casks/voicemac.rb
@@ -1,4 +1,4 @@
-class Voicemac < Cask
+cask :v1 => 'voicemac' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/volatility.rb b/Casks/volatility.rb
index 24fca188c318..a29cc593f633 100644
--- a/Casks/volatility.rb
+++ b/Casks/volatility.rb
@@ -1,4 +1,4 @@
-class Volatility < Cask
+cask :v1 => 'volatility' do
   version '2.4'
   sha256 '528f06cfd9f0562f7a437c7f1db0d1f54650c3fe9969974718794fd737fbff6d'
 
diff --git a/Casks/voodoopad.rb b/Casks/voodoopad.rb
index 6723cea86abc..8fad07640ead 100644
--- a/Casks/voodoopad.rb
+++ b/Casks/voodoopad.rb
@@ -1,4 +1,4 @@
-class Voodoopad < Cask
+cask :v1 => 'voodoopad' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/vox-preferences-pane.rb b/Casks/vox-preferences-pane.rb
index 4b4e430f98e7..60a9f3f39ee0 100644
--- a/Casks/vox-preferences-pane.rb
+++ b/Casks/vox-preferences-pane.rb
@@ -1,4 +1,4 @@
-class VoxPreferencesPane < Cask
+cask :v1 => 'vox-preferences-pane' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/vox.rb b/Casks/vox.rb
index 352049a523ed..2e229d636f06 100644
--- a/Casks/vox.rb
+++ b/Casks/vox.rb
@@ -1,4 +1,4 @@
-class Vox < Cask
+cask :v1 => 'vox' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/voxox.rb b/Casks/voxox.rb
index 60932c428cf4..4ce93bcdf4c1 100644
--- a/Casks/voxox.rb
+++ b/Casks/voxox.rb
@@ -1,4 +1,4 @@
-class Voxox < Cask
+cask :v1 => 'voxox' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/vuescan.rb b/Casks/vuescan.rb
index fa3c404acee2..9d6248febc6a 100644
--- a/Casks/vuescan.rb
+++ b/Casks/vuescan.rb
@@ -1,4 +1,4 @@
-class Vuescan < Cask
+cask :v1 => 'vuescan' do
   version '9.4.51'
 
   if Hardware::CPU.is_32_bit?
diff --git a/Casks/vyprvpn.rb b/Casks/vyprvpn.rb
index 04b8dbbb5df2..df58b1740f9f 100644
--- a/Casks/vyprvpn.rb
+++ b/Casks/vyprvpn.rb
@@ -1,4 +1,4 @@
-class Vyprvpn < Cask
+cask :v1 => 'vyprvpn' do
   version '2.6.1.2422'
   sha256 '6097c9660fcc496bbaa77bc870ff2483aa92c7ce4bea409fb98c8b635bac2710'
 
diff --git a/Casks/wacom-bamboo-tablet.rb b/Casks/wacom-bamboo-tablet.rb
index ebd3244aa28f..362db1ef04b8 100644
--- a/Casks/wacom-bamboo-tablet.rb
+++ b/Casks/wacom-bamboo-tablet.rb
@@ -1,4 +1,4 @@
-class WacomBambooTablet < Cask
+cask :v1 => 'wacom-bamboo-tablet' do
   version '5.3.5-4'
   sha256 '3368525540f01c6160839a6dee8618c887681d33ed61b15a1835def1cd2c70f2'
 
diff --git a/Casks/wacom-tablet.rb b/Casks/wacom-tablet.rb
index d373e71e4a87..9fbb687cdf8f 100644
--- a/Casks/wacom-tablet.rb
+++ b/Casks/wacom-tablet.rb
@@ -1,4 +1,4 @@
-class WacomTablet < Cask
+cask :v1 => 'wacom-tablet' do
   version '6.3.8-2'
   sha256 'a1812ba11896841fd592de889753aaf50fd86bb6278c05270a1f8a0c80365969'
 
diff --git a/Casks/wake-on-lan.rb b/Casks/wake-on-lan.rb
index 54439b0887de..71a12101bfbb 100644
--- a/Casks/wake-on-lan.rb
+++ b/Casks/wake-on-lan.rb
@@ -1,4 +1,4 @@
-class WakeOnLan < Cask
+cask :v1 => 'wake-on-lan' do
   version '1.0'
   sha256 '00d86efd23e9d5de5451e26d6957f3af1a1a3bc66d11c50b8563454113fd5ab1'
 
diff --git a/Casks/wallpaper-wizard.rb b/Casks/wallpaper-wizard.rb
index 83b961fc9cd2..b3feade2e955 100644
--- a/Casks/wallpaper-wizard.rb
+++ b/Casks/wallpaper-wizard.rb
@@ -1,4 +1,4 @@
-class WallpaperWizard < Cask
+cask :v1 => 'wallpaper-wizard' do
   version '1.4'
   sha256 '73cd786b81db5eec9734277d8b74a34bb90494637bb5324f8a6a9df40ef89704'
 
diff --git a/Casks/wasted.rb b/Casks/wasted.rb
index ac7205f0fe99..2d0dcc0a1419 100644
--- a/Casks/wasted.rb
+++ b/Casks/wasted.rb
@@ -1,4 +1,4 @@
-class Wasted < Cask
+cask :v1 => 'wasted' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/waterroof.rb b/Casks/waterroof.rb
index 595840399d8d..d233c988c0b2 100644
--- a/Casks/waterroof.rb
+++ b/Casks/waterroof.rb
@@ -1,4 +1,4 @@
-class Waterroof < Cask
+cask :v1 => 'waterroof' do
   version '3.8'
   sha256 '30c5794bab61ad30a019b0f1a2cf798dcc6f3bc83a867fde1b3a4f71019c48ee'
 
diff --git a/Casks/wavtap.rb b/Casks/wavtap.rb
index 0ba59576fe1c..ff3c6dc622c1 100644
--- a/Casks/wavtap.rb
+++ b/Casks/wavtap.rb
@@ -1,4 +1,4 @@
-class Wavtap < Cask
+cask :v1 => 'wavtap' do
   version '0.2.0'
   sha256 'ae4bbdb82c2b04ab7fa9995ed688b59d79e91f67122ed405409f19d74e7f60e5'
 
diff --git a/Casks/wd-security.rb b/Casks/wd-security.rb
index aa463f241ac9..6d58ba87b3ed 100644
--- a/Casks/wd-security.rb
+++ b/Casks/wd-security.rb
@@ -1,4 +1,4 @@
-class WdSecurity < Cask
+cask :v1 => 'wd-security' do
   version '1.0.8.2'
   sha256 '1a82e8cd9d8e7d23b8201c6460c75cd6c388f8c588b6608caf2c31394b3fd37a'
 
diff --git a/Casks/web-sharing.rb b/Casks/web-sharing.rb
index fd78960d177f..2e7430a5bd31 100644
--- a/Casks/web-sharing.rb
+++ b/Casks/web-sharing.rb
@@ -1,4 +1,4 @@
-class WebSharing < Cask
+cask :v1 => 'web-sharing' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/webp-quicklook.rb b/Casks/webp-quicklook.rb
index 25b8a7307c3a..ae16338886c4 100644
--- a/Casks/webp-quicklook.rb
+++ b/Casks/webp-quicklook.rb
@@ -1,4 +1,4 @@
-class WebpQuicklook < Cask
+cask :v1 => 'webp-quicklook' do
   version '2.1'
   sha256 '9efbdd2b3dcb44d41a53c1cb6ce64397fd00bd399189b1b742d2f4b2de28f437'
 
diff --git a/Casks/webstorm.rb b/Casks/webstorm.rb
index 260f70b9eb9c..497d6ff3451f 100644
--- a/Casks/webstorm.rb
+++ b/Casks/webstorm.rb
@@ -1,4 +1,4 @@
-class Webstorm < Cask
+cask :v1 => 'webstorm' do
   version '9.0'
   sha256 '278b1692c9aa17b44d15a801a50714624ab7dea9aedda364f08fa45b7ff66766'
 
diff --git a/Casks/wechat.rb b/Casks/wechat.rb
index ea41189ca8cd..2448c711a1ed 100644
--- a/Casks/wechat.rb
+++ b/Casks/wechat.rb
@@ -1,4 +1,4 @@
-class Wechat < Cask
+cask :v1 => 'wechat' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/wedge.rb b/Casks/wedge.rb
index 74aba6925284..e57b87061a20 100644
--- a/Casks/wedge.rb
+++ b/Casks/wedge.rb
@@ -1,4 +1,4 @@
-class Wedge < Cask
+cask :v1 => 'wedge' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/weibox.rb b/Casks/weibox.rb
index b861a17280ac..4786f4856955 100644
--- a/Casks/weibox.rb
+++ b/Casks/weibox.rb
@@ -1,4 +1,4 @@
-class Weibox < Cask
+cask :v1 => 'weibox' do
   version '2.6.1'
   sha256 '60c023ba7cc9f93ac72a7b1a4e8a518595348f4f6d8c4fbef0af8822c318a908'
 
diff --git a/Casks/weka.rb b/Casks/weka.rb
index 0ca7412fa5b6..dc1de9aa5dfa 100644
--- a/Casks/weka.rb
+++ b/Casks/weka.rb
@@ -1,4 +1,4 @@
-class Weka < Cask
+cask :v1 => 'weka' do
   version '3.6.11'
   sha256 '51643edc349f46d76b96460ab16b97cf8e2d63ae6a4f6e5ba4c89dd404b56cea'
 
diff --git a/Casks/welly.rb b/Casks/welly.rb
index 0f09ff003d75..2d3240851838 100644
--- a/Casks/welly.rb
+++ b/Casks/welly.rb
@@ -1,4 +1,4 @@
-class Welly < Cask
+cask :v1 => 'welly' do
   version '2.7'
   sha256 'cb24a26432d8927b1159a1865602c3f30b5190f628167c954e4d6cc723cfcb0f'
 
diff --git a/Casks/wercker.rb b/Casks/wercker.rb
index c70529fababb..fab7ab115617 100644
--- a/Casks/wercker.rb
+++ b/Casks/wercker.rb
@@ -1,4 +1,4 @@
-class Wercker < Cask
+cask :v1 => 'wercker' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/wesnoth.rb b/Casks/wesnoth.rb
index 14528b474de1..b0692ccd9aec 100644
--- a/Casks/wesnoth.rb
+++ b/Casks/wesnoth.rb
@@ -1,4 +1,4 @@
-class Wesnoth < Cask
+cask :v1 => 'wesnoth' do
   version '1.10.7'
   sha256 'cdd7788e55e26c9d619b7c98b87db1b99c6a0fc9f525ddb63a6bd33923d94a6f'
 
diff --git a/Casks/whatpulse.rb b/Casks/whatpulse.rb
index 27576cf7c9b0..de38405bba7c 100644
--- a/Casks/whatpulse.rb
+++ b/Casks/whatpulse.rb
@@ -1,4 +1,4 @@
-class Whatpulse < Cask
+cask :v1 => 'whatpulse' do
   version '2.4.1'
   sha256 '877a2feb8a916ee4de637cc0839399e9c240bdd3e6a96beb8dd66edb49ffec74'
 
diff --git a/Casks/whatsapp-pocket.rb b/Casks/whatsapp-pocket.rb
index bd2c2562646c..80dc38c90127 100644
--- a/Casks/whatsapp-pocket.rb
+++ b/Casks/whatsapp-pocket.rb
@@ -1,4 +1,4 @@
-class WhatsappPocket < Cask
+cask :v1 => 'whatsapp-pocket' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/whatsize.rb b/Casks/whatsize.rb
index e611d6e2ac04..08fec03cb4a0 100644
--- a/Casks/whatsize.rb
+++ b/Casks/whatsize.rb
@@ -1,4 +1,4 @@
-class Whatsize < Cask
+cask :v1 => 'whatsize' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/whiskey.rb b/Casks/whiskey.rb
index d9a33fe54e3d..edf2418d1e10 100644
--- a/Casks/whiskey.rb
+++ b/Casks/whiskey.rb
@@ -1,4 +1,4 @@
-class Whiskey < Cask
+cask :v1 => 'whiskey' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/whiteclock.rb b/Casks/whiteclock.rb
index 89cd05b181b3..24006cb20b3b 100644
--- a/Casks/whiteclock.rb
+++ b/Casks/whiteclock.rb
@@ -1,4 +1,4 @@
-class Whiteclock < Cask
+cask :v1 => 'whiteclock' do
   version '2.0'
   sha256 '9ad4a713dca77cfbca5bf4d8d1263126ec2b95fa588ad80be4f5a79140eefb6d'
 
diff --git a/Casks/widelands.rb b/Casks/widelands.rb
index c40edef4b36f..73267932ae38 100644
--- a/Casks/widelands.rb
+++ b/Casks/widelands.rb
@@ -1,4 +1,4 @@
-class Widelands < Cask
+cask :v1 => 'widelands' do
   version 'Build 18'
   sha256 '1d209dcf653942788120c6f1abbe6f421fdefe6776f4feed48c58eddeb4c3722'
 
diff --git a/Casks/wifimasterkey.rb b/Casks/wifimasterkey.rb
index a945fefc7685..bb005e1b52b8 100644
--- a/Casks/wifimasterkey.rb
+++ b/Casks/wifimasterkey.rb
@@ -1,4 +1,4 @@
-class Wifimasterkey < Cask
+cask :v1 => 'wifimasterkey' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/window-switch.rb b/Casks/window-switch.rb
index 9918221f6a5a..fe2139743d92 100644
--- a/Casks/window-switch.rb
+++ b/Casks/window-switch.rb
@@ -1,4 +1,4 @@
-class WindowSwitch < Cask
+cask :v1 => 'window-switch' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/windownaut.rb b/Casks/windownaut.rb
index 64a4b55b6341..937395f8a4dc 100644
--- a/Casks/windownaut.rb
+++ b/Casks/windownaut.rb
@@ -1,4 +1,4 @@
-class Windownaut < Cask
+cask :v1 => 'windownaut' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/wineskin-winery.rb b/Casks/wineskin-winery.rb
index 366d9dcb5d36..7f7c28b1c034 100644
--- a/Casks/wineskin-winery.rb
+++ b/Casks/wineskin-winery.rb
@@ -1,4 +1,4 @@
-class WineskinWinery < Cask
+cask :v1 => 'wineskin-winery' do
   version '1.7'
   sha256 'ef3ae1fe17a7bc622a59171985f304f506aea7ca0ad342281536dac8609eac32'
 
diff --git a/Casks/wings3d.rb b/Casks/wings3d.rb
index bc5544d640ce..e3aee92dcc32 100644
--- a/Casks/wings3d.rb
+++ b/Casks/wings3d.rb
@@ -1,4 +1,4 @@
-class Wings3d < Cask
+cask :v1 => 'wings3d' do
   version '1.5.3'
   sha256 'ec1bc0302fc7a12c0e5f06162673782943ac4394c2a942a6111b3f321e8be6d5'
 
diff --git a/Casks/wireover.rb b/Casks/wireover.rb
index 695428d0373a..bb89b2bc6f44 100644
--- a/Casks/wireover.rb
+++ b/Casks/wireover.rb
@@ -1,4 +1,4 @@
-class Wireover < Cask
+cask :v1 => 'wireover' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/wireshark.rb b/Casks/wireshark.rb
index 95115400610a..b62f4273e7bb 100644
--- a/Casks/wireshark.rb
+++ b/Casks/wireshark.rb
@@ -1,4 +1,4 @@
-class Wireshark < Cask
+cask :v1 => 'wireshark' do
   version '1.12.1'
   sha256 '3ce749efbcf89dd72b4e1c2336f4edd7111e05ce9cad8da2df189ac4e56fa1b7'
 
diff --git a/Casks/wiretap-studio.rb b/Casks/wiretap-studio.rb
index c0dea1e0b532..c0f91a51ab42 100644
--- a/Casks/wiretap-studio.rb
+++ b/Casks/wiretap-studio.rb
@@ -1,4 +1,4 @@
-class WiretapStudio < Cask
+cask :v1 => 'wiretap-studio' do
   version '1.2.2'
   sha256 'cfb0eb8b10828153f900d93a920b650cbba8a21d1f7e28bedc0414ccb2c3f8d8'
 
diff --git a/Casks/witch.rb b/Casks/witch.rb
index 421f87ef7cb8..26ed83979d1a 100644
--- a/Casks/witch.rb
+++ b/Casks/witch.rb
@@ -1,4 +1,4 @@
-class Witch < Cask
+cask :v1 => 'witch' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/witgui.rb b/Casks/witgui.rb
index 9b481c31360f..eac5dc00fd42 100644
--- a/Casks/witgui.rb
+++ b/Casks/witgui.rb
@@ -1,4 +1,4 @@
-class Witgui < Cask
+cask :v1 => 'witgui' do
   version '2.1.2'
   sha256 '4e108153a2cce9fede1358b265dfcd7d9f03c15658e2c9278ddad8a04260cf9b'
 
diff --git a/Casks/wiznote.rb b/Casks/wiznote.rb
index 30a0cc21b430..23190b3352ed 100644
--- a/Casks/wiznote.rb
+++ b/Casks/wiznote.rb
@@ -1,4 +1,4 @@
-class Wiznote < Cask
+cask :v1 => 'wiznote' do
   version '2.1.13'
   sha256 '5735502f06e93013f1350df89dd0423c1c250da798d7e5970d18a67034bb032f'
 
diff --git a/Casks/wiztoolsorg-restclient.rb b/Casks/wiztoolsorg-restclient.rb
index 17edba55c9ca..0a43b69ae05a 100644
--- a/Casks/wiztoolsorg-restclient.rb
+++ b/Casks/wiztoolsorg-restclient.rb
@@ -1,4 +1,4 @@
-class WiztoolsorgRestclient < Cask
+cask :v1 => 'wiztoolsorg-restclient' do
   version '3.2.2'
   sha256 'd920279ef6406acb02a12485e1e8adaf1942cf196f0628c8e6b40744f6120aac'
 
diff --git a/Casks/wjoy.rb b/Casks/wjoy.rb
index 048190784582..4954027b6635 100644
--- a/Casks/wjoy.rb
+++ b/Casks/wjoy.rb
@@ -1,4 +1,4 @@
-class Wjoy < Cask
+cask :v1 => 'wjoy' do
   version '0.7.1'
   sha256 '98a9f825634b09b901ad979a6cdda241a04a1cbd7dcd14b4b17b0bebe3f40ee1'
 
diff --git a/Casks/wkhtmltopdf.rb b/Casks/wkhtmltopdf.rb
index b7246ca725c9..f00b4396a4c6 100644
--- a/Casks/wkhtmltopdf.rb
+++ b/Casks/wkhtmltopdf.rb
@@ -1,4 +1,4 @@
-class Wkhtmltopdf < Cask
+cask :v1 => 'wkhtmltopdf' do
   version '0.12.1'
   sha256 'ef203403b78dd4dc50ec9a3adb6e956d0267e59f7346cc749a6f86378a4bf791'
 
diff --git a/Casks/wondershare-player.rb b/Casks/wondershare-player.rb
index 594b06c2354d..22ac6080eca0 100644
--- a/Casks/wondershare-player.rb
+++ b/Casks/wondershare-player.rb
@@ -1,4 +1,4 @@
-class WondersharePlayer < Cask
+cask :v1 => 'wondershare-player' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/woodhouse.rb b/Casks/woodhouse.rb
index bf81c766a612..5e110e0dca56 100644
--- a/Casks/woodhouse.rb
+++ b/Casks/woodhouse.rb
@@ -1,4 +1,4 @@
-class Woodhouse < Cask
+cask :v1 => 'woodhouse' do
   version '0.5.0'
   sha256 '3ed1b6711eb9ec862e34addc141d681d9b0fed2950b9d9b7189734087eeb7541'
 
diff --git a/Casks/wordservice.rb b/Casks/wordservice.rb
index f9ad30d06eee..1665c0d34b26 100644
--- a/Casks/wordservice.rb
+++ b/Casks/wordservice.rb
@@ -1,4 +1,4 @@
-class Wordservice < Cask
+cask :v1 => 'wordservice' do
   version '2.8'
   sha256 '2d32be5f99a1fd6d01d2f2d1338ec101918edec6e9a79cbe960a82bd68383478'
 
diff --git a/Casks/worksnaps-client.rb b/Casks/worksnaps-client.rb
index 4057c2c0ca02..3be08bcd8608 100644
--- a/Casks/worksnaps-client.rb
+++ b/Casks/worksnaps-client.rb
@@ -1,4 +1,4 @@
-class WorksnapsClient < Cask
+cask :v1 => 'worksnaps-client' do
   version '1.1.20141010-2'
   sha256 'ca1949845c9f65ae3e0ae0302b89048d706622b07661c393af765af7a520a5e6'
 
diff --git a/Casks/wowhead-client.rb b/Casks/wowhead-client.rb
index 1769ea88e7f5..b4adbba8059f 100644
--- a/Casks/wowhead-client.rb
+++ b/Casks/wowhead-client.rb
@@ -1,4 +1,4 @@
-class WowheadClient < Cask
+cask :v1 => 'wowhead-client' do
   version '1.2.2'
   sha256 '6d3b8cebcc74da52c459c4fd91168ad24b4c00dd12c63c44c25fb60870ff716b'
 
diff --git a/Casks/wraparound.rb b/Casks/wraparound.rb
index 7a17cb2fe9d3..a653937eac04 100644
--- a/Casks/wraparound.rb
+++ b/Casks/wraparound.rb
@@ -1,4 +1,4 @@
-class Wraparound < Cask
+cask :v1 => 'wraparound' do
   version '2.0b2'
   sha256 'f156dfa65dad43d38cb3b0f8febd8de9711f4794bb166a293ced93860ebf7879'
 
diff --git a/Casks/wuala.rb b/Casks/wuala.rb
index 3bbe5f18eecb..8f33e56e3d0f 100644
--- a/Casks/wuala.rb
+++ b/Casks/wuala.rb
@@ -1,4 +1,4 @@
-class Wuala < Cask
+cask :v1 => 'wuala' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/wyzo.rb b/Casks/wyzo.rb
index f4a55635ffaa..530ec54fdcdc 100644
--- a/Casks/wyzo.rb
+++ b/Casks/wyzo.rb
@@ -1,4 +1,4 @@
-class Wyzo < Cask
+cask :v1 => 'wyzo' do
   version '3.5.6'
   sha256 '18cda3c323544c729d7e532151a32c70d8427dae2762695229d102762b313026'
 
diff --git a/Casks/x-lite.rb b/Casks/x-lite.rb
index 55f5e9571026..bfdb59bd4049 100644
--- a/Casks/x-lite.rb
+++ b/Casks/x-lite.rb
@@ -1,4 +1,4 @@
-class XLite < Cask
+cask :v1 => 'x-lite' do
   version '4.6.1_73074'
   sha256 'a14f577a1af1d0c81428065d0b94f9a5ea0f7886c1c2c4442ae050a8c497b297'
 
diff --git a/Casks/x-mirage.rb b/Casks/x-mirage.rb
index 3ffe0ad55e5f..441e0a1f345d 100644
--- a/Casks/x-mirage.rb
+++ b/Casks/x-mirage.rb
@@ -1,4 +1,4 @@
-class XMirage < Cask
+cask :v1 => 'x-mirage' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/x-moto.rb b/Casks/x-moto.rb
index f859ed3a3c0f..a70ac8bc869a 100644
--- a/Casks/x-moto.rb
+++ b/Casks/x-moto.rb
@@ -1,4 +1,4 @@
-class XMoto < Cask
+cask :v1 => 'x-moto' do
   version '0.5.10'
   sha256 '0b032d21fb0644db252fe9210f9c0a3f465616996aad6d50b20ead2123a3507a'
 
diff --git a/Casks/x2goclient.rb b/Casks/x2goclient.rb
index 267868d679a5..b74a19f0394b 100644
--- a/Casks/x2goclient.rb
+++ b/Casks/x2goclient.rb
@@ -1,4 +1,4 @@
-class X2goclient < Cask
+cask :v1 => 'x2goclient' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/x48.rb b/Casks/x48.rb
index ca53f2db02ee..08693c4621e6 100644
--- a/Casks/x48.rb
+++ b/Casks/x48.rb
@@ -1,4 +1,4 @@
-class X48 < Cask
+cask :v1 => 'x48' do
   # note: "48" is not a version number, but an intrinsic part of the product name
   version '0.6.4'
   sha256 '21184fceec8fd471d034932ac9b49f41c98cd5d730fa3fb02ccf0bcf02951f70'
diff --git a/Casks/xact.rb b/Casks/xact.rb
index 88cc1d93fe90..7ea20d869cb7 100644
--- a/Casks/xact.rb
+++ b/Casks/xact.rb
@@ -1,4 +1,4 @@
-class Xact < Cask
+cask :v1 => 'xact' do
   version '2.34'
   sha256 '849e3f1c2be4d4c3d99ba69a9af1dcc1a0593549e85f24773a78f52cb172f7fb'
 
diff --git a/Casks/xamarin-android.rb b/Casks/xamarin-android.rb
index 9886cd62ddb2..8f294c205e5c 100644
--- a/Casks/xamarin-android.rb
+++ b/Casks/xamarin-android.rb
@@ -1,4 +1,4 @@
-class XamarinAndroid < Cask
+cask :v1 => 'xamarin-android' do
   version '4.18.0-34'
   sha256 '012f7266b123a1cc8cc189db8c3aea24c5daa8912df684525336fabc86e279e7'
 
diff --git a/Casks/xamarin-ios.rb b/Casks/xamarin-ios.rb
index f1d7eeb1650e..6c87fb1cbc42 100644
--- a/Casks/xamarin-ios.rb
+++ b/Casks/xamarin-ios.rb
@@ -1,4 +1,4 @@
-class XamarinIos < Cask
+cask :v1 => 'xamarin-ios' do
   version '8.2.0.193'
   sha256 '6fd3ffd73937d937e0dac4bfdc6534fc948ceebf38d02b3eee94cd857fba4ee8'
 
diff --git a/Casks/xamarin-studio.rb b/Casks/xamarin-studio.rb
index 0f22eaed48b6..b938b5256663 100644
--- a/Casks/xamarin-studio.rb
+++ b/Casks/xamarin-studio.rb
@@ -1,4 +1,4 @@
-class XamarinStudio < Cask
+cask :v1 => 'xamarin-studio' do
   version '5.5.0.227-0'
   sha256 '4c05b5174fd1d2eacef44f2f96557fc213f25381ad0ea3c139612217a20e8d46'
 
diff --git a/Casks/xamarin.rb b/Casks/xamarin.rb
index d97e6574f50e..96f11a8a6a9f 100644
--- a/Casks/xamarin.rb
+++ b/Casks/xamarin.rb
@@ -1,4 +1,4 @@
-class Xamarin < Cask
+cask :v1 => 'xamarin' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/xampp.rb b/Casks/xampp.rb
index 810245d7b375..499babfbbb57 100644
--- a/Casks/xampp.rb
+++ b/Casks/xampp.rb
@@ -1,4 +1,4 @@
-class Xampp < Cask
+cask :v1 => 'xampp' do
   version '1.8.3.3'
   sha256 'b54cced0697caa418851a4bdb11ee1697b3f7f71130e1e6bce19582d60e41530'
 
diff --git a/Casks/xaos.rb b/Casks/xaos.rb
index 67e1f5b88f92..4d045f3e3db6 100644
--- a/Casks/xaos.rb
+++ b/Casks/xaos.rb
@@ -1,4 +1,4 @@
-class Xaos < Cask
+cask :v1 => 'xaos' do
   version '3.6'
   sha256 '1a3864f354759c03c13150ef541b48d06cf74351360a85a8b46e73a45edc7054'
 
diff --git a/Casks/xbench.rb b/Casks/xbench.rb
index ee76ea8d94c1..fda443cbdf29 100644
--- a/Casks/xbench.rb
+++ b/Casks/xbench.rb
@@ -1,4 +1,4 @@
-class Xbench < Cask
+cask :v1 => 'xbench' do
   version '1.3'
   sha256 '285d860273b22054b807930ac496735e287d124f233da489e4104d2411690e55'
 
diff --git a/Casks/xbmc.rb b/Casks/xbmc.rb
index f04315faad38..c07d51cf0d86 100644
--- a/Casks/xbmc.rb
+++ b/Casks/xbmc.rb
@@ -1,4 +1,4 @@
-class Xbmc < Cask
+cask :v1 => 'xbmc' do
   version '13.2'
   sha256 '5f76f75971aa27cc74dfeaca3633d5e079ab7731deabb0f8be909e5e871a9223'
 
diff --git a/Casks/xbox360-controller-driver.rb b/Casks/xbox360-controller-driver.rb
index 293d27e9a07a..eb5ca9558dde 100644
--- a/Casks/xbox360-controller-driver.rb
+++ b/Casks/xbox360-controller-driver.rb
@@ -1,4 +1,4 @@
-class Xbox360ControllerDriver < Cask
+cask :v1 => 'xbox360-controller-driver' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/xca.rb b/Casks/xca.rb
index f6c73182dad0..3849bea7afeb 100644
--- a/Casks/xca.rb
+++ b/Casks/xca.rb
@@ -1,4 +1,4 @@
-class Xca < Cask
+cask :v1 => 'xca' do
   version '0.9.3'
   sha256 'f2daef9c1be16c9ff57613b13f32d015944187c6971467e13857fe3f50889222'
 
diff --git a/Casks/xee.rb b/Casks/xee.rb
index a5a870d6fa9f..bcd86f7771cc 100644
--- a/Casks/xee.rb
+++ b/Casks/xee.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-class Xee < Cask
+cask :v1 => 'xee' do
   version '3.4'
   sha256 'e9d47feb6fd1365333958e04372bbc02d3bc098ba7a14695a0c91957dfb1fb99'
 
diff --git a/Casks/xiami.rb b/Casks/xiami.rb
index e29e26729b61..696651c4a939 100644
--- a/Casks/xiami.rb
+++ b/Casks/xiami.rb
@@ -1,4 +1,4 @@
-class Xiami < Cask
+cask :v1 => 'xiami' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/xld.rb b/Casks/xld.rb
index f1966d26e7c1..982cc8fff7d9 100644
--- a/Casks/xld.rb
+++ b/Casks/xld.rb
@@ -1,4 +1,4 @@
-class Xld < Cask
+cask :v1 => 'xld' do
   version '20141109'
   sha256 '117f99b27d9396e468799129817e64e2fb04a87bb7bf9e11fa33ddac95cb3615'
 
diff --git a/Casks/xmarks-safari.rb b/Casks/xmarks-safari.rb
index dfc40a47b36f..c08e0b44f1cd 100644
--- a/Casks/xmarks-safari.rb
+++ b/Casks/xmarks-safari.rb
@@ -1,4 +1,4 @@
-class XmarksSafari < Cask
+cask :v1 => 'xmarks-safari' do
   version '2.0.18'
   sha256 'f64018d51cdb24bb1e6861d04b8f49b6cd88c26c5369f1ad877e9c51b0abe04e'
 
diff --git a/Casks/xmind.rb b/Casks/xmind.rb
index a29a2ec1168b..b799b71d33bf 100644
--- a/Casks/xmind.rb
+++ b/Casks/xmind.rb
@@ -1,4 +1,4 @@
-class Xmind < Cask
+cask :v1 => 'xmind' do
   version '3.4.1'
   sha256 '0a1b9f833c117ced046a7ccee854cf4efcc9d489c12a126cb269b7dbefcd309a'
 
diff --git a/Casks/xmplify.rb b/Casks/xmplify.rb
index 97731cc1c193..26cd36a9793d 100644
--- a/Casks/xmplify.rb
+++ b/Casks/xmplify.rb
@@ -1,4 +1,4 @@
-class Xmplify < Cask
+cask :v1 => 'xmplify' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/xmrouter.rb b/Casks/xmrouter.rb
index 6cff0dbe178f..7a35f5b72e2d 100644
--- a/Casks/xmrouter.rb
+++ b/Casks/xmrouter.rb
@@ -1,4 +1,4 @@
-class Xmrouter < Cask
+cask :v1 => 'xmrouter' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/xnconvert.rb b/Casks/xnconvert.rb
index 9485220b5e93..db9066a68ebd 100644
--- a/Casks/xnconvert.rb
+++ b/Casks/xnconvert.rb
@@ -1,4 +1,4 @@
-class Xnconvert < Cask
+cask :v1 => 'xnconvert' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/xnviewmp.rb b/Casks/xnviewmp.rb
index 0d2b43a9abc7..2e0b44c7b86e 100644
--- a/Casks/xnviewmp.rb
+++ b/Casks/xnviewmp.rb
@@ -1,4 +1,4 @@
-class Xnviewmp < Cask
+cask :v1 => 'xnviewmp' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/xquartz.rb b/Casks/xquartz.rb
index 62fa3ac05d39..0fa0ef7e2d16 100644
--- a/Casks/xquartz.rb
+++ b/Casks/xquartz.rb
@@ -1,4 +1,4 @@
-class Xquartz < Cask
+cask :v1 => 'xquartz' do
   version '2.7.7'
   sha256 'c9b3a373b7fd989331117acb9696fffd6b9ee1a08ba838b02ed751b184005211'
 
diff --git a/Casks/xrg.rb b/Casks/xrg.rb
index d11f29beffda..ec4d3fdbdb32 100644
--- a/Casks/xrg.rb
+++ b/Casks/xrg.rb
@@ -1,4 +1,4 @@
-class Xrg < Cask
+cask :v1 => 'xrg' do
   version '1.7.3'
   sha256 '972ee45e202dee87aa5a696d2393f5eece21c8e6a54368ab6fefb6a371187063'
 
diff --git a/Casks/xscope.rb b/Casks/xscope.rb
index 8b4cd5e6006e..8b86eb3709f5 100644
--- a/Casks/xscope.rb
+++ b/Casks/xscope.rb
@@ -1,4 +1,4 @@
-class Xscope < Cask
+cask :v1 => 'xscope' do
   version '4.1'
   sha256 '7323455710792157878a4c3eb5b1d2884061557fff6739c3a82a8dca122f5f83'
 
diff --git a/Casks/xscreensaver.rb b/Casks/xscreensaver.rb
index 24cace5d4f98..83eea2f31593 100644
--- a/Casks/xscreensaver.rb
+++ b/Casks/xscreensaver.rb
@@ -1,4 +1,4 @@
-class Xscreensaver < Cask
+cask :v1 => 'xscreensaver' do
   version '5.30'
   sha256 '3d82adb17e2713959c58b45e67ef352177c47eab938791d9147e81922718c861'
 
diff --git a/Casks/xslimmer.rb b/Casks/xslimmer.rb
index 3a46ecc3857c..89fb0052bed5 100644
--- a/Casks/xslimmer.rb
+++ b/Casks/xslimmer.rb
@@ -1,4 +1,4 @@
-class Xslimmer < Cask
+cask :v1 => 'xslimmer' do
   version '1.9.4'
   sha256 '3b496e1f51c10e48d6d0d4ac35f35f993a256044e8923936813363d5ef04b56a'
 
diff --git a/Casks/xtorrent.rb b/Casks/xtorrent.rb
index 496eff077f7e..92fa5556913a 100644
--- a/Casks/xtorrent.rb
+++ b/Casks/xtorrent.rb
@@ -1,4 +1,4 @@
-class Xtorrent < Cask
+cask :v1 => 'xtorrent' do
   version '2.1 (v171)'
   sha256 '26ea235dcb827c6e58ab3409bec83396e86704d742d517e527016ecd44672379'
 
diff --git a/Casks/xtrafinder.rb b/Casks/xtrafinder.rb
index 28046fbf5b1a..190c7be03a63 100644
--- a/Casks/xtrafinder.rb
+++ b/Casks/xtrafinder.rb
@@ -1,4 +1,4 @@
-class Xtrafinder < Cask
+cask :v1 => 'xtrafinder' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/yabumi.rb b/Casks/yabumi.rb
index c9b41ad087e8..b77d309e9ae5 100644
--- a/Casks/yabumi.rb
+++ b/Casks/yabumi.rb
@@ -1,4 +1,4 @@
-class Yabumi < Cask
+cask :v1 => 'yabumi' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/yacreader.rb b/Casks/yacreader.rb
index e745fcab5326..bb9e0d01ad6d 100644
--- a/Casks/yacreader.rb
+++ b/Casks/yacreader.rb
@@ -1,4 +1,4 @@
-class Yacreader < Cask
+cask :v1 => 'yacreader' do
   version '7.2.0'
   sha256 'e671e2c7914c070bc5ed7144db147d9ab6d6f1bc8a8272673e6dc39cb52b3101'
 
diff --git a/Casks/yandex.rb b/Casks/yandex.rb
index ad2f7147ba29..68b54be8b1a0 100644
--- a/Casks/yandex.rb
+++ b/Casks/yandex.rb
@@ -1,4 +1,4 @@
-class Yandex < Cask
+cask :v1 => 'yandex' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/yandexdisk.rb b/Casks/yandexdisk.rb
index 90b918a875a7..d38705f87a59 100644
--- a/Casks/yandexdisk.rb
+++ b/Casks/yandexdisk.rb
@@ -1,4 +1,4 @@
-class Yandexdisk < Cask
+cask :v1 => 'yandexdisk' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/yasu.rb b/Casks/yasu.rb
index 55ab38c3371e..4f1433ad1d26 100644
--- a/Casks/yasu.rb
+++ b/Casks/yasu.rb
@@ -1,4 +1,4 @@
-class Yasu < Cask
+cask :v1 => 'yasu' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/yed.rb b/Casks/yed.rb
index d6526fb608f9..c8a242765e1c 100644
--- a/Casks/yed.rb
+++ b/Casks/yed.rb
@@ -1,4 +1,4 @@
-class Yed < Cask
+cask :v1 => 'yed' do
   version '3.13'
   sha256 'b597d7468cef6981ed364a17c525a8b83d0818fd016c21f3efc6e3ea99922d1d'
 
diff --git a/Casks/yemuzip.rb b/Casks/yemuzip.rb
index 5be5b119443c..ed780b807bb6 100644
--- a/Casks/yemuzip.rb
+++ b/Casks/yemuzip.rb
@@ -1,4 +1,4 @@
-class Yemuzip < Cask
+cask :v1 => 'yemuzip' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/yep.rb b/Casks/yep.rb
index c137aa769d53..0a2dd2734a96 100644
--- a/Casks/yep.rb
+++ b/Casks/yep.rb
@@ -1,4 +1,4 @@
-class Yep < Cask
+cask :v1 => 'yep' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/yimello.rb b/Casks/yimello.rb
index d234425f9e57..0fc9468af930 100644
--- a/Casks/yimello.rb
+++ b/Casks/yimello.rb
@@ -1,4 +1,4 @@
-class Yimello < Cask
+cask :v1 => 'yimello' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/ynab.rb b/Casks/ynab.rb
index c51c2e2fe2df..62b962068878 100644
--- a/Casks/ynab.rb
+++ b/Casks/ynab.rb
@@ -1,4 +1,4 @@
-class Ynab < Cask
+cask :v1 => 'ynab' do
   version '4.3.655'
   sha256 '0635c56582a1367c2ca3a8ab88805ec89625f2c5042497e7f13081726b2238a3'
 
diff --git a/Casks/yojimbo.rb b/Casks/yojimbo.rb
index 64b4c9dd54c7..799ab8d9ca55 100644
--- a/Casks/yojimbo.rb
+++ b/Casks/yojimbo.rb
@@ -1,4 +1,4 @@
-class Yojimbo < Cask
+cask :v1 => 'yojimbo' do
   version '4.0.3'
   sha256 '3d56523799db955ddf362e3b4b43a4a193b426ea76cf02d1647ecd56e5231c3b'
 
diff --git a/Casks/yorufukurou.rb b/Casks/yorufukurou.rb
index 3630b83e9381..8d501ed8a9b0 100644
--- a/Casks/yorufukurou.rb
+++ b/Casks/yorufukurou.rb
@@ -1,4 +1,4 @@
-class Yorufukurou < Cask
+cask :v1 => 'yorufukurou' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/youdao.rb b/Casks/youdao.rb
index 2d898a74bcb1..82721eb9d391 100644
--- a/Casks/youdao.rb
+++ b/Casks/youdao.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-class Youdao < Cask
+cask :v1 => 'youdao' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/youll-never-take-me-alive.rb b/Casks/youll-never-take-me-alive.rb
index 4c75a5498973..66c749751be7 100644
--- a/Casks/youll-never-take-me-alive.rb
+++ b/Casks/youll-never-take-me-alive.rb
@@ -1,4 +1,4 @@
-class YoullNeverTakeMeAlive < Cask
+cask :v1 => 'youll-never-take-me-alive' do
   version '0.9.9'
   sha256 'e055e96ed1816b30b420533af8f9de90da088b339d51aa99a5c20c636e8ba9c8'
 
diff --git a/Casks/younited.rb b/Casks/younited.rb
index e917f2cc8ec1..e685e9f4a2a4 100644
--- a/Casks/younited.rb
+++ b/Casks/younited.rb
@@ -1,4 +1,4 @@
-class Younited < Cask
+cask :v1 => 'younited' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/youtrack-workflow.rb b/Casks/youtrack-workflow.rb
index 6b030d760aa7..f1abba511773 100644
--- a/Casks/youtrack-workflow.rb
+++ b/Casks/youtrack-workflow.rb
@@ -1,4 +1,4 @@
-class YoutrackWorkflow < Cask
+cask :v1 => 'youtrack-workflow' do
   version '5.2.1'
   sha256 'a0ecd6b54d8cb2726086aa4db2744446e75a42f02e99e975fee237200b244e91'
 
diff --git a/Casks/youview.rb b/Casks/youview.rb
index babc87b50c16..c8aab10ca494 100644
--- a/Casks/youview.rb
+++ b/Casks/youview.rb
@@ -1,4 +1,4 @@
-class Youview < Cask
+cask :v1 => 'youview' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/yubikey-neo-manager.rb b/Casks/yubikey-neo-manager.rb
index 032b53f6ff43..c12cafb59914 100644
--- a/Casks/yubikey-neo-manager.rb
+++ b/Casks/yubikey-neo-manager.rb
@@ -1,4 +1,4 @@
-class YubikeyNeoManager < Cask
+cask :v1 => 'yubikey-neo-manager' do
   version '0.2.2'
   sha256 '4ea699743fd90586ef48b9d906bd4ad109eedeaa11b58028431197bd8396897a'
 
diff --git a/Casks/yubikey-personalization-gui.rb b/Casks/yubikey-personalization-gui.rb
index 7992258ba3aa..e4e51461bd43 100644
--- a/Casks/yubikey-personalization-gui.rb
+++ b/Casks/yubikey-personalization-gui.rb
@@ -1,4 +1,4 @@
-class YubikeyPersonalizationGui < Cask
+cask :v1 => 'yubikey-personalization-gui' do
   version '3.1.14'
   sha256 'f0c3d016b90f54e69525d2fec4dee89df499862e4a8a1ad3323e0fca57287408'
 
diff --git a/Casks/yubiswitch.rb b/Casks/yubiswitch.rb
index ae6b718dd9e2..5844dc13c771 100644
--- a/Casks/yubiswitch.rb
+++ b/Casks/yubiswitch.rb
@@ -1,4 +1,4 @@
-class Yubiswitch < Cask
+cask :v1 => 'yubiswitch' do
   version '0.7'
   sha256 '680577971e037ca52292e62809e0709adce1d79946a7d740627e83cda6d4d6ca'
 
diff --git a/Casks/yummy-ftp.rb b/Casks/yummy-ftp.rb
index f8d4cbf7e652..310d5b71fc4a 100644
--- a/Casks/yummy-ftp.rb
+++ b/Casks/yummy-ftp.rb
@@ -1,4 +1,4 @@
-class YummyFtp < Cask
+cask :v1 => 'yummy-ftp' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/zed.rb b/Casks/zed.rb
index df1eebc00b38..35886e226129 100644
--- a/Casks/zed.rb
+++ b/Casks/zed.rb
@@ -1,4 +1,4 @@
-class Zed < Cask
+cask :v1 => 'zed' do
   version '1.0.0'
   sha256 '38adf6049be293b8fca425e7976f4d51d2aea296c5177110be8fc872f9fa76aa'
 
diff --git a/Casks/zendserver.rb b/Casks/zendserver.rb
index 8fe7d0dfd416..3bdfbf2c46eb 100644
--- a/Casks/zendserver.rb
+++ b/Casks/zendserver.rb
@@ -1,4 +1,4 @@
-class Zendserver < Cask
+cask :v1 => 'zendserver' do
   version '6.3.0'
   sha256 'a1e7f5c4801ae0658508dcbde9e71e6d914cd2546f5d261c7eb7ae31ef4bd31f'
 
diff --git a/Casks/zendstudio.rb b/Casks/zendstudio.rb
index 11f8f6128b3d..c8fcb1b5a450 100644
--- a/Casks/zendstudio.rb
+++ b/Casks/zendstudio.rb
@@ -1,4 +1,4 @@
-class Zendstudio < Cask
+cask :v1 => 'zendstudio' do
   version '10.6.1'
   sha256 '98cafacf5e2f08ae22561b4f9c756400e3c28202f1e97c345357816d3b38b40d'
 
diff --git a/Casks/zepheer.rb b/Casks/zepheer.rb
index 90cb6ed0c5e3..c2139dbc924c 100644
--- a/Casks/zepheer.rb
+++ b/Casks/zepheer.rb
@@ -1,4 +1,4 @@
-class Zepheer < Cask
+cask :v1 => 'zepheer' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/zephyros.rb b/Casks/zephyros.rb
index 8b395559cbb0..88fcdec31ca6 100644
--- a/Casks/zephyros.rb
+++ b/Casks/zephyros.rb
@@ -1,4 +1,4 @@
-class Zephyros < Cask
+cask :v1 => 'zephyros' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/zero10-editor.rb b/Casks/zero10-editor.rb
index dc2d3061a810..0727c8f72e7b 100644
--- a/Casks/zero10-editor.rb
+++ b/Casks/zero10-editor.rb
@@ -1,4 +1,4 @@
-class Zero10Editor < Cask
+cask :v1 => 'zero10-editor' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/zeroad.rb b/Casks/zeroad.rb
index c5fee53f4276..dabf18bf32b5 100644
--- a/Casks/zeroad.rb
+++ b/Casks/zeroad.rb
@@ -1,4 +1,4 @@
-class Zeroad < Cask
+cask :v1 => 'zeroad' do
   version '0.0.16-alpha'
   sha256 'c68d43559752bfff1ee9b5b42ec951e435aca2a6bd8ee6bd7f99fbcdc5989455'
 
diff --git a/Casks/zeroinstall.rb b/Casks/zeroinstall.rb
index bcb55ef7c654..b5cd92cc5c95 100644
--- a/Casks/zeroinstall.rb
+++ b/Casks/zeroinstall.rb
@@ -1,4 +1,4 @@
-class Zeroinstall < Cask
+cask :v1 => 'zeroinstall' do
   version '2.7'
   sha256 '12246277e9d03fb1a083f6a0d7d088d7b90170dbd5fd8fb900b36d0470fb88e0'
 
diff --git a/Casks/zeroxdbe-eap.rb b/Casks/zeroxdbe-eap.rb
index a0c3acda2343..0f98efb81155 100644
--- a/Casks/zeroxdbe-eap.rb
+++ b/Casks/zeroxdbe-eap.rb
@@ -1,4 +1,4 @@
-class ZeroxdbeEap < Cask
+cask :v1 => 'zeroxdbe-eap' do
   version '138.2221.3'
   sha256 'fc88c53d55fa13330421aebf77c0fb136eaa3e6ccff8e08ed577e51c53195fba'
 
diff --git a/Casks/zeroxed.rb b/Casks/zeroxed.rb
index 923d77360550..f3d804a45c86 100644
--- a/Casks/zeroxed.rb
+++ b/Casks/zeroxed.rb
@@ -1,4 +1,4 @@
-class Zeroxed < Cask
+cask :v1 => 'zeroxed' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/zipcleaner.rb b/Casks/zipcleaner.rb
index f3e8bdefad8a..0b47a34f6cd9 100644
--- a/Casks/zipcleaner.rb
+++ b/Casks/zipcleaner.rb
@@ -1,4 +1,4 @@
-class Zipcleaner < Cask
+cask :v1 => 'zipcleaner' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/zipeg.rb b/Casks/zipeg.rb
index 8f3c5df274c2..a530b6e81a48 100644
--- a/Casks/zipeg.rb
+++ b/Casks/zipeg.rb
@@ -1,4 +1,4 @@
-class Zipeg < Cask
+cask :v1 => 'zipeg' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/zoc.rb b/Casks/zoc.rb
index 8a23d344e36b..713458358b96 100644
--- a/Casks/zoc.rb
+++ b/Casks/zoc.rb
@@ -1,4 +1,4 @@
-class Zoc < Cask
+cask :v1 => 'zoc' do
   version '6.60'
   sha256 '2a73ceaa1515d2d2321905dc667e62bbc8c99d87fbfc5d003156d59b2c2d7e7b'
 
diff --git a/Casks/zoom.rb b/Casks/zoom.rb
index 48dd1bf281ec..c117bcacfbe3 100644
--- a/Casks/zoom.rb
+++ b/Casks/zoom.rb
@@ -1,4 +1,4 @@
-class Zoom < Cask
+cask :v1 => 'zoom' do
   version '1.1.5'
   sha256 'ab9584758d922f3fa2c607ae6bf58841969fdd5740ff17af76f41ecfd7c6ae11'
 
diff --git a/Casks/zoomus.rb b/Casks/zoomus.rb
index 3357615e11ef..37afcac74b42 100644
--- a/Casks/zoomus.rb
+++ b/Casks/zoomus.rb
@@ -1,4 +1,4 @@
-class Zoomus < Cask
+cask :v1 => 'zoomus' do
   version :latest
   sha256 :no_check
 
diff --git a/Casks/zooom.rb b/Casks/zooom.rb
index 06df71bbf81a..28b5181811d6 100644
--- a/Casks/zooom.rb
+++ b/Casks/zooom.rb
@@ -1,4 +1,4 @@
-class Zooom < Cask
+cask :v1 => 'zooom' do
   version '2.6.0'
   sha256 'eda52f42d06a6cd32c2fc419358a4a589087a1592a38e717577e3ae9a656036f'
 
diff --git a/Casks/zotero.rb b/Casks/zotero.rb
index a0f1e0049482..f71fc05c8786 100644
--- a/Casks/zotero.rb
+++ b/Casks/zotero.rb
@@ -1,4 +1,4 @@
-class Zotero < Cask
+cask :v1 => 'zotero' do
   version '4.0.23'
   sha256 'f97ef96f005674ad8227ae6eb2096c81d334b771347c566c3581bee5100675e3'
 
diff --git a/Casks/zterm.rb b/Casks/zterm.rb
index 4a784d2407d5..89707000601f 100644
--- a/Casks/zterm.rb
+++ b/Casks/zterm.rb
@@ -1,4 +1,4 @@
-class Zterm < Cask
+cask :v1 => 'zterm' do
   version '1.2'
   sha256 '711b1e4322970d2ece65ab5d51e18f2e634c2f43847db9a7a98e4326e1b8217c'