diff --git a/lib/mutant.rb b/lib/mutant.rb
index 7363e410..078394dc 100644
--- a/lib/mutant.rb
+++ b/lib/mutant.rb
@@ -57,13 +57,12 @@ require 'mutant/mutator/node/literal/nil'
 require 'mutant/mutator/node/argument'
 require 'mutant/mutator/node/arguments'
 require 'mutant/mutator/node/begin'
-require 'mutant/mutator/node/block_pass'
-require 'mutant/mutator/node/cbase'
 require 'mutant/mutator/node/connective/binary'
 require 'mutant/mutator/node/const'
 require 'mutant/mutator/node/named_value/access'
 require 'mutant/mutator/node/named_value/constant_assignment'
 require 'mutant/mutator/node/named_value/variable_assignment'
+require 'mutant/mutator/node/noop'
 require 'mutant/mutator/node/while'
 require 'mutant/mutator/node/super'
 require 'mutant/mutator/node/zsuper'
diff --git a/lib/mutant/mutator/node/block_pass.rb b/lib/mutant/mutator/node/block_pass.rb
deleted file mode 100644
index 65615c7f..00000000
--- a/lib/mutant/mutator/node/block_pass.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-module Mutant
-  class Mutator
-    class Node
-
-      # Mutation emitter to handle block_pass nodes
-      class BlockPass < self
-
-        handle(:block_pass)
-
-      private
-
-        # Emit mutations
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def dispatch
-          # noop, for now
-        end
-
-      end # BlockPass
-    end # Node
-  end # Mutator
-end # Mutant
diff --git a/lib/mutant/mutator/node/cbase.rb b/lib/mutant/mutator/node/noop.rb
similarity index 64%
rename from lib/mutant/mutator/node/cbase.rb
rename to lib/mutant/mutator/node/noop.rb
index fb6a1989..5f6178f7 100644
--- a/lib/mutant/mutator/node/cbase.rb
+++ b/lib/mutant/mutator/node/noop.rb
@@ -2,10 +2,10 @@ module Mutant
   class Mutator
     class Node
 
-      # Mutation emitter to handle cbase nodes
-      class Cbase < self
+      # Mutation emitter to handle noop nodes
+      class Noop < self
 
-        handle(:cbase)
+        handle(:block_pass, :cbase)
 
       private
 
@@ -16,10 +16,10 @@ module Mutant
         # @api private
         #
         def dispatch
-          # noop, for now
+          # noop
         end
 
-      end # Cbase
+      end # Noop
     end # Node
   end # Mutator
 end # Mutant