diff --git a/windows/security/threat-protection/TOC.md b/windows/security/threat-protection/TOC.md
index 316afb72b1..caca71920d 100644
--- a/windows/security/threat-protection/TOC.md
+++ b/windows/security/threat-protection/TOC.md
@@ -16,81 +16,81 @@
 ##### [Network firewall](windows-firewall/windows-firewall-with-advanced-security.md)
 #### [Next generation protection](windows-defender-antivirus/windows-defender-antivirus-in-windows-10.md)
 #### [Endpoint detection and response](microsoft-defender-atp/overview-endpoint-detection-response.md)
-##### [Security operations dashboard](microsoft-defender-atp/security-operations-dashboard-windows-defender-advanced-threat-protection.md)
+##### [Security operations dashboard](microsoft-defender-atp/security-operations-dashboard.md)
 
 ##### [Incidents queue](microsoft-defender-atp/incidents-queue.md)
 ###### [View and organize the Incidents queue](microsoft-defender-atp/view-incidents-queue.md)
-###### [Manage incidents](microsoft-defender-atp/manage-incidents-windows-defender-advanced-threat-protection.md)
-###### [Investigate incidents](microsoft-defender-atp/investigate-incidents-windows-defender-advanced-threat-protection.md)
+###### [Manage incidents](microsoft-defender-atp/manage-incidents.md)
+###### [Investigate incidents](microsoft-defender-atp/investigate-incidents.md)
 
 
 
 ##### Alerts queue
-###### [View and organize the Alerts queue](microsoft-defender-atp/alerts-queue-windows-defender-advanced-threat-protection.md)
-###### [Manage alerts](microsoft-defender-atp/manage-alerts-windows-defender-advanced-threat-protection.md)
-###### [Investigate alerts](microsoft-defender-atp/investigate-alerts-windows-defender-advanced-threat-protection.md)
-###### [Investigate files](microsoft-defender-atp/investigate-files-windows-defender-advanced-threat-protection.md)
-###### [Investigate machines](microsoft-defender-atp/investigate-machines-windows-defender-advanced-threat-protection.md)
-###### [Investigate an IP address](microsoft-defender-atp/investigate-ip-windows-defender-advanced-threat-protection.md)
-###### [Investigate a domain](microsoft-defender-atp/investigate-domain-windows-defender-advanced-threat-protection.md)
-###### [Investigate a user account](microsoft-defender-atp/investigate-user-windows-defender-advanced-threat-protection.md)
+###### [View and organize the Alerts queue](microsoft-defender-atp/alerts-queue.md)
+###### [Manage alerts](microsoft-defender-atp/manage-alerts.md)
+###### [Investigate alerts](microsoft-defender-atp/investigate-alerts.md)
+###### [Investigate files](microsoft-defender-atp/investigate-files.md)
+###### [Investigate machines](microsoft-defender-atp/investigate-machines.md)
+###### [Investigate an IP address](microsoft-defender-atp/investigate-ip.md)
+###### [Investigate a domain](microsoft-defender-atp/investigate-domain.md)
+###### [Investigate a user account](microsoft-defender-atp/investigate-user.md)
  
 ##### Machines list
