diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ActiveDirectoryGroup.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ActiveDirectoryGroup.java
index cbff51255dea..b5b58eff8e36 100644
--- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ActiveDirectoryGroup.java
+++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ActiveDirectoryGroup.java
@@ -6,7 +6,7 @@
 
 package com.microsoft.azure.management.graphrbac;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.graphrbac.implementation.ADGroupInner;
 import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
@@ -14,7 +14,7 @@
 /**
  * An immutable client-side representation of an Azure AD group.
  */
-@LangDefinition
+@Fluent(ContainerName = "/Microsoft.Azure.Management.Fluent.Graph.RBAC")
 public interface ActiveDirectoryGroup extends
         Wrapper<ADGroupInner> {
     /**
@@ -49,7 +49,6 @@ public interface ActiveDirectoryGroup extends
     /**
      * Container interface for all the definitions that need to be implemented.
      */
-    @LangDefinition(ContainerName = "~/ActiveDirectoryGroup.Definition", ContainerFileName = "IDefinition")
     interface Definition extends
             DefinitionStages.Blank,
             DefinitionStages.WithDisplayName,
@@ -60,7 +59,6 @@ interface Definition extends
     /**
      * Grouping of all the group definition stages.
      */
-    @LangDefinition(ContainerName = "~/ActiveDirectoryGroup.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
     interface DefinitionStages {
         /**
          * The first stage of the group definition.
@@ -107,14 +105,12 @@ interface WithCreate extends
     /**
      * Grouping of all the group update stages.
      */
-    @LangDefinition(ContainerName = "~/ActiveDirectoryGroup.Update", ContainerFileName = "IUpdate", IsContainerOnly = true)
     interface UpdateStages {
     }
 
     /**
      * The template for a group update operation, containing all the settings that can be modified.
      */
-    @LangDefinition(ContainerName = "~/ActiveDirectoryGroup.Update", ContainerFileName = "IUpdate")
     interface Update {
     }
 }
diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Groups.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Groups.java
index b54155736e1f..059c06b0284d 100644
--- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Groups.java
+++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Groups.java
@@ -7,7 +7,7 @@
 package com.microsoft.azure.management.graphrbac;
 
 import com.microsoft.azure.CloudException;
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
@@ -18,7 +18,7 @@
 /**
  * Entry point to AD group management API.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent(ContainerName = "/Microsoft.Azure.Management.Fluent.Graph.RBAC")
 public interface Groups extends
         SupportsCreating<ActiveDirectoryGroup.DefinitionStages.Blank>,
         SupportsListing<ActiveDirectoryGroup>,
diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipal.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipal.java
index da38f832162a..69accaa88469 100644
--- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipal.java
+++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipal.java
@@ -6,7 +6,7 @@
 
 package com.microsoft.azure.management.graphrbac;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.graphrbac.implementation.ServicePrincipalInner;
 import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
@@ -16,7 +16,7 @@
 /**
  * An immutable client-side representation of an Azure AD service principal.
  */
-@LangDefinition
+@Fluent(ContainerName = "/Microsoft.Azure.Management.Fluent.Graph.RBAC")
 public interface ServicePrincipal extends
         Wrapper<ServicePrincipalInner> {
     /**
@@ -51,7 +51,6 @@ public interface ServicePrincipal extends
     /**
      * Container interface for all the definitions that need to be implemented.
      */
-    @LangDefinition(ContainerName = "~/ServicePrincipal.Definition", ContainerFileName = "IDefinition")
     interface Definition extends
             DefinitionStages.Blank,
             DefinitionStages.WithCreate {
@@ -60,7 +59,6 @@ interface Definition extends
     /**
      * Grouping of all the service principal definition stages.
      */
-    @LangDefinition(ContainerName = "~/ServicePrincipal.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
     interface DefinitionStages {
         /**
          * The first stage of the service principal definition.
@@ -95,14 +93,12 @@ interface WithCreate extends
     /**
      * Grouping of all the service principal update stages.
      */
-    @LangDefinition(ContainerName = "~/ServicePrincipal.Update", ContainerFileName = "IUpdate", IsContainerOnly = true)
     interface UpdateStages {
     }
 
     /**
      * The template for a service principal update operation, containing all the settings that can be modified.
      */
-    @LangDefinition(ContainerName = "~/ServicePrincipal.Update", ContainerFileName = "IUpdate")
     interface Update {
     }
 }
diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipals.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipals.java
index 2df78735ead5..b9708af224e5 100644
--- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipals.java
+++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipals.java
@@ -6,7 +6,7 @@
 
 package com.microsoft.azure.management.graphrbac;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
 import com.microsoft.rest.ServiceCall;
@@ -16,7 +16,7 @@
 /**
  * Entry point to service principal management API.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent(ContainerName = "/Microsoft.Azure.Management.Fluent.Graph.RBAC")
 public interface ServicePrincipals extends
         SupportsCreating<ServicePrincipal.DefinitionStages.Blank>,
         SupportsListing<ServicePrincipal> {
diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/User.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/User.java
index 5eab2a4d8563..933dd9371e59 100644
--- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/User.java
+++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/User.java
@@ -6,7 +6,7 @@
 
 package com.microsoft.azure.management.graphrbac;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.graphrbac.implementation.UserInner;
 import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
@@ -14,7 +14,7 @@
 /**
  * An immutable client-side representation of an Azure AD user.
  */
-@LangDefinition
+@Fluent(ContainerName = "/Microsoft.Azure.Management.Fluent.Graph.RBAC")
 public interface User extends
         Wrapper<UserInner> {
 
@@ -60,7 +60,6 @@ public interface User extends
     /**
      * Container interface for all the definitions that need to be implemented.
      */
-    @LangDefinition(ContainerName = "~/User.Definition", ContainerFileName = "IDefinition")
     interface Definition extends
             DefinitionStages.Blank,
             DefinitionStages.WithDisplayName,
@@ -72,7 +71,6 @@ interface Definition extends
     /**
      * Grouping of all the user definition stages.
      */
-    @LangDefinition(ContainerName = "~/User.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
     interface DefinitionStages {
         /**
          * The first stage of the user definition.
@@ -155,14 +153,12 @@ interface WithCreate extends
     /**
      * Grouping of all the user update stages.
      */
-    @LangDefinition(ContainerName = "~/User.Update", ContainerFileName = "IUpdate", IsContainerOnly = true)
     interface UpdateStages {
     }
 
     /**
      * The template for a user update operation, containing all the settings that can be modified.
      */
-    @LangDefinition(ContainerName = "~/User.Update", ContainerFileName = "IUpdate")
     interface Update {
     }
 }
diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Users.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Users.java
index 32399ef5ecf4..9a982426ebe0 100644
--- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Users.java
+++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Users.java
@@ -6,7 +6,7 @@
 
 package com.microsoft.azure.management.graphrbac;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
 import com.microsoft.rest.ServiceCall;
@@ -16,7 +16,7 @@
 /**
  * Entry point to AD user management API.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent(ContainerName = "/Microsoft.Azure.Management.Fluent.Graph.RBAC")
 public interface Users extends
         SupportsCreating<User.DefinitionStages.Blank>,
         SupportsListing<User> {
diff --git a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/AccessPolicy.java b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/AccessPolicy.java
index 0d017ae06b20..a75072b430af 100644
--- a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/AccessPolicy.java
+++ b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/AccessPolicy.java
@@ -7,6 +7,7 @@
 package com.microsoft.azure.management.keyvault;
 
 import com.microsoft.azure.management.apigeneration.Fluent;
+import com.microsoft.azure.management.apigeneration.Method;
 import com.microsoft.azure.management.graphrbac.ActiveDirectoryGroup;
 import com.microsoft.azure.management.graphrbac.ServicePrincipal;
 import com.microsoft.azure.management.graphrbac.User;
@@ -21,7 +22,7 @@
 /**
  * An immutable client-side representation of a key vault access policy.
  */
-@Fluent()
+@Fluent(ContainerName = "/Microsoft.Azure.Management.Fluent.KeyVault")
 public interface AccessPolicy extends
         ChildResource<Vault>,
         Wrapper<AccessPolicyEntry> {
@@ -136,6 +137,7 @@ interface WithPermissions<ParentT> {
              *
              * @return the next stage of access policy definition
              */
+            @Method
             WithAttach<ParentT> allowKeyAllPermissions();
 
             /**
@@ -159,6 +161,7 @@ interface WithPermissions<ParentT> {
              *
              * @return the next stage of access policy definition
              */
+            @Method
             WithAttach<ParentT> allowSecretAllPermissions();
 
             /**
@@ -276,6 +279,7 @@ interface WithPermissions<ParentT> {
              *
              * @return the next stage of access policy definition
              */
+            @Method
             WithAttach<ParentT> allowKeyAllPermissions();
 
             /**
@@ -299,6 +303,7 @@ interface WithPermissions<ParentT> {
              *
              * @return the next stage of access policy definition
              */
+            @Method
             WithAttach<ParentT> allowSecretAllPermissions();
 
             /**
@@ -344,6 +349,7 @@ interface WithPermissions {
              *
              * @return the next stage of access policy update
              */
+            @Method
             Update allowKeyAllPermissions();
 
             /**
@@ -367,6 +373,7 @@ interface WithPermissions {
              *
              * @return the next stage of access policy update
              */
+            @Method
             Update disallowKeyAllPermissions();
 
             /**
@@ -390,6 +397,7 @@ interface WithPermissions {
              *
              * @return the next stage of access policy definition
              */
+            @Method
             Update allowSecretAllPermissions();
 
             /**
@@ -413,6 +421,7 @@ interface WithPermissions {
              *
              * @return the next stage of access policy update
              */
+            @Method
             Update disallowSecretAllPermissions();
 
             /**
diff --git a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vault.java b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vault.java
index 228b7738e390..be7094a8ff5d 100644
--- a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vault.java
+++ b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vault.java
@@ -7,6 +7,7 @@
 package com.microsoft.azure.management.keyvault;
 
 import com.microsoft.azure.management.apigeneration.Fluent;
+import com.microsoft.azure.management.apigeneration.Method;
 import com.microsoft.azure.management.keyvault.implementation.VaultInner;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource;
 import com.microsoft.azure.management.resources.fluentcore.model.Appliable;
@@ -20,7 +21,7 @@
 /**
  * An immutable client-side representation of an Azure Key Vault.
  */
-@Fluent
+@Fluent(ContainerName = "/Microsoft.Azure.Management.Fluent.KeyVault")
 public interface Vault extends
         GroupableResource,
         Refreshable<Vault>,
@@ -134,6 +135,7 @@ interface WithAccessPolicy {
              *
              * @return the first stage of the access policy definition
              */
+            @Method
             AccessPolicy.DefinitionStages.Blank<WithCreate> defineAccessPolicy();
         }
 
@@ -227,6 +229,7 @@ interface WithAccessPolicy {
              *
              * @return the first stage of the access policy definition
              */
+            @Method
             AccessPolicy.UpdateDefinitionStages.Blank<Update> defineAccessPolicy();
 
             /**
diff --git a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java
index 7298a7b4ad60..d7cb26fc0fbe 100644
--- a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java
+++ b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java
@@ -18,7 +18,7 @@
 /**
  * Entry point for key vaults management API.
  */
-@Fluent
+@Fluent(ContainerName = "/Microsoft.Azure.Management.Fluent.KeyVault")
 public interface Vaults extends
         SupportsListing<Vault>,
         SupportsCreating<Vault.DefinitionStages.Blank>,