diff --git a/.openpublishing.redirection.windows-deployment.json b/.openpublishing.redirection.windows-deployment.json
index b603a54613..b4041cd83e 100644
--- a/.openpublishing.redirection.windows-deployment.json
+++ b/.openpublishing.redirection.windows-deployment.json
@@ -1504,6 +1504,21 @@
       "source_path": "windows/deployment/windows-autopatch/deploy/windows-autopatch-groups-manage-autopatch-groups.md",
       "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-manage-autopatch-groups",
       "redirect_document_id": true
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/prepare/windows-autopatch-enroll-tenant.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/prepare/windows-autopatch-feature-activation",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/manage/windows-autopatch-unenroll-tenant.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-feature-deactivation",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/references/windows-autopatch-changes-to-tenant.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/references/windows-autopatch-changes-made-at-feature-activation",
+      "redirect_document_id": true
     }
   ]
 }
diff --git a/windows/deployment/windows-autopatch/TOC.yml b/windows/deployment/windows-autopatch/TOC.yml
index a678f8d182..69c792af96 100644
--- a/windows/deployment/windows-autopatch/TOC.yml
+++ b/windows/deployment/windows-autopatch/TOC.yml
@@ -22,7 +22,7 @@
         - name: Configure your network
           href: prepare/windows-autopatch-configure-network.md
         - name: Enroll your tenant
-          href: prepare/windows-autopatch-enroll-tenant.md
+          href: prepare/windows-autopatch-feature-activation.md
           items:
             - name: Fix issues found by the Readiness assessment tool
               href: prepare/windows-autopatch-fix-issues.md
@@ -79,7 +79,7 @@
         - name: Exclude a device
           href: manage/windows-autopatch-exclude-device.md
         - name: Unenroll your tenant
-          href: manage/windows-autopatch-unenroll-tenant.md
+          href: manage/windows-autopatch-feature-deactivation.md
     - name: Monitor
       href:
       items:
@@ -128,7 +128,7 @@
             - name: Conflicting configurations
               href: references/windows-autopatch-conflicting-configurations.md
         - name: Changes made at tenant enrollment
-          href: references/windows-autopatch-changes-to-tenant.md
+          href: references/windows-autopatch-changes-made-at-feature-activation.md
     - name: What's new
       href:
       items: 
diff --git a/windows/deployment/windows-autopatch/manage/windows-autopatch-unenroll-tenant.md b/windows/deployment/windows-autopatch/manage/windows-autopatch-feature-deactivation.md
similarity index 100%
rename from windows/deployment/windows-autopatch/manage/windows-autopatch-unenroll-tenant.md
rename to windows/deployment/windows-autopatch/manage/windows-autopatch-feature-deactivation.md
diff --git a/windows/deployment/windows-autopatch/prepare/windows-autopatch-enroll-tenant.md b/windows/deployment/windows-autopatch/prepare/windows-autopatch-feature-activation.md
similarity index 100%
rename from windows/deployment/windows-autopatch/prepare/windows-autopatch-enroll-tenant.md
rename to windows/deployment/windows-autopatch/prepare/windows-autopatch-feature-activation.md
diff --git a/windows/deployment/windows-autopatch/references/windows-autopatch-changes-to-tenant.md b/windows/deployment/windows-autopatch/references/windows-autopatch-changes-made-at-feature-activation.md
similarity index 100%
rename from windows/deployment/windows-autopatch/references/windows-autopatch-changes-to-tenant.md
rename to windows/deployment/windows-autopatch/references/windows-autopatch-changes-made-at-feature-activation.md