diff --git a/common/pom.xml b/common/pom.xml
index 8c714047729..3bfeccf0a0b 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -18,11 +18,12 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>drill-root</artifactId>
+    <artifactId>apache-drill</artifactId>
     <groupId>org.apache.drill</groupId>
     <version>1.17.0-SNAPSHOT</version>
   </parent>
diff --git a/contrib/data/pom.xml b/contrib/data/pom.xml
index 6278d820e19..809a2f95c76 100644
--- a/contrib/data/pom.xml
+++ b/contrib/data/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
diff --git a/contrib/data/tpch-sample-data/pom.xml b/contrib/data/tpch-sample-data/pom.xml
index 128c3e4f112..973349899f6 100644
--- a/contrib/data/tpch-sample-data/pom.xml
+++ b/contrib/data/tpch-sample-data/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>drill-contrib-data-parent</artifactId>
@@ -49,7 +50,7 @@
               <url>http://apache-drill.s3.amazonaws.com/files/sf-0.01_tpc-h_parquet_typed.tgz</url>
               <outputFileName>tpch.tgz</outputFileName>
               <unpack>true</unpack>
-              <outputDirectory>${project.build.directory}/classes/tpch</outputDirectory>
+              <outputDirectory>${project.build.outputDirectory}/tpch</outputDirectory>
             </configuration>
           </execution>
         </executions>
diff --git a/contrib/format-ltsv/pom.xml b/contrib/format-ltsv/pom.xml
index 9d83e9e4690..35eda3cd7ab 100644
--- a/contrib/format-ltsv/pom.xml
+++ b/contrib/format-ltsv/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -64,7 +65,7 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${basedir}/target/classes/org/apache/drill/exec/store/ltsv
+              <outputDirectory>${project.build.outputDirectory}/org/apache/drill/exec/store/ltsv
               </outputDirectory>
               <resources>
                 <resource>
diff --git a/contrib/format-maprdb/pom.xml b/contrib/format-maprdb/pom.xml
index bff7b695ba1..1d4ad4bf769 100644
--- a/contrib/format-maprdb/pom.xml
+++ b/contrib/format-maprdb/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
diff --git a/contrib/format-syslog/pom.xml b/contrib/format-syslog/pom.xml
index ca3e61e4d05..7b0a9487084 100644
--- a/contrib/format-syslog/pom.xml
+++ b/contrib/format-syslog/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -71,7 +72,7 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${basedir}/target/classes/org/apache/drill/exec/store/syslog
+              <outputDirectory>${project.build.outputDirectory}/org/apache/drill/exec/store/syslog
               </outputDirectory>
               <resources>
                 <resource>
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 0004031c8f3..1394e5c0676 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -18,11 +18,12 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>drill-root</artifactId>
     <groupId>org.apache.drill</groupId>
+    <artifactId>apache-drill</artifactId>
     <version>1.17.0-SNAPSHOT</version>
   </parent>
 
diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml
index 859e2428da6..6d01d8a1ce8 100644
--- a/contrib/storage-hbase/pom.xml
+++ b/contrib/storage-hbase/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
@@ -114,7 +115,7 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${basedir}/target/classes/org/apache/drill/exec/expr/fn/impl</outputDirectory>
+              <outputDirectory>${project.build.outputDirectory}/org/apache/drill/exec/expr/fn/impl</outputDirectory>
               <resources>
                 <resource>
                   <directory>src/main/java/org/apache/drill/exec/expr/fn/impl</directory>
@@ -125,7 +126,7 @@
                   <filtering>true</filtering>
                 </resource>
                 <resource>
-                  <directory>target/generated-sources</directory>
+                  <directory>${project.build.directory}/generated-sources</directory>
                   <!-- <include>*/org</include> -->
                   <filtering>true</filtering>
                 </resource>
