diff --git a/cloudbaseinit/conf/maas.py b/cloudbaseinit/conf/maas.py
index c82627e34..35a13b9c6 100644
--- a/cloudbaseinit/conf/maas.py
+++ b/cloudbaseinit/conf/maas.py
@@ -27,23 +27,23 @@ def __init__(self, config):
         super(MAASOptions, self).__init__(config, group="maas")
         self._options = [
             cfg.StrOpt("metadata_base_url", default=None,
-                       help="The base URL for MaaS metadata",
+                       help="The base URL for MAAS metadata",
                        deprecated_name="maas_metadata_url",
                        deprecated_group="DEFAULT"),
             cfg.StrOpt("oauth_consumer_key", default="",
-                       help="The MaaS OAuth consumer key",
+                       help="The MAAS OAuth consumer key",
                        deprecated_name="maas_oauth_consumer_key",
                        deprecated_group="DEFAULT"),
             cfg.StrOpt("oauth_consumer_secret", default="",
-                       help="The MaaS OAuth consumer secret",
+                       help="The MAAS OAuth consumer secret",
                        deprecated_name="maas_oauth_consumer_secret",
                        deprecated_group="DEFAULT"),
             cfg.StrOpt("oauth_token_key", default="",
-                       help="The MaaS OAuth token key",
+                       help="The MAAS OAuth token key",
                        deprecated_name="maas_oauth_token_key",
                        deprecated_group="DEFAULT"),
             cfg.StrOpt("oauth_token_secret", default="",
-                       help="The MaaS OAuth token secret",
+                       help="The MAAS OAuth token secret",
                        deprecated_name="maas_oauth_token_secret",
                        deprecated_group="DEFAULT"),
             cfg.BoolOpt(
diff --git a/cloudbaseinit/metadata/services/maasservice.py b/cloudbaseinit/metadata/services/maasservice.py
index d477e7b39..e35061bfd 100644
--- a/cloudbaseinit/metadata/services/maasservice.py
+++ b/cloudbaseinit/metadata/services/maasservice.py
@@ -74,7 +74,7 @@ def load(self):
         super(MaaSHttpService, self).load()
 
         if not CONF.maas.metadata_base_url:
-            LOG.debug('MaaS metadata url not set')
+            LOG.debug('MAAS metadata url not set')
         else:
             try:
                 self._get_cache_data('%s/meta-data/' % self._metadata_version)
diff --git a/doc/source/intro.rst b/doc/source/intro.rst
index 534c0c922..47755e19a 100644
--- a/doc/source/intro.rst
+++ b/doc/source/intro.rst
@@ -8,7 +8,7 @@ It was designed to initialize and configure guest operating systems under
 `OpenStack <https://www.openstack.org/>`_,
 `OpenNebula <http://opennebula.org/>`_,
 `CloudStack <https://cloudstack.apache.org/>`_,
-`MaaS <https://maas.ubuntu.com/>`_ and many others.
+`MAAS <https://maas.io/>`_ and many others.
 Under `Cloudbase <http://www.cloudbase.it/cloud-init-windows/>`_ page,
 stable and beta installers can be found and the service itself is very easy to
 configure through configuration files. It can also customize instances based
diff --git a/doc/source/services.rst b/doc/source/services.rst
index a38b64385..ce641488f 100644
--- a/doc/source/services.rst
+++ b/doc/source/services.rst
@@ -326,7 +326,7 @@ Config options for `default` section:
     * retry_count_interval (integer: 4)
 
 
-Ubuntu MaaS
+Canonical MAAS
 -----------
 
 .. class:: cloudbaseinit.metadata.services.maasservice.MaaSHttpService