-###### [View and organize the Machines list](microsoft-defender-atp/machines-view-overview-windows-defender-advanced-threat-protection.md)
-###### [Manage machine group and tags](microsoft-defender-atp/machine-tags-windows-defender-advanced-threat-protection.md)
-###### [Alerts related to this machine](microsoft-defender-atp/investigate-machines-windows-defender-advanced-threat-protection.md#alerts-related-to-this-machine)
-###### [Machine timeline](microsoft-defender-atp/investigate-machines-windows-defender-advanced-threat-protection.md#machine-timeline)
-####### [Search for specific events](microsoft-defender-atp/investigate-machines-windows-defender-advanced-threat-protection.md#search-for-specific-events)
-####### [Filter events from a specific date](microsoft-defender-atp/investigate-machines-windows-defender-advanced-threat-protection.md#filter-events-from-a-specific-date)
-####### [Export machine timeline events](microsoft-defender-atp/investigate-machines-windows-defender-advanced-threat-protection.md#export-machine-timeline-events)
-####### [Navigate between pages](microsoft-defender-atp/investigate-machines-windows-defender-advanced-threat-protection.md#navigate-between-pages)
+###### [View and organize the Machines list](microsoft-defender-atp/machines-view-overview.md)
+###### [Manage machine group and tags](microsoft-defender-atp/machine-tags.md)
+###### [Alerts related to this machine](microsoft-defender-atp/investigate-machines.md#alerts-related-to-this-machine)
+###### [Machine timeline](microsoft-defender-atp/investigate-machines.md#machine-timeline)
+####### [Search for specific events](microsoft-defender-atp/investigate-machines.md#search-for-specific-events)
+####### [Filter events from a specific date](microsoft-defender-atp/investigate-machines.md#filter-events-from-a-specific-date)
+####### [Export machine timeline events](microsoft-defender-atp/investigate-machines.md#export-machine-timeline-events)
+####### [Navigate between pages](microsoft-defender-atp/investigate-machines.md#navigate-between-pages)
 
 
-##### [Take response actions](microsoft-defender-atp/response-actions-windows-defender-advanced-threat-protection.md)
-###### [Take response actions on a machine](microsoft-defender-atp/respond-machine-alerts-windows-defender-advanced-threat-protection.md)
-####### [Collect investigation package](microsoft-defender-atp/respond-machine-alerts-windows-defender-advanced-threat-protection.md#collect-investigation-package-from-machines)
-####### [Run antivirus scan](microsoft-defender-atp/respond-machine-alerts-windows-defender-advanced-threat-protection.md#run-windows-defender-antivirus-scan-on-machines)
-####### [Restrict app execution](microsoft-defender-atp/respond-machine-alerts-windows-defender-advanced-threat-protection.md#restrict-app-execution)
-####### [Remove app restriction](microsoft-defender-atp/respond-machine-alerts-windows-defender-advanced-threat-protection.md#remove-app-restriction)
-####### [Isolate machines from the network](microsoft-defender-atp/respond-machine-alerts-windows-defender-advanced-threat-protection.md#isolate-machines-from-the-network)
-####### [Release machine from isolation](microsoft-defender-atp/respond-machine-alerts-windows-defender-advanced-threat-protection.md#release-machine-from-isolation)
-####### [Check activity details in Action center](microsoft-defender-atp/respond-machine-alerts-windows-defender-advanced-threat-protection.md#check-activity-details-in-action-center)
+##### [Take response actions](microsoft-defender-atp/response-actions.md)
+###### [Take response actions on a machine](microsoft-defender-atp/respond-machine-alerts.md)
+####### [Collect investigation package](microsoft-defender-atp/respond-machine-alerts.md#collect-investigation-package-from-machines)
+####### [Run antivirus scan](microsoft-defender-atp/respond-machine-alerts.md#run-windows-defender-antivirus-scan-on-machines)
+####### [Restrict app execution](microsoft-defender-atp/respond-machine-alerts.md#restrict-app-execution)
+####### [Remove app restriction](microsoft-defender-atp/respond-machine-alerts.md#remove-app-restriction)
+####### [Isolate machines from the network](microsoft-defender-atp/respond-machine-alerts.md#isolate-machines-from-the-network)
+####### [Release machine from isolation](microsoft-defender-atp/respond-machine-alerts.md#release-machine-from-isolation)
+####### [Check activity details in Action center](microsoft-defender-atp/respond-machine-alerts.md#check-activity-details-in-action-center)
  
-###### [Take response actions on a file](microsoft-defender-atp/respond-file-alerts-windows-defender-advanced-threat-protection.md)
-####### [Stop and quarantine files in your network](microsoft-defender-atp/respond-file-alerts-windows-defender-advanced-threat-protection.md#stop-and-quarantine-files-in-your-network)
-####### [Remove file from quarantine](microsoft-defender-atp/respond-file-alerts-windows-defender-advanced-threat-protection.md#remove-file-from-quarantine)
-####### [Block files in your network](microsoft-defender-atp/respond-file-alerts-windows-defender-advanced-threat-protection.md#block-files-in-your-network)
-####### [Remove file from blocked list](microsoft-defender-atp/respond-file-alerts-windows-defender-advanced-threat-protection.md#remove-file-from-blocked-list)
-####### [Check activity details in Action center](microsoft-defender-atp/respond-file-alerts-windows-defender-advanced-threat-protection.md#check-activity-details-in-action-center)
-####### [Deep analysis](microsoft-defender-atp/respond-file-alerts-windows-defender-advanced-threat-protection.md#deep-analysis)
-####### [Submit files for analysis](microsoft-defender-atp/respond-file-alerts-windows-defender-advanced-threat-protection.md#submit-files-for-analysis)
-####### [View deep analysis reports](microsoft-defender-atp/respond-file-alerts-windows-defender-advanced-threat-protection.md#view-deep-analysis-reports)
-####### [Troubleshoot deep analysis](microsoft-defender-atp/respond-file-alerts-windows-defender-advanced-threat-protection.md#troubleshoot-deep-analysis)
+###### [Take response actions on a file](microsoft-defender-atp/respond-file-alerts.md)
+####### [Stop and quarantine files in your network](microsoft-defender-atp/respond-file-alerts.md#stop-and-quarantine-files-in-your-network)
+####### [Remove file from quarantine](microsoft-defender-atp/respond-file-alerts.md#remove-file-from-quarantine)
+####### [Block files in your network](microsoft-defender-atp/respond-file-alerts.md#block-files-in-your-network)
+####### [Remove file from blocked list](microsoft-defender-atp/respond-file-alerts.md#remove-file-from-blocked-list)
+####### [Check activity details in Action center](microsoft-defender-atp/respond-file-alerts.md#check-activity-details-in-action-center)
+####### [Deep analysis](microsoft-defender-atp/respond-file-alerts.md#deep-analysis)
+####### [Submit files for analysis](microsoft-defender-atp/respond-file-alerts.md#submit-files-for-analysis)
+####### [View deep analysis reports](microsoft-defender-atp/respond-file-alerts.md#view-deep-analysis-reports)
+####### [Troubleshoot deep analysis](microsoft-defender-atp/respond-file-alerts.md#troubleshoot-deep-analysis)
  
 
-#### [Automated investigation and remediation](microsoft-defender-atp/automated-investigations-windows-defender-advanced-threat-protection.md)
-##### [Learn about the automated investigation and remediation dashboard](microsoft-defender-atp/manage-auto-investigation-windows-defender-advanced-threat-protection.md)
+#### [Automated investigation and remediation](microsoft-defender-atp/automated-investigations.md)
+##### [Learn about the automated investigation and remediation dashboard](microsoft-defender-atp/manage-auto-investigation.md)
 
 
-#### [Secure score](microsoft-defender-atp/overview-secure-score-windows-defender-advanced-threat-protection.md)
+#### [Secure score](microsoft-defender-atp/overview-secure-score.md)
 #### [Threat analytics](microsoft-defender-atp/threat-analytics.md)
 
