diff --git a/lib/ansible/modules/extras/univention/udm_share.py b/lib/ansible/modules/extras/univention/udm_share.py
index a77fbcdee2..8831c3d79f 100644
--- a/lib/ansible/modules/extras/univention/udm_share.py
+++ b/lib/ansible/modules/extras/univention/udm_share.py
@@ -411,86 +411,126 @@ def main():
             writeable                       = dict(type='bool',
                                                    default=True),
             sambaBlockSize                  = dict(type='str',
+                                                   aliases=['samba_block_size'],
                                                    default=None),
             sambaBlockingLocks              = dict(type='bool',
+                                                   aliases=['samba_blocking_locks'],
                                                    default=True),
             sambaBrowseable                 = dict(type='bool',
+                                                   aliases=['samba_browsable'],
                                                    default=True),
             sambaCreateMode                 = dict(type='str',
+                                                   aliases=['samba_create_mode'],
                                                    default='0744'),
             sambaCscPolicy                  = dict(type='str',
+                                                   aliases=['samba_csc_policy'],
                                                    default='manual'),
             sambaCustomSettings             = dict(type='list',
+                                                   aliases=['samba_custom_settings'],
                                                    default=[]),
             sambaDirectoryMode              = dict(type='str',
+                                                   aliases=['samba_directory_mode'],
                                                    default='0755'),
             sambaDirectorySecurityMode      = dict(type='str',
+                                                   aliases=['samba_directory_security_mode'],
                                                    default='0777'),
             sambaDosFilemode                = dict(type='bool',
+                                                   aliases=['samba_dos_filemode'],
                                                    default=False),
             sambaFakeOplocks                = dict(type='bool',
+                                                   aliases=['samba_fake_oplocks'],
                                                    default=False),
             sambaForceCreateMode            = dict(type='bool',
+                                                   aliases=['samba_force_create_mode'],
                                                    default=False),
             sambaForceDirectoryMode         = dict(type='bool',
+                                                   aliases=['samba_force_directory_mode'],
                                                    default=False),
             sambaForceDirectorySecurityMode = dict(type='bool',
+                                                   aliases=['samba_force_directory_security_mode'],
                                                    default=False),
             sambaForceGroup                 = dict(type='str',
+                                                   aliases=['samba_force_group'],
                                                    default=None),
             sambaForceSecurityMode          = dict(type='bool',
+                                                   aliases=['samba_force_security_mode'],
                                                    default=False),
             sambaForceUser                  = dict(type='str',
+                                                   aliases=['samba_force_user'],
                                                    default=None),
             sambaHideFiles                  = dict(type='str',
+                                                   aliases=['samba_hide_files'],
                                                    default=None),
             sambaHideUnreadable             = dict(type='bool',
+                                                   aliases=['samba_hide_unreadable'],
                                                    default=False),
             sambaHostsAllow                 = dict(type='list',
+                                                   aliases=['samba_hosts_allow'],
                                                    default=[]),
             sambaHostsDeny                  = dict(type='list',
+                                                   aliases=['samba_hosts_deny'],
                                                    default=[]),
             sambaInheritAcls                = dict(type='bool',
+                                                   aliases=['samba_inherit_acls'],
                                                    default=True),
             sambaInheritOwner               = dict(type='bool',
+                                                   aliases=['samba_inherit_owner'],
                                                    default=False),
             sambaInheritPermissions         = dict(type='bool',
+                                                   aliases=['samba_inherit_permissions'],
                                                    default=False),
             sambaInvalidUsers               = dict(type='str',
+                                                   aliases=['samba_invalid_users'],
                                                    default=None),
             sambaLevel2Oplocks              = dict(type='bool',
+                                                   aliases=['samba_level_2_oplocks'],
                                                    default=True),
             sambaLocking                    = dict(type='bool',
+                                                   aliases=['samba_locking'],
                                                    default=True),
             sambaMSDFSRoot                  = dict(type='bool',
+                                                   aliases=['samba_msdfs_root'],
                                                    default=False),
             sambaName                       = dict(type='str',
+                                                   aliases=['samba_name'],
                                                    default=None),
             sambaNtAclSupport               = dict(type='bool',
+                                                   aliases=['samba_nt_acl_support'],
                                                    default=True),
             sambaOplocks                    = dict(type='bool',
+                                                   aliases=['samba_oplocks'],
                                                    default=True),
             sambaPostexec                   = dict(type='str',
+                                                   aliases=['samba_postexec'],
                                                    default=None),
             sambaPreexec                    = dict(type='str',
+                                                   aliases=['samba_preexec'],
                                                    default=None),
             sambaPublic                     = dict(type='bool',
+                                                   aliases=['samba_public'],
                                                    default=False),
             sambaSecurityMode               = dict(type='str',
+                                                   aliases=['samba_security_mode'],
                                                    default='0777'),
             sambaStrictLocking              = dict(type='str',
+                                                   aliases=['samba_strict_locking'],
                                                    default='Auto'),
             sambaVFSObjects                 = dict(type='str',
+                                                   aliases=['samba_vfs_objects'],
                                                    default=None),
             sambaValidUsers                 = dict(type='str',
+                                                   aliases=['samba_valid_users'],
                                                    default=None),
             sambaWriteList                  = dict(type='str',
+                                                   aliases=['samba_write_list'],
                                                    default=None),
             sambaWriteable                  = dict(type='bool',
+                                                   aliases=['samba_writeable'],
                                                    default=True),
             nfs_hosts                       = dict(type='list',
                                                    default=[]),
             nfsCustomSettings               = dict(type='list',
+                                                   aliases=['nfs_custom_settings'],
                                                    default=[]),
             state                           = dict(default='present',
                                                    choices=['present', 'absent'],