diff --git a/sdk/policyinsights/mgmt-v2018_07_01_preview/pom.xml b/sdk/policyinsights/mgmt-v2018_07_01_preview/pom.xml
index 99d6e8bbf63e..7013f5301146 100644
--- a/sdk/policyinsights/mgmt-v2018_07_01_preview/pom.xml
+++ b/sdk/policyinsights/mgmt-v2018_07_01_preview/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.1.0</version>
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-policyinsights</artifactId>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/sdk/policyinsights/mgmt-v2018_07_01_preview/src/main/java/com/microsoft/azure/management/policyinsights/v2018_07_01_preview/Remediation.java b/sdk/policyinsights/mgmt-v2018_07_01_preview/src/main/java/com/microsoft/azure/management/policyinsights/v2018_07_01_preview/Remediation.java
index 3e892d592505..49d3df8de9af 100644
--- a/sdk/policyinsights/mgmt-v2018_07_01_preview/src/main/java/com/microsoft/azure/management/policyinsights/v2018_07_01_preview/Remediation.java
+++ b/sdk/policyinsights/mgmt-v2018_07_01_preview/src/main/java/com/microsoft/azure/management/policyinsights/v2018_07_01_preview/Remediation.java
@@ -75,7 +75,7 @@ public interface Remediation extends HasInner<RemediationInner>, Indexable, Upda
     /**
      * The entirety of the Remediation definition.
      */
-    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithManagementGroup, DefinitionStages.WithCreate {
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithMicrosoft.PolicyInsight, DefinitionStages.WithCreate {
     }
 
     /**
@@ -85,19 +85,19 @@ interface DefinitionStages {
         /**
          * The first stage of a Remediation definition.
          */
-        interface Blank extends WithManagementGroup {
+        interface Blank extends WithMicrosoft.PolicyInsight {
         }
 
         /**
          * The stage of the remediation definition allowing to specify Microsoft.PolicyInsight.
          */
-        interface WithManagementGroup {
+        interface WithMicrosoft.PolicyInsight {
            /**
             * Specifies managementGroupId.
             * @param managementGroupId Management group ID
             * @return the next definition stage
             */
-            WithCreate withManagementGroupId(String managementGroupId);
+            WithCreate withExistingMicrosoft.PolicyInsight(String managementGroupId);
         }
 
         /**
diff --git a/sdk/policyinsights/mgmt-v2018_07_01_preview/src/main/java/com/microsoft/azure/management/policyinsights/v2018_07_01_preview/implementation/RemediationImpl.java b/sdk/policyinsights/mgmt-v2018_07_01_preview/src/main/java/com/microsoft/azure/management/policyinsights/v2018_07_01_preview/implementation/RemediationImpl.java
index ef922cadedfe..bb0988bbdd83 100644
--- a/sdk/policyinsights/mgmt-v2018_07_01_preview/src/main/java/com/microsoft/azure/management/policyinsights/v2018_07_01_preview/implementation/RemediationImpl.java
+++ b/sdk/policyinsights/mgmt-v2018_07_01_preview/src/main/java/com/microsoft/azure/management/policyinsights/v2018_07_01_preview/implementation/RemediationImpl.java
@@ -121,7 +121,7 @@ public String type() {
     }
 
     @Override
-    public RemediationImpl withManagementGroupId(String managementGroupId) {
+    public RemediationImpl withExistingMicrosoft.PolicyInsight(String managementGroupId) {
         this.managementGroupId = managementGroupId;
         return this;
     }