diff --git a/apiclient/discovery.py b/apiclient/discovery.py
index bfe42e2..2a53b0d 100644
--- a/apiclient/discovery.py
+++ b/apiclient/discovery.py
@@ -45,7 +45,7 @@
 from errors import InvalidJsonError
 from errors import MediaUploadSizeError
 from errors import UnacceptableMimeTypeError
-from errors import UnknownApiOrApiVersion
+from errors import UnknownApiNameOrVersion
 from errors import UnknownLinkType
 from http import HttpRequest
 from model import JsonModel
@@ -169,7 +169,7 @@
   resp, content = http.request(requested_url)
 
   if resp.status == 404:
-    raise UnknownApiOrApiVersion("name: %s  version: %s" % (serviceName,
+    raise UnknownApiNameOrVersion("name: %s  version: %s" % (serviceName,
                                                             version))
   if resp.status >= 400:
     raise HttpError(resp, content, requested_url)
diff --git a/apiclient/errors.py b/apiclient/errors.py
index c77c704..ff0c154 100644
--- a/apiclient/errors.py
+++ b/apiclient/errors.py
@@ -70,7 +70,7 @@
   """Link type unknown or unexpected."""
   pass
 
-class UnknownApiOrApiVersion(Error):
+class UnknownApiNameOrVersion(Error):
   """No API with that name and version exists."""
   pass