diff --git a/sdk/batch/microsoft-azure-batch/pom.xml b/sdk/batch/microsoft-azure-batch/pom.xml
index 059295ff2dac..00381ecdff89 100644
--- a/sdk/batch/microsoft-azure-batch/pom.xml
+++ b/sdk/batch/microsoft-azure-batch/pom.xml
@@ -10,7 +10,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
     <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-    <relativePath>../../parents/azure-data-sdk-client</relativePath>
+    <relativePath>../../parents/azure-data-sdk-parent</relativePath>
   </parent>
 
   <groupId>com.microsoft.azure</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-autosuggest/pom.xml b/sdk/cognitiveservices/ms-azure-cs-autosuggest/pom.xml
index 80e1171980ab..146f38711f8f 100644
--- a/sdk/cognitiveservices/ms-azure-cs-autosuggest/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-autosuggest/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-autosuggest</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-computervision/pom.xml b/sdk/cognitiveservices/ms-azure-cs-computervision/pom.xml
index 0e1924609b71..b8d55a461725 100644
--- a/sdk/cognitiveservices/ms-azure-cs-computervision/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-computervision/pom.xml
@@ -11,7 +11,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-computervision</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-contentmoderator/pom.xml b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/pom.xml
index bb49e61dc16d..90199df0ff3d 100644
--- a/sdk/cognitiveservices/ms-azure-cs-contentmoderator/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/pom.xml
@@ -11,7 +11,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-contentmoderator</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-customimagesearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/pom.xml
index a2231a399afd..001a4303df7c 100644
--- a/sdk/cognitiveservices/ms-azure-cs-customimagesearch/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-customimagesearch</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-customsearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-customsearch/pom.xml
index d55567de6603..ca4d910243bc 100644
--- a/sdk/cognitiveservices/ms-azure-cs-customsearch/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-customsearch/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-customsearch</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/pom.xml b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/pom.xml
index a3c95093f497..497b32800d2c 100644
--- a/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/pom.xml
@@ -11,7 +11,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-customvision-prediction</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-customvision-training/pom.xml b/sdk/cognitiveservices/ms-azure-cs-customvision-training/pom.xml
index cc6b3106acc0..9b7768a37b50 100644
--- a/sdk/cognitiveservices/ms-azure-cs-customvision-training/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-customvision-training/pom.xml
@@ -11,7 +11,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-customvision-training</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-entitysearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-entitysearch/pom.xml
index 47b803841d93..4e2a45712578 100644
--- a/sdk/cognitiveservices/ms-azure-cs-entitysearch/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-entitysearch/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-entitysearch</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-faceapi/pom.xml b/sdk/cognitiveservices/ms-azure-cs-faceapi/pom.xml
index c76d540f4f2e..c4b48125406c 100644
--- a/sdk/cognitiveservices/ms-azure-cs-faceapi/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-faceapi/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-faceapi</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-imagesearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-imagesearch/pom.xml
index ef961acb032b..797f5cc93cc6 100644
--- a/sdk/cognitiveservices/ms-azure-cs-imagesearch/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-imagesearch/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-imagesearch</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-luis-authoring/pom.xml b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/pom.xml
index d1c9208c057e..1ac80de0c8a9 100644
--- a/sdk/cognitiveservices/ms-azure-cs-luis-authoring/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-luis-authoring</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-luis-runtime/pom.xml b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/pom.xml
index e559681b9942..41ce2b48521e 100644
--- a/sdk/cognitiveservices/ms-azure-cs-luis-runtime/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
   <artifactId>azure-cognitiveservices-luis-runtime</artifactId>
   <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-newssearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-newssearch/pom.xml
