diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancer.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancer.java
index 888fa8c24ab5b..3d8b8766e8600 100644
--- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancer.java
+++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancer.java
@@ -23,7 +23,7 @@
 /**
  * Entry point for load balancer management API in Azure.
  */
-@Fluent()
+@Fluent
 public interface LoadBalancer extends
         GroupableResource,
         Refreshable<LoadBalancer>,
diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasBackendPort.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasBackendPort.java
index 3e70ff673353c..9f76fcc3783d1 100644
--- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasBackendPort.java
+++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasBackendPort.java
@@ -5,13 +5,12 @@
  */
 package com.microsoft.azure.management.network.model;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
-import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion;
+import com.microsoft.azure.management.apigeneration.Fluent;
 
 /**
  * An interface representing a model's ability to reference a load balancer backend port.
  */
-@LangDefinition()
+@Fluent
 public interface HasBackendPort  {
     /**
      * @return the backend port number the network traffic is sent to
@@ -21,11 +20,6 @@ public interface HasBackendPort  {
     /**
      * Grouping of definition stages involving specifying a backend port.
      */
-    @LangDefinition(
-                ContainerName = "Definition",
-                ContainerFileName = "IDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface DefinitionStages {
         /**
          * The stage of a definition allowing to specify the backend port.
@@ -46,11 +40,6 @@ interface WithBackendPort<ReturnT> {
     /**
      * Grouping of update stages involving modifying a backend port.
      */
-    @LangDefinition(
-                ContainerName = "Update",
-                ContainerFileName = "IUpdate",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateStages {
         /**
          * The stage of an update allowing to modify the backend port.
@@ -69,11 +58,6 @@ interface WithBackendPort<ReturnT> {
     /**
      * Grouping of definition stages applicable as part of a load balancer update, involving modifying the backend port.
      */
-    @LangDefinition(
-                ContainerName = "UpdateDefinition",
-                ContainerFileName = "IUpdateDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateDefinitionStages {
         /**
          * The stage of a definition allowing to specify the backend port.
diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasFloatingIp.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasFloatingIp.java
index 7e3e40d57cfe6..8b2615408ad53 100644
--- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasFloatingIp.java
+++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasFloatingIp.java
@@ -5,13 +5,9 @@
  */
 package com.microsoft.azure.management.network.model;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
-import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion;
-
 /**
  * An interface representing a model's ability to have floating IP support.
  */
-@LangDefinition()
 public interface HasFloatingIp {
     /**
      * @return the state of the floating IP enablement
@@ -21,11 +17,6 @@ public interface HasFloatingIp {
     /**
      * Grouping of definition stages involving enabling or disabling floating IP support.
      */
-    @LangDefinition(
-                ContainerName = "Definition",
-                ContainerFileName = "IDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface DefinitionStages {
         /**
          * The stage of a definition allowing to control floating IP support.
@@ -56,11 +47,6 @@ interface WithFloatingIp<ReturnT> {
     /**
      * Grouping of update stages involving enabling or disabling floating IP support.
      */
-    @LangDefinition(
-                ContainerName = "Update",
-                ContainerFileName = "IUpdate",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateStages {
         /**
          * The stage of a definition allowing to control floating IP support.
@@ -92,11 +78,6 @@ interface WithFloatingIp<ReturnT> {
     /**
      * Grouping of definition stages applicable as part of a load balancer update, involving enabling or disabling floating IP support.
      */
-    @LangDefinition(
-                ContainerName = "UpdateDefinition",
-                ContainerFileName = "IUpdateDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateDefinitionStages {
         /**
          * The stage of a definition allowing to control floating IP support.
diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasFrontend.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasFrontend.java
index 4cbe3a0b6a2af..4c613da875576 100644
--- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasFrontend.java
+++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasFrontend.java
@@ -5,14 +5,13 @@
  */
 package com.microsoft.azure.management.network.model;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
-import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.network.Frontend;
 
 /**
  * An interface representing a model's ability to references a load balancer frontend.
  */
-@LangDefinition()
+@Fluent
 public interface HasFrontend  {
     /**
      * @return the associated frontend
@@ -22,11 +21,6 @@ public interface HasFrontend  {
     /**
      * Grouping of definition stages involving specifying the frontend.
      */
-    @LangDefinition(
-                ContainerName = "Definition",
-                ContainerFileName = "IDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface DefinitionStages {
         /**
          * The stage of a definition allowing to specify a load balancer frontend.
@@ -45,11 +39,6 @@ interface WithFrontend<ReturnT> {
     /**
      * Grouping of update stages involving specifying the frontend.
      */
-    @LangDefinition(
-                ContainerName = "Update",
-                ContainerFileName = "IUpdate",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateStages {
         /**
          * The stage of an update allowing to specify a frontend.
@@ -68,11 +57,6 @@ interface WithFrontend<ReturnT> {
     /**
      * Grouping of definition stages applicable as part of a load balancer update.
      */
-    @LangDefinition(
-                ContainerName = "UpdateDefinition",
-                ContainerFileName = "IUpdateDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateDefinitionStages {
         /**
          * The stage of a definition allowing to specify a frontend from this load balancer to associate.
diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasLoadBalancingRules.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasLoadBalancingRules.java
index 7f85020203df4..cb0d102ccb102 100644
--- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasLoadBalancingRules.java
+++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasLoadBalancingRules.java
@@ -7,13 +7,13 @@
 
 import java.util.Map;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.network.LoadBalancingRule;
 
 /**
  * An interface representing a model's ability to reference load balancing rules.
  */
-@LangDefinition()
+@Fluent()
 public interface HasLoadBalancingRules  {
     /**
      * @return the associated load balancing rules from this load balancer, indexed by their names
diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasNetworkInterfaces.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasNetworkInterfaces.java
index 05981f1ce71e1..3ee434124db13 100644
--- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasNetworkInterfaces.java
+++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasNetworkInterfaces.java
@@ -5,7 +5,7 @@
  */
 package com.microsoft.azure.management.network.model;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.network.NetworkInterface;
 
 import java.util.List;
@@ -13,7 +13,7 @@
 /**
  * Interface exposing a list of network interfaces.
  */
-@LangDefinition()
+@Fluent()
 public interface HasNetworkInterfaces {
     /**
      * Gets the primary network interface.
diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasPrivateIpAddress.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasPrivateIpAddress.java
index e8dd1972e277e..57745777a33f1 100644
--- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasPrivateIpAddress.java
+++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasPrivateIpAddress.java
@@ -5,14 +5,13 @@
  */
 package com.microsoft.azure.management.network.model;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
-import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.network.IPAllocationMethod;
 
 /**
  * An interface representing a model's ability to reference a private IP address.
  */
-@LangDefinition()
+@Fluent()
 public interface HasPrivateIpAddress  {
     /**
      * @return the private IP address associated with this resource
@@ -27,11 +26,6 @@ public interface HasPrivateIpAddress  {
     /**
      * Grouping of definition stages involving specifying the private IP address.
      */
-    @LangDefinition(
-                ContainerName = "Definition",
-                ContainerFileName = "IDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface DefinitionStages {
         /**
          * The stage of a definition allowing to specify the private IP address.
@@ -56,11 +50,6 @@ interface WithPrivateIpAddress<ReturnT> {
     /**
      * Grouping of update stages involving modifying the private IP address.
      */
-    @LangDefinition(
-                ContainerName = "Update",
-                ContainerFileName = "IUpdate",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateStages {
         /**
          * The stage of an update allowing to modify the private IP address.
@@ -85,11 +74,6 @@ interface WithPrivateIpAddress<ReturnT> {
     /**
      * Grouping of definition stages applicable as part of a parent resource update, involving specifying the private IP address.
      */
-    @LangDefinition(
-                ContainerName = "UpdateDefinition",
-                ContainerFileName = "IUpdateDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateDefinitionStages {
         /**
          * The stage of a definition allowing to specify the private IP address.
diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasProtocol.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasProtocol.java
index 6b8c19a8c277a..2339a97bb9a7c 100644
--- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasProtocol.java
+++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasProtocol.java
@@ -5,14 +5,13 @@
  */
 package com.microsoft.azure.management.network.model;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
-import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion;
+import com.microsoft.azure.management.apigeneration.Fluent;
 
 /**
  * An interface representing a model's ability to reference a transport protocol.
  * @param <ProtocolT> the protocol type of the value
  */
-@LangDefinition()
+@Fluent()
 public interface HasProtocol<ProtocolT>  {
     /**
      * @return the protocol
@@ -22,11 +21,6 @@ public interface HasProtocol<ProtocolT>  {
     /**
      * Grouping of definition stages involving specifying the protocol.
      */
-    @LangDefinition(
-                ContainerName = "Definition",
-                ContainerFileName = "IDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface DefinitionStages {
         /**
          * The stage of a definition allowing to specify the protocol.
@@ -46,11 +40,6 @@ interface WithProtocol<ReturnT, ProtocolT> {
     /**
      * Grouping of update stages involving modifying the protocol.
      */
-    @LangDefinition(
-                ContainerName = "Update",
-                ContainerFileName = "IUpdate",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateStages {
         /**
          * The stage of an update allowing to modify the transport protocol.
@@ -70,11 +59,6 @@ interface WithProtocol<ReturnT, ProtocolT> {
     /**
      * Grouping of definition stages applicable as part of a load balancer update, involving specifying the protocol.
      */
-    @LangDefinition(
-                ContainerName = "UpdateDefinition",
-                ContainerFileName = "IUpdateDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateDefinitionStages {
         /**
          * The stage of a definition allowing to specify the protocol.
diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasPublicIpAddress.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasPublicIpAddress.java
index 6addec9d24739..84fb634506477 100644
--- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasPublicIpAddress.java
+++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasPublicIpAddress.java
@@ -5,15 +5,14 @@
  */
 package com.microsoft.azure.management.network.model;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
-import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.network.PublicIpAddress;
 import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
 
 /**
  * An interface representing a model's ability to reference a public IP address.
  */
-@LangDefinition()
+@Fluent
 public interface HasPublicIpAddress  {
     /**
      * @return the resource ID of the associated public IP address
@@ -28,11 +27,6 @@ public interface HasPublicIpAddress  {
     /**
      * Grouping of definition stages involving specifying the public IP address.
      */
-    @LangDefinition(
-                ContainerName = "Definition",
-                ContainerFileName = "IDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface DefinitionStages {
         /**
          * The stage of the definition allowing to associate the resource with an existing public IP address.
@@ -106,11 +100,6 @@ interface WithPublicIpAddress<ReturnT> extends
     /**
      * Grouping of update stages involving modifying an existing reference to a public IP address.
      */
-    @LangDefinition(
-                ContainerName = "Update",
-                ContainerFileName = "IUpdate",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateStages {
         /**
          * The stage definition allowing to associate the resource with an existing public IP address.
@@ -191,11 +180,6 @@ interface WithPublicIpAddress<ReturnT> extends
     /**
      * Grouping of definition stages applicable as part of a parent resource update, involving specifying a public IP address.
      */
-    @LangDefinition(
-                ContainerName = "UpdateDefinition",
-                ContainerFileName = "IUpdateDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateDefinitionStages {
         /**
          * The stage of the definition allowing to associate the resource with an existing public IP address.
diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/Resource.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/Resource.java
index 8980e023f76d8..413b49c9ecf4c 100644
--- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/Resource.java
+++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/Resource.java
@@ -1,21 +1,21 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
+/*
+* Copyright (c) Microsoft Corporation. All rights reserved.
+* Licensed under the MIT License. See License.txt in the project root for
+* license information.
+*/
 
 package com.microsoft.azure.management.resources.fluentcore.arm.models;
 
-import com.microsoft.azure.management.apigeneration.Fluent;
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.resources.fluentcore.arm.Region;
 import com.microsoft.azure.management.resources.fluentcore.model.Indexable;
 
 import java.util.Map;
 
 /**
- * Base interfaces for fluent resources.
- */
-@Fluent
+* Base interfaces for fluent resources.
+*/
+@LangDefinition()
 public interface Resource extends Indexable {
     /**
      * @return the resource ID string
@@ -52,6 +52,7 @@ public interface Resource extends Indexable {
      *
      * @param <T> the type of the next stage resource definition
      */
+    @LangDefinition(ContainerName = "Resource.Definition", ContainerFileName = "IDefinition")
     interface DefinitionWithRegion<T> {
         /**
          * Specifies the region for the resource by name.
@@ -73,6 +74,7 @@ interface DefinitionWithRegion<T> {
      *
      * @param <T> the type of the next stage resource definition
      */
+    @LangDefinition(ContainerName = "Resource.Definition", ContainerFileName = "IDefinition")
     interface DefinitionWithTags<T> {
         /**
          * Specifies tags for the resource as a {@link Map}.
@@ -95,6 +97,7 @@ interface DefinitionWithTags<T> {
      *
      * @param <T> the type of the next stage resource update
      */
+    @LangDefinition(ContainerName = "Resource.Update", ContainerFileName = "IUpdate")
     interface UpdateWithTags<T> {
         /**
          * Specifies tags for the resource as a {@link Map}.
diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsBatchCreation.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsBatchCreation.java
index 1a343ee8360a0..5c15774c09c1d 100644
--- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsBatchCreation.java
+++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsBatchCreation.java
@@ -1,6 +1,8 @@
 package com.microsoft.azure.management.resources.fluentcore.collection;
 
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource;
 import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
 import com.microsoft.azure.management.resources.fluentcore.model.CreatedResources;
@@ -16,6 +18,7 @@
  * (Note: this interface is not intended to be implemented by user code)
  * @param <ResourceT> the top level Azure resource type
  */
+@LangDefinition(ContainerName = "CollectionActions", MethodConversionType = MethodConversion.OnlyMethod)
 public interface SupportsBatchCreation<ResourceT extends Resource> {
     /**
      * Executes the create requests on a collection (batch) of resources.
diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Attachable.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Attachable.java
index ef105f2a2a60a..150bb181f6b4c 100644
--- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Attachable.java
+++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Attachable.java
@@ -25,7 +25,7 @@ public interface Attachable<ParentT> {
      * The final stage of the child object definition, as which it can be attached to the parent.
      * @param <ParentT> the parent definition
      */
-    @LangDefinition(ContainerName = "~/Core.ChildResource.Definition", ContainerFileName = "IDefinition")
+    @LangDefinition(ContainerName = "~/ChildResource.Definition", ContainerFileName = "IDefinition")
     interface InDefinition<ParentT> {
         /**
          * Attaches the child definition to the parent resource definiton.
@@ -50,7 +50,7 @@ interface InDefinitionAlt<ParentT> {
      * The final stage of the child object definition, as which it can be attached to the parent.
      * @param <ParentT> the parent definition
      */
-    @LangDefinition(ContainerName = "~/Core.ChildResource.Update", ContainerFileName = "IUpdate")
+    @LangDefinition(ContainerName = "~/ChildResource.Update", ContainerFileName = "IUpdate")
     interface InUpdate<ParentT> {
         /**
          * Attaches the child definition to the parent resource update.