diff --git a/django_website/templates/docs/index.html b/django_website/templates/docs/index.html
index 51e7547ca..a8c35e8f7 100644
--- a/django_website/templates/docs/index.html
+++ b/django_website/templates/docs/index.html
@@ -29,10 +29,10 @@ <h2>The essential documentation</h2>
 <li><a href="install/">Installation guide</a></li>
 <li>Tutorial: Writing your first Django app
     <ul>
-    <li><a href="tutorial1/">Part 1: Initialization, creating models, the database API</a></li>
-    <li><a href="tutorial2/">Part 2: Exploring the automatically-generated admin site</a></li>
-    <li><a href="tutorial3/">Part 3: Creating the public interface views</a></li>
-    <li><a href="tutorial4/">Part 4: Simple form processing and generic views</a></li>
+    <li><a href="tutorial01/">Part 1: Initialization, creating models, the database API</a></li>
+    <li><a href="tutorial02/">Part 2: Exploring the automatically-generated admin site</a></li>
+    <li><a href="tutorial03/">Part 3: Creating the public interface views</a></li>
+    <li><a href="tutorial04/">Part 4: Simple form processing and generic views</a></li>
     </ul>
 </li>
 <li><a href="faq/">Frequently asked questions (FAQ)</a></li>
@@ -42,8 +42,8 @@ <h2>The essential documentation</h2>
 <h2 id="reference">Reference</h2>
 
 <ul>
-<li><a href="django_admin/">The django-admin.py and manage.py utilities</a></li>
-<li>Models: <a href="model_api/">Creating models</a> | <a href="models/">Examples</a> | <a href="db_api/">The database API</a> | <a href="transactions/">Transactions</a></li>
+<li><a href="django-admin/">The django-admin.py and manage.py utilities</a></li>
+<li>Models: <a href="model-api/">Creating models</a> | <a href="models/">Examples</a> | <a href="db-api/">The database API</a> | <a href="transactions/">Transactions</a></li>
 
 <li>Templates: <a href="templates/">Guide for HTML authors</a> | <a href="templates_python/">Guide for Python programmers</a></li>
 
@@ -61,7 +61,7 @@ <h2 id="reference">Reference</h2>
 
 <li><a href="add_ons/">Add-on applications (contrib)</a>
     <ul>
-    <li><a href="syndication/">Syndication feeds (RSS and Atom)</a></li>
+    <li><a href="syndication_feeds/">Syndication feeds (RSS and Atom)</a></li>
     <li><a href="flatpages/">Flatpages</a></li>
     <li><a href="redirects/">Redirects</a></li>
     <li><a href="sites/">Sites</a></li>
@@ -84,7 +84,7 @@ <h2>Solving specific problems</h2>
 <li><a href="static_files/">Serving static/media files</a></li>
 <li><a href="email/">Sending e-mail</a></li>
 <li><a href="legacy_databases/">Integrating with (introspecting) a legacy database</a></li>
-<li><a href="outputting_pdfs/">Outputting PDFs dynamically</a></li>
+<li><a href="outputting_pdf/">Outputting PDFs dynamically</a></li>
 <li><a href="outputting_csv/">Outputting CSV dynamically</a></li>
 </ul>
 
@@ -99,7 +99,7 @@ <h2>Et cetera</h2>
 
 <h2>Release notes</h2>
 <ul>
-<li><a href="095_release_notes/">Version 0.95</a></li>
+<li><a href="release_notes_0.95/">Version 0.95</a></li>
 </ul>
 {% endblock %}