index c8d4e12181ef..b555aaf42481 100644
--- a/sdk/cognitiveservices/ms-azure-cs-newssearch/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-newssearch/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-newssearch</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-qnamaker/pom.xml b/sdk/cognitiveservices/ms-azure-cs-qnamaker/pom.xml
index fc8fea6d5d6a..abefe6dd54e8 100644
--- a/sdk/cognitiveservices/ms-azure-cs-qnamaker/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-qnamaker/pom.xml
@@ -11,7 +11,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-qnamaker</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-spellcheck/pom.xml b/sdk/cognitiveservices/ms-azure-cs-spellcheck/pom.xml
index 811991e09c2e..4a86f185efc7 100644
--- a/sdk/cognitiveservices/ms-azure-cs-spellcheck/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-spellcheck/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <version>1.1.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure.cognitiveservices:azure-cognitiveservices-spellcheck;current} -->
     <artifactId>azure-cognitiveservices-spellcheck</artifactId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-textanalytics/pom.xml b/sdk/cognitiveservices/ms-azure-cs-textanalytics/pom.xml
index 76d75db7bf8c..7a52ce5f3e0f 100644
--- a/sdk/cognitiveservices/ms-azure-cs-textanalytics/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-textanalytics/pom.xml
@@ -11,7 +11,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-textanalytics</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-videosearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-videosearch/pom.xml
index f2095a71a717..76fdcaf82bd1 100644
--- a/sdk/cognitiveservices/ms-azure-cs-videosearch/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-videosearch/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-videosearch</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-visualsearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-visualsearch/pom.xml
index b82907b8eb5a..c839b6df6c1f 100644
--- a/sdk/cognitiveservices/ms-azure-cs-visualsearch/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-visualsearch/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-visualsearch</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/cognitiveservices/ms-azure-cs-websearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-websearch/pom.xml
index db8edd4797e0..c4b2a074cb3c 100644
--- a/sdk/cognitiveservices/ms-azure-cs-websearch/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-websearch/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-websearch</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
diff --git a/sdk/eventgrid/microsoft-azure-eventgrid/pom.xml b/sdk/eventgrid/microsoft-azure-eventgrid/pom.xml
index 9f3c6f7b39ce..4863f99d3365 100644
--- a/sdk/eventgrid/microsoft-azure-eventgrid/pom.xml
+++ b/sdk/eventgrid/microsoft-azure-eventgrid/pom.xml
@@ -18,7 +18,7 @@
         <groupId>com.azure</groupId>
         <artifactId>azure-data-sdk-parent</artifactId>
         <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-        <relativePath>../../parents/azure-data-sdk-client</relativePath>
+        <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <url>https://github.com/Azure/azure-sdk-for-java</url>
     <licenses>
diff --git a/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml b/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml
index 898747047ba1..9285d096c221 100644
--- a/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml
+++ b/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml
@@ -8,7 +8,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
     <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-    <relativePath>../../parents/azure-data-sdk-client</relativePath>
+    <relativePath>../../parents/azure-data-sdk-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/sdk/eventhubs/microsoft-azure-eventhubs-extensions/pom.xml b/sdk/eventhubs/microsoft-azure-eventhubs-extensions/pom.xml
index 42d2699627fa..9f6c9b7b62a4 100644
--- a/sdk/eventhubs/microsoft-azure-eventhubs-extensions/pom.xml
+++ b/sdk/eventhubs/microsoft-azure-eventhubs-extensions/pom.xml
@@ -8,7 +8,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
     <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-    <relativePath>../../parents/azure-data-sdk-client</relativePath>
+    <relativePath>../../parents/azure-data-sdk-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/sdk/eventhubs/microsoft-azure-eventhubs/pom.xml b/sdk/eventhubs/microsoft-azure-eventhubs/pom.xml
index 7316375d177d..df696d9ac217 100644
--- a/sdk/eventhubs/microsoft-azure-eventhubs/pom.xml
+++ b/sdk/eventhubs/microsoft-azure-eventhubs/pom.xml
@@ -8,7 +8,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
     <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-    <relativePath>../../parents/azure-data-sdk-client</relativePath>
