diff --git a/lib/parfait/type.rb b/lib/parfait/type.rb
index 003c29f3..2d4b1112 100644
--- a/lib/parfait/type.rb
+++ b/lib/parfait/type.rb
@@ -63,8 +63,12 @@ module Parfait
       end
     end
 
+    def class_name
+      @object_class.name
+    end
+
     def to_s
-      "#{@object_class.name}-#{@names.inspect}"
+      "#{class_name}-#{@names.inspect}"
     end
 
     def method_names
diff --git a/test/parfait/type/test_basic.rb b/test/parfait/type/test_basic.rb
index d2a49e58..ecfb749d 100644
--- a/test/parfait/type/test_basic.rb
+++ b/test/parfait/type/test_basic.rb
@@ -72,5 +72,11 @@ module Parfait
       type = @mess.get_type
       assert_equal type , @mess.get_internal_word(0)
     end
+    def test_to_s
+      assert @type.to_s.include?(@type.object_class.name.to_s)
+    end
+    def test_class_name
+      assert_equal :Message , @type.class_name
+    end
   end
 end