diff --git a/docs/UsersGuide/guide.md b/docs/UsersGuide/guide.md
index b44f19e755..d5e811779c 100644
--- a/docs/UsersGuide/guide.md
+++ b/docs/UsersGuide/guide.md
@@ -74,14 +74,14 @@ This section is divided into three sub-sections:
     - [Asserts in F´](./dev/assert.md)
     - [GDS Dashboard Reference](./dev/gds-dashboard-reference.md)
     - [Integration Test API](./dev/testAPI/user_guide.md)
-    - [v3 Migration Guide](./user/v3-migration-guide.md)
+    - [CMake User Guide](./cmake/cmake-intro.md)
 - Advanced F´ Topics:
     - [F´ Python Guidelines](./dev/py-dev.md)
     - [Porting F´ To a New Platform](./dev/porting-guide.md)
     - [F´ On Baremetal and Multi-Core Systems](./dev/baremetal-multicore.md)
     - [Configuring an IDE for Use With F´](./dev/configure-ide.md)
     - [OS Layer Description](./dev/os-docs.md)
-    - [CMake User Guide](./cmake/cmake-intro.md)
+    - [v3 Migration Guide](./user/v3-migration-guide.md)
 - API Documentation
     - [GDS CLI Design](./dev/gds-cli-dev.md)
     - [C++ Documentation](./api/c++/html/index.html)
diff --git a/docs/_includes/toc.md b/docs/_includes/toc.md
index 5868f0b6f4..5e01082cf4 100644
--- a/docs/_includes/toc.md
+++ b/docs/_includes/toc.md
@@ -69,7 +69,7 @@
         <li><a href="/fprime/UsersGuide/dev/assert.html">Asserts in F´</a></li>
         <li><a href="/fprime/UsersGuide/dev/gds-dashboard-reference.html">GDS Dashboard Reference</a></li>
         <li><a href="/fprime/UsersGuide/dev/testAPI/user_guide.html">Integration Test API</a></li>
-        <li><a href="/fprime/UsersGuide/user/v3-migration-guide.html">v3 Migration Guide</a></li>
+        <li><a href="/fprime/UsersGuide/cmake/cmake-intro.html">CMake User Guide</a></li>
       </ul>
     </details>
     <details>
@@ -80,6 +80,7 @@
         <li><a href="/fprime/UsersGuide/dev/baremetal-multicore.html">F´ On Baremetal and Multi-Core Systems</a></li>
         <li><a href="/fprime/UsersGuide/dev/configure-ide.html">Configuring an IDE for Use With F´</a></li>
         <li><a href="/fprime/UsersGuide/dev/os-docs.html">OS Layer Description</a></li>
+        <li><a href="/fprime/UsersGuide/user/v3-migration-guide.html">v3 Migration Guide</a></li>
       </ul>
     </details>
     <details>
@@ -87,7 +88,7 @@
       <ul>
         <li><a href="/fprime/UsersGuide/dev/gds-cli-dev.html">GDS CLI Design</a></li>
         <li><a href="/fprime/UsersGuide/api/c++/html/index.html">C++ Documentation</a></li>
-        <li><a href="/fprime/UsersGuide/api/cmake/API.html">CMake User API</a></li>
+        <li><a href="/fprime/UsersGuide/cmake/cmake-api.html">CMake User API</a></li>
       </ul>
     </details>
   </ul>