diff --git a/lib/mutant.rb b/lib/mutant.rb
index bc1b98d2..1d5745c0 100644
--- a/lib/mutant.rb
+++ b/lib/mutant.rb
@@ -58,7 +58,7 @@ require 'mutant/mutator/node/argument'
 require 'mutant/mutator/node/arguments'
 require 'mutant/mutator/node/begin'
 require 'mutant/mutator/node/named_value/access'
-require 'mutant/mutator/node/named_value/assignment'
+require 'mutant/mutator/node/named_value/variable_assignment'
 require 'mutant/mutator/node/while'
 require 'mutant/mutator/node/super'
 require 'mutant/mutator/node/send'
diff --git a/lib/mutant/mutator/node/named_value/assignment.rb b/lib/mutant/mutator/node/named_value/variable_assignment.rb
similarity index 87%
rename from lib/mutant/mutator/node/named_value/assignment.rb
rename to lib/mutant/mutator/node/named_value/variable_assignment.rb
index 17631b0c..7460798b 100644
--- a/lib/mutant/mutator/node/named_value/assignment.rb
+++ b/lib/mutant/mutator/node/named_value/variable_assignment.rb
@@ -3,8 +3,8 @@ module Mutant
     class Node
       module NamedValue
 
-        # Mutation emitter to handle value assignment nodes
-        class Assignment < Node
+        # Mutation emitter to handle variable assignment nodes
+        class VariableAssignment < Node
 
           children :name, :value
 
@@ -43,7 +43,7 @@ module Mutant
             end
           end
 
-        end # Assignment
+        end # VariableAssignment
       end # NamedValue
     end # Node
   end # Mutator
diff --git a/spec/unit/mutant/mutator/node/named_value/assignment/mutation_spec.rb b/spec/unit/mutant/mutator/node/named_value/variable_assignment/mutation_spec.rb
similarity index 93%
rename from spec/unit/mutant/mutator/node/named_value/assignment/mutation_spec.rb
rename to spec/unit/mutant/mutator/node/named_value/variable_assignment/mutation_spec.rb
index 05a26ab4..59449390 100644
--- a/spec/unit/mutant/mutator/node/named_value/assignment/mutation_spec.rb
+++ b/spec/unit/mutant/mutator/node/named_value/variable_assignment/mutation_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mutant::Mutator::Node::NamedValue::Assignment, 'mutations' do
+describe Mutant::Mutator::Node::NamedValue::VariableAssignment, 'mutations' do
 
   before do
     Mutant::Random.stub(:hex_string => :random)