diff --git a/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/factory.py b/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/factory.py
index 8bbab399..1ed26757 100644
--- a/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/factory.py
+++ b/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/factory.py
@@ -22,8 +22,12 @@ PLUGINS = {
                    'cloudconfigplugins.write_files.WriteFilesPlugin',
     'set_timezone': 'cloudbaseinit.plugins.common.userdataplugins.'
                     'cloudconfigplugins.set_timezone.SetTimezonePlugin',
+    'timezone': 'cloudbaseinit.plugins.common.userdataplugins.'
+                'cloudconfigplugins.set_timezone.SetTimezonePlugin',
     'set_hostname': 'cloudbaseinit.plugins.common.userdataplugins.'
                     'cloudconfigplugins.set_hostname.SetHostnamePlugin',
+    'hostname': 'cloudbaseinit.plugins.common.userdataplugins.'
+                'cloudconfigplugins.set_hostname.SetHostnamePlugin',
 }
 
 
diff --git a/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/set_hostname.py b/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/set_hostname.py
index 6b28361e..2b6bfe7d 100644
--- a/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/set_hostname.py
+++ b/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/set_hostname.py
@@ -27,7 +27,11 @@ LOG = oslo_logging.getLogger(__name__)
 class SetHostnamePlugin(base.BaseCloudConfigPlugin):
     """Change the hostname for the underlying platform.
 
-    If the timezone is changed a restart will be required.
+    If the hostname is changed a restart will be required.
+
+    To change the hostname to 'myhostname', use this syntax:
+
+        hostname: myhostname
 
     """
 
diff --git a/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/set_timezone.py b/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/set_timezone.py
index fc9b8b02..2b81cdcd 100644
--- a/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/set_timezone.py
+++ b/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/set_timezone.py
@@ -31,9 +31,9 @@ class SetTimezonePlugin(base.BaseCloudConfigPlugin):
     https://technet.microsoft.com/en-us/library/cc749073%28v=ws.10%29.aspx).
 
     For instance, to change the timezone to 'America/Montevideo', use
-    this syntax::
+    this syntax:
 
-        set_timezone: America/Montevideo
+        timezone: America/Montevideo
 
     """