diff --git a/doc.zih.tu-dresden.de/docs/access/access.md b/doc.zih.tu-dresden.de/docs/access/overview.md
similarity index 97%
rename from doc.zih.tu-dresden.de/docs/access/access.md
rename to doc.zih.tu-dresden.de/docs/access/overview.md
index 15ff4d4200220426640888c8a39baf1605f0d3a6..e324c4cad6a1fb2539f226e90c85d5cae3af6909 100644
--- a/doc.zih.tu-dresden.de/docs/access/access.md
+++ b/doc.zih.tu-dresden.de/docs/access/overview.md
@@ -1,4 +1,4 @@
-# Access to the cluster
+# Access to the Cluster
 
 ## SSH access
 
diff --git a/doc.zih.tu-dresden.de/docs/application/application.md b/doc.zih.tu-dresden.de/docs/application/overview.md
similarity index 88%
rename from doc.zih.tu-dresden.de/docs/application/application.md
rename to doc.zih.tu-dresden.de/docs/application/overview.md
index ed66ce5727afb4d0987711e05fb1a1be8f9e14cc..5a7644da0723f7cb026dded99a8a98befbb354bd 100644
--- a/doc.zih.tu-dresden.de/docs/application/application.md
+++ b/doc.zih.tu-dresden.de/docs/application/overview.md
@@ -1,4 +1,4 @@
-# Application for HPC Login
+# Application for Login and Resources
 
 In order to use the HPC systems installed at ZIH, a project application form has to be filled in.
 The HPC project manager should hold a professorship (university) or head a research group. You may
diff --git a/doc.zih.tu-dresden.de/docs/archive/overview.md b/doc.zih.tu-dresden.de/docs/archive/overview.md
new file mode 100644
index 0000000000000000000000000000000000000000..42491b1f35af69931b4c1ef30765bc2567777394
--- /dev/null
+++ b/doc.zih.tu-dresden.de/docs/archive/overview.md
@@ -0,0 +1,5 @@
+# Archive
+
+A warm welcome to the *archive*. You probably got here by following a link from within the compendium.
+The archive holds outdated documentation for future reference. Documentation in the archive, is not
+further updated.
diff --git a/doc.zih.tu-dresden.de/docs/data_lifecycle/data_management.md b/doc.zih.tu-dresden.de/docs/data_lifecycle/overview.md
similarity index 99%
rename from doc.zih.tu-dresden.de/docs/data_lifecycle/data_management.md
rename to doc.zih.tu-dresden.de/docs/data_lifecycle/overview.md
index 598fd816fcf25782b4e4c270aa75c72a79a9511f..902a6caec3cb605a7ef79a881a3a689dcb861346 100644
--- a/doc.zih.tu-dresden.de/docs/data_lifecycle/data_management.md
+++ b/doc.zih.tu-dresden.de/docs/data_lifecycle/overview.md
@@ -1,4 +1,4 @@
-# Create a Project Structure / Data Management
+# Data Lifecycle Management
 
 Correct organisation of the project structure is a straightforward way to the efficient work of the
 whole team. There have to be rules and regulations for working with the project that every member
