diff --git a/module_build_service/resolver/MBSResolver.py b/module_build_service/resolver/MBSResolver.py
index 76ce2d0b..ce631762 100644
--- a/module_build_service/resolver/MBSResolver.py
+++ b/module_build_service/resolver/MBSResolver.py
@@ -156,7 +156,7 @@ class MBSResolver(GenericResolver):
 
     def resolve_profiles(self, mmd, keys):
         """
-        :param mmd: ModuleMetadata instance of module
+        :param mmd: Modulemd.Module instance of module
         :param keys: list of modulemd installation profiles to include in
                      the result.
         :return: Dictionary with keys set according to `keys` param and values
@@ -213,8 +213,8 @@ class MBSResolver(GenericResolver):
         :param strict: Normally this function returns None if no module can be
             found.  If strict=True, then an UnprocessableEntity is raised.
         :return: a mapping containing buildrequire modules info in key/value pairs,
-            where key is koji_tag and value is the ModuleMetadata object.
-        :rtype: dict(str, :class:`ModuleMetadata`)
+            where key is koji_tag and value is the Modulemd.Module object.
+        :rtype: dict(str, :class:`Modulemd.Module`)
         """
 
         if mmd:
diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py
index c9968871..f6bcd43d 100644
--- a/module_build_service/scheduler/handlers/modules.py
+++ b/module_build_service/scheduler/handlers/modules.py
@@ -223,7 +223,7 @@ def wait(config, session, msg):
         cg_build_koji_tag = conf.koji_cg_default_build_tag
         if conf.system not in ['koji', 'test']:
             # In case of non-koji backend, we want to get the dependencies
-            # of the local module build based on ModuleMetadata, because the
+            # of the local module build based on Modulemd.Module, because the
             # local build is not stored in the external MBS and therefore we
             # cannot query it using the `query` as for Koji below.
             dependencies = resolver.get_module_build_dependencies(
diff --git a/module_build_service/utils/mse.py b/module_build_service/utils/mse.py
index 7f8c1cf8..2403104c 100644
--- a/module_build_service/utils/mse.py
+++ b/module_build_service/utils/mse.py
@@ -121,7 +121,7 @@ def _get_mmds_from_requires(session, requires, mmds, recursive=False,
     the list of module metadata objects defined by `requires` dict.
 
     :param session: SQLAlchemy DB session.
-    :param requires: Modulemetadata requires or buildrequires.
+    :param requires: Modulemd.Module requires or buildrequires.
     :param mmds: Dictionary with already handled name:streams as a keys and lists
         of resulting mmds as values.
     :param recursive: If True, the requires are checked recursively.
diff --git a/module_build_service/utils/submit.py b/module_build_service/utils/submit.py
index fb9058d7..6822c786 100644
--- a/module_build_service/utils/submit.py
+++ b/module_build_service/utils/submit.py
@@ -116,7 +116,7 @@ def format_mmd(mmd, scmurl, session=None):
     Prepares the modulemd for the MBS. This does things such as replacing the
     branches of components with commit hashes and adding metadata in the xmd
     dictionary.
-    :param mmd: the ModuleMetadata object to format
+    :param mmd: the Modulemd.Module object to format
     :param scmurl: the url to the modulemd
     """
     # Import it here, because SCM uses utils methods and fails to import