-#### [Advanced hunting](microsoft-defender-atp/overview-hunting-windows-defender-advanced-threat-protection.md)
-##### [Query data using Advanced hunting](microsoft-defender-atp/advanced-hunting-windows-defender-advanced-threat-protection.md)
-###### [Advanced hunting reference](microsoft-defender-atp/advanced-hunting-reference-windows-defender-advanced-threat-protection.md)
-###### [Advanced hunting query language best practices](microsoft-defender-atp/advanced-hunting-best-practices-windows-defender-advanced-threat-protection.md)
+#### [Advanced hunting](microsoft-defender-atp/overview-hunting.md)
+##### [Query data using Advanced hunting](microsoft-defender-atp/advanced-hunting.md)
+###### [Advanced hunting reference](microsoft-defender-atp/advanced-hunting-reference.md)
+###### [Advanced hunting query language best practices](microsoft-defender-atp/advanced-hunting-best-practices.md)
 ##### [Custom detections](microsoft-defender-atp/overview-custom-detections.md)
 ###### [Create custom detections rules](microsoft-defender-atp/custom-detection-rules.md)
 
  
 
 #### [Management and APIs](microsoft-defender-atp/management-apis.md)
-##### [Understand threat intelligence concepts](microsoft-defender-atp/threat-indicator-concepts-windows-defender-advanced-threat-protection.md)
+##### [Understand threat intelligence concepts](microsoft-defender-atp/threat-indicator-concepts.md)
 ##### [Windows Defender ATP APIs](microsoft-defender-atp/apis-intro.md)
-##### [Managed security service provider support](microsoft-defender-atp/mssp-support-windows-defender-advanced-threat-protection.md)
+##### [Managed security service provider support](microsoft-defender-atp/mssp-support.md)
 
 #### [Microsoft threat protection](microsoft-defender-atp/threat-protection-integration.md)
-#####  [Protect users, data, and devices with conditional access](microsoft-defender-atp/conditional-access-windows-defender-advanced-threat-protection.md)
+#####  [Protect users, data, and devices with conditional access](microsoft-defender-atp/conditional-access.md)
 ##### [Microsoft Cloud App Security integration overview](microsoft-defender-atp/microsoft-cloud-app-security-integration.md)
 ##### [Information protection in Windows overview](microsoft-defender-atp/information-protection-in-windows-overview.md)
 
@@ -100,16 +100,16 @@
 
 
 
-#### [Portal overview](microsoft-defender-atp/portal-overview-windows-defender-advanced-threat-protection.md)
+#### [Portal overview](microsoft-defender-atp/portal-overview.md)
 
 
 
 ### [Get started](microsoft-defender-atp/get-started.md)
-#### [What's new in Windows Defender ATP](microsoft-defender-atp/whats-new-in-windows-defender-atp.md)
-#### [Minimum requirements](microsoft-defender-atp/minimum-requirements-windows-defender-advanced-threat-protection.md)
-#### [Validate licensing and complete setup](microsoft-defender-atp/licensing-windows-defender-advanced-threat-protection.md)
-#### [Preview features](microsoft-defender-atp/preview-windows-defender-advanced-threat-protection.md)
-#### [Data storage and privacy](microsoft-defender-atp/data-storage-privacy-windows-defender-advanced-threat-protection.md)
+#### [What's new in Windows Defender ATP](microsoft-defender-atp/whats-new-in-microsoft-defender-atp.md)
+#### [Minimum requirements](microsoft-defender-atp/minimum-requirements.md)
+#### [Validate licensing and complete setup](microsoft-defender-atp/licensing.md)
+#### [Preview features](microsoft-defender-atp/preview.md)
+#### [Data storage and privacy](microsoft-defender-atp/data-storage-privacy.md)
 #### [Assign user access to the portal](microsoft-defender-atp/assign-portal-access.md)
 
 #### [Evaluate Windows Defender ATP](microsoft-defender-atp/evaluate-atp.md)
@@ -243,65 +243,65 @@
 
 ####### [Advanced Hunting](microsoft-defender-atp/run-advanced-query-api.md)
 