diff --git a/doc.zih.tu-dresden.de/docs/data_transfer/data_moving.md b/doc.zih.tu-dresden.de/docs/data_transfer/overview.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/data_transfer/data_moving.md
rename to doc.zih.tu-dresden.de/docs/data_transfer/overview.md
diff --git a/doc.zih.tu-dresden.de/docs/jobs_and_resources/use_of_hardware.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/overview.md
similarity index 99%
rename from doc.zih.tu-dresden.de/docs/jobs_and_resources/use_of_hardware.md
rename to doc.zih.tu-dresden.de/docs/jobs_and_resources/overview.md
index a12b26c37a2d5923ed9de51f0a80e5700c612132..c48a7f41b2d6a3edfb2d5142b6b65b05c28c7176 100644
--- a/doc.zih.tu-dresden.de/docs/jobs_and_resources/use_of_hardware.md
+++ b/doc.zih.tu-dresden.de/docs/jobs_and_resources/overview.md
@@ -1,4 +1,4 @@
-# Use of Hardware
+# Jobs and Resources
 
 To run the software, do some calculations or compile your code compute nodes have to be used. Login
 nodes which are using for login can not be used for your computations. Submit your tasks (by using
diff --git a/doc.zih.tu-dresden.de/docs/software/applications.md b/doc.zih.tu-dresden.de/docs/software/applications_overview.md
similarity index 98%
rename from doc.zih.tu-dresden.de/docs/software/applications.md
rename to doc.zih.tu-dresden.de/docs/software/applications_overview.md
index 7a939447e6a8fee0d5525f80cb8c18f6192f1ff4..6a6123597f629b504eb9aa874ec0a36d5eeb4ea2 100644
--- a/doc.zih.tu-dresden.de/docs/software/applications.md
+++ b/doc.zih.tu-dresden.de/docs/software/applications_overview.md
@@ -1,4 +1,4 @@
-# Installed Applications
+# Applications
 
 The following applications are available on the HRSK systems. (General
 descriptions are taken from the vendor's web site or from
diff --git a/doc.zih.tu-dresden.de/docs/software/overview.md b/doc.zih.tu-dresden.de/docs/software/overview.md
index dbb75ca856f493db73454fb45bbedc4955c6d7be..874f8ad2cb426d2ec4cc020be92ad7c4663d34fa 100644
--- a/doc.zih.tu-dresden.de/docs/software/overview.md
+++ b/doc.zih.tu-dresden.de/docs/software/overview.md
@@ -1,4 +1,4 @@
-# Overview
+# Environment and Software
 
 According to [What software do I need]**todo link**, first of all, check the [Software module
 list]**todo link**.  Keep in mind that there are two different environments: **scs5** (for the x86
diff --git a/doc.zih.tu-dresden.de/docs/software/software_development.md b/doc.zih.tu-dresden.de/docs/software/software_development_overview.md
similarity index 98%
rename from doc.zih.tu-dresden.de/docs/software/software_development.md
rename to doc.zih.tu-dresden.de/docs/software/software_development_overview.md
index 28fd208e9504ed50f8ee7dee8790490212b7fd92..dc55ba6c6f49666e25a0380f49d4c58dc45e9e0a 100644
--- a/doc.zih.tu-dresden.de/docs/software/software_development.md
+++ b/doc.zih.tu-dresden.de/docs/software/software_development_overview.md
@@ -1,4 +1,4 @@
-# Software Development at HPC Systems
+# Software Development and Tools
 
 This section provides you with the basic knowledge and tools to get you out of trouble. It will tell
 you:
diff --git a/doc.zih.tu-dresden.de/mkdocs.yml b/doc.zih.tu-dresden.de/mkdocs.yml
index 59f841162b9d7606323be177eec434e0beb254ee..50bad6491a6fe511fd707acd7d2145b009a8e0ca 100644
--- a/doc.zih.tu-dresden.de/mkdocs.yml
+++ b/doc.zih.tu-dresden.de/mkdocs.yml
@@ -1,24 +1,24 @@
 nav:
   - Home: index.md
   - Application for Login and Resources:
-    - Overview: application/application.md
+    - Overview: application/overview.md
     - Access: application/access.md
     - Terms: application/terms_of_use.md
     - Request for Resources: application/request_for_resources.md
     - Project Request Form: application/project_request_form.md
     - Project Management: application/project_management.md
   - Access to the Cluster:
-    - Overview: access/access.md
+    - Overview: access/overview.md
     - Desktop Visualization: access/desktop_cloud_visualization.md
     - Web VNC: access/web_vnc.md
     - Login: access/login.md
     - Security Restrictions: access/security_restrictions.md
     - SSH with Putty: access/ssh_mit_putty.md
     - JupyterHub:
-      - Overview: ../../access/jupyterhub.md
-      - JupyterHub for Teaching: ../../access/jupyterhub_for_teaching.md
+      - JupyterHub: access/jupyterhub.md
+      - JupyterHub for Teaching: access/jupyterhub_for_teaching.md
   - Transfer of Data:
-    - Overview: data_transfer/data_moving.md
+    - Overview: data_transfer/overview.md
     - Data Mover: data_transfer/data_mover.md
     - Export Nodes: data_transfer/export_nodes.md
   - Environment and Software:
@@ -33,7 +33,7 @@ nav:
       - Singularity Example Definitions: software/singularity_example_definitions.md
       - VM tools: software/vm_tools.md
     - Applications:
-      - Overview: software/applications.md
+      - Overview: software/applications_overview.md
       - Bio Informatics: software/bioinformatics.md
       - Computational Fluid Dynamics (CFD): software/cfd.md
       - Nanoscale Simulations: software/nanoscale_simulations.md
@@ -57,7 +57,7 @@ nav:
     - Virtual Machines: software/virtual_machines.md
     - Virtual Desktops: software/virtual_desktops.md
     - Software Development and Tools:
-      - Overview: software/software_development.md
+      - Overview: software/software_development_overview.md
       - Building Software: software/building_software.md
       - GPU Programming: software/gpu_programming.md
       - Compilers: software/compilers.md
@@ -71,7 +71,7 @@ nav:
       - Vampir: software/vampir.md
       - Mathematics: software/mathematics.md
   - Data Lifecycle Management:
-    - Overview: data_lifecycle/data_management.md
+    - Overview: data_lifecycle/overview.md
     - Quotas: data_lifecycle/quotas.md
     - Workspaces: data_lifecycle/workspaces.md
     - BeeGFS: data_lifecycle/bee_gfs.md
@@ -82,7 +82,7 @@ nav:
     - Preservation of Research Data: data_lifecycle/preservation_research_data.md
     - Structuring Experiments: data_lifecycle/experiments.md
   - Jobs and Resources:
-    - Overview: jobs_and_resources/use_of_hardware.md
+    - Overview: jobs_and_resources/overview.md
     - Batch Systems: jobs_and_resources/batch_systems.md
     - Hardware Resources:
       - Hardware Taurus: jobs_and_resources/hardware_taurus.md
@@ -109,6 +109,7 @@ nav:
   #- Tests: tests.md
   - Support: support.md
   - Archive:
+    - Overview: archive/overview.md
     - CXFS End of Support: archive/cxfs_end_of_support.md
     - Debugging Tools: archive/debugging_tools.md
     - Hardware: archive/hardware.md
@@ -139,13 +140,13 @@ nav:
 
 
 # Project Information
-site_name: ZIH HPC Compendium 2.0
-site_description: ZIH HPC Compendium 2.0
+site_name: ZIH HPC Compendium
+site_description: ZIH HPC Compendium
 site_author: ZIH Team
 site_dir: public
 site_url: https://gitlab.hrz.tu-chemnitz.de/hpcsupport/hpc-compendium
 # uncomment next 3 lines if link to repo should not be displayed in the navbar
-repo_name: GitLab hpcsupport/hpc-compendium
+repo_name: GitLab hpc-compendium
 repo_url: https://gitlab.hrz.tu-chemnitz.de/hpcsupport/hpc-compendium
 edit_uri: blob/master/docs/