diff --git a/docs/conf.py b/docs/conf.py
index 30b0235e..39852728 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,7 +19,7 @@
 
 # -- Project information -----------------------------------------------------
 
-project = u'SEB Server Setup'
+project = u'SEB Server'
 copyright = u'2019, ETH Zurich'
 author = u'Andreas Hefti'
 
@@ -86,9 +86,9 @@ html_theme = 'sphinx_rtd_theme'
 # documentation.
 #
 html_theme_options = {
-    "description": "Documentation for SEB Server installation",
+    "description": "SEB Server User Guide",
     "github_user": "anhefti",
-    "github_repo": "seb-server-setup",
+    "github_repo": "seb-server,
     "link": "#3782BE",
     "link_hover": "#3782BE",
     "page_width": "1024px",
@@ -113,7 +113,7 @@ html_static_path = ['_static']
 # -- Options for HTMLHelp output ---------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'SEBServerSetupdoc'
+htmlhelp_basename = 'SEBServerdoc'
 
 
 # -- Options for LaTeX output ------------------------------------------------
@@ -140,7 +140,7 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'SEBServerSetup.tex', u'SEB Server Setup Documentation',
+    (master_doc, 'SEBServer.tex', u'SEB Server User Guide',
      u'Andreas Hefti', 'manual'),
 ]
 
@@ -150,7 +150,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'sebserversetup', u'SEB Server Setup Documentation',
+    (master_doc, 'sebserversetup', u'SEB Server User Guide',
      [author], 1)
 ]
 
@@ -161,8 +161,8 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'SEBServerSetup', u'SEB Server Setup Documentation',
-     author, 'SEBServerSetup', 'One line description of project.',
+    (master_doc, 'SEBServer', u'SEB Server User Guide',
+     author, 'SEBServer', 'One line description of project.',
      'Miscellaneous'),
 ]