diff --git a/conf.py b/conf.py
index 36be6625c..a9b0ec1a7 100644
--- a/conf.py
+++ b/conf.py
@@ -108,14 +108,21 @@ def _asset_hash(path: os.PathLike[str]) -> str:
 ]
 
 rediraffe_redirects = {
-    "clang.rst": "advanced-tools/clang.rst",
-    "coverity.rst": "advanced-tools/coverity.rst",
-    "gdb.rst": "advanced-tools/gdb.rst",
+    # Development Tools
+    "clang.rst": "development-tools/clang.rst",
+    "coverity.rst": "development-tools/coverity.rst",
+    "gdb.rst": "development-tools/gdb.rst",
+    # Advanced Tools was renamed Development Tools in gh-1149
+    "advanced-tools/clang.rst": "development-tools/clang.rst",
+    "advanced-tools/coverity.rst": "development-tools/coverity.rst",
+    "advanced-tools/gdb.rst": "development-tools/gdb.rst",
+    # Core Developers
     "coredev.rst": "core-developers/become-core-developer.rst",
     "committing.rst": "core-developers/committing.rst",
     "developers.rst": "core-developers/developer-log.rst",
     "experts.rst": "core-developers/experts.rst",
     "motivations.rst": "core-developers/motivations.rst",
+    # Developer Workflow
     "c-api.rst": "developer-workflow/c-api.rst",
     "communication.rst": "developer-workflow/communication-channels.rst",
     "devcycle.rst": "developer-workflow/development-cycle.rst",
@@ -124,22 +131,27 @@ def _asset_hash(path: os.PathLike[str]) -> str:
     "langchanges.rst": "developer-workflow/lang-changes.rst",
     "porting.rst": "developer-workflow/porting.rst",
     "stdlibchanges.rst": "developer-workflow/stdlib.rst",
+    # Documentation
     "docquality.rst": "documentation/help-documenting.rst",
     "documenting.rst": "documentation/start-documenting.rst",
+    # Getting Started
     "fixingissues.rst": "getting-started/fixing-issues.rst",
     "help.rst": "getting-started/getting-help.rst",
     "gitbootcamp.rst": "getting-started/git-boot-camp.rst",
     "pullrequest.rst": "getting-started/pull-request-lifecycle.rst",
     "setup.rst": "getting-started/setup-building.rst",
+    # CPython Internals
     "compiler.rst": "internals/compiler.rst",
     "exploring.rst": "internals/exploring.rst",
     "garbage_collector.rst": "internals/garbage-collector.rst",
     "parser.rst": "internals/parser.rst",
+    # Testing and Buildbots
     "buildbots.rst": "testing/buildbots.rst",
     "coverage.rst": "testing/coverage.rst",
     "buildworker.rst": "testing/new-buildbot-worker.rst",
     "runtests.rst": "testing/run-write-tests.rst",
     "silencewarnings.rst": "testing/silence-warnings.rst",
+    # Issues and Triaging
     "gh-faq.rst": "triage/github-bpo-faq.rst",
     "tracker.rst": "triage/issue-tracker.rst",
     "gh-labels.rst": "triage/labels.rst",
diff --git a/advanced-tools/clang.rst b/development-tools/clang.rst
similarity index 100%
rename from advanced-tools/clang.rst
rename to development-tools/clang.rst
diff --git a/advanced-tools/coverity.rst b/development-tools/coverity.rst
similarity index 100%
rename from advanced-tools/coverity.rst
rename to development-tools/coverity.rst
diff --git a/advanced-tools/gdb.rst b/development-tools/gdb.rst
similarity index 100%
rename from advanced-tools/gdb.rst
rename to development-tools/gdb.rst
diff --git a/advanced-tools/index.rst b/development-tools/index.rst
similarity index 52%
rename from advanced-tools/index.rst
rename to development-tools/index.rst
index afa96741f..6a3e7466e 100644
--- a/advanced-tools/index.rst
+++ b/development-tools/index.rst
@@ -1,6 +1,6 @@
-==============
-Advanced Tools
-==============
+=================
+Development Tools
+=================
 
 .. toctree::
    :maxdepth: 5
diff --git a/index.rst b/index.rst
index b84a76667..82327d46a 100644
--- a/index.rst
+++ b/index.rst
@@ -247,9 +247,9 @@ Full Table of Contents
    triage/index
    documentation/index
    testing/index
+   development-tools/index
    core-developers/index
    internals/index
-   advanced-tools/index
    versions
 
 .. _Buildbot status: https://www.python.org/dev/buildbot/