+    <relativePath>../../parents/azure-data-sdk-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/sdk/keyvault/microsoft-azure-keyvault-complete/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-complete/pom.xml
index b406d85a47ba..1188650c4e6a 100644
--- a/sdk/keyvault/microsoft-azure-keyvault-complete/pom.xml
+++ b/sdk/keyvault/microsoft-azure-keyvault-complete/pom.xml
@@ -8,7 +8,7 @@ the MIT License. See License.txt in the project root for license information. --
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
     <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-    <relativePath>../../parents/azure-data-sdk-client</relativePath>
+    <relativePath>../../parents/azure-data-sdk-parent</relativePath>
   </parent>
 
   <groupId>com.microsoft.azure</groupId>
diff --git a/sdk/keyvault/microsoft-azure-keyvault-core/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-core/pom.xml
index 91839e778224..e5f78c9aef9b 100644
--- a/sdk/keyvault/microsoft-azure-keyvault-core/pom.xml
+++ b/sdk/keyvault/microsoft-azure-keyvault-core/pom.xml
@@ -9,7 +9,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
     <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-    <relativePath>../../parents/azure-data-sdk-client</relativePath>
+    <relativePath>../../parents/azure-data-sdk-parent</relativePath>
   </parent>
 
   <groupId>com.microsoft.azure</groupId>
diff --git a/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml
index 2a10b5a53b30..d55c8365ba2a 100644
--- a/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml
+++ b/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml
@@ -8,7 +8,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
     <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-    <relativePath>../../parents/azure-data-sdk-client</relativePath>
+    <relativePath>../../parents/azure-data-sdk-parent</relativePath>
   </parent>
 
     <groupId>com.microsoft.azure</groupId>
diff --git a/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml
index d4822f6cea01..9c08df22e725 100644
--- a/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml
+++ b/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml
@@ -9,7 +9,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
     <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-    <relativePath>../../parents/azure-data-sdk-client</relativePath>
+    <relativePath>../../parents/azure-data-sdk-parent</relativePath>
   </parent>
 
   <groupId>com.microsoft.azure</groupId>
diff --git a/sdk/keyvault/microsoft-azure-keyvault-test/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-test/pom.xml
index 5316a56069b5..cc060313b224 100644
--- a/sdk/keyvault/microsoft-azure-keyvault-test/pom.xml
+++ b/sdk/keyvault/microsoft-azure-keyvault-test/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
     <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-    <relativePath>../../parents/azure-data-sdk-client</relativePath>
+    <relativePath>../../parents/azure-data-sdk-parent</relativePath>
   </parent>
 
   <groupId>com.microsoft.azure</groupId>
diff --git a/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml
index a6e93538fa04..e37c3ea97acb 100644
--- a/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml
+++ b/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
     <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-    <relativePath>../../parents/azure-data-sdk-client</relativePath>
+    <relativePath>../../parents/azure-data-sdk-parent</relativePath>
   </parent>
 
   <groupId>com.microsoft.azure</groupId>
diff --git a/sdk/keyvault/microsoft-azure-keyvault/pom.xml b/sdk/keyvault/microsoft-azure-keyvault/pom.xml
index 11d4cfbb4b5e..09c2e728c58f 100644
--- a/sdk/keyvault/microsoft-azure-keyvault/pom.xml
+++ b/sdk/keyvault/microsoft-azure-keyvault/pom.xml
@@ -7,7 +7,7 @@ the MIT License. See License.txt in the project root for license information. --
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
     <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-    <relativePath>../../parents/azure-data-sdk-client</relativePath>
+    <relativePath>../../parents/azure-data-sdk-parent</relativePath>
   </parent>
 
   <groupId>com.microsoft.azure</groupId>
