diff --git a/admin_manual/configuration_user/user_auth_ldap.rst b/admin_manual/configuration_user/user_auth_ldap.rst
index 4202da664..567f93109 100644
--- a/admin_manual/configuration_user/user_auth_ldap.rst
+++ b/admin_manual/configuration_user/user_auth_ldap.rst
@@ -88,7 +88,7 @@ User DN:
 
   Example:
 
-  * *uid=owncloudsystemuser,cn=sysusers,dc=my-company,dc=com*
+  * *uid=nextcloudsystemuser,cn=sysusers,dc=my-company,dc=com*
 
 Password:
   The password for the user given above. Empty for anonymous access.
@@ -136,7 +136,7 @@ Edit raw filter instead:
   Clicking on this text toggles the filter mode and you can enter the raw LDAP 
   filter directly. Example::
 
-   (&(objectClass=inetOrgPerson)(memberOf=cn=owncloudusers,ou=groups,
+   (&(objectClass=inetOrgPerson)(memberOf=cn=nextcloudusers,ou=groups,
    dc=example,dc=com))
 
 x users found:
@@ -184,12 +184,12 @@ Edit raw filter instead:
 
   * only username:: 
 
-     (&(objectClass=inetOrgPerson)(memberOf=cn=owncloudusers,ou=groups,
+     (&(objectClass=inetOrgPerson)(memberOf=cn=nextcloudusers,ou=groups,
      dc=example,dc=com)(uid=%uid)
   
   * username or email address::
   
-     ((&(objectClass=inetOrgPerson)(memberOf=cn=owncloudusers,ou=groups,
+     ((&(objectClass=inetOrgPerson)(memberOf=cn=nextcloudusers,ou=groups,
      dc=example,dc=com)(|(uid=%uid)(mail=%uid)))
 
 Group Filter
@@ -404,8 +404,8 @@ Email Field:
   * Example: *mail*
 
 User Home Folder Naming Rule:
-  By default, the ownCloud server creates the user directory in your ownCloud 
-  data directory and gives it the ownCloud username, .e.g ``/var/www/owncloud/data/alice``. You may want to override this setting and name it after an LDAP
+  By default, the Nextcloud server creates the user directory in your Nextcloud 
+  data directory and gives it the Nextcloud username, .e.g ``/var/www/nextcloud/data/alice``. You may want to override this setting and name it after an LDAP
   attribute value. The attribute can also return an absolute path, e.g. 
   ``/mnt/storage43/alice``. Leave it empty for default behavior.
 
diff --git a/admin_manual/images/ldap-advanced-1-connection.png b/admin_manual/images/ldap-advanced-1-connection.png
index fb5c5bd23..2aad2f8dc 100644
Binary files a/admin_manual/images/ldap-advanced-1-connection.png and b/admin_manual/images/ldap-advanced-1-connection.png differ
diff --git a/admin_manual/images/ldap-advanced-2-directory.png b/admin_manual/images/ldap-advanced-2-directory.png
index e83e9e16e..7b57498eb 100644
Binary files a/admin_manual/images/ldap-advanced-2-directory.png and b/admin_manual/images/ldap-advanced-2-directory.png differ
diff --git a/admin_manual/images/ldap-advanced-3-attributes.png b/admin_manual/images/ldap-advanced-3-attributes.png
index f37eb43f7..58855958c 100644
Binary files a/admin_manual/images/ldap-advanced-3-attributes.png and b/admin_manual/images/ldap-advanced-3-attributes.png differ
diff --git a/admin_manual/images/ldap-expert.png b/admin_manual/images/ldap-expert.png
index de0229095..062de17ed 100644
Binary files a/admin_manual/images/ldap-expert.png and b/admin_manual/images/ldap-expert.png differ
diff --git a/admin_manual/images/ldap-wizard-1-server.png b/admin_manual/images/ldap-wizard-1-server.png
index 80ce25dd9..6e976282c 100644
Binary files a/admin_manual/images/ldap-wizard-1-server.png and b/admin_manual/images/ldap-wizard-1-server.png differ
diff --git a/admin_manual/images/ldap-wizard-2-user.png b/admin_manual/images/ldap-wizard-2-user.png
index ef6b59192..2c046aaf2 100644
Binary files a/admin_manual/images/ldap-wizard-2-user.png and b/admin_manual/images/ldap-wizard-2-user.png differ
diff --git a/admin_manual/images/ldap-wizard-3-login.png b/admin_manual/images/ldap-wizard-3-login.png
index 42c49bd69..eedc6758b 100644
Binary files a/admin_manual/images/ldap-wizard-3-login.png and b/admin_manual/images/ldap-wizard-3-login.png differ
diff --git a/admin_manual/images/ldap-wizard-4-group.png b/admin_manual/images/ldap-wizard-4-group.png
index a3ecde4b0..bf6d924dc 100644
Binary files a/admin_manual/images/ldap-wizard-4-group.png and b/admin_manual/images/ldap-wizard-4-group.png differ
diff --git a/admin_manual/images/ldap-wizard-5-group.png b/admin_manual/images/ldap-wizard-5-group.png
deleted file mode 100644
index 13608b5f5..000000000
Binary files a/admin_manual/images/ldap-wizard-5-group.png and /dev/null differ