diff --git a/lib/register/integer.rb b/lib/register/integer.rb
index 2ba4aeb4..dcdb2b77 100644
--- a/lib/register/integer.rb
+++ b/lib/register/integer.rb
@@ -1,5 +1,5 @@
 module Register
-  class Integer < Word
+  class UnusedAndAbandonedInteger < Word
     # needs to be here as Word's constructor is private (to make it abstract)
     def initialize reg
       super
diff --git a/lib/virtual/constants.rb b/lib/virtual/constants.rb
index 1f1dc5fe..2d832cfa 100644
--- a/lib/virtual/constants.rb
+++ b/lib/virtual/constants.rb
@@ -2,11 +2,11 @@ module Virtual
   
   class Constant < ::Virtual::Value
   end
-  class TrueValue < Constant
+  class TrueConstant < Constant
   end
-  class FalseValue < Constant
+  class FalseConstant < Constant
   end
-  class NilValue < Constant
+  class NilConstant < Constant
   end
 
   # another abstract "marker" class (so we can check for it)
diff --git a/test/virtual/test_basic.rb b/test/virtual/test_basic.rb
index 1a66d8f5..706728b2 100644
--- a/test/virtual/test_basic.rb
+++ b/test/virtual/test_basic.rb
@@ -11,17 +11,17 @@ class TestBasic < MiniTest::Test
 
   def test_true
     @string_input    = 'true '
-    @output = "---RETURN_MARKER- !ruby/object:Virtual::TrueValue {}RETURN_MARKER"
+    @output = "---RETURN_MARKER- !ruby/object:Virtual::TrueConstant {}RETURN_MARKER"
     check
   end
   def test_false
     @string_input    = 'false '
-    @output = "---RETURN_MARKER- !ruby/object:Virtual::FalseValue {}RETURN_MARKER"
+    @output = "---RETURN_MARKER- !ruby/object:Virtual::FalseConstant {}RETURN_MARKER"
     check
   end
   def test_nil
     @string_input    = 'nil '
-    @output = "---RETURN_MARKER- !ruby/object:Virtual::NilValue {}RETURN_MARKER"
+    @output = "---RETURN_MARKER- !ruby/object:Virtual::NilConstant {}RETURN_MARKER"
     check
   end