diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 19e37bb9a5617..7917233c95e2d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -171,6 +171,9 @@ We try to maintain consistent naming so everything stays clean and predictable.
   * Pay attention to details, for example: `"Git Hub" != "git_hub" != "GitHub"`
   * If the result of that process is something unhelpful, such as `Macintosh Installer`,
     then just create the best name you can, based on the author's web page.
+  * If the result conflicts with the name of an existing Cask, make yours unique
+    by prepending the name of the vendor or developer, followed by a separator.
+    Example: [unison.rb](../Casks/unison.rb) and [panic-unison.rb](../Casks/panic-unison.rb).
 
 ##### Canonical Names of `pkg`-based Installers
 
@@ -195,7 +198,8 @@ To get from the App's canonical name to the Cask name:
   * delete a leading hyphen
   * a leading digit gets spelled out into English: `1password` becomes `onepassword`
 
-Casks are stored in a Ruby file matching their name.
+Casks are stored in a Ruby file matching their name.  If possible, avoid creating
+Cask files which differ only by the placement of hyphens.
 
 #### Cask Class
 
diff --git a/Casks/webpquicklook.rb b/Casks/emin-webpquicklook.rb
similarity index 86%
rename from Casks/webpquicklook.rb
rename to Casks/emin-webpquicklook.rb
index a8af882c787d5..94e5e349350b1 100644
--- a/Casks/webpquicklook.rb
+++ b/Casks/emin-webpquicklook.rb
@@ -1,4 +1,4 @@
-class Webpquicklook < Cask
+class EminWebpquicklook < Cask
   url 'https://raw.github.com/emin/WebPQuickLook/master/WebpQuickLook.tar.gz'
   homepage 'https://github.com/emin/WebPQuickLook'
   version 'latest'
diff --git a/Casks/f-lux.rb b/Casks/f-lux.rb
deleted file mode 100644
index 74f741765507d..0000000000000
--- a/Casks/f-lux.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class FLux < Cask
-  url 'https://justgetflux.com/mac/Flux.zip'
-  homepage 'http://justgetflux.com'
-  version 'latest'
-  no_checksum
-  link 'Flux.app'
-
-  after_install do
-    # Don't ask to move the app bundle to /Applications
-    system '/usr/bin/defaults', 'write', 'org.herf.Flux', 'moveToApplicationsFolderAlertSuppress', '-bool', 'true'
-  end
-end
diff --git a/Casks/flux.rb b/Casks/flux.rb
index d377b998be620..48b820c85cd95 100644
--- a/Casks/flux.rb
+++ b/Casks/flux.rb
@@ -1,7 +1,12 @@
 class Flux < Cask
-  url 'http://instruktion.net/theescapers/downloads/FluxV4.zip'
-  homepage 'http://www.theescapers.com/flux/'
-  version '4'
+  url 'https://justgetflux.com/mac/Flux.zip'
+  homepage 'http://justgetflux.com'
+  version 'latest'
   no_checksum
   link 'Flux.app'
+
+  after_install do
+    # Don't ask to move the app bundle to /Applications
+    system '/usr/bin/defaults', 'write', 'org.herf.Flux', 'moveToApplicationsFolderAlertSuppress', '-bool', 'true'
+  end
 end
diff --git a/Casks/unison-usenet.rb b/Casks/panic-unison.rb
similarity index 89%
rename from Casks/unison-usenet.rb
rename to Casks/panic-unison.rb
index 395f2fecb99b3..633f3b2f12c13 100644
--- a/Casks/unison-usenet.rb
+++ b/Casks/panic-unison.rb
@@ -1,4 +1,4 @@
-class UnisonUsenet < Cask
+class PanicUnison < Cask
   url 'http://download.panic.com/Unison/Unison%202.1.10.zip'
   homepage 'http://panic.com/unison/'
   version '2.1.10'
diff --git a/Casks/the-escapers-flux.rb b/Casks/the-escapers-flux.rb
new file mode 100644
index 0000000000000..3b6c63b78107b
--- /dev/null
+++ b/Casks/the-escapers-flux.rb
@@ -0,0 +1,7 @@
+class TheEscapersFlux < Cask
+  url 'http://instruktion.net/theescapers/downloads/FluxV4.zip'
+  homepage 'http://www.theescapers.com/flux/'
+  version '4'
+  no_checksum
+  link 'Flux.app'
+end