diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Namespaces.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Namespaces.java
index aeef085a8bf1..6bb52a7e2368 100644
--- a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Namespaces.java
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/Namespaces.java
@@ -15,11 +15,11 @@
 import rx.Observable;
 import com.microsoft.azure.arm.resources.collection.SupportsListingByResourceGroup;
 import com.microsoft.azure.arm.collection.SupportsListing;
+import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.NetworkRuleSetInner;
 import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.NamespacesInner;
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.eventhub.v2017_04_01.NamespaceAuthorizationRule;
 import rx.Completable;
-import com.microsoft.azure.management.eventhub.v2017_04_01.implementation.NetworkRuleSetInner;
 
 /**
  * Type representing Namespaces.
@@ -42,6 +42,27 @@ public interface Namespaces extends SupportsCreating<EHNamespace.DefinitionStage
      */
     Observable<MessagingPlan> getMessagingPlanAsync(String resourceGroupName, String namespaceName);
 
+    /**
+     * Create or update NetworkRuleSet for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @param parameters The Namespace IpFilterRule.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkRuleSet> createOrUpdateNetworkRuleSetAsync(String resourceGroupName, String namespaceName, NetworkRuleSetInner parameters);
+
+    /**
+     * Gets NetworkRuleSet for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkRuleSet> getNetworkRuleSetAsync(String resourceGroupName, String namespaceName);
+
     /**
      * Check the give Namespace name availability.
      *
@@ -106,25 +127,4 @@ public interface Namespaces extends SupportsCreating<EHNamespace.DefinitionStage
      */
     Observable<AccessKeys> regenerateKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, RegenerateAccessKeyParameters parameters);
 
-    /**
-     * Create or update NetworkRuleSet for a Namespace.
-     *
-     * @param resourceGroupName Name of the resource group within the azure subscription.
-     * @param namespaceName The Namespace name
-     * @param parameters The Namespace IpFilterRule.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable for the request
-     */
-    Observable<NetworkRuleSet> createOrUpdateNetworkRuleSetAsync(String resourceGroupName, String namespaceName, NetworkRuleSetInner parameters);
-
-    /**
-     * Gets NetworkRuleSet for a Namespace.
-     *
-     * @param resourceGroupName Name of the resource group within the azure subscription.
-     * @param namespaceName The Namespace name
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable for the request
-     */
-    Observable<NetworkRuleSet> getNetworkRuleSetAsync(String resourceGroupName, String namespaceName);
-
 }
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespacesImpl.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespacesImpl.java
index 163f50f55c95..b5a69fe16094 100644
--- a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespacesImpl.java
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespacesImpl.java
@@ -23,11 +23,11 @@
 import com.microsoft.azure.PagedList;
 import com.microsoft.azure.Page;
 import com.microsoft.azure.management.eventhub.v2017_04_01.MessagingPlan;
+import com.microsoft.azure.management.eventhub.v2017_04_01.NetworkRuleSet;
 import com.microsoft.azure.management.eventhub.v2017_04_01.CheckNameAvailabilityResult;
 import com.microsoft.azure.management.eventhub.v2017_04_01.NamespaceAuthorizationRule;
 import com.microsoft.azure.management.eventhub.v2017_04_01.AccessKeys;
 import com.microsoft.azure.management.eventhub.v2017_04_01.RegenerateAccessKeyParameters;
-import com.microsoft.azure.management.eventhub.v2017_04_01.NetworkRuleSet;
 
 class NamespacesImpl extends GroupableResourcesCoreImpl<EHNamespace, EHNamespaceImpl, EHNamespaceInner, NamespacesInner, EventHubManager>  implements Namespaces {
     protected NamespacesImpl(EventHubManager manager) {
@@ -143,6 +143,30 @@ public MessagingPlan call(MessagingPlanInner inner) {
         });
     }
 
+    @Override
+    public Observable<NetworkRuleSet> createOrUpdateNetworkRuleSetAsync(String resourceGroupName, String namespaceName, NetworkRuleSetInner parameters) {
+        NamespacesInner client = this.inner();
+        return client.createOrUpdateNetworkRuleSetAsync(resourceGroupName, namespaceName, parameters)
+        .map(new Func1<NetworkRuleSetInner, NetworkRuleSet>() {
+            @Override
+            public NetworkRuleSet call(NetworkRuleSetInner inner) {
+                return new NetworkRuleSetImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<NetworkRuleSet> getNetworkRuleSetAsync(String resourceGroupName, String namespaceName) {
+        NamespacesInner client = this.inner();
+        return client.getNetworkRuleSetAsync(resourceGroupName, namespaceName)
+        .map(new Func1<NetworkRuleSetInner, NetworkRuleSet>() {
+            @Override
+            public NetworkRuleSet call(NetworkRuleSetInner inner) {
+                return new NetworkRuleSetImpl(inner, manager());
+            }
+        });
+    }
+
     @Override
     public Observable<CheckNameAvailabilityResult> checkNameAvailabilityAsync(String name) {
         NamespacesInner client = this.inner();
@@ -246,28 +270,4 @@ public AccessKeys call(AccessKeysInner inner) {
         });
     }
 
-    @Override
-    public Observable<NetworkRuleSet> createOrUpdateNetworkRuleSetAsync(String resourceGroupName, String namespaceName, NetworkRuleSetInner parameters) {
-        NamespacesInner client = this.inner();
-        return client.createOrUpdateNetworkRuleSetAsync(resourceGroupName, namespaceName, parameters)
-        .map(new Func1<NetworkRuleSetInner, NetworkRuleSet>() {
-            @Override
-            public NetworkRuleSet call(NetworkRuleSetInner inner) {
-                return new NetworkRuleSetImpl(inner, manager());
-            }
-        });
-    }
-
-    @Override
-    public Observable<NetworkRuleSet> getNetworkRuleSetAsync(String resourceGroupName, String namespaceName) {
-        NamespacesInner client = this.inner();
-        return client.getNetworkRuleSetAsync(resourceGroupName, namespaceName)
-        .map(new Func1<NetworkRuleSetInner, NetworkRuleSet>() {
-            @Override
-            public NetworkRuleSet call(NetworkRuleSetInner inner) {
-                return new NetworkRuleSetImpl(inner, manager());
-            }
-        });
-    }
-
 }
diff --git a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespacesInner.java b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespacesInner.java
index 76fe17d37277..964111f3b45f 100644
--- a/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespacesInner.java
+++ b/eventhub/resource-manager/v2017_04_01/src/main/java/com/microsoft/azure/management/eventhub/v2017_04_01/implementation/NamespacesInner.java
@@ -134,11 +134,11 @@ interface NamespacesService {
         Observable<Response<ResponseBody>> regenerateKeys(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("authorizationRuleName") String authorizationRuleName, @Path("subscriptionId") String subscriptionId, @Body RegenerateAccessKeyParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2017_04_01.Namespaces createOrUpdateNetworkRuleSet" })
-        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/networkRuleSets/default")
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/networkRuleSet/default")
         Observable<Response<ResponseBody>> createOrUpdateNetworkRuleSet(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Body NetworkRuleSetInner parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2017_04_01.Namespaces getNetworkRuleSet" })
-        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/networkRuleSets/default")
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/networkRuleSet/default")
         Observable<Response<ResponseBody>> getNetworkRuleSet(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhub.v2017_04_01.Namespaces listNext" })