diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/Microsoft.Azure.Management.AutoManage.sln b/sdk/automanage/Microsoft.Azure.Management.Automanage/Microsoft.Azure.Management.Automanage.sln
similarity index 85%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/Microsoft.Azure.Management.AutoManage.sln
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/Microsoft.Azure.Management.Automanage.sln
index 86eb7532b5a63..51f15afc25721 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/Microsoft.Azure.Management.AutoManage.sln
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/Microsoft.Azure.Management.Automanage.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30225.117
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Management.AutoManage", "src\Microsoft.Azure.Management.AutoManage.csproj", "{729E0304-87FD-499C-A0EB-A9339D91A3FF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Management.Automanage", "src\Microsoft.Azure.Management.Automanage.csproj", "{729E0304-87FD-499C-A0EB-A9339D91A3FF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Management.AutoManage.Tests", "tests\Microsoft.Azure.Management.AutoManage.Tests.csproj", "{BF6E0BED-7C6B-47FF-82C1-AD40FE0350EA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Management.Automanage.Tests", "tests\Microsoft.Azure.Management.Automanage.Tests.csproj", "{BF6E0BED-7C6B-47FF-82C1-AD40FE0350EA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/AzSdk.RP.props b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/AzSdk.RP.props
similarity index 86%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/AzSdk.RP.props
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/AzSdk.RP.props
index 49c92de420e04..a4c3addd0d23e 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/AzSdk.RP.props
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/AzSdk.RP.props
@@ -1,7 +1,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
   <PropertyGroup>
-    <AzureApiTag>AutoManage_0_1_0-preview;AutoManage_06_30_2020-preview;</AzureApiTag>
+    <AzureApiTag>Automanage_0_1_0-preview;Automanage_06_30_2020-preview;</AzureApiTag>
     <PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/CHANGELOG.md b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/CHANGELOG.md
similarity index 100%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/CHANGELOG.md
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/CHANGELOG.md
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/AccountsOperations.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/AccountsOperations.cs
similarity index 99%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/AccountsOperations.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/AccountsOperations.cs
index 0eb436d0d960e..65b8232de9d2f 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/AccountsOperations.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/AccountsOperations.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage
+namespace Microsoft.Azure.Management.Automanage
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/AccountsOperationsExtensions.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/AccountsOperationsExtensions.cs
similarity index 99%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/AccountsOperationsExtensions.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/AccountsOperationsExtensions.cs
index 62d3491a58dfb..49b38f8198e93 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/AccountsOperationsExtensions.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/AccountsOperationsExtensions.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage
+namespace Microsoft.Azure.Management.Automanage
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/AutomanageClient.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/AutomanageClient.cs
similarity index 99%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/AutomanageClient.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/AutomanageClient.cs
index e0a3862134b68..f817a238c76a2 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/AutomanageClient.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/AutomanageClient.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage
+namespace Microsoft.Azure.Management.Automanage
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/ConfigurationProfileAssignmentsOperations.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/ConfigurationProfileAssignmentsOperations.cs
similarity index 99%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/ConfigurationProfileAssignmentsOperations.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/ConfigurationProfileAssignmentsOperations.cs
index 910d7cde3d67f..841ad0a27cf12 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/ConfigurationProfileAssignmentsOperations.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/ConfigurationProfileAssignmentsOperations.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage
+namespace Microsoft.Azure.Management.Automanage
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/ConfigurationProfileAssignmentsOperationsExtensions.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/ConfigurationProfileAssignmentsOperationsExtensions.cs
similarity index 99%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/ConfigurationProfileAssignmentsOperationsExtensions.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/ConfigurationProfileAssignmentsOperationsExtensions.cs
index 70e2ac4b6c6d9..bd37c422f1f1a 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/ConfigurationProfileAssignmentsOperationsExtensions.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/ConfigurationProfileAssignmentsOperationsExtensions.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage
+namespace Microsoft.Azure.Management.Automanage
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/ConfigurationProfilePreferencesOperations.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/ConfigurationProfilePreferencesOperations.cs
similarity index 99%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/ConfigurationProfilePreferencesOperations.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/ConfigurationProfilePreferencesOperations.cs
index 74f6228a227fd..98a6e17bb3630 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/ConfigurationProfilePreferencesOperations.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/ConfigurationProfilePreferencesOperations.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage
+namespace Microsoft.Azure.Management.Automanage
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/ConfigurationProfilePreferencesOperationsExtensions.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/ConfigurationProfilePreferencesOperationsExtensions.cs
similarity index 99%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/ConfigurationProfilePreferencesOperationsExtensions.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/ConfigurationProfilePreferencesOperationsExtensions.cs
index 08132cc2048c0..f4289cba50a59 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/ConfigurationProfilePreferencesOperationsExtensions.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/ConfigurationProfilePreferencesOperationsExtensions.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage
+namespace Microsoft.Azure.Management.Automanage
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/IAccountsOperations.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/IAccountsOperations.cs
similarity index 99%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/IAccountsOperations.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/IAccountsOperations.cs
index 9e2be4f693609..a3fbaf02dc023 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/IAccountsOperations.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/IAccountsOperations.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage
+namespace Microsoft.Azure.Management.Automanage
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/IAutomanageClient.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/IAutomanageClient.cs
similarity index 98%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/IAutomanageClient.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/IAutomanageClient.cs
index 8673fc530a206..6c188aab1e5ac 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/IAutomanageClient.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/IAutomanageClient.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage
+namespace Microsoft.Azure.Management.Automanage
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/IConfigurationProfileAssignmentsOperations.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/IConfigurationProfileAssignmentsOperations.cs
similarity index 99%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/IConfigurationProfileAssignmentsOperations.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/IConfigurationProfileAssignmentsOperations.cs
index c6cc880589b4f..ce75480dd0a46 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/IConfigurationProfileAssignmentsOperations.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/IConfigurationProfileAssignmentsOperations.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage
+namespace Microsoft.Azure.Management.Automanage
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/IConfigurationProfilePreferencesOperations.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/IConfigurationProfilePreferencesOperations.cs
similarity index 99%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/IConfigurationProfilePreferencesOperations.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/IConfigurationProfilePreferencesOperations.cs
index 869dcca17b2d2..583cf07ae647b 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/IConfigurationProfilePreferencesOperations.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/IConfigurationProfilePreferencesOperations.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage
+namespace Microsoft.Azure.Management.Automanage
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/IOperations.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/IOperations.cs
similarity index 97%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/IOperations.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/IOperations.cs
index 939de59a26d90..61caee406e41d 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/IOperations.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/IOperations.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage
+namespace Microsoft.Azure.Management.Automanage
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/Account.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/Account.cs
similarity index 97%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/Account.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/Account.cs
index 1ed4b721ab229..faf5333d903b5 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/Account.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/Account.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Newtonsoft.Json;
     using System.Collections;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/AccountIdentity.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/AccountIdentity.cs
similarity index 97%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/AccountIdentity.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/AccountIdentity.cs
index 720dc3bfa6597..7dc6ceec84064 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/AccountIdentity.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/AccountIdentity.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Newtonsoft.Json;
     using System.Linq;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfile.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfile.cs
similarity index 92%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfile.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfile.cs
index 0fc309ed5c304..e44616853159e 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfile.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfile.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
 
     /// <summary>
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfileAssignment.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfileAssignment.cs
similarity index 97%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfileAssignment.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfileAssignment.cs
index a2fd67eb0c731..29e4e04a13b24 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfileAssignment.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfileAssignment.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Newtonsoft.Json;
     using System.Linq;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfileAssignmentCompliance.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfileAssignmentCompliance.cs
similarity index 97%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfileAssignmentCompliance.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfileAssignmentCompliance.cs
index 2218901daa7c3..ce4b26bbc6938 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfileAssignmentCompliance.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfileAssignmentCompliance.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Newtonsoft.Json;
     using System.Linq;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfileAssignmentProperties.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfileAssignmentProperties.cs
similarity index 98%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfileAssignmentProperties.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfileAssignmentProperties.cs
index d0f436b056c5c..a1991d0ec9095 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfileAssignmentProperties.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfileAssignmentProperties.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Newtonsoft.Json;
     using System.Linq;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfilePreference.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfilePreference.cs
similarity index 97%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfilePreference.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfilePreference.cs
index 5adfba65333e3..dc99520292c91 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfilePreference.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfilePreference.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Newtonsoft.Json;
     using System.Collections;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfilePreferenceAntiMalware.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfilePreferenceAntiMalware.cs
similarity index 98%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfilePreferenceAntiMalware.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfilePreferenceAntiMalware.cs
index 71e30fe9469ab..8875b4d641bd2 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfilePreferenceAntiMalware.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfilePreferenceAntiMalware.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Newtonsoft.Json;
     using System.Linq;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfilePreferenceProperties.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfilePreferenceProperties.cs
similarity index 97%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfilePreferenceProperties.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfilePreferenceProperties.cs
index af1f2d7bb7f21..86314938bf140 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfilePreferenceProperties.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfilePreferenceProperties.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Newtonsoft.Json;
     using System.Linq;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfilePreferenceVmBackup.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfilePreferenceVmBackup.cs
similarity index 98%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfilePreferenceVmBackup.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfilePreferenceVmBackup.cs
index 921c6dcb14d33..e27200a8c493a 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ConfigurationProfilePreferenceVmBackup.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ConfigurationProfilePreferenceVmBackup.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Newtonsoft.Json;
     using System.Linq;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/EnableRealTimeProtection.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/EnableRealTimeProtection.cs
similarity index 91%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/EnableRealTimeProtection.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/EnableRealTimeProtection.cs
index 880e8f85892ce..8e6a85bd31861 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/EnableRealTimeProtection.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/EnableRealTimeProtection.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
 
     /// <summary>
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ErrorResponse.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ErrorResponse.cs
similarity index 96%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ErrorResponse.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ErrorResponse.cs
index 34ca49919df45..ca24e2ca8ae26 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ErrorResponse.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ErrorResponse.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Newtonsoft.Json;
     using System.Linq;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ErrorResponseBody.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ErrorResponseBody.cs
similarity index 97%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ErrorResponseBody.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ErrorResponseBody.cs
index ad0a894cdaca7..3eee8cac51557 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ErrorResponseBody.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ErrorResponseBody.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Newtonsoft.Json;
     using System.Linq;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ErrorResponseException.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ErrorResponseException.cs
similarity index 97%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ErrorResponseException.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ErrorResponseException.cs
index c628662bd8f17..b49e95bfe24e9 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ErrorResponseException.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ErrorResponseException.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Microsoft.Rest;
 
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/Operation.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/Operation.cs
similarity index 98%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/Operation.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/Operation.cs
index ee3f927f2e59d..83e105f29360d 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/Operation.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/Operation.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Serialization;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/OperationDisplay.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/OperationDisplay.cs
similarity index 97%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/OperationDisplay.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/OperationDisplay.cs
index 76bafe99c9f4c..de8fbc510b94d 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/OperationDisplay.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/OperationDisplay.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Newtonsoft.Json;
     using System.Linq;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/Page.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/Page.cs
similarity index 96%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/Page.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/Page.cs
index 0ac8e5b45f4bf..1510a14106328 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/Page.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/Page.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ProvisioningStatus.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ProvisioningStatus.cs
similarity index 92%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ProvisioningStatus.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ProvisioningStatus.cs
index 44c289ea2b25c..39e799c0d1c6a 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ProvisioningStatus.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ProvisioningStatus.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
 
     /// <summary>
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ProxyResource.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ProxyResource.cs
similarity index 96%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ProxyResource.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ProxyResource.cs
index 5db1da47feede..93b7529e80ca7 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ProxyResource.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ProxyResource.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using System.Linq;
 
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/Resource.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/Resource.cs
similarity index 97%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/Resource.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/Resource.cs
index 39feab1dd40a9..35f3ef7e94dbc 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/Resource.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/Resource.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ResourceIdentityType.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ResourceIdentityType.cs
similarity index 97%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ResourceIdentityType.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ResourceIdentityType.cs
index 2637187a6478e..3d1ae4491aa1c 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ResourceIdentityType.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ResourceIdentityType.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Newtonsoft.Json;
     using Newtonsoft.Json.Converters;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/RunScheduledScan.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/RunScheduledScan.cs
similarity index 91%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/RunScheduledScan.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/RunScheduledScan.cs
index 0ab23b6179acf..08e058eccbd5e 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/RunScheduledScan.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/RunScheduledScan.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
 
     /// <summary>
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ScanType.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ScanType.cs
similarity index 91%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ScanType.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ScanType.cs
index ba25bc1e25b7e..402ef1096e3fc 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/ScanType.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/ScanType.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
 
     /// <summary>
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/TrackedResource.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/TrackedResource.cs
similarity index 97%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/TrackedResource.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/TrackedResource.cs
index 9be20b9448d98..2a109511571d2 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/TrackedResource.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/TrackedResource.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
     using Newtonsoft.Json;
     using System.Collections;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/UpdateStatus.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/UpdateStatus.cs
similarity index 92%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/UpdateStatus.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/UpdateStatus.cs
index 8c1f511cb6c2b..a57d4d77bf466 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Models/UpdateStatus.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Models/UpdateStatus.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage.Models
+namespace Microsoft.Azure.Management.Automanage.Models
 {
 
     /// <summary>
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Operations.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Operations.cs
similarity index 99%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Operations.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Operations.cs
index a0a6968470c7e..3e2db2f56cc30 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/Operations.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/Operations.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage
+namespace Microsoft.Azure.Management.Automanage
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/OperationsExtensions.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/OperationsExtensions.cs
similarity index 97%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/OperationsExtensions.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/OperationsExtensions.cs
index 34681f45f35b9..cef373bc540a1 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Generated/OperationsExtensions.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Generated/OperationsExtensions.cs
@@ -8,7 +8,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace Microsoft.Azure.Management.AutoManage
+namespace Microsoft.Azure.Management.Automanage
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Microsoft.Azure.Management.AutoManage.csproj b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Microsoft.Azure.Management.Automanage.csproj
similarity index 72%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Microsoft.Azure.Management.AutoManage.csproj
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Microsoft.Azure.Management.Automanage.csproj
index 4358e59d07518..650fbf979303a 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Microsoft.Azure.Management.AutoManage.csproj
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Microsoft.Azure.Management.Automanage.csproj
@@ -7,12 +7,12 @@
     <TargetFrameworks>$(SdkTargetFx)</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
-    <PackageId>Microsoft.Azure.Management.AutoManage</PackageId>
-    <Description>Microsoft Azure AutoManage Class Library</Description>
+    <PackageId>Microsoft.Azure.Management.Automanage</PackageId>
+    <Description>Microsoft Azure Automanage Class Library</Description>
     <VersionPrefix>0.1.0-preview</VersionPrefix>
-    <AssemblyName>Microsoft.Azure.Management.AutoManage</AssemblyName>
-    <RootNameSpace>Microsoft.Azure.Management.AutoManage</RootNameSpace>
-    <PackageTags>AutoManagement;AutoManaged;Automanagement Configuration Profile; Automanagement Account</PackageTags>
+    <AssemblyName>Microsoft.Azure.Management.Automanage</AssemblyName>
+    <RootNameSpace>Microsoft.Azure.Management.Automanage</RootNameSpace>
+    <PackageTags>Automanagement;Automanaged;Automanagement Configuration Profile; Automanagement Account</PackageTags>
     <PackageReleaseNotes>For detailed release notes, see: https://github.com/Azure/azure-sdk-for-net/blob/psSdkJson6/src/SDKs/Automanage/Management.Automanage/changelog.md</PackageReleaseNotes>
   </PropertyGroup>
 
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Properties/AssemblyInfo.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/Properties/AssemblyInfo.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/Properties/AssemblyInfo.cs
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/src/generate.ps1 b/sdk/automanage/Microsoft.Azure.Management.Automanage/src/generate.ps1
similarity index 100%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/src/generate.ps1
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/src/generate.ps1
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/Helpers/RecordedDelegatingHandler.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/Helpers/RecordedDelegatingHandler.cs
similarity index 97%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/Helpers/RecordedDelegatingHandler.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/Helpers/RecordedDelegatingHandler.cs
index 97384fdf92e63..2e94a520f570b 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/Helpers/RecordedDelegatingHandler.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/Helpers/RecordedDelegatingHandler.cs
@@ -8,9 +8,9 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
-using Microsoft.Azure.Management.AutoManage.Models;
+using Microsoft.Azure.Management.Automanage.Models;
 
-namespace AutoManage.Tests.Helpers
+namespace Automanage.Tests.Helpers
 {
     public class RecordedDelegatingHandler : DelegatingHandler
     {
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/Microsoft.Azure.Management.AutoManage.Tests.csproj b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/Microsoft.Azure.Management.Automanage.Tests.csproj
similarity index 70%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/Microsoft.Azure.Management.AutoManage.Tests.csproj
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/Microsoft.Azure.Management.Automanage.Tests.csproj
index fdde0e28b5ec5..9174551f04b06 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/Microsoft.Azure.Management.AutoManage.Tests.csproj
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/Microsoft.Azure.Management.Automanage.Tests.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(RepoEngPath)/mgmt/AzSdk.test.reference.props" />
   <PropertyGroup>
-    <PackageId>AutoManage.Tests</PackageId>
-    <Description>AutoManage.Tests Class Library</Description>
-    <AssemblyName>AutoManage.Tests</AssemblyName>
+    <PackageId>Automanage.Tests</PackageId>
+    <Description>Automanage.Tests Class Library</Description>
+    <AssemblyName>Automanage.Tests</AssemblyName>
     <VersionPrefix>0.1.0-preview</VersionPrefix>
-    <RootNamespace>Microsoft.Azure.Management.AutoManage.Tests</RootNamespace>
+    <RootNamespace>Microsoft.Azure.Management.Automanage.Tests</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
@@ -14,6 +14,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.6.0-preview" />    
-    <ProjectReference Include="..\src\Microsoft.Azure.Management.AutoManage.csproj" />
+    <ProjectReference Include="..\src\Microsoft.Azure.Management.Automanage.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/ScenarioTests/AccountsTests.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/ScenarioTests/AccountsTests.cs
similarity index 90%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/ScenarioTests/AccountsTests.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/ScenarioTests/AccountsTests.cs
index 28f8bb2f034e1..975664bdc57d9 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/ScenarioTests/AccountsTests.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/ScenarioTests/AccountsTests.cs
@@ -1,15 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-namespace AutoManage.Tests.ScenarioTests
+namespace Automanage.Tests.ScenarioTests
 {
     using System;
     using System.Collections.Generic;
     using System.Net;
     using System.Threading.Tasks;
-    using AutoManage.Tests.Helpers;
-    using Microsoft.Azure.Management.AutoManage;
-    using Microsoft.Azure.Management.AutoManage.Models;
+    using Automanage.Tests.Helpers;
+    using Microsoft.Azure.Management.Automanage;
+    using Microsoft.Azure.Management.Automanage.Models;
     using Microsoft.Rest.Azure;
     using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
     using Xunit;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/ScenarioTests/ConfigurationProfilePreferencesTests.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/ScenarioTests/ConfigurationProfilePreferencesTests.cs
similarity index 94%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/ScenarioTests/ConfigurationProfilePreferencesTests.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/ScenarioTests/ConfigurationProfilePreferencesTests.cs
index 1b23f99d973f7..2b8598285d921 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/ScenarioTests/ConfigurationProfilePreferencesTests.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/ScenarioTests/ConfigurationProfilePreferencesTests.cs
@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-namespace AutoManage.Tests.ScenarioTests
+namespace Automanage.Tests.ScenarioTests
 {
     using System.Net;
     using System.Threading;
     using System.Threading.Tasks;
-    using AutoManage.Tests.Helpers;
-    using Microsoft.Azure.Management.AutoManage;
-    using Microsoft.Azure.Management.AutoManage.Models;
+    using Automanage.Tests.Helpers;
+    using Microsoft.Azure.Management.Automanage;
+    using Microsoft.Azure.Management.Automanage.Models;
     using Microsoft.Rest.ClientRuntime.Azure.TestFramework;    
     using Xunit;
     using Xunit.Abstractions;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/ScenarioTests/ConfigurationProfilesAssignmentsTests.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/ScenarioTests/ConfigurationProfilesAssignmentsTests.cs
similarity index 95%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/ScenarioTests/ConfigurationProfilesAssignmentsTests.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/ScenarioTests/ConfigurationProfilesAssignmentsTests.cs
index 8027851212c93..44b25bd35bd87 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/ScenarioTests/ConfigurationProfilesAssignmentsTests.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/ScenarioTests/ConfigurationProfilesAssignmentsTests.cs
@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-namespace AutoManage.Tests.ScenarioTests
+namespace Automanage.Tests.ScenarioTests
 {
     using System.Net;
     using System.Threading;
     using System.Threading.Tasks;
-    using AutoManage.Tests.Helpers;
-    using Microsoft.Azure.Management.AutoManage;
-    using Microsoft.Azure.Management.AutoManage.Models;
+    using Automanage.Tests.Helpers;
+    using Microsoft.Azure.Management.Automanage;
+    using Microsoft.Azure.Management.Automanage.Models;
     using Microsoft.Rest.ClientRuntime.Azure.TestFramework;    
     using Xunit;
     using Xunit.Abstractions;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/ScenarioTests/OperationsTests.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/ScenarioTests/OperationsTests.cs
similarity index 92%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/ScenarioTests/OperationsTests.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/ScenarioTests/OperationsTests.cs
index f080128ec36d7..5a8ca6e5b049b 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/ScenarioTests/OperationsTests.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/ScenarioTests/OperationsTests.cs
@@ -1,15 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
-namespace AutoManage.Tests.ScenarioTests
+namespace Automanage.Tests.ScenarioTests
 {
     using System;
     using System.Collections.Generic;
     using System.Net;
     using System.Threading.Tasks;
-    using AutoManage.Tests.Helpers;
-    using Microsoft.Azure.Management.AutoManage;
-    using Microsoft.Azure.Management.AutoManage.Models;
+    using Automanage.Tests.Helpers;
+    using Microsoft.Azure.Management.Automanage;
+    using Microsoft.Azure.Management.Automanage.Models;
     using Microsoft.Rest.Azure;
     using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
     using Xunit;
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/ScenarioTests/TestBase.cs b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/ScenarioTests/TestBase.cs
similarity index 96%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/ScenarioTests/TestBase.cs
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/ScenarioTests/TestBase.cs
index 9e3395de06be6..1418e1f0faf17 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/ScenarioTests/TestBase.cs
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/ScenarioTests/TestBase.cs
@@ -3,17 +3,17 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.Azure.Management.AutoManage;
-using Microsoft.Azure.Management.AutoManage.Models;
+using Microsoft.Azure.Management.Automanage;
+using Microsoft.Azure.Management.Automanage.Models;
 using Xunit;
 using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
 using Microsoft.Azure.Test.HttpRecorder;
 using System.IO;
 using Microsoft.Azure.Management.ResourceManager;
 using Microsoft.Azure.Management.ResourceManager.Models;
-using AutoManage.Tests.Helpers;
+using Automanage.Tests.Helpers;
 
-namespace AutoManage.Tests.ScenarioTests
+namespace Automanage.Tests.ScenarioTests
 {
     public class TestBase
     {
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/AccountsTests/AccountsOperationsGetsExpectedAccount.json b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/AccountsTests/AccountsOperationsGetsExpectedAccount.json
similarity index 100%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/AccountsTests/AccountsOperationsGetsExpectedAccount.json
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/AccountsTests/AccountsOperationsGetsExpectedAccount.json
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/AccountsTests/AccountsOperationsListsReturnsAllAccounts.json b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/AccountsTests/AccountsOperationsListsReturnsAllAccounts.json
similarity index 100%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/AccountsTests/AccountsOperationsListsReturnsAllAccounts.json
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/AccountsTests/AccountsOperationsListsReturnsAllAccounts.json
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/ConfigurationProfilePreferencesTests/ConfigurationProfilesPreferencesCreatesPreferences.json b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/ConfigurationProfilePreferencesTests/ConfigurationProfilesPreferencesCreatesPreferences.json
similarity index 100%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/ConfigurationProfilePreferencesTests/ConfigurationProfilesPreferencesCreatesPreferences.json
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/ConfigurationProfilePreferencesTests/ConfigurationProfilesPreferencesCreatesPreferences.json
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/ConfigurationProfilePreferencesTests/ConfigurationProfilesPreferencesGetReturnsExpectedPreferences.json b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/ConfigurationProfilePreferencesTests/ConfigurationProfilesPreferencesGetReturnsExpectedPreferences.json
similarity index 100%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/ConfigurationProfilePreferencesTests/ConfigurationProfilesPreferencesGetReturnsExpectedPreferences.json
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/ConfigurationProfilePreferencesTests/ConfigurationProfilesPreferencesGetReturnsExpectedPreferences.json
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/ConfigurationProfilePreferencesTests/ConfigurationProfilesPreferencesListsAnyPreferences.json b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/ConfigurationProfilePreferencesTests/ConfigurationProfilesPreferencesListsAnyPreferences.json
similarity index 100%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/ConfigurationProfilePreferencesTests/ConfigurationProfilesPreferencesListsAnyPreferences.json
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/ConfigurationProfilePreferencesTests/ConfigurationProfilesPreferencesListsAnyPreferences.json
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/ConfigurationProfilePreferencesTests/ConfigurationProfilesPreferencesListsPreferences.json b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/ConfigurationProfilePreferencesTests/ConfigurationProfilesPreferencesListsPreferences.json
similarity index 100%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/ConfigurationProfilePreferencesTests/ConfigurationProfilesPreferencesListsPreferences.json
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/ConfigurationProfilePreferencesTests/ConfigurationProfilesPreferencesListsPreferences.json
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/ConfigurationProfilesAssignmentsTests/ConfigurationProfilesAssignmentsCreatesProfile.json b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/ConfigurationProfilesAssignmentsTests/ConfigurationProfilesAssignmentsCreatesProfile.json
similarity index 100%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/ConfigurationProfilesAssignmentsTests/ConfigurationProfilesAssignmentsCreatesProfile.json
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/ConfigurationProfilesAssignmentsTests/ConfigurationProfilesAssignmentsCreatesProfile.json
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/ConfigurationProfilesAssignmentsTests/ConfigurationProfilesAssignmentsGetsExpectedProfile.json b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/ConfigurationProfilesAssignmentsTests/ConfigurationProfilesAssignmentsGetsExpectedProfile.json
similarity index 100%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/ConfigurationProfilesAssignmentsTests/ConfigurationProfilesAssignmentsGetsExpectedProfile.json
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/ConfigurationProfilesAssignmentsTests/ConfigurationProfilesAssignmentsGetsExpectedProfile.json
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/ConfigurationProfilesAssignmentsTests/ConfigurationProfilesListAssignmentsGetsExpectedProfile.json b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/ConfigurationProfilesAssignmentsTests/ConfigurationProfilesListAssignmentsGetsExpectedProfile.json
similarity index 100%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/ConfigurationProfilesAssignmentsTests/ConfigurationProfilesListAssignmentsGetsExpectedProfile.json
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/ConfigurationProfilesAssignmentsTests/ConfigurationProfilesListAssignmentsGetsExpectedProfile.json
diff --git a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/OperationsTests/ListOperationsGetsAllValidOperations.json b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/OperationsTests/ListOperationsGetsAllValidOperations.json
similarity index 98%
rename from sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/OperationsTests/ListOperationsGetsAllValidOperations.json
rename to sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/OperationsTests/ListOperationsGetsAllValidOperations.json
index 7779c2009a570..b34aaf66e735a 100644
--- a/sdk/automanage/Microsoft.Azure.Management.AutoManage/tests/SessionRecords/OperationsTests/ListOperationsGetsAllValidOperations.json
+++ b/sdk/automanage/Microsoft.Azure.Management.Automanage/tests/SessionRecords/OperationsTests/ListOperationsGetsAllValidOperations.json
@@ -16,7 +16,7 @@
           "FxVersion/4.6.28207.03",
           "OSName/Windows",
           "OSVersion/Microsoft.Windows.10.0.18363.",
-          "Microsoft.Azure.Management.AutoManage.AutomanageClient/0.6.0"
+          "Microsoft.Azure.Management.Automanage.AutomanageClient/0.6.0"
         ]
       },
       "ResponseHeaders": {