diff --git a/src/calibre/customize/__init__.py b/src/calibre/customize/__init__.py
index 27e319de14..8ddc791b2f 100644
--- a/src/calibre/customize/__init__.py
+++ b/src/calibre/customize/__init__.py
@@ -218,7 +218,7 @@ class MetadataReaderPlugin(Plugin): # {{{
         with the input data.
         :param type: The type of file. Guaranteed to be one of the entries
         in :attr:`file_types`.
-        :return: A :class:`calibre.ebooks.metadata.MetaInformation` object
+        :return: A :class:`calibre.ebooks.metadata.book.Metadata` object
         '''
         return None
 # }}}
@@ -248,7 +248,7 @@ class MetadataWriterPlugin(Plugin): # {{{
         with the input data.
         :param type: The type of file. Guaranteed to be one of the entries
         in :attr:`file_types`.
-        :param mi: A :class:`calibre.ebooks.metadata.MetaInformation` object
+        :param mi: A :class:`calibre.ebooks.metadata.book.Metadata` object
         '''
         pass
 
diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py
index 75517e9df7..94aea1e79d 100644
--- a/src/calibre/devices/apple/driver.py
+++ b/src/calibre/devices/apple/driver.py
@@ -872,7 +872,7 @@ class ITUNES(DriverBase):
         once uploaded to the device. len(names) == len(files)
         :return: A list of 3-element tuples. The list is meant to be passed
         to L{add_books_to_metadata}.
-        :metadata: If not None, it is a list of :class:`MetaInformation` objects.
+        :metadata: If not None, it is a list of :class:`Metadata` objects.
         The idea is to use the metadata to determine where on the device to
         put the book. len(metadata) == len(files). Apart from the regular
         cover (path to cover), there may also be a thumbnail attribute, which should
diff --git a/src/calibre/ebooks/metadata/epub.py b/src/calibre/ebooks/metadata/epub.py
index 041a1ee603..ac6b5feebe 100644
--- a/src/calibre/ebooks/metadata/epub.py
+++ b/src/calibre/ebooks/metadata/epub.py
@@ -164,7 +164,7 @@ def get_cover(opf, opf_path, stream, reader=None):
             return render_html_svg_workaround(cpage, default_log)
 
 def get_metadata(stream, extract_cover=True):
-    """ Return metadata as a :class:`MetaInformation` object """
+    """ Return metadata as a :class:`Metadata` object """
     stream.seek(0)
     reader = OCFZipReader(stream)
     mi = MetaInformation(reader.opf)
diff --git a/src/calibre/ebooks/metadata/fetch.py b/src/calibre/ebooks/metadata/fetch.py
index 96807c06ae..9b8a42e482 100644
--- a/src/calibre/ebooks/metadata/fetch.py
+++ b/src/calibre/ebooks/metadata/fetch.py
@@ -29,7 +29,7 @@ class MetadataSource(Plugin): # {{{
     future use.
 
     The fetch method must store the results in `self.results` as a list of
-    :class:`MetaInformation` objects. If there is an error, it should be stored
+    :class:`Metadata` objects. If there is an error, it should be stored
     in `self.exception` and `self.tb` (for the traceback).
     '''