diff --git a/sdk/loganalytics/microsoft-azure-loganalytics/pom.xml b/sdk/loganalytics/microsoft-azure-loganalytics/pom.xml
index 7647d655bee4..3cce95a37627 100644
--- a/sdk/loganalytics/microsoft-azure-loganalytics/pom.xml
+++ b/sdk/loganalytics/microsoft-azure-loganalytics/pom.xml
@@ -18,7 +18,7 @@
         <groupId>com.azure</groupId>
         <artifactId>azure-data-sdk-parent</artifactId>
         <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-        <relativePath>../../parents/azure-data-sdk-client</relativePath>
+        <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
     <url>https://github.com/Azure/azure-sdk-for-java</url>
     <licenses>
diff --git a/sdk/mediaservices/microsoft-azure-media/pom.xml b/sdk/mediaservices/microsoft-azure-media/pom.xml
index 56d04fea57ff..fb3e707e65db 100644
--- a/sdk/mediaservices/microsoft-azure-media/pom.xml
+++ b/sdk/mediaservices/microsoft-azure-media/pom.xml
@@ -26,7 +26,7 @@
         <groupId>com.azure</groupId>
         <artifactId>azure-data-sdk-parent</artifactId>
         <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-        <relativePath>../../parents/azure-data-sdk-client</relativePath>
+        <relativePath>../../parents/azure-data-sdk-parent</relativePath>
       </parent>
 
 
diff --git a/sdk/parents/azure-data-sdk-parent/pom.xml b/sdk/parents/azure-data-sdk-parent/pom.xml
index 0aec88a5ccbe..ee5714f48605 100644
--- a/sdk/parents/azure-data-sdk-parent/pom.xml
+++ b/sdk/parents/azure-data-sdk-parent/pom.xml
@@ -325,6 +325,18 @@
             <failOnError>false</failOnError>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-surefire-plugin;external_dependency} -->
+          <configuration>
+            <environmentVariables>
+              <test.mode>${testMode}</test.mode>
+              <KEYVAULT_VAULTURI>https://azure-keyvault-3.vault.azure.net</KEYVAULT_VAULTURI>
+              <KEYVAULT_VAULTURI_ALT>https://azure-keyvault-2.vault.azure.net</KEYVAULT_VAULTURI_ALT>
+            </environmentVariables>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
@@ -443,18 +455,6 @@
           </reportSet>
         </reportSets>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-surefire-plugin;external_dependency} -->
-        <configuration>
-          <environmentVariables>
-            <test.mode>${testMode}</test.mode>
-            <KEYVAULT_VAULTURI>https://azure-keyvault-3.vault.azure.net</KEYVAULT_VAULTURI>
-            <KEYVAULT_VAULTURI_ALT>https://azure-keyvault-2.vault.azure.net</KEYVAULT_VAULTURI_ALT>
-          </environmentVariables>
-        </configuration>
-      </plugin>
     </plugins>
   </reporting>
 
diff --git a/sdk/servicebus/microsoft-azure-servicebus/pom.xml b/sdk/servicebus/microsoft-azure-servicebus/pom.xml
index f2266bd37a24..7f65a1b2b5de 100644
--- a/sdk/servicebus/microsoft-azure-servicebus/pom.xml
+++ b/sdk/servicebus/microsoft-azure-servicebus/pom.xml
@@ -16,7 +16,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
     <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-    <relativePath>../../parents/azure-data-sdk-client</relativePath>
+    <relativePath>../../parents/azure-data-sdk-parent</relativePath>
   </parent>
 
   <distributionManagement>
diff --git a/sdk/storage/microsoft-azure-storage-blob/pom.xml b/sdk/storage/microsoft-azure-storage-blob/pom.xml
index 9768e67f4bee..0a62fb807835 100644
--- a/sdk/storage/microsoft-azure-storage-blob/pom.xml
+++ b/sdk/storage/microsoft-azure-storage-blob/pom.xml
@@ -10,7 +10,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../parents/azure-data-sdk-client</relativePath>
+      <relativePath>../../parents/azure-data-sdk-parent</relativePath>
     </parent>
 
     <groupId>com.microsoft.azure</groupId>