diff --git a/site/guide/01-upgrading-from-0.4.md b/site/guide/01-upgrading.md
similarity index 100%
rename from site/guide/01-upgrading-from-0.4.md
rename to site/guide/01-upgrading.md
diff --git a/site/guide/10-pastebin.md b/site/guide/10-pastebin-tutorial.md
similarity index 100%
rename from site/guide/10-pastebin.md
rename to site/guide/10-pastebin-tutorial.md
diff --git a/site/guide/index.md b/site/guide/index.md
index d8fc9aaf..82b2f099 100644
--- a/site/guide/index.md
+++ b/site/guide/index.md
@@ -14,8 +14,7 @@ aspect of Rocket. The sections are:
    - **[Introduction](introduction/):** introduces Rocket and its philosophy.
    - **[Quickstart](quickstart/):** presents the minimal steps necessary to
       run your first Rocket application.
-   - **[Upgrading from v0.4](upgrading-from-0.4/):** a migration guide from v0.4
-     to v0.5.
+   - **[Upgrading from v0.4](upgrading/):** a migration guide from v0.4 to v0.5.
    - **[Getting Started](getting-started/):** a gentle introduction to getting
      your first Rocket application running.
    - **[Overview](overview/):** describes the core concepts of Rocket.
@@ -28,7 +27,7 @@ aspect of Rocket. The sections are:
    - **[Testing](testing/):** how to unit and integration test a Rocket
      application.
    - **[Configuration](configuration/):** how to configure a Rocket application.
-   - **[Pastebin Tutorial](pastebin/):** a tutorial on how to create a pastebin
+   - **[Pastebin Tutorial](pastebin-tutorial/):** a tutorial creating a pastebin
      with Rocket.
    - **[Conclusion](conclusion/):** concludes the guide and discusses next steps
      for learning.