diff --git a/README.md b/README.md
index fa8925fe44fdc8b57b923a0aaddd38bbb48e94c8..5c94ff0c074f7eb7773acd59e01ab68a1494c748 100644
--- a/README.md
+++ b/README.md
@@ -218,7 +218,6 @@ make html
 make html-watch
 
 # For pdf output run:
-make latex
 make latexpdf
 ```
 
diff --git a/documentation/user-guide/conf.py b/documentation/user-guide/conf.py
index e489168a390036d5765118b0dad35f8e8fdf2fe1..efa8dcae64cb60ba2017aee8004a8bd3c163f37c 100644
--- a/documentation/user-guide/conf.py
+++ b/documentation/user-guide/conf.py
@@ -17,7 +17,7 @@
 
 # -- Project information -----------------------------------------------------
 
-project = u'View Server - Users Guide'
+project = u'View Server - User Guide'
 copyright = u'2019, 2020, EOX IT Services GmbH'
 author = u'EOX IT Services GmbH'
 
@@ -65,8 +65,8 @@ numfig_secnum_depth = 2
 
 latex_documents = [(
     'index',
-    'View-Server_-_Users-Guide.tex',
-    u'View Server - Users Guide',
+    'View-Server_-_User-Guide.tex',
+    u'View Server - User Guide',
     u'EOX IT Services GmbH',
     'manual',
     True
diff --git a/documentation/user-guide/downloading.rst b/documentation/user-guide/downloading.rst
index a063bddde5cec9656ec30b00aba5083f274709b7..1d19b183d8c66d05120005e1cfd5cdb9dfa49d52 100644
--- a/documentation/user-guide/downloading.rst
+++ b/documentation/user-guide/downloading.rst
@@ -30,4 +30,4 @@ service. Clients are advised to download bigger coverages in junks and but them
 together afterwards.
 
 The final chapter :ref:`sample_requests` holds a list of sample requests against
-the various services described in this users guide.
+the various services described in this user guide.
diff --git a/documentation/user-guide/index.rst b/documentation/user-guide/index.rst
index ce89751242c2d91ae59b233a74364855dcefce86..0c7cca566e6f78506eba506ac8a8a59f5de5196d 100644
--- a/documentation/user-guide/index.rst
+++ b/documentation/user-guide/index.rst
@@ -1,7 +1,7 @@
 .. _contents:
 
-View Server - Users Guide
-=========================
+View Server - User Guide
+========================
 
 .. toctree::
    :maxdepth: 3
diff --git a/documentation/user-guide/intro.rst b/documentation/user-guide/intro.rst
index 88c797c0d3392738af0906aa68f01aeb6362aa7e..b9951ff69edd36c3a8a0daa24ef7e3265415c36f 100644
--- a/documentation/user-guide/intro.rst
+++ b/documentation/user-guide/intro.rst
@@ -1,7 +1,7 @@
 Introduction
 ============
 
-This is the Users Guide of the View Server (VS). The intended readers are users
+This is the User Guide of the View Server (VS). The intended readers are users
 of the web client shown below and external services provided by the View Server.
 
 These provided external services are services for searching, viewing, and