diff --git a/library/univention_udm.py b/library/univention_directory_manager.py
similarity index 96%
rename from library/univention_udm.py
rename to library/univention_directory_manager.py
index 30e3f1e..a7f84c1 100755
--- a/library/univention_udm.py
+++ b/library/univention_directory_manager.py
@@ -8,7 +8,7 @@ ANSIBLE_METADATA = {
 
 DOCUMENTATION = '''
 ---
-module: univention_udm
+module: univention_directory_manager
 
 short_description: Accessing the Univention Directory Manager
 
@@ -63,7 +63,7 @@ author:
 EXAMPLES = '''
 # create a new user object
 - name: create a user
-  univention_udm:
+  univention_directory_manager:
     module: 'users/user'
     action: 'modify'
     state: 'present'
@@ -77,7 +77,7 @@ EXAMPLES = '''
 
 # delete one or more objects
 - name: delete a user with a search filter
-  univention_udm:
+  univention_directory_manager:
     module: 'users/user'
     action: 'modify'
     state: 'absent'
@@ -85,7 +85,7 @@ EXAMPLES = '''
 
 # use position to place the object in the directory tree
 - name: create a user with position
-  univention_udm:
+  univention_directory_manager:
     module: 'users/user'
     action: 'modify'
     state: 'present'
@@ -100,7 +100,7 @@ EXAMPLES = '''
 
 # delete on very specific object
 - name: delete the user with position
-  univention_udm:
+  univention_directory_manager:
     module: 'users/user'
     action: 'modify'
     state: 'absent'
@@ -108,7 +108,7 @@ EXAMPLES = '''
 
 # add or change specific properties
 - name: modify testuser3 - add or change a property
-  univention_udm:
+  univention_directory_manager:
     module: 'users/user'
     action: 'modify'
     state: 'present'
@@ -119,7 +119,7 @@ EXAMPLES = '''
 
 # remove specific properties
 - name: modify testuser3 - remove property
-  univention_udm:
+  univention_directory_manager:
     module: 'users/user'
     action: 'modify'
     state: 'present'
diff --git a/test_play.yml b/test_play.yml
index bf0bc97..adcf712 100644
--- a/test_play.yml
+++ b/test_play.yml
@@ -2,7 +2,7 @@
 - hosts: my-testservers
   tasks:
     - name: create a user
-      univention_udm:
+      univention_directory_manager:
         module: 'users/user'
         state: 'present'
         set_properties:
@@ -13,12 +13,12 @@
           - property: 'password'
             value: 'univention'
     - name: delete a user with a search filter
-      univention_udm:
+      univention_directory_manager:
         module: 'users/user'
         state: 'absent'
         filter: '(uid=testuser1)'
     - name: create a user with position
-      univention_udm:
+      univention_directory_manager:
         module: 'users/user'
         state: 'present'
         position: 'cn=users,ou=DEMOSCHOOL,dc=t1,dc=intranet'
@@ -30,12 +30,12 @@
           - property: 'password'
             value: 'univention'
     - name: delete the user with position
-      univention_udm:
+      univention_directory_manager:
         module: 'users/user'
         state: 'absent'
         dn: 'uid=testuser2,cn=users,ou=DEMOSCHOOL,dc=t1,dc=intranet'
     - name: create testuser3
-      univention_udm:
+      univention_directory_manager:
         module: 'users/user'
         state: 'present'
         set_properties:
@@ -46,7 +46,7 @@
           - property: 'password'
             value: 'univention'
     - name: modify testuser3 - add property
-      univention_udm:
+      univention_directory_manager:
         module: 'users/user'
         state: 'present'
         filter: '(uid=testuser3)'
@@ -54,7 +54,7 @@
           - property: 'firstname'
             value: 'max'
     - name: modify testuser3 - change property
-      univention_udm:
+      univention_directory_manager:
         module: 'users/user'
         state: 'present'
         filter: '(uid=testuser3)'
@@ -62,7 +62,7 @@
           - property: 'lastname'
             value: 'mustermann'
     - name: modify testuser3 - remove property
-      univention_udm:
+      univention_directory_manager:
         module: 'users/user'
         state: 'present'
         filter: '(uid=testuser3)'
@@ -70,7 +70,7 @@
           - property: 'firstname'
             value: 'does not matter'
     - name: modify testuser3 - add an option
-      univention_udm:
+      univention_directory_manager:
         module: 'users/user'
         state: 'present'
         filter: '(uid=testuser3)'
@@ -78,14 +78,14 @@
           - default
           - pki
     - name: modify testuser3 - remove an option
-      univention_udm:
+      univention_directory_manager:
         module: 'users/user'
         state: 'present'
         filter: '(uid=testuser3)'
         options:
           - default
     - name: delete testuser3
-      univention_udm:
+      univention_directory_manager:
         module: 'users/user'
         state: 'present'
         filter: 'uid=testuser3'