diff --git a/lib/bson/exceptions.rb b/lib/bson/exceptions.rb
index 16c6084..89c2f87 100644
--- a/lib/bson/exceptions.rb
+++ b/lib/bson/exceptions.rb
@@ -29,10 +29,7 @@ module BSON
   # Raised when given a string is not valid utf-8 (Ruby 1.8 only).
   class InvalidStringEncoding < BSONError; end
 
-  # Raised when attempting to initialize an invalid ObjectID.
-  class InvalidObjectID < BSONError; end
-
-  # Raised when attempting to initialize an invalid ObjectID.
+  # Raised when attempting to initialize an invalid ObjectId.
   class InvalidObjectId < BSONError; end
 
   # Raised when trying to insert a document that exceeds the 4MB limit or
diff --git a/lib/bson/types/dbref.rb b/lib/bson/types/dbref.rb
index e0570f0..583fee9 100644
--- a/lib/bson/types/dbref.rb
+++ b/lib/bson/types/dbref.rb
@@ -26,7 +26,7 @@ module BSON
     # Create a DBRef. Use this class in conjunction with DB#dereference.
     #
     # @param [String] a collection name
-    # @param [ObjectID] an object id
+    # @param [ObjectId] an object id
     #
     # @core dbrefs constructor_details
     def initialize(namespace, object_id)