diff --git a/errors.py b/errors.py
index dfe6b22ed..2e80ecfa9 100644
--- a/errors.py
+++ b/errors.py
@@ -12,12 +12,8 @@ class InvalidOperation(Exception):
     """Raised when a client attempts to perform an invalid operation.
     """
 
-class InvalidDatabaseName(ValueError):
-    """Raised when an invalid database name is used.
-    """
-
-class InvalidCollectionName(ValueError):
-    """Raised when an invalid collection name is used.
+class InvalidName(ValueError):
+    """Raised when an invalid name is used.
     """
 
 class InvalidBSON(ValueError):