diff --git a/lib/cask/artifact.rb b/lib/cask/artifact.rb
index 6b28e902c..7300e44a4 100644
--- a/lib/cask/artifact.rb
+++ b/lib/cask/artifact.rb
@@ -6,7 +6,7 @@ require 'cask/artifact/hardlinked'
 
 require 'cask/artifact/app'
 require 'cask/artifact/binary'
-require 'cask/artifact/block'
+require 'cask/artifact/after_block'
 require 'cask/artifact/colorpicker'
 require 'cask/artifact/font'
 require 'cask/artifact/nested_container'
@@ -37,10 +37,10 @@ module Cask::Artifact
       Cask::Artifact::Widget,
       Cask::Artifact::Service,
       Cask::Artifact::CaskroomOnly,
-      Cask::Artifact::Block,
       Cask::Artifact::Binary,
       Cask::Artifact::InputMethod,
       Cask::Artifact::ScreenSaver,
+      Cask::Artifact::AfterBlock,
     ]
   end
 
diff --git a/lib/cask/artifact/block.rb b/lib/cask/artifact/after_block.rb
similarity index 85%
rename from lib/cask/artifact/block.rb
rename to lib/cask/artifact/after_block.rb
index d61ce8438..742df0129 100644
--- a/lib/cask/artifact/block.rb
+++ b/lib/cask/artifact/after_block.rb
@@ -1,4 +1,4 @@
-class Cask::Artifact::Block < Cask::Artifact::Base
+class Cask::Artifact::AfterBlock < Cask::Artifact::Base
   def self.me?(cask)
     cask.artifacts[:after_install].any? ||
       cask.artifacts[:after_uninstall].any?
diff --git a/test/cask/artifact/block_test.rb b/test/cask/artifact/after_block_test.rb
similarity index 86%
rename from test/cask/artifact/block_test.rb
rename to test/cask/artifact/after_block_test.rb
index 9670a590c..f4523fc31 100644
--- a/test/cask/artifact/block_test.rb
+++ b/test/cask/artifact/after_block_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-describe Cask::Artifact::Block do
+describe Cask::Artifact::AfterBlock do
   describe 'install' do
     it 'calls the specified block after installing, passing the cask' do
       called      = false
@@ -15,7 +15,7 @@ describe Cask::Artifact::Block do
       end
 
       cask = CaskWithAfterInstall.new
-      Cask::Artifact::Block.new(cask).install
+      Cask::Artifact::AfterBlock.new(cask).install
 
       called.must_equal true
       yielded_arg.must_equal cask
@@ -36,7 +36,7 @@ describe Cask::Artifact::Block do
       end
 
       cask = CaskWithAfterUninstall.new
-      Cask::Artifact::Block.new(cask).uninstall
+      Cask::Artifact::AfterBlock.new(cask).uninstall
 
       called.must_equal true
       yielded_arg.must_equal cask