diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index aef1b1864a..977b00b305 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -97,7 +97,7 @@ Additional fields you might need for special use-cases:
 | `service`          | relative path to a service that should be linked into the `~/Library/Services` folder on installation
 | `binary`           | relative path to a binary that should be linked into the `~/usr/local/bin` folder on installation
 | `input_method`     | relative path to a input method that should be linked into the `~/Library/Input Methods` folder on installation
-| `screen_saver`     | relative path to a screensaver that should be linked into the `~/Library/Screen Savers` folder on installation
+| `screen_saver`     | relative path to a Screen Saver that should be linked into the `~/Library/Screen Savers` folder on installation
 | `nested_container` | relative path to an inner container that must be extracted before moving on with the installation; this allows us to support dmg inside tar, zip inside dmg, etc.
 | `depends_on_formula` | a list of Homebrew Formulae upon which this Cask depends
 | `caveats`          | a string or Ruby block providing the user with Cask-specific information at install time (see __Caveats Details__ for more information)
diff --git a/FAQ.md b/FAQ.md
index 0c561cdc16..e27f55c795 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -59,7 +59,7 @@ We don't know up-front precisely what files are going to be in the
 dmg/zip/tgz/etc, so it's really helpful to have a place to dump all of them
 safely, then iterate through and act on the files we care about. For an `.app` file
 this may be symlinking it into `~/Applications` or `/Applications`, for a `.pkg` file
-this might be running the installer. For a screensaver it may be symlinking it
+this might be running the installer. For a Screen Saver it may be symlinking it
 into the appropriate directory for it to show up in System Preferences.
 
 The reason we implement this project on top of Homebrew was based on a belief
diff --git a/lib/cask/artifact.rb b/lib/cask/artifact.rb
index 6b28e902c3..fc94a865c0 100644
--- a/lib/cask/artifact.rb
+++ b/lib/cask/artifact.rb
@@ -17,7 +17,7 @@ require 'cask/artifact/widget'
 require 'cask/artifact/service'
 require 'cask/artifact/caskroom_only'
 require 'cask/artifact/input_method'
-require 'cask/artifact/screensaver'
+require 'cask/artifact/screen_saver'
 
 
 module Cask::Artifact
diff --git a/lib/cask/artifact/screensaver.rb b/lib/cask/artifact/screen_saver.rb
similarity index 94%
rename from lib/cask/artifact/screensaver.rb
rename to lib/cask/artifact/screen_saver.rb
index 7c1a0784d8..0c6a438a7b 100644
--- a/lib/cask/artifact/screensaver.rb
+++ b/lib/cask/artifact/screen_saver.rb
@@ -1,3 +1,3 @@
 class Cask::Artifact::ScreenSaver < Cask::Artifact::Symlinked
 
-end
\ No newline at end of file
+end