-####### [Alert](microsoft-defender-atp/alerts-windows-defender-advanced-threat-protection-new.md)
-######## [List alerts](microsoft-defender-atp/get-alerts-windows-defender-advanced-threat-protection-new.md)
-######## [Create alert](microsoft-defender-atp/create-alert-by-reference-windows-defender-advanced-threat-protection-new.md)
-######## [Update Alert](microsoft-defender-atp/update-alert-windows-defender-advanced-threat-protection-new.md)
-######## [Get alert information by ID](microsoft-defender-atp/get-alert-info-by-id-windows-defender-advanced-threat-protection-new.md)
-######## [Get alert related domains information](microsoft-defender-atp/get-alert-related-domain-info-windows-defender-advanced-threat-protection-new.md)
-######## [Get alert related file information](microsoft-defender-atp/get-alert-related-files-info-windows-defender-advanced-threat-protection-new.md)
-######## [Get alert related IPs information](microsoft-defender-atp/get-alert-related-ip-info-windows-defender-advanced-threat-protection-new.md)
-######## [Get alert related machine information](microsoft-defender-atp/get-alert-related-machine-info-windows-defender-advanced-threat-protection-new.md)
-######## [Get alert related user information](microsoft-defender-atp/get-alert-related-user-info-windows-defender-advanced-threat-protection-new.md)
+####### [Alert](microsoft-defender-atp/alerts.md)
+######## [List alerts](microsoft-defender-atp/get-alerts.md)
+######## [Create alert](microsoft-defender-atp/create-alert-by-reference.md)
+######## [Update Alert](microsoft-defender-atp/update-alert.md)
+######## [Get alert information by ID](microsoft-defender-atp/get-alert-info-by-id.md)
+######## [Get alert related domains information](microsoft-defender-atp/get-alert-related-domain-info.md)
+######## [Get alert related file information](microsoft-defender-atp/get-alert-related-files-info.md)
+######## [Get alert related IPs information](microsoft-defender-atp/get-alert-related-ip-info.md)
+######## [Get alert related machine information](microsoft-defender-atp/get-alert-related-machine-info.md)
+######## [Get alert related user information](microsoft-defender-atp/get-alert-related-user-info.md)
 
-####### [Machine](microsoft-defender-atp/machine-windows-defender-advanced-threat-protection-new.md)
-######## [List machines](microsoft-defender-atp/get-machines-windows-defender-advanced-threat-protection-new.md)
-######## [Get machine by ID](microsoft-defender-atp/get-machine-by-id-windows-defender-advanced-threat-protection-new.md)
-######## [Get machine log on users](microsoft-defender-atp/get-machine-log-on-users-windows-defender-advanced-threat-protection-new.md)
-######## [Get machine related alerts](microsoft-defender-atp/get-machine-related-alerts-windows-defender-advanced-threat-protection-new.md)
-######## [Add or Remove machine tags](microsoft-defender-atp/add-or-remove-machine-tags-windows-defender-advanced-threat-protection-new.md)
-######## [Find machines by IP](microsoft-defender-atp/find-machines-by-ip-windows-defender-advanced-threat-protection-new.md)
+####### [Machine](microsoft-defender-atp/machine.md)
+######## [List machines](microsoft-defender-atp/get-machines.md)
+######## [Get machine by ID](microsoft-defender-atp/get-machine-by-id.md)
+######## [Get machine log on users](microsoft-defender-atp/get-machine-log-on-users.md)
+######## [Get machine related alerts](microsoft-defender-atp/get-machine-related-alerts.md)
+######## [Add or Remove machine tags](microsoft-defender-atp/add-or-remove-machine-tags.md)
+######## [Find machines by IP](microsoft-defender-atp/find-machines-by-ip.md)
 
-####### [Machine Action](microsoft-defender-atp/machineaction-windows-defender-advanced-threat-protection-new.md)
-######## [List Machine Actions](microsoft-defender-atp/get-machineactions-collection-windows-defender-advanced-threat-protection-new.md)
-######## [Get Machine Action](microsoft-defender-atp/get-machineaction-object-windows-defender-advanced-threat-protection-new.md)
-######## [Collect investigation package](microsoft-defender-atp/collect-investigation-package-windows-defender-advanced-threat-protection-new.md)
-######## [Get investigation package SAS URI](microsoft-defender-atp/get-package-sas-uri-windows-defender-advanced-threat-protection-new.md)
-######## [Isolate machine](microsoft-defender-atp/isolate-machine-windows-defender-advanced-threat-protection-new.md)
-######## [Release machine from isolation](microsoft-defender-atp/unisolate-machine-windows-defender-advanced-threat-protection-new.md)
-######## [Restrict app execution](microsoft-defender-atp/restrict-code-execution-windows-defender-advanced-threat-protection-new.md)
-######## [Remove app restriction](microsoft-defender-atp/unrestrict-code-execution-windows-defender-advanced-threat-protection-new.md)
-######## [Run antivirus scan](microsoft-defender-atp/run-av-scan-windows-defender-advanced-threat-protection-new.md)
-######## [Offboard machine](microsoft-defender-atp/offboard-machine-api-windows-defender-advanced-threat-protection-new.md)
-######## [Stop and quarantine file](microsoft-defender-atp/stop-and-quarantine-file-windows-defender-advanced-threat-protection-new.md)
-######## [Initiate investigation (preview)](microsoft-defender-atp/initiate-autoir-investigation-windows-defender-advanced-threat-protection-new.md)
+####### [Machine Action](microsoft-defender-atp/machineaction.md)
+######## [List Machine Actions](microsoft-defender-atp/get-machineactions-collection.md)
+######## [Get Machine Action](microsoft-defender-atp/get-machineaction-object.md)
+######## [Collect investigation package](microsoft-defender-atp/collect-investigation-package.md)
+######## [Get investigation package SAS URI](microsoft-defender-atp/get-package-sas-uri.md)
+######## [Isolate machine](microsoft-defender-atp/isolate-machine.md)
+######## [Release machine from isolation](microsoft-defender-atp/unisolate-machine.md)
+######## [Restrict app execution](microsoft-defender-atp/restrict-code-execution.md)
+######## [Remove app restriction](microsoft-defender-atp/unrestrict-code-execution.md)
+######## [Run antivirus scan](microsoft-defender-atp/run-av-scan.md)
+######## [Offboard machine](microsoft-defender-atp/offboard-machine-api.md)
+######## [Stop and quarantine file](microsoft-defender-atp/stop-and-quarantine-file.md)
+######## [Initiate investigation (preview)](microsoft-defender-atp/initiate-autoir-investigation.md)
 
