diff --git a/user_manual/conf.py b/user_manual/conf.py
index db0307f17e..3269dfc18a 100644
--- a/user_manual/conf.py
+++ b/user_manual/conf.py
@@ -186,8 +186,8 @@ latex_elements = {
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'ownCloudAndroidAppManual.tex', u'ownCloud Android App Manual',
-   u'The ownCloud developers', 'manual'),
+  ('index', 'NextcloudAndroidAppManual.tex', u'Nextcloud Android App Manual',
+   u'The Nextcloud developers', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -216,10 +216,10 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('owncloud.1', 'owncloud', u'Android synchronisation and file management utility.',
-     [u'The ownCloud developers'], 1),
-    ('owncloudcmd.1', 'owncloudcmd', u'ownCloud Android app.',
-     [u'The ownCloud developers'], 1),
+    ('nextcloud.1', 'nextcloud', u'Android synchronisation and file management utility.',
+     [u'The Nextcloud developers'], 1),
+    ('nextcloudcmd.1', 'nextcloudcmd', u'Nextcloud Android app.',
+     [u'The Nextcloud developers'], 1),
 ]
 
 # If true, show URL addresses after external links.
@@ -232,8 +232,8 @@ man_show_urls = True
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'ownCloudClientManual', u'ownCloud Android App Manual',
-   u'The ownCloud developers', 'ownCloud', 'The ownCloud Android App Manual.',
+  ('index', 'NextcloudClientManual', u'ownCloud Android App Manual',
+   u'The Nextcloud developers', 'ownCloud', 'The ownCloud Android App Manual.',
    'Miscellaneous'),
 ]
 
@@ -250,10 +250,10 @@ texinfo_documents = [
 # -- Options for Epub output ---------------------------------------------------
 
 # Bibliographic Dublin Core info.
-epub_title = u'ownCloud Android App Manual'
-epub_author = u'The ownCloud developers'
-epub_publisher = u'The ownCloud developers'
-epub_copyright = u'2013-2015, The ownCloud developers'
+epub_title = u'Nextcloud Android App Manual'
+epub_author = u'The Nextcloud developers'
+epub_publisher = u'The Nextcloud developers'
+epub_copyright = u'2016, The Nextcloud developers'
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.
diff --git a/user_manual/images/android-1.png b/user_manual/images/android-1.png
index 49f9f4e84d..ea31c88815 100644
Binary files a/user_manual/images/android-1.png and b/user_manual/images/android-1.png differ
diff --git a/user_manual/images/android-10.png b/user_manual/images/android-10.png
old mode 100644
new mode 100755
index 8b33b735ca..25e69f4a01
Binary files a/user_manual/images/android-10.png and b/user_manual/images/android-10.png differ
diff --git a/user_manual/images/android-2.png b/user_manual/images/android-2.png
old mode 100644
new mode 100755
index 489db590a1..97a7a4e871
Binary files a/user_manual/images/android-2.png and b/user_manual/images/android-2.png differ
diff --git a/user_manual/images/android-3.png b/user_manual/images/android-3.png
old mode 100644
new mode 100755
index 81c0c89eda..14c002b3ad
Binary files a/user_manual/images/android-3.png and b/user_manual/images/android-3.png differ
diff --git a/user_manual/images/android-4.png b/user_manual/images/android-4.png
old mode 100644
new mode 100755
index 30197e6c2a..18d37807b0
Binary files a/user_manual/images/android-4.png and b/user_manual/images/android-4.png differ
diff --git a/user_manual/index.rst b/user_manual/index.rst
index cf15912511..a90dc783de 100644
--- a/user_manual/index.rst
+++ b/user_manual/index.rst
@@ -1,7 +1,7 @@
 .. _contents:
 
-ownCloud Android App Manual
-==============================
+Nextcloud Android App Manual
+============================
 
 .. toctree::
    :maxdepth: 2