diff --git a/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/INamespacesOperations.cs b/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/INamespacesOperations.cs
index c34fd7fa4506..3a4905d975c3 100644
--- a/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/INamespacesOperations.cs
+++ b/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/INamespacesOperations.cs
@@ -334,7 +334,7 @@ public partial interface INamespacesOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<SharedAccessAuthorizationRuleListResult>> ListKeysWithHttpMessagesAsync(string resourceGroupName, string namespaceName, string authorizationRuleName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ResourceListKeys>> ListKeysWithHttpMessagesAsync(string resourceGroupName, string namespaceName, string authorizationRuleName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Regenerates the Primary/Secondary Keys to the Namespace
         /// Authorization Rule
diff --git a/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/Models/SharedAccessAuthorizationRuleListResult.cs b/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/Models/SharedAccessAuthorizationRuleListResult.cs
deleted file mode 100644
index 69254307e060..000000000000
--- a/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/Models/SharedAccessAuthorizationRuleListResult.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.NotificationHubs.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// The response of the List Namespace operation.
-    /// </summary>
-    public partial class SharedAccessAuthorizationRuleListResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// SharedAccessAuthorizationRuleListResult class.
-        /// </summary>
-        public SharedAccessAuthorizationRuleListResult()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// SharedAccessAuthorizationRuleListResult class.
-        /// </summary>
-        /// <param name="value">Result of the List AuthorizationRules
-        /// operation.</param>
-        /// <param name="nextLink">Link to the next set of results. Not empty
-        /// if Value contains incomplete list of AuthorizationRules</param>
-        public SharedAccessAuthorizationRuleListResult(IList<SharedAccessAuthorizationRuleResource> value = default(IList<SharedAccessAuthorizationRuleResource>), string nextLink = default(string))
-        {
-            Value = value;
-            NextLink = nextLink;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets result of the List AuthorizationRules operation.
-        /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public IList<SharedAccessAuthorizationRuleResource> Value { get; set; }
-
-        /// <summary>
-        /// Gets or sets link to the next set of results. Not empty if Value
-        /// contains incomplete list of AuthorizationRules
-        /// </summary>
-        [JsonProperty(PropertyName = "nextLink")]
-        public string NextLink { get; set; }
-
-    }
-}
diff --git a/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/NamespacesOperations.cs b/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/NamespacesOperations.cs
index 46c2d2eb6851..9fe91ffde5e2 100644
--- a/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/NamespacesOperations.cs
+++ b/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/NamespacesOperations.cs
@@ -2120,7 +2120,7 @@ internal NamespacesOperations(NotificationHubsManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<SharedAccessAuthorizationRuleListResult>> ListKeysWithHttpMessagesAsync(string resourceGroupName, string namespaceName, string authorizationRuleName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ResourceListKeys>> ListKeysWithHttpMessagesAsync(string resourceGroupName, string namespaceName, string authorizationRuleName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -2260,7 +2260,7 @@ internal NamespacesOperations(NotificationHubsManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<SharedAccessAuthorizationRuleListResult>();
+            var _result = new AzureOperationResponse<ResourceListKeys>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -2273,7 +2273,7 @@ internal NamespacesOperations(NotificationHubsManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SharedAccessAuthorizationRuleListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ResourceListKeys>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
diff --git a/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/NamespacesOperationsExtensions.cs b/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/NamespacesOperationsExtensions.cs
index b66a161247d5..bdfb9e011452 100644
--- a/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/NamespacesOperationsExtensions.cs
+++ b/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/NamespacesOperationsExtensions.cs
@@ -498,7 +498,7 @@ public static IPage<SharedAccessAuthorizationRuleResource> ListAuthorizationRule
             /// <param name='authorizationRuleName'>
             /// The connection string of the namespace for the specified authorizationRule.
             /// </param>
-            public static SharedAccessAuthorizationRuleListResult ListKeys(this INamespacesOperations operations, string resourceGroupName, string namespaceName, string authorizationRuleName)
+            public static ResourceListKeys ListKeys(this INamespacesOperations operations, string resourceGroupName, string namespaceName, string authorizationRuleName)
             {
                 return operations.ListKeysAsync(resourceGroupName, namespaceName, authorizationRuleName).GetAwaiter().GetResult();
             }
@@ -521,7 +521,7 @@ public static SharedAccessAuthorizationRuleListResult ListKeys(this INamespacesO
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<SharedAccessAuthorizationRuleListResult> ListKeysAsync(this INamespacesOperations operations, string resourceGroupName, string namespaceName, string authorizationRuleName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ResourceListKeys> ListKeysAsync(this INamespacesOperations operations, string resourceGroupName, string namespaceName, string authorizationRuleName, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.ListKeysWithHttpMessagesAsync(resourceGroupName, namespaceName, authorizationRuleName, null, cancellationToken).ConfigureAwait(false))
                 {
diff --git a/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/SdkInfo_NotificationHubsManagementClient.cs b/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/SdkInfo_NotificationHubsManagementClient.cs
index 596a87426e57..79c208ead5e9 100644
--- a/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/SdkInfo_NotificationHubsManagementClient.cs
+++ b/sdk/notificationhubs/Microsoft.Azure.Management.NotificationHubs/src/Generated/SdkInfo_NotificationHubsManagementClient.cs
@@ -25,16 +25,5 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_NotificationHub
               }.AsEnumerable();
           }
       }
-      // BEGIN: Code Generation Metadata Section
-      public static readonly String AutoRestVersion = "v2";
-      public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413";
-      public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/notificationhubs/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=D:\\Code\\azure-sdk-for-net\\sdk";
-      public static readonly String GithubForkName = "Azure";
-      public static readonly String GithubBranchName = "master";
-      public static readonly String GithubCommidId = "2916791fddcf1b69ebbc0741aa809350201041be";
-      public static readonly String CodeGenerationErrors = "";
-      public static readonly String GithubRepoName = "azure-rest-api-specs";
-      // END: Code Generation Metadata Section
   }
 }
-