-####### [Indicators (preview)](microsoft-defender-atp/ti-indicator-windows-defender-advanced-threat-protection-new.md)
-######## [Submit Indicator](microsoft-defender-atp/post-ti-indicator-windows-defender-advanced-threat-protection-new.md)
-######## [List Indicators](microsoft-defender-atp/get-ti-indicators-collection-windows-defender-advanced-threat-protection-new.md)
-######## [Delete Indicator](microsoft-defender-atp/delete-ti-indicator-by-id-windows-defender-advanced-threat-protection-new.md)
+####### [Indicators (preview)](microsoft-defender-atp/ti-indicator.md)
+######## [Submit Indicator](microsoft-defender-atp/post-ti-indicator.md)
+######## [List Indicators](microsoft-defender-atp/get-ti-indicators-collection.md)
+######## [Delete Indicator](microsoft-defender-atp/delete-ti-indicator-by-id.md)
 
 ####### Domain
-######## [Get domain related alerts](microsoft-defender-atp/get-domain-related-alerts-windows-defender-advanced-threat-protection-new.md)
-######## [Get domain related machines](microsoft-defender-atp/get-domain-related-machines-windows-defender-advanced-threat-protection-new.md)
-######## [Get domain statistics](microsoft-defender-atp/get-domain-statistics-windows-defender-advanced-threat-protection-new.md)
-######## [Is domain seen in organization](microsoft-defender-atp/is-domain-seen-in-org-windows-defender-advanced-threat-protection-new.md)
+######## [Get domain related alerts](microsoft-defender-atp/get-domain-related-alerts.md)
+######## [Get domain related machines](microsoft-defender-atp/get-domain-related-machines.md)
+######## [Get domain statistics](microsoft-defender-atp/get-domain-statistics.md)
+######## [Is domain seen in organization](microsoft-defender-atp/is-domain-seen-in-org.md)
 
-####### [File](microsoft-defender-atp/files-windows-defender-advanced-threat-protection-new.md)
-######## [Get file information](microsoft-defender-atp/get-file-information-windows-defender-advanced-threat-protection-new.md)
-######## [Get file related alerts](microsoft-defender-atp/get-file-related-alerts-windows-defender-advanced-threat-protection-new.md)
-######## [Get file related machines](microsoft-defender-atp/get-file-related-machines-windows-defender-advanced-threat-protection-new.md)
-######## [Get file statistics](microsoft-defender-atp/get-file-statistics-windows-defender-advanced-threat-protection-new.md)
+####### [File](microsoft-defender-atp/files.md)
+######## [Get file information](microsoft-defender-atp/get-file-information.md)
+######## [Get file related alerts](microsoft-defender-atp/get-file-related-alerts.md)
+######## [Get file related machines](microsoft-defender-atp/get-file-related-machines.md)
+######## [Get file statistics](microsoft-defender-atp/get-file-statistics.md)
 
 ####### IP
-######## [Get IP related alerts](microsoft-defender-atp/get-ip-related-alerts-windows-defender-advanced-threat-protection-new.md)
-######## [Get IP related machines](microsoft-defender-atp/get-ip-related-machines-windows-defender-advanced-threat-protection-new.md)
-######## [Get IP statistics](microsoft-defender-atp/get-ip-statistics-windows-defender-advanced-threat-protection-new.md)
-######## [Is IP seen in organization](microsoft-defender-atp/is-ip-seen-org-windows-defender-advanced-threat-protection-new.md)
+######## [Get IP related alerts](microsoft-defender-atp/get-ip-related-alerts.md)
+######## [Get IP related machines](microsoft-defender-atp/get-ip-related-machines.md)
+######## [Get IP statistics](microsoft-defender-atp/get-ip-statistics.md)
+######## [Is IP seen in organization](microsoft-defender-atp/is-ip-seen-org.md)
 
-####### [User](microsoft-defender-atp/user-windows-defender-advanced-threat-protection-new.md)
-######## [Get user related alerts](microsoft-defender-atp/get-user-related-alerts-windows-defender-advanced-threat-protection-new.md)
-######## [Get user related machines](microsoft-defender-atp/get-user-related-machines-windows-defender-advanced-threat-protection-new.md)
+####### [User](microsoft-defender-atp/user.md)
+######## [Get user related alerts](microsoft-defender-atp/get-user-related-alerts.md)
+######## [Get user related machines](microsoft-defender-atp/get-user-related-machines.md)
 
 
 ###### How to use APIs - Samples
@@ -400,7 +400,7 @@
 ##### [Configure Windows Defender Security Center time zone settings](microsoft-defender-atp/time-settings.md)
   
 
-### [Troubleshoot Windows Defender ATP](microsoft-defender-atp/troubleshoot-wdatp.md)
+### [Troubleshoot Windows Defender ATP](microsoft-defender-atp/troubleshoot-overview.md)
 ####Troubleshoot sensor state
 ##### [Check sensor state](microsoft-defender-atp/check-sensor-status.md)
 ##### [Fix unhealthy sensors](microsoft-defender-atp/fix-unhealhty-sensors.md)
