diff --git a/.gitignore b/.gitignore
index fbf4373..b379087 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 .bundle
 .DS_Store
 .sass-cache
-_gist_cache
-_code_cache
+.gist-cache
+.pygments-cache
 _deploy
 public
 sass.old
diff --git a/Rakefile b/Rakefile
index ca76518..80d027d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -156,9 +156,9 @@ task :integrate do
   FileUtils.mv Dir.glob("#{source_dir}/#{stash_dir}/*.*"), "#{source_dir}/#{posts_dir}/"
 end
 
-desc "Clean out caches: _code_cache, _gist_cache, .sass-cache"
+desc "Clean out caches: .pygments-cache, .gist-cache, .sass-cache"
 task :clean do
-  rm_rf ["_code_cache/**", "_gist_cache/**", ".sass-cache/**", "source/stylesheets/screen.css"]
+  rm_rf [".pygments-cache/**", ".gist-cache/**", ".sass-cache/**", "source/stylesheets/screen.css"]
 end
 
 desc "Move sass to sass.old, install sass theme updates, replace sass/custom with sass.old/custom"
diff --git a/plugins/gist_tag.rb b/plugins/gist_tag.rb
index 946ea23..ac5ee3c 100644
--- a/plugins/gist_tag.rb
+++ b/plugins/gist_tag.rb
@@ -16,7 +16,7 @@ module Jekyll
       super
       @text           = text
       @cache_disabled = false
-      @cache_folder   = File.expand_path "../_gist_cache", File.dirname(__FILE__)
+      @cache_folder   = File.expand_path "../.gist-cache", File.dirname(__FILE__)
       FileUtils.mkdir_p @cache_folder
     end
 
diff --git a/plugins/pygments_code.rb b/plugins/pygments_code.rb
index 67ce8c3..b87413f 100644
--- a/plugins/pygments_code.rb
+++ b/plugins/pygments_code.rb
@@ -2,7 +2,7 @@ require 'pygments'
 require 'fileutils'
 require 'digest/md5'
 
-PYGMENTS_CACHE_DIR = File.expand_path('../../_code_cache', __FILE__)
+PYGMENTS_CACHE_DIR = File.expand_path('../../.pygments-cache', __FILE__)
 FileUtils.mkdir_p(PYGMENTS_CACHE_DIR)
 
 module HighlightCode