diff --git a/docs/about/index.md b/docs/about/about-us.md
similarity index 100%
rename from docs/about/index.md
rename to docs/about/about-us.md
diff --git a/docs/assignments/week03/group-project/index.md b/docs/assignments/week03/group-project/week03-group-project.md
similarity index 100%
rename from docs/assignments/week03/group-project/index.md
rename to docs/assignments/week03/group-project/week03-group-project.md
diff --git a/docs/assignments/week03/openscad-adai-edu/index.md b/docs/assignments/week03/openscad-adai-edu/week03-openscad.md
similarity index 100%
rename from docs/assignments/week03/openscad-adai-edu/index.md
rename to docs/assignments/week03/openscad-adai-edu/week03-openscad.md
diff --git a/docs/index.md b/docs/index.md
deleted file mode 100644
index 652f09c121cf072c61f92b3fc16809c2ebf05eaf..0000000000000000000000000000000000000000
--- a/docs/index.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Home
-
-### Week 03 - CAM
-- [Group Assignment](assignments/week03/group-project/index.md)
-- [OpenScad](assignments/week03/openscad-adai-edu/index.md)
-
-### Week 04 - Lorem Ipsum
diff --git a/docs/welcome.md b/docs/welcome.md
new file mode 100644
index 0000000000000000000000000000000000000000..033c179072435aaa0b24b8f175507327d967b7f2
--- /dev/null
+++ b/docs/welcome.md
@@ -0,0 +1,7 @@
+# Home
+
+### Week 03 - CAM
+- [Group Assignment](assignments/week03/group-project/week03-group-project.md)
+- [OpenScad](assignments/week03/openscad-adai-edu/week03-openscad.md)
+
+### Week 04 - Lorem Ipsum
diff --git a/mkdocs.yml b/mkdocs.yml
index 4b89cf3e18eeb865a2b48dc6396e82c7d558b4e6..2ed81212e953f247fae651c29dcd1e669f770770 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -12,13 +12,13 @@ theme:
 
 nav:
   - Home:
-    - Welcome: index.md
-    - About us: about\index.md
+    - Welcome: welcome.md
+    - About us: about\about-us.md
   - Assignments:
-      - Week 3 - CAM: assignments/week03/group-project/index.md
-      - Week 4 - ????: assignments/week03/group-project/index.md
+      - Week 3 - CAM: assignments/week03/group-project/week03-group-project.md
+      - Week 4 - ????: assignments/week03/group-project/week04-?????.md
   - Rambling and Deviations:
-    - Week 03 - Adai & Edu explore OpenScad: assignments/week03/openscad-adai-edu/index.md
+    - Week 03 - Adai & Edu explore OpenScad: assignments/week03/openscad-adai-edu/week03-openscad.md
   - Team Tips:
     - Git: tips/git-settings.md