diff --git a/windows/security/threat-protection/microsoft-defender-atp/add-or-remove-machine-tags-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/add-or-remove-machine-tags.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/add-or-remove-machine-tags-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/add-or-remove-machine-tags.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/advanced-features-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/advanced-features.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/advanced-features-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/advanced-features.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/advanced-hunting-best-practices-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/advanced-hunting-best-practices.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/advanced-hunting-best-practices-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/advanced-hunting-best-practices.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/advanced-hunting-reference-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/advanced-hunting-reference.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/advanced-hunting-reference-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/advanced-hunting-reference.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/advanced-hunting-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/advanced-hunting.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/advanced-hunting-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/advanced-hunting.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/alerts-queue-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/alerts-queue.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/alerts-queue-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/alerts-queue.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/alerts-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/alerts.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/alerts-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/alerts.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/api-portal-mapping-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/api-portal-mapping.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/api-portal-mapping-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/api-portal-mapping.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/assign-portal-access-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/assign-portal-access.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/assign-portal-access-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/assign-portal-access.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/attack-simulations-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/attack-simulations.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/attack-simulations-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/attack-simulations.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/automated-investigations-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/automated-investigations.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/automated-investigations-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/automated-investigations.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/basic-permissions-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/basic-permissions.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/basic-permissions-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/basic-permissions.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/check-sensor-status-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/check-sensor-status.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/check-sensor-status-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/check-sensor-status.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/collect-investigation-package-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/collect-investigation-package.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/collect-investigation-package-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/collect-investigation-package.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/community-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/community.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/community-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/community.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/conditional-access-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/conditional.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/conditional-access-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/conditional.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/configure-arcsight-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/configure-arcsight.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/configure-arcsight-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/configure-arcsight.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/configure-conditional-access-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/configure-conditional-access.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/configure-conditional-access-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/configure-conditional-access.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/configure-email-notifications-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/configure-email-notifications.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/configure-email-notifications-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/configure-email-notifications.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-gp-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-gp.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-gp-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-gp.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-mdm-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-mdm.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-mdm-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-mdm.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-non-windows-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-non-windows.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-non-windows-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-non-windows.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-sccm-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-sccm.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-sccm-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-sccm.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-script-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-script.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-script-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-script.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-vdi-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-vdi.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-vdi-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-vdi.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/configure-endpoints.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/configure-endpoints.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/configure-mssp-support-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/configure-mssp-support.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/configure-mssp-support-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/configure-mssp-support.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/configure-proxy-internet-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/configure-proxy-internet.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/configure-proxy-internet-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/configure-proxy-internet.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/configure-server-endpoints-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/configure-server-endpoints.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/configure-server-endpoints-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/configure-server-endpoints.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/configure-siem-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/configure-siem.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/configure-siem-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/configure-siem.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/configure-splunk-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/configure-splunk.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/configure-splunk-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/configure-splunk.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/create-alert-by-reference-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/create-alert-by-reference.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/create-alert-by-reference-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/create-alert-by-reference.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/custom-ti-api-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/custom-ti-api.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/custom-ti-api-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/custom-ti-api.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/data-retention-settings-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/data-retention-settings.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/data-retention-settings-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/data-retention-settings.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/data-storage-privacy-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/data-storage-privacy.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/data-storage-privacy-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/data-storage-privacy.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/defender-compatibility-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/defender-compatibility.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/defender-compatibility-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/defender-compatibility.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/delete-ti-indicator-by-id-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/delete-ti-indicator-by-id.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/delete-ti-indicator-by-id-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/delete-ti-indicator-by-id.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/enable-custom-ti-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/enable-custom-ti.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/enable-custom-ti-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/enable-custom-ti.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/enable-secure-score-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/enable-secure-score.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/enable-secure-score-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/enable-secure-score.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/enable-siem-integration-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/enable-siem-integration.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/enable-siem-integration-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/enable-siem-integration.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/event-error-codes-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/event-error-codes.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/event-error-codes-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/event-error-codes.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/experiment-custom-ti-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/experiment-custom-ti.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/experiment-custom-ti-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/experiment-custom-ti.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/files-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/files.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/files-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/files.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/find-machine-info-by-ip-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/find-machine-info-by-ip.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/find-machine-info-by-ip-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/find-machine-info-by-ip.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/find-machines-by-ip-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/find-machines-by-ip.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/find-machines-by-ip-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/find-machines-by-ip.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/fix-unhealhty-sensors.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/fix-unhealhty-sensors.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-alert-info-by-id-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-alert-info-by-id.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-alert-info-by-id-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-alert-info-by-id.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-alert-related-domain-info-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-alert-related-domain-info.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-alert-related-domain-info-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-alert-related-domain-info.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-alert-related-files-info-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-alert-related-files-info.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-alert-related-files-info-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-alert-related-files-info.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-alert-related-ip-info-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-alert-related-ip-info.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-alert-related-ip-info-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-alert-related-ip-info.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-alert-related-machine-info-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-alert-related-machine-info.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-alert-related-machine-info-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-alert-related-machine-info.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-alert-related-user-info-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-alert-related-user-info.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-alert-related-user-info-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-alert-related-user-info.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-alerts-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-alerts.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-alerts-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-alerts.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-cvekbmap-collection-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/get-cvekbmap-collection.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-cvekbmap-collection-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-cvekbmap-collection.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-domain-related-alerts-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-domain-related-alerts.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-domain-related-alerts-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-domain-related-alerts.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-domain-related-machines-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-domain-related-machines.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-domain-related-machines-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-domain-related-machines.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-domain-statistics-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-domain-statistics.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-domain-statistics-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-domain-statistics.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-file-information-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-file-information.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-file-information-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-file-information.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-file-related-alerts-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-file-related-alerts.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-file-related-alerts-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-file-related-alerts.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-file-related-machines-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-file-related-machines.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-file-related-machines-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-file-related-machines.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-file-statistics-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-file-statistics.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-file-statistics-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-file-statistics.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-ip-related-alerts-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-ip-related-alerts.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-ip-related-alerts-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-ip-related-alerts.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-ip-related-machines-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-ip-related-machines.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-ip-related-machines-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-ip-related-machines.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-ip-statistics-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-ip-statistics.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-ip-statistics-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-ip-statistics.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-kbinfo-collection-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/get-kbinfo-collection.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-kbinfo-collection-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-kbinfo-collection.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-machine-by-id-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-machine-by-id.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-machine-by-id-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-machine-by-id.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-machine-log-on-users-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-machine-log-on-users.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-machine-log-on-users-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-machine-log-on-users.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-machine-related-alerts-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-machine-related-alerts.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-machine-related-alerts-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-machine-related-alerts.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-machineaction-object-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-machineaction-object.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-machineaction-object-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-machineaction-object.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-machineactions-collection-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-machineactions-collection.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-machineactions-collection-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-machineactions-collection.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-machinegroups-collection-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/get-machinegroups-collection.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-machinegroups-collection-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-machinegroups-collection.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-machines-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-machines.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-machines-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-machines.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-machinesecuritystates-collection-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/get-machinesecuritystates-collection.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-machinesecuritystates-collection-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-machinesecuritystates-collection.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-package-sas-uri-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-package-sas-uri.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-package-sas-uri-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-package-sas-uri.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-ti-indicators-collection-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-ti-indicators-collection.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-ti-indicators-collection-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-ti-indicators-collection.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-user-information-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-user-information.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-user-information-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-user-information.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-user-related-alerts-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-user-related-alerts.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-user-related-alerts-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-user-related-alerts.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/get-user-related-machines-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/get-user-related-machines.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/get-user-related-machines-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/get-user-related-machines.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/initiate-autoir-investigation-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/initiate-autoir-investigation.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/initiate-autoir-investigation-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/initiate-autoir-investigation.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/investigate-alerts-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/investigate-alerts.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/investigate-alerts-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/investigate-alerts.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/investigate-domain-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/investigate-domain.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/investigate-domain-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/investigate-domain.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/investigate-files-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/investigate-files.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/investigate-files-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/investigate-files.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/investigate-incidents-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/investigate-incidents.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/investigate-incidents-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/investigate-incidents.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/investigate-ip-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/investigate-ip.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/investigate-ip-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/investigate-ip.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/investigate-machines-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/investigate-machines.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/investigate-machines-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/investigate-machines.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/investigate-user-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/investigate-user.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/investigate-user-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/investigate-user.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/is-domain-seen-in-org-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/is-domain-seen-in-org.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/is-domain-seen-in-org-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/is-domain-seen-in-org.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/is-ip-seen-org-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/is-ip-seen-org.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/is-ip-seen-org-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/is-ip-seen-org.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/isolate-machine-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/isolate-machine.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/isolate-machine-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/isolate-machine.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/licensing-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/licensing.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/licensing-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/licensing.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/machine-groups-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/machine-groups.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/machine-groups-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/machine-groups.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/machine-reports-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/machine-reports.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/machine-reports-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/machine-reports.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/machine-tags-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/machine-tags.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/machine-tags-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/machine-tags.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/machine-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/machine.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/machine-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/machine.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/machineaction-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/machineaction.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/machineaction-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/machineaction.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/machines-view-overview-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/machines-view-overview.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/machines-view-overview-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/machines-view-overview.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/manage-alerts-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/manage-alerts.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/manage-alerts-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/manage-alerts.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/manage-allowed-blocked-list-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/manage-allowed-blocked-list.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/manage-allowed-blocked-list-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/manage-allowed-blocked-list.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/manage-auto-investigation-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/manage-auto-investigation.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/manage-auto-investigation-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/manage-auto-investigation.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/manage-automation-allowed-blocked-list-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/manage-automation-allowed-blocked-list.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/manage-automation-allowed-blocked-list-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/manage-automation-allowed-blocked-list.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/manage-automation-file-uploads-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/manage-automation-file-uploads.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/manage-automation-file-uploads-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/manage-automation-file-uploads.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/manage-automation-folder-exclusions-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/manage-automation-folder-exclusions.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/manage-automation-folder-exclusions-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/manage-automation-folder-exclusions.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/manage-incidents-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/manage-incidents.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/manage-incidents-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/manage-incidents.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/manage-suppression-rules-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/manage-suppression-rules.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/manage-suppression-rules-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/manage-suppression-rules.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/minimum-requirements-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/minimum-requirements.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/minimum-requirements-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/minimum-requirements.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/mssp-support-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/mssp-support.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/mssp-support-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/mssp-support.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/offboard-machine-api-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/offboard-machine-api.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/offboard-machine-api-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/offboard-machine-api.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/offboard-machines-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/offboard-machines.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/offboard-machines-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/offboard-machines.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/onboard-configure-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/onboard-configure.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/onboard-configure-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/onboard-configure.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/onboard-downlevel-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/onboard-downlevel.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/onboard-downlevel-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/onboard-downlevel.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/overview-hunting-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/overview-hunting.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/overview-hunting-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/overview-hunting.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/overview-secure-score-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/overview-secure-score.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/overview-secure-score-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/overview-secure-score.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/portal-overview-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/portal-overview.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/portal-overview-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/portal-overview.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/post-ti-indicator-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/post-ti-indicator.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/post-ti-indicator-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/post-ti-indicator.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/powerbi-reports-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/powerbi-reports.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/powerbi-reports-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/powerbi-reports.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/powershell-example-code-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/powershell-example-code.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/powershell-example-code-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/powershell-example-code.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/preferences-setup-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/preferences-setup.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/preferences-setup-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/preferences-setup.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/preview-settings-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/preview-settings.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/preview-settings-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/preview-settings.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/preview-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/preview.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/preview-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/preview.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/pull-alerts-using-rest-api-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/pull-alerts-using-rest-api.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/pull-alerts-using-rest-api-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/pull-alerts-using-rest-api.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/python-example-code-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/python-example-code.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/python-example-code-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/python-example-code.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/rbac-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/rbac.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/rbac-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/rbac.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/respond-file-alerts-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/respond-file-alerts.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/respond-file-alerts-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/respond-file-alerts.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/respond-machine-alerts-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/respond-machine-alerts.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/respond-machine-alerts-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/respond-machine-alerts.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/response-actions-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/response-actions.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/response-actions-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/response-actions.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/restrict-code-execution-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/restrict-code-execution.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/restrict-code-execution-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/restrict-code-execution.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/run-av-scan-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/run-av-scan.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/run-av-scan-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/run-av-scan.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/run-detection-test-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/run-detection-test.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/run-detection-test-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/run-detection-test.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/secure-score-dashboard-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/secure-score-dashboard.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/secure-score-dashboard-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/secure-score-dashboard.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/security-operations-dashboard-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/security-operations-dashboard.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/security-operations-dashboard-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/security-operations-dashboard.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/service-status-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/service-status.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/service-status-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/service-status.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/stop-and-quarantine-file-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/stop-and-quarantine-file.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/stop-and-quarantine-file-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/stop-and-quarantine-file.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/supported-response-apis-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/supported-response-apis.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/supported-response-apis-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/supported-response-apis.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/threat-indicator-concepts-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/threat-indicator-concepts.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/threat-indicator-concepts-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/threat-indicator-concepts.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/threat-protection-reports-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/threat-protection-reports.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/threat-protection-reports-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/threat-protection-reports.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/ti-indicator-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/ti-indicator.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/ti-indicator-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/ti-indicator.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/time-settings-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/time-settings.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/time-settings-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/time-settings.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/troubleshoot-custom-ti.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/troubleshoot-custom-ti.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/troubleshoot-onboarding-error-messages-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/troubleshoot-onboarding-error-messages.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/troubleshoot-onboarding-error-messages-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/troubleshoot-onboarding-error-messages.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/troubleshoot-onboarding-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/troubleshoot-onboarding.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/troubleshoot-onboarding-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/troubleshoot-onboarding.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/troubleshoot-wdatp.md b/windows/security/threat-protection/microsoft-defender-atp/troubleshoot-overview.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/troubleshoot-wdatp.md
rename to windows/security/threat-protection/microsoft-defender-atp/troubleshoot-overview.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/troubleshoot-siem-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/troubleshoot-siem.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/troubleshoot-siem-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/troubleshoot-siem.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/troubleshoot-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/troubleshoot.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/troubleshoot-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/troubleshoot.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/unisolate-machine-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/unisolate-machine.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/unisolate-machine-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/unisolate-machine.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/unrestrict-code-execution-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/unrestrict-code-execution.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/unrestrict-code-execution-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/unrestrict-code-execution.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/update-alert-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/update-alert.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/update-alert-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/update-alert.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/use-custom-ti-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/use-custom-ti.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/use-custom-ti-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/use-custom-ti.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/use-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/use.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/use-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/use.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/user-roles-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/microsoft-defender-atp/user-roles.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/user-roles-windows-defender-advanced-threat-protection.md
rename to windows/security/threat-protection/microsoft-defender-atp/user-roles.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/user-windows-defender-advanced-threat-protection-new.md b/windows/security/threat-protection/microsoft-defender-atp/user.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/user-windows-defender-advanced-threat-protection-new.md
rename to windows/security/threat-protection/microsoft-defender-atp/user.md
diff --git a/windows/security/threat-protection/microsoft-defender-atp/whats-new-in-windows-defender-atp.md b/windows/security/threat-protection/microsoft-defender-atp/whats-new-in-microsoft-defender-atp.md
similarity index 100%
rename from windows/security/threat-protection/microsoft-defender-atp/whats-new-in-windows-defender-atp.md
rename to windows/security/threat-protection/microsoft-defender-atp/whats-new-in-microsoft-defender-atp.md