diff --git a/contrib/storage-hive/core/pom.xml b/contrib/storage-hive/core/pom.xml
index b4acdac3c96..8f97f6ef228 100644
--- a/contrib/storage-hive/core/pom.xml
+++ b/contrib/storage-hive/core/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
diff --git a/contrib/storage-hive/hive-exec-shade/pom.xml b/contrib/storage-hive/hive-exec-shade/pom.xml
index a767000451b..c5ae4db9dcc 100644
--- a/contrib/storage-hive/hive-exec-shade/pom.xml
+++ b/contrib/storage-hive/hive-exec-shade/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -178,7 +179,7 @@
                   <version>${project.version}</version>
                   <type>jar</type>
                   <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                  <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                   <includes>**/**</includes>
                 </artifactItem>
               </artifactItems>
diff --git a/contrib/storage-hive/pom.xml b/contrib/storage-hive/pom.xml
index e99181651a6..840d340fec8 100644
--- a/contrib/storage-hive/pom.xml
+++ b/contrib/storage-hive/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.drill.contrib</groupId>
diff --git a/contrib/storage-jdbc/pom.xml b/contrib/storage-jdbc/pom.xml
index 2a4286c074c..63f5c93d80f 100755
--- a/contrib/storage-jdbc/pom.xml
+++ b/contrib/storage-jdbc/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
diff --git a/contrib/storage-kafka/pom.xml b/contrib/storage-kafka/pom.xml
index 83a1a299bf9..a89e27b5b15 100644
--- a/contrib/storage-kafka/pom.xml
+++ b/contrib/storage-kafka/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
diff --git a/contrib/storage-kudu/pom.xml b/contrib/storage-kudu/pom.xml
index b9f676a60de..4ad3075608e 100644
--- a/contrib/storage-kudu/pom.xml
+++ b/contrib/storage-kudu/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
diff --git a/contrib/storage-mongo/pom.xml b/contrib/storage-mongo/pom.xml
index a58ed57400a..052b9d3a56b 100644
--- a/contrib/storage-mongo/pom.xml
+++ b/contrib/storage-mongo/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>drill-contrib-parent</artifactId>
diff --git a/contrib/storage-opentsdb/pom.xml b/contrib/storage-opentsdb/pom.xml
index 7891a0f2f0e..ff8ae3cfc3d 100644
--- a/contrib/storage-opentsdb/pom.xml
+++ b/contrib/storage-opentsdb/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>drill-contrib-parent</artifactId>
diff --git a/contrib/udfs/pom.xml b/contrib/udfs/pom.xml
index 38f7dfa92c0..b71e49b4b05 100644
--- a/contrib/udfs/pom.xml
+++ b/contrib/udfs/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
 <parent>
@@ -94,7 +95,7 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${basedir}/target/classes/org/apache/drill/exec/udfs</outputDirectory>
+              <outputDirectory>${project.build.outputDirectory}/org/apache/drill/exec/udfs</outputDirectory>
               <resources>
                 <resource>
                   <directory>src/main/java/org/apache/drill/exec/udfs</directory>
@@ -110,7 +111,7 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${project.build.directory}/classes/sample-data</outputDirectory>
+              <outputDirectory>${project.build.outputDirectory}/sample-data</outputDirectory>
               <resources>
                 <resource>
                   <directory>sample-data</directory>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 0e3d792b8a7..616ec3887a9 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -18,10 +18,11 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>drill-root</artifactId>
+    <artifactId>apache-drill</artifactId>
     <groupId>org.apache.drill</groupId>
     <version>1.17.0-SNAPSHOT</version>
   </parent>
@@ -170,7 +171,7 @@
                 <descriptor>src/assemble/bin-assembly.xml</descriptor>
               </descriptors>
               <appendAssemblyId>false</appendAssemblyId>
-              <finalName>apache-drill-${project.version}</finalName>
+              <finalName>${project.parent.artifactId}-${project.version}</finalName>
             </configuration>
           </execution>
           <execution>
@@ -185,7 +186,7 @@
                 <descriptor>src/assemble/bin-assembly-dir.xml</descriptor>
               </descriptors>
               <appendAssemblyId>false</appendAssemblyId>
-              <finalName>apache-drill-${project.version}</finalName>
+              <finalName>${project.parent.artifactId}-${project.version}</finalName>
             </configuration>
           </execution>
         </executions>
@@ -390,7 +391,7 @@
                   <directory>/opt/drill</directory>
                   <sources>
                     <source>
-                      <location>target/apache-drill-${project.version}/apache-drill-${project.version}/git.properties</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/git.properties</location>
                     </source>
                   </sources>
                 </mapping>
@@ -398,7 +399,7 @@
                   <directory>/opt/drill</directory>
                   <sources>
                     <source>
-                      <location>target/apache-drill-${project.version}/apache-drill-${project.version}/KEYS</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/KEYS</location>
                     </source>
                   </sources>
                 </mapping>
@@ -406,7 +407,7 @@
                   <directory>/opt/drill</directory>
                   <sources>
                     <source>
-                      <location>target/apache-drill-${project.version}/apache-drill-${project.version}/LICENSE</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/LICENSE</location>
                     </source>
                   </sources>
                 </mapping>
@@ -414,7 +415,7 @@
                   <directory>/opt/drill</directory>
                   <sources>
                     <source>
-                      <location>target/apache-drill-${project.version}/apache-drill-${project.version}/NOTICE</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/NOTICE</location>
                     </source>
                   </sources>
                 </mapping>
@@ -422,7 +423,7 @@
                   <directory>/opt/drill</directory>
                   <sources>
                     <source>
-                      <location>target/apache-drill-${project.version}/apache-drill-${project.version}/README.md</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/README.md</location>
                     </source>
                   </sources>
                 </mapping>
@@ -430,7 +431,7 @@
                   <directory>/opt/drill/jars</directory>
                   <sources>
                     <source>
-                      <location>target/apache-drill-${project.version}/apache-drill-${project.version}/jars</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/jars</location>
                     </source>
                   </sources>
                 </mapping>
@@ -438,7 +439,7 @@
                   <directory>/opt/drill/bin</directory>
                   <sources>
                     <source>
-                      <location>target/apache-drill-${project.version}/apache-drill-${project.version}/bin</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/bin</location>
                     </source>
                   </sources>
                 </mapping>
@@ -446,7 +447,7 @@
 		<directory>/opt/drill/sample-data</directory>
                   <sources>
                     <source>
-                      <location>target/apache-drill-${project.version}/apache-drill-${project.version}/sample-data</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/sample-data</location>
                     </source>
                   </sources>
                 </mapping>
@@ -454,7 +455,7 @@
                   <directory>/etc/drill/conf</directory>
                   <sources>
                     <source>
-                      <location>target/apache-drill-${project.version}/apache-drill-${project.version}/conf</location>
+                      <location>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/conf</location>
                     </source>
                   </sources>
                   <configuration>true</configuration>
@@ -490,10 +491,10 @@
                 </goals>
                 <configuration>
                   <skipPOMs>false</skipPOMs>
-                  <deb>distribution/target/apache-drill-${project.version}/apache-drill-${project.version}.deb</deb>
+                  <deb>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}.deb</deb>
                   <dataSet>
                     <data>
-                      <src>target/apache-drill-${project.version}/apache-drill-${project.version}/git.properties</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/git.properties</src>
                       <type>file</type>
                       <mapper>
                         <type>perm</type>
@@ -501,7 +502,7 @@
                       </mapper>
                     </data>
                     <data>
-                      <src>target/apache-drill-${project.version}/apache-drill-${project.version}/KEYS</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}${project.parent.artifactId}-${project.version}/KEYS</src>
                       <type>file</type>
                       <mapper>
                         <type>perm</type>
@@ -509,7 +510,7 @@
                       </mapper>
                     </data>
                     <data>
-                      <src>target/apache-drill-${project.version}/apache-drill-${project.version}/LICENSE</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/LICENSE</src>
                       <type>file</type>
                       <mapper>
                         <type>perm</type>
@@ -517,7 +518,7 @@
                       </mapper>
                     </data>
                     <data>
-                      <src>target/apache-drill-${project.version}/apache-drill-${project.version}/NOTICE</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/NOTICE</src>
                       <type>file</type>
                       <mapper>
                         <type>perm</type>
@@ -525,7 +526,7 @@
                       </mapper>
                     </data>
                     <data>
-                      <src>target/apache-drill-${project.version}/apache-drill-${project.version}/README.md</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/README.md</src>
                       <type>file</type>
                       <mapper>
                         <type>perm</type>
@@ -533,7 +534,7 @@
                       </mapper>
                     </data>
                     <data>
-                      <src>target/apache-drill-${project.version}/apache-drill-${project.version}/jars</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/jars</src>
                       <type>directory</type>
                       <mapper>
                         <type>perm</type>
@@ -541,7 +542,7 @@
                       </mapper>
                     </data>
                     <data>
-                      <src>target/apache-drill-${project.version}/apache-drill-${project.version}/bin</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/bin</src>
                       <type>directory</type>
                       <mapper>
                         <type>perm</type>
@@ -550,7 +551,7 @@
                       </mapper>
                     </data>
                     <data>
-                      <src>target/apache-drill-${project.version}/apache-drill-${project.version}/sample-data</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/sample-data</src>
                       <type>directory</type>
                       <mapper>
                         <type>perm</type>
@@ -559,7 +560,7 @@
                       </mapper>
                     </data>
                     <data>
-                      <src>target/apache-drill-${project.version}/apache-drill-${project.version}/conf</src>
+                      <src>${project.build.directory}/${project.parent.artifactId}-${project.version}/${project.parent.artifactId}-${project.version}/conf</src>
                       <type>directory</type>
                       <mapper>
                         <type>perm</type>
diff --git a/drill-shaded/drill-shaded-guava/pom.xml b/drill-shaded/drill-shaded-guava/pom.xml
index 83645d9e677..211e7f55574 100644
--- a/drill-shaded/drill-shaded-guava/pom.xml
+++ b/drill-shaded/drill-shaded-guava/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
diff --git a/drill-shaded/pom.xml b/drill-shaded/pom.xml
index b3bb3f8b974..20a78256194 100644
--- a/drill-shaded/pom.xml
+++ b/drill-shaded/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
diff --git a/drill-yarn/pom.xml b/drill-yarn/pom.xml
index 9de6d477610..724da3ed6b3 100644
--- a/drill-yarn/pom.xml
+++ b/drill-yarn/pom.xml
@@ -18,10 +18,11 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>drill-root</artifactId>
+    <artifactId>apache-drill</artifactId>
     <groupId>org.apache.drill</groupId>
     <version>1.17.0-SNAPSHOT</version>
   </parent>
@@ -57,7 +58,7 @@
             </goals>
             <configuration>
               <dotGitDirectory>${project.basedir}/../.git</dotGitDirectory>
-              <generateGitPropertiesFilename>target/classes/git.properties</generateGitPropertiesFilename>
+              <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
             </configuration>
           </execution>
         </executions>
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 366b174524e..1874c471bbc 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>exec-parent</artifactId>
diff --git a/exec/java-exec/src/test/resources/drill-udf/pom.xml b/exec/java-exec/src/test/resources/drill-udf/pom.xml
index 0a68198b9c6..affafc37d17 100644
--- a/exec/java-exec/src/test/resources/drill-udf/pom.xml
+++ b/exec/java-exec/src/test/resources/drill-udf/pom.xml
@@ -31,7 +31,7 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <jar.finalName>${project.name}</jar.finalName>
-    <custom.buildDirectory>${project.basedir}/target</custom.buildDirectory>
+    <custom.buildDirectory>${project.build.directory}</custom.buildDirectory>
     <drill.version>1.13.0</drill.version>
     <include.files>**/*.java</include.files>
     <include.resources>**/*.conf</include.resources>
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index be79b418c85..510ab02ed7e 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.drill.exec</groupId>
@@ -267,7 +268,7 @@
           <additionalClasspathElements>
             <additionalClasspathElements>${settings.localRepository}/junit/junit/${junit.version}/junit-${junit.version}.jar</additionalClasspathElements>
             <additionalClasspathElements>${settings.localRepository}/org/hamcrest/hamcrest-core/${hamcrest.core.version}/hamcrest-core-${hamcrest.core.version}.jar</additionalClasspathElements>
-            <additionalClasspathElements>${project.build.directory}/test-classes/</additionalClasspathElements>
+            <additionalClasspathElements>${project.build.testOutputDirectory}/</additionalClasspathElements>
           </additionalClasspathElements>
 
           <systemPropertyVariables>
diff --git a/exec/jdbc/pom.xml b/exec/jdbc/pom.xml
index 23fec3abaeb..4da9835ba9b 100644
--- a/exec/jdbc/pom.xml
+++ b/exec/jdbc/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.drill.exec</groupId>
diff --git a/exec/memory/base/pom.xml b/exec/memory/base/pom.xml
index 0839a339a17..642830763a7 100644
--- a/exec/memory/base/pom.xml
+++ b/exec/memory/base/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>memory-parent</artifactId>
diff --git a/exec/memory/pom.xml b/exec/memory/pom.xml
index 55f544d7b47..f1ff1ff2c96 100644
--- a/exec/memory/pom.xml
+++ b/exec/memory/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>exec-parent</artifactId>
diff --git a/exec/pom.xml b/exec/pom.xml
index c360f5a39d8..db47abbfd68 100644
--- a/exec/pom.xml
+++ b/exec/pom.xml
@@ -18,10 +18,11 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>drill-root</artifactId>
+    <artifactId>apache-drill</artifactId>
     <groupId>org.apache.drill</groupId>
     <version>1.17.0-SNAPSHOT</version>
   </parent>
diff --git a/exec/rpc/pom.xml b/exec/rpc/pom.xml
index 0dcc7ca5f31..18517b14889 100644
--- a/exec/rpc/pom.xml
+++ b/exec/rpc/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>exec-parent</artifactId>
diff --git a/exec/vector/pom.xml b/exec/vector/pom.xml
index 830b5455d98..7abac3298f1 100644
--- a/exec/vector/pom.xml
+++ b/exec/vector/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>exec-parent</artifactId>
diff --git a/logical/pom.xml b/logical/pom.xml
index b1e8ab8ec42..db959841baf 100644
--- a/logical/pom.xml
+++ b/logical/pom.xml
@@ -18,11 +18,12 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   
   <parent>
-    <artifactId>drill-root</artifactId>
+    <artifactId>apache-drill</artifactId>
     <groupId>org.apache.drill</groupId>
     <version>1.17.0-SNAPSHOT</version>
   </parent>
diff --git a/metastore/file-metadata/pom.xml b/metastore/file-metadata/pom.xml
index d0bd79428da..65ab004e68a 100644
--- a/metastore/file-metadata/pom.xml
+++ b/metastore/file-metadata/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
diff --git a/metastore/metastore-api/pom.xml b/metastore/metastore-api/pom.xml
index d3f3aed8e7d..550f2c2e0fe 100644
--- a/metastore/metastore-api/pom.xml
+++ b/metastore/metastore-api/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
diff --git a/metastore/pom.xml b/metastore/pom.xml
index 2558e11b628..6230ff372e4 100644
--- a/metastore/pom.xml
+++ b/metastore/pom.xml
@@ -18,12 +18,13 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.drill</groupId>
-    <artifactId>drill-root</artifactId>
+    <artifactId>apache-drill</artifactId>
     <version>1.17.0-SNAPSHOT</version>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index f2b626d6754..484955a3bb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -29,7 +30,7 @@
   </parent>
 
   <groupId>org.apache.drill</groupId>
-  <artifactId>drill-root</artifactId>
+  <artifactId>apache-drill</artifactId>
   <version>1.17.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
@@ -42,8 +43,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <sourceReleaseAssemblyDescriptor>source-release-zip-tar</sourceReleaseAssemblyDescriptor>
 
-    <target.gen.source.path>${project.basedir}/target/generated-sources</target.gen.source.path>
-    <proto.cas.path>${project.basedir}/src/main/protobuf/</proto.cas.path>
+    <target.gen.source.path>${project.build.directory}/generated-sources</target.gen.source.path>
     <dep.junit.version>4.12</dep.junit.version>
     <dep.slf4j.version>1.7.25</dep.slf4j.version>
     <shaded.guava.version>23.0</shaded.guava.version>
@@ -546,7 +546,7 @@
               <goal>revision</goal>
             </goals>
             <configuration>
-              <generateGitPropertiesFilename>target/classes/git.properties</generateGitPropertiesFilename>
+              <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
             </configuration>
           </execution>
           <execution>
@@ -1805,9 +1805,9 @@
                 <fileSet>
                   <directory>${project.build.directory}</directory>
                   <includes>
-                    <include>apache-drill-${project.version}.tar.gz</include>
-                    <include>apache-drill-${project.version}-src.tar.gz</include>
-                    <include>apache-drill-${project.version}-src.zip</include>
+                    <include>${project.artifactId}-${project.version}.tar.gz</include>
+                    <include>${project.artifactId}-${project.version}-src.tar.gz</include>
+                    <include>${project.artifactId}-${project.version}-src.zip</include>
                   </includes>
                 </fileSet>
               </fileSets>
@@ -1822,7 +1822,7 @@
                 <id>source-release-assembly</id>
                 <configuration>
                   <appendAssemblyId>false</appendAssemblyId>
-                  <finalName>apache-drill-${project.version}-src</finalName>
+                  <finalName>${project.artifactId}-${project.version}-src</finalName>
                 </configuration>
               </execution>
             </executions>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 04629ac1b94..ebf59cc088d 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -18,11 +18,12 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>drill-root</artifactId>
+    <artifactId>apache-drill</artifactId>
     <groupId>org.apache.drill</groupId>
     <version>1.17.0-SNAPSHOT</version>
   </parent>
diff --git a/tools/fmpp/pom.xml b/tools/fmpp/pom.xml
index ac12752e87c..5f2c6c94bab 100644
--- a/tools/fmpp/pom.xml
+++ b/tools/fmpp/pom.xml
@@ -18,7 +18,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
diff --git a/tools/pom.xml b/tools/pom.xml
index 1511c910317..83de3a5dc78 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -18,10 +18,11 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>drill-root</artifactId>
+    <artifactId>apache-drill</artifactId>
     <groupId>org.apache.drill</groupId>
     <version>1.17.0-SNAPSHOT</version>
   </parent>