You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by sa...@apache.org on 2021/05/31 02:13:17 UTC

[ozone] branch master updated: HDDS-4936. Change ozone groupId from org.apache.hadoop to org.apache.ozone (#2018)

This is an automated email from the ASF dual-hosted git repository.

sammichen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git


The following commit(s) were added to refs/heads/master by this push:
     new fa4ddbc  HDDS-4936. Change ozone groupId from org.apache.hadoop to org.apache.ozone (#2018)
fa4ddbc is described below

commit fa4ddbccf361e4df1f0421fd8193f5e22cd7c9c6
Author: Sammi Chen <sa...@apache.org>
AuthorDate: Mon May 31 10:12:49 2021 +0800

    HDDS-4936. Change ozone groupId from org.apache.hadoop to org.apache.ozone (#2018)
    
    * HDDS-4936. Change ozone maven groupId from org.apache.hadoop to org.apache.ozone.
    
    * HDDS-5008. Remove hadoop from ozone module artifactId.
    
    * Fix checkstyle
    
    * Update module names in coverage.sh
    
    * Fix GH workflow
    
    * Fix module names
    
    * Fix ozone-manager artifact name
    
    * Fix IDEA run configs
    
    * HDDS-4936. Change ozone maven groupId from org.apache.hadoop to org.apache.ozone.
    
    * HDDS-5008. Remove hadoop from ozone module artifactId.
    
    * Fix tarball name for dependency check
    
    * Fix update-jar-report.sh
    
    * Fix tarball name in kubernetes check
    
    * Fix path in cache cleanup
    
    * trigger new CI check
    
    Co-authored-by: Doroszlai, Attila <ad...@apache.org>
    Co-authored-by: Elek Márton <el...@apache.org>
---
 .github/workflows/post-commit.yml                  |  26 ++--
 hadoop-hdds/client/pom.xml                         |  22 ++--
 hadoop-hdds/common/pom.xml                         |  26 ++--
 hadoop-hdds/config/pom.xml                         |  10 +-
 hadoop-hdds/container-service/pom.xml              |  42 +++---
 hadoop-hdds/docs/content/interface/O3fs.md         |   4 +-
 hadoop-hdds/docs/content/interface/O3fs.zh.md      |   8 +-
 hadoop-hdds/docs/content/interface/Ofs.md          |   4 +-
 hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.md |   6 +-
 .../docs/content/recipe/SparkOzoneFSK8S.zh.md      |   6 +-
 hadoop-hdds/docs/pom.xml                           |   6 +-
 hadoop-hdds/framework/pom.xml                      |  34 ++---
 hadoop-hdds/hadoop-dependency-client/pom.xml       |   6 +-
 hadoop-hdds/hadoop-dependency-server/pom.xml       |   6 +-
 hadoop-hdds/hadoop-dependency-test/pom.xml         |   6 +-
 hadoop-hdds/interface-admin/pom.xml                |  10 +-
 hadoop-hdds/interface-client/pom.xml               |   6 +-
 hadoop-hdds/interface-server/pom.xml               |  10 +-
 hadoop-hdds/pom.xml                                |  78 +++++------
 hadoop-hdds/server-scm/pom.xml                     |  56 ++++----
 hadoop-hdds/test-utils/pom.xml                     |   6 +-
 hadoop-hdds/tools/pom.xml                          |  26 ++--
 hadoop-ozone/client/pom.xml                        |  14 +-
 hadoop-ozone/common/pom.xml                        |  26 ++--
 hadoop-ozone/csi/pom.xml                           |  14 +-
 hadoop-ozone/datanode/pom.xml                      |  14 +-
 hadoop-ozone/dev-support/checks/coverage.sh        |   3 +-
 hadoop-ozone/dev-support/checks/integration.sh     |   2 +-
 hadoop-ozone/dev-support/checks/unit.sh            |   2 +-
 hadoop-ozone/dev-support/docker/Dockerfile         |   2 +-
 .../intellij/runConfigurations/CsiServer.xml       |   4 +-
 .../intellij/runConfigurations/Datanode1.xml       |   2 +-
 .../intellij/runConfigurations/Datanode2.xml       |   2 +-
 .../intellij/runConfigurations/Datanode3.xml       |   2 +-
 .../intellij/runConfigurations/FreonStandalone.xml |   4 +-
 .../intellij/runConfigurations/OzoneFsShell.xml    |   2 +-
 .../intellij/runConfigurations/OzoneManager.xml    |   2 +-
 .../runConfigurations/OzoneManagerInit.xml         |   2 +-
 .../intellij/runConfigurations/OzoneShell.xml      |   2 +-
 .../intellij/runConfigurations/Recon.xml           |   4 +-
 .../intellij/runConfigurations/S3Gateway.xml       |   4 +-
 .../runConfigurations/StorageContainerManager.xml  |   2 +-
 .../StorageContainerManagerInit.xml                |   2 +-
 .../dist/dev-support/bin/dist-tar-stitching        |   6 +-
 hadoop-ozone/dist/pom.xml                          |  72 +++++------
 .../main/compose/ozone-mr/hadoop27/docker-config   |   4 +-
 .../main/compose/ozone-mr/hadoop31/docker-config   |   4 +-
 .../main/compose/ozone-mr/hadoop32/docker-config   |   4 +-
 .../dist/src/main/compose/ozonesecure-mr/README.md |   2 +-
 .../src/main/compose/ozonesecure-mr/docker-config  |   4 +-
 hadoop-ozone/dist/src/main/license/bin/LICENSE.txt |   2 +-
 hadoop-ozone/dist/src/main/license/jar-report.txt  |  58 ++++-----
 .../dist/src/main/license/update-jar-report.sh     |   2 +-
 .../dist/src/main/smoketest/cli/classpath.robot    |  14 +-
 hadoop-ozone/dist/src/shell/ozone/ozone            |  42 +++---
 .../fault-injection-test/mini-chaos-tests/pom.xml  |  24 ++--
 .../fault-injection-test/network-tests/pom.xml     |   6 +-
 hadoop-ozone/fault-injection-test/pom.xml          |   6 +-
 hadoop-ozone/insight/pom.xml                       |  42 +++---
 hadoop-ozone/integration-test/pom.xml              |  70 +++++-----
 hadoop-ozone/interface-client/pom.xml              |  10 +-
 hadoop-ozone/interface-storage/pom.xml             |  30 ++---
 hadoop-ozone/native-client/README.md               |   4 +-
 hadoop-ozone/ozone-manager/pom.xml                 |  60 ++++-----
 hadoop-ozone/ozonefs-common/pom.xml                |  42 +++---
 hadoop-ozone/ozonefs-hadoop2/pom.xml               |  16 +--
 hadoop-ozone/ozonefs-hadoop3/pom.xml               |  14 +-
 hadoop-ozone/ozonefs-shaded/pom.xml                |  10 +-
 hadoop-ozone/ozonefs/pom.xml                       |  14 +-
 hadoop-ozone/pom.xml                               | 142 ++++++++++-----------
 hadoop-ozone/recon-codegen/pom.xml                 |  10 +-
 hadoop-ozone/recon/pom.xml                         |  38 +++---
 hadoop-ozone/s3gateway/pom.xml                     |  42 +++---
 hadoop-ozone/tools/pom.xml                         |  50 ++++----
 pom.xml                                            |   4 +-
 75 files changed, 681 insertions(+), 682 deletions(-)

diff --git a/.github/workflows/post-commit.yml b/.github/workflows/post-commit.yml
index 4fbdc1b..44a8cce 100644
--- a/.github/workflows/post-commit.yml
+++ b/.github/workflows/post-commit.yml
@@ -62,13 +62,13 @@ jobs:
         if: matrix.java == '8'
         with:
           name: ozone-bin
-          path: hadoop-ozone/dist/target/hadoop-ozone*.tar.gz
+          path: hadoop-ozone/dist/target/ozone*.tar.gz
           retention-days: 1
       - name: Delete temporary build artifacts before caching
         run: |
           #Never cache local artifacts
-          rm -rf ~/.m2/repository/org/apache/hadoop/hadoop-hdds*
-          rm -rf ~/.m2/repository/org/apache/hadoop/hadoop-ozone*
+          rm -rf ~/.m2/repository/org/apache/ozone/hdds*
+          rm -rf ~/.m2/repository/org/apache/ozone/ozone*
         if: always()
   basic:
     runs-on: ubuntu-18.04
@@ -113,8 +113,8 @@ jobs:
       - name: Delete temporary build artifacts before caching
         run: |
           #Never cache local artifacts
-          rm -rf ~/.m2/repository/org/apache/hadoop/hadoop-hdds*
-          rm -rf ~/.m2/repository/org/apache/hadoop/hadoop-ozone*
+          rm -rf ~/.m2/repository/org/apache/ozone/hdds*
+          rm -rf ~/.m2/repository/org/apache/ozone/ozone*
         if: always()
   dependency:
     needs: compile
@@ -131,7 +131,7 @@ jobs:
       - name: Untar binaries
         run: |
           mkdir dist
-          tar  -C dist --strip-components 1 -xzf hadoop-ozone*.tar.gz
+          tar  -C dist --strip-components 1 -xzf ozone*.tar.gz
       - name: Execute tests
         run: |
           export OZONE_DIST_DIR=`pwd`/dist
@@ -171,7 +171,7 @@ jobs:
       - name: Untar binaries
         run: |
           mkdir -p /mnt/ozone/hadoop-ozone/dist/target
-          tar xzvf hadoop-ozone*.tar.gz -C /mnt/ozone/hadoop-ozone/dist/target
+          tar xzvf ozone*.tar.gz -C /mnt/ozone/hadoop-ozone/dist/target
           sudo chmod -R a+rwX /mnt/ozone/hadoop-ozone/dist/target
       - name: Execute tests
         run: |
@@ -210,7 +210,7 @@ jobs:
       - name: Untar binaries
         run: |
           mkdir -p /mnt/ozone/hadoop-ozone/dist/target
-          tar xzvf hadoop-ozone*.tar.gz -C /mnt/ozone/hadoop-ozone/dist/target
+          tar xzvf ozone*.tar.gz -C /mnt/ozone/hadoop-ozone/dist/target
       - name: Execute tests
         run: |
           cd /mnt/ozone/hadoop-ozone/dist/target/ozone-* && sudo mkdir .aws && sudo chmod 777 .aws && sudo chown 1000 .aws
@@ -264,8 +264,8 @@ jobs:
       - name: Delete temporary build artifacts before caching
         run: |
           #Never cache local artifacts
-          rm -rf ~/.m2/repository/org/apache/hadoop/hadoop-hdds*
-          rm -rf ~/.m2/repository/org/apache/hadoop/hadoop-ozone*
+          rm -rf ~/.m2/repository/org/apache/ozone/hdds*
+          rm -rf ~/.m2/repository/org/apache/ozone/ozone*
         if: always()
   coverage:
     runs-on: ubuntu-18.04
@@ -294,7 +294,7 @@ jobs:
       - name: Untar binaries
         run: |
           mkdir -p hadoop-ozone/dist/target
-          tar xzvf target/artifacts/ozone-bin/hadoop-ozone*.tar.gz -C hadoop-ozone/dist/target
+          tar xzvf target/artifacts/ozone-bin/ozone*.tar.gz -C hadoop-ozone/dist/target
       - name: Calculate combined coverage
         run: ./hadoop-ozone/dev-support/checks/coverage.sh
       - name: Setup java 11
@@ -315,6 +315,6 @@ jobs:
       - name: Delete temporary build artifacts before caching
         run: |
           #Never cache local artifacts
-          rm -rf ~/.m2/repository/org/apache/hadoop/hadoop-hdds*
-          rm -rf ~/.m2/repository/org/apache/hadoop/hadoop-ozone*
+          rm -rf ~/.m2/repository/org/apache/ozone/hdds*
+          rm -rf ~/.m2/repository/org/apache/ozone/ozone*
         if: always()
diff --git a/hadoop-hdds/client/pom.xml b/hadoop-hdds/client/pom.xml
index 4a99b9e..1646495 100644
--- a/hadoop-hdds/client/pom.xml
+++ b/hadoop-hdds/client/pom.xml
@@ -18,12 +18,12 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-hdds</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>hdds</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>hadoop-hdds-client</artifactId>
+  <artifactId>hdds-client</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Distributed Data Store Client Library</description>
   <name>Apache Ozone HDDS Client</name>
@@ -31,17 +31,17 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-common</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -52,8 +52,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-test</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-test</artifactId>
       <scope>test</scope>
     </dependency>
 
diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml
index cebee64..137061a 100644
--- a/hadoop-hdds/common/pom.xml
+++ b/hadoop-hdds/common/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-hdds</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>hdds</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-hdds-common</artifactId>
+  <artifactId>hdds-common</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Distributed Data Store Common</description>
   <name>Apache Ozone HDDS Common</name>
@@ -30,8 +30,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-client</artifactId>
     </dependency>
     <dependency>
       <groupId>info.picocli</groupId>
@@ -66,12 +66,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <artifactId>jackson-annotations</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-config</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-config</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
 
@@ -188,12 +188,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-interface-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-interface-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-interface-admin</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-interface-admin</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
diff --git a/hadoop-hdds/config/pom.xml b/hadoop-hdds/config/pom.xml
index 4c0d3d4..9b261ae 100644
--- a/hadoop-hdds/config/pom.xml
+++ b/hadoop-hdds/config/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-hdds</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>hdds</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-hdds-config</artifactId>
+  <artifactId>hdds-config</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Distributed Data Store Config Tools</description>
   <name>Apache Ozone HDDS Config</name>
@@ -38,8 +38,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
 
diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml
index 0c64c8f..e79fcf2 100644
--- a/hadoop-hdds/container-service/pom.xml
+++ b/hadoop-hdds/container-service/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-hdds</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>hdds</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-hdds-container-service</artifactId>
+  <artifactId>hdds-container-service</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Distributed Data Store Container Service</description>
   <name>Apache Ozone HDDS Container Service</name>
@@ -30,12 +30,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -43,18 +43,18 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <artifactId>commons-compress</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-common</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-framework</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-framework</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-client</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
@@ -77,8 +77,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-docs</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-docs</artifactId>
       <scope>provided</scope>
     </dependency>
 
@@ -98,8 +98,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-test</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-test</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -152,15 +152,15 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.apache.hadoop</groupId>
-                  <artifactId>hadoop-hdds-server-framework</artifactId>
+                  <groupId>org.apache.ozone</groupId>
+                  <artifactId>hdds-server-framework</artifactId>
                   <outputDirectory>${project.build.outputDirectory}
                   </outputDirectory>
                   <includes>webapps/static/**/*.*</includes>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.apache.hadoop</groupId>
-                  <artifactId>hadoop-hdds-docs</artifactId>
+                  <groupId>org.apache.ozone</groupId>
+                  <artifactId>hdds-docs</artifactId>
                   <outputDirectory>${project.build.outputDirectory}/webapps/hddsDatanode</outputDirectory>
                   <includes>docs/**/*.*</includes>
                 </artifactItem>
diff --git a/hadoop-hdds/docs/content/interface/O3fs.md b/hadoop-hdds/docs/content/interface/O3fs.md
index 4db9d23..f2cfb37 100644
--- a/hadoop-hdds/docs/content/interface/O3fs.md
+++ b/hadoop-hdds/docs/content/interface/O3fs.md
@@ -68,10 +68,10 @@ This will make this bucket to be the default Hadoop compatible file system and r
 You also need to add the ozone-filesystem-hadoop3.jar file to the classpath:
 
 {{< highlight bash >}}
-export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/hadoop-ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH
+export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH
 {{< /highlight >}}
 
-(Note: with Hadoop 2.x, use the `hadoop-ozone-filesystem-hadoop2-*.jar`)
+(Note: with Hadoop 2.x, use the `ozone-filesystem-hadoop2-*.jar`)
 
 Once the default Filesystem has been setup, users can run commands like ls, put, mkdir, etc.
 For example,
diff --git a/hadoop-hdds/docs/content/interface/O3fs.zh.md b/hadoop-hdds/docs/content/interface/O3fs.zh.md
index 5282387..38a807f 100644
--- a/hadoop-hdds/docs/content/interface/O3fs.zh.md
+++ b/hadoop-hdds/docs/content/interface/O3fs.zh.md
@@ -64,10 +64,10 @@ ozone sh bucket create /volume/bucket
 你还需要将 ozone-filesystem.jar 文件加入 classpath:
 
 {{< highlight bash >}}
-export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/hadoop-ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH
+export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH
 {{< /highlight >}}
 
-(注意:当使用Hadoop 2.x时,应该在classpath上添加hadoop-ozone-filesystem-hadoop2-*.jar)
+(注意:当使用Hadoop 2.x时,应该在classpath上添加ozone-filesystem-hadoop2-*.jar)
 
 当配置了默认的文件系统之后,用户可以运行 ls、put、mkdir 等命令,比如:
 
@@ -137,10 +137,10 @@ hdfs dfs -ls o3fs://bucket.volume.om-host.example.com:6789/key
 你还需要将 ozone-filesystem.jar 文件加入 classpath:
 
 {{< highlight bash >}}
-export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/hadoop-ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH
+export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH
 {{< /highlight >}}
 
-(注意:当使用Hadoop 2.x时,应该在classpath上添加hadoop-ozone-filesystem-hadoop2-*.jar)
+(注意:当使用Hadoop 2.x时,应该在classpath上添加ozone-filesystem-hadoop2-*.jar)
 
 当配置了默认的文件系统之后,用户可以运行 ls、put、mkdir 等命令,比如:
 
diff --git a/hadoop-hdds/docs/content/interface/Ofs.md b/hadoop-hdds/docs/content/interface/Ofs.md
index fcc1467..0f552c3 100644
--- a/hadoop-hdds/docs/content/interface/Ofs.md
+++ b/hadoop-hdds/docs/content/interface/Ofs.md
@@ -82,10 +82,10 @@ This will make all the volumes and buckets to be the default Hadoop compatible f
 You also need to add the ozone-filesystem-hadoop3.jar file to the classpath:
 
 {{< highlight bash >}}
-export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/hadoop-ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH
+export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH
 {{< /highlight >}}
 
-(Note: with Hadoop 2.x, use the `hadoop-ozone-filesystem-hadoop2-*.jar`)
+(Note: with Hadoop 2.x, use the `ozone-filesystem-hadoop2-*.jar`)
 
 Once the default Filesystem has been setup, users can run commands like ls, put, mkdir, etc.
 For example:
diff --git a/hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.md b/hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.md
index 0f0d094..cb2b884 100644
--- a/hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.md
+++ b/hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.md
@@ -82,7 +82,7 @@ And create a custom `core-site.xml`.
 Copy the `ozonefs.jar` file from an ozone distribution (__use the hadoop2 version!__)
 
 ```
-kubectl cp om-0:/opt/hadoop/share/ozone/lib/hadoop-ozone-filesystem-hadoop2-VERSION.jar hadoop-ozone-filesystem-hadoop2.jar
+kubectl cp om-0:/opt/hadoop/share/ozone/lib/ozone-filesystem-hadoop2-VERSION.jar ozone-filesystem-hadoop2.jar
 ```
 
 
@@ -93,7 +93,7 @@ ADD core-site.xml /opt/hadoop/conf/core-site.xml
 ADD ozone-site.xml /opt/hadoop/conf/ozone-site.xml
 ENV HADOOP_CONF_DIR=/opt/hadoop/conf
 ENV SPARK_EXTRA_CLASSPATH=/opt/hadoop/conf
-ADD hadoop-ozone-filesystem-hadoop2.jar /opt/hadoop-ozone-filesystem-hadoop2.jar
+ADD ozone-filesystem-hadoop2.jar /opt/ozone-filesystem-hadoop2.jar
 ```
 
 ```bash
@@ -142,7 +142,7 @@ bin/spark-submit \
     --conf spark.kubernetes.authenticate.driver.serviceAccountName=spark \
     --conf spark.kubernetes.container.image=myrepo/spark-ozone \
     --conf spark.kubernetes.container.image.pullPolicy=Always \
-    --jars /opt/hadoop-ozone-filesystem-hadoop2.jar \
+    --jars /opt/ozone-filesystem-hadoop2.jar \
     local:///opt/spark/examples/jars/spark-examples_2.11-2.4.0.jar \
     o3fs://test.s3v.ozone-om-0.ozone-om:9862/alice.txt
 ```
diff --git a/hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.zh.md b/hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.zh.md
index 1a1589c..5f1e919 100644
--- a/hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.zh.md
+++ b/hadoop-hdds/docs/content/recipe/SparkOzoneFSK8S.zh.md
@@ -77,7 +77,7 @@ kubectl cp om-0:/opt/hadoop/etc/hadoop/ozone-site.xml .
      </property>
 </configuration>
 ```
-kubectl cp om-0:/opt/hadoop/share/ozone/lib/hadoop-ozone-filesystem-hadoop2-VERSION.jar hadoop-ozone-filesystem-hadoop2.jar
+kubectl cp om-0:/opt/hadoop/share/ozone/lib/ozone-filesystem-hadoop2-VERSION.jar ozone-filesystem-hadoop2.jar
 ```
 
 
@@ -88,7 +88,7 @@ ADD core-site.xml /opt/hadoop/conf/core-site.xml
 ADD ozone-site.xml /opt/hadoop/conf/ozone-site.xml
 ENV HADOOP_CONF_DIR=/opt/hadoop/conf
 ENV SPARK_EXTRA_CLASSPATH=/opt/hadoop/conf
-ADD hadoop-ozone-filesystem-hadoop2.jar /opt/hadoop-ozone-filesystem-hadoop2.jar
+ADD ozone-filesystem-hadoop2.jar /opt/ozone-filesystem-hadoop2.jar
 ```
 
 ```bash
@@ -140,7 +140,7 @@ bin/spark-submit \
     --conf spark.kubernetes.authenticate.driver.serviceAccountName=spark \
     --conf spark.kubernetes.container.image=myrepo/spark-ozone \
     --conf spark.kubernetes.container.image.pullPolicy=Always \
-    --jars /opt/hadoop-ozone-filesystem-hadoop2.jar \
+    --jars /opt/ozone-filesystem-hadoop2.jar \
     local:///opt/spark/examples/jars/spark-examples_2.11-2.4.0.jar \
     o3fs://test.s3v.ozone-om-0.ozone-om:9862/alice.txt
 ```
diff --git a/hadoop-hdds/docs/pom.xml b/hadoop-hdds/docs/pom.xml
index cdb50ff..dbcd3bb 100644
--- a/hadoop-hdds/docs/pom.xml
+++ b/hadoop-hdds/docs/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-hdds</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>hdds</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-hdds-docs</artifactId>
+  <artifactId>hdds-docs</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone/HDDS Documentation</description>
   <name>Apache Ozone/HDDS Documentation</name>
diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml
index 5da3df4..4d604f1 100644
--- a/hadoop-hdds/framework/pom.xml
+++ b/hadoop-hdds/framework/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-hdds</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>hdds</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-hdds-server-framework</artifactId>
+  <artifactId>hdds-server-framework</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Distributed Data Store Server Framework
   </description>
@@ -31,25 +31,25 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-interface-server</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-interface-server</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-interface-admin</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-interface-admin</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-server</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-server</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -107,8 +107,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-test</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-test</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -128,8 +128,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-common</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml b/hadoop-hdds/hadoop-dependency-client/pom.xml
index ff18c8f..9531725 100644
--- a/hadoop-hdds/hadoop-dependency-client/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-client/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-hdds</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>hdds</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-hdds-hadoop-dependency-client</artifactId>
+  <artifactId>hdds-hadoop-dependency-client</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Distributed Data Store Hadoop client dependencies
   </description>
diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml b/hadoop-hdds/hadoop-dependency-server/pom.xml
index d031a70..b9bd05e 100644
--- a/hadoop-hdds/hadoop-dependency-server/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-server/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-hdds</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>hdds</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-hdds-hadoop-dependency-server</artifactId>
+  <artifactId>hdds-hadoop-dependency-server</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Distributed Data Store Hadoop server dependencies
   </description>
diff --git a/hadoop-hdds/hadoop-dependency-test/pom.xml b/hadoop-hdds/hadoop-dependency-test/pom.xml
index edcbe64..34cf949 100644
--- a/hadoop-hdds/hadoop-dependency-test/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-test/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-hdds</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>hdds</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-hdds-hadoop-dependency-test</artifactId>
+  <artifactId>hdds-hadoop-dependency-test</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Distributed Data Store Hadoop test dependencies
   </description>
diff --git a/hadoop-hdds/interface-admin/pom.xml b/hadoop-hdds/interface-admin/pom.xml
index 0559afc..91c1416 100644
--- a/hadoop-hdds/interface-admin/pom.xml
+++ b/hadoop-hdds/interface-admin/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-hdds</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>hdds</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-hdds-interface-admin</artifactId>
+  <artifactId>hdds-interface-admin</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Distributed Data Store Admin interface
   </description>
@@ -36,8 +36,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
     </dependency>
     <!-- required to use common hdds.proto -->
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-interface-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-interface-client</artifactId>
     </dependency>
   </dependencies>
   <build>
diff --git a/hadoop-hdds/interface-client/pom.xml b/hadoop-hdds/interface-client/pom.xml
index c3e4d8c..b3083ba 100644
--- a/hadoop-hdds/interface-client/pom.xml
+++ b/hadoop-hdds/interface-client/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-hdds</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>hdds</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-hdds-interface-client</artifactId>
+  <artifactId>hdds-interface-client</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Distributed Data Store Client interface
   </description>
diff --git a/hadoop-hdds/interface-server/pom.xml b/hadoop-hdds/interface-server/pom.xml
index f27b1ae..442ed82 100644
--- a/hadoop-hdds/interface-server/pom.xml
+++ b/hadoop-hdds/interface-server/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-hdds</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>hdds</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-hdds-interface-server</artifactId>
+  <artifactId>hdds-interface-server</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Distributed Data Store Server interface
   </description>
@@ -37,8 +37,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
     </dependency>
     <!-- required to use common hdds.proto -->
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-interface-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-interface-client</artifactId>
     </dependency>
   </dependencies>
   <build>
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index 7d7126a..6384884 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -18,12 +18,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-main-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone-main</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>hadoop-hdds</artifactId>
+  <artifactId>hdds</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Distributed Data Store Project</description>
   <name>Apache Ozone HDDS</name>
@@ -64,116 +64,116 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-common</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-common</artifactId>
         <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-hadoop-dependency-client</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-hadoop-dependency-client</artifactId>
         <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-hadoop-dependency-server</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-hadoop-dependency-server</artifactId>
         <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-hadoop-dependency-test</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-hadoop-dependency-test</artifactId>
         <version>${hdds.version}</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-interface-server</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-interface-server</artifactId>
         <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-interface-client</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-interface-client</artifactId>
         <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-interface-admin</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-interface-admin</artifactId>
         <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-client</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-client</artifactId>
         <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-tools</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-tools</artifactId>
         <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-server-framework</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-server-framework</artifactId>
         <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-server-scm</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-server-scm</artifactId>
         <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-container-service</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-container-service</artifactId>
         <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-docs</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-docs</artifactId>
         <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-config</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-config</artifactId>
         <version>${hdds.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-test-utils</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-test-utils</artifactId>
         <version>${hdds.version}</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-common</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-common</artifactId>
         <version>${hdds.version}</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-container-service</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-container-service</artifactId>
         <version>${hdds.version}</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
 
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-server-scm</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-server-scm</artifactId>
         <type>test-jar</type>
         <version>${hdds.version}</version>
         <scope>test</scope>
diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml
index 771299f..1f6f7e9 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-hdds</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>hdds</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-hdds-server-scm</artifactId>
+  <artifactId>hdds-server-scm</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Distributed Data Store Storage Container Manager Server</description>
   <name>Apache Ozone HDDS SCM Server</name>
@@ -30,36 +30,36 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-common</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-container-service</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-container-service</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-server</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-server</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-framework</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-framework</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-docs</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-docs</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -85,14 +85,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-container-service</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-container-service</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-common</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -131,8 +131,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <artifactId>bcprov-jdk15on</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-test</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-test</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -156,15 +156,15 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.apache.hadoop</groupId>
-                  <artifactId>hadoop-hdds-server-framework</artifactId>
+                  <groupId>org.apache.ozone</groupId>
+                  <artifactId>hdds-server-framework</artifactId>
                   <outputDirectory>${project.build.outputDirectory}
                   </outputDirectory>
                   <includes>webapps/static/**/*.*</includes>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.apache.hadoop</groupId>
-                  <artifactId>hadoop-hdds-docs</artifactId>
+                  <groupId>org.apache.ozone</groupId>
+                  <artifactId>hdds-docs</artifactId>
                   <outputDirectory>${project.build.outputDirectory}/webapps/scm
                   </outputDirectory>
                   <includes>docs/**/*.*</includes>
@@ -185,7 +185,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
     </plugins>
     <testResources>
       <testResource>
-        <directory>${basedir}/../../hadoop-hdds/common/src/main/resources</directory>
+        <directory>${basedir}/../../hdds/common/src/main/resources</directory>
       </testResource>
       <testResource>
         <directory>${basedir}/src/test/resources</directory>
diff --git a/hadoop-hdds/test-utils/pom.xml b/hadoop-hdds/test-utils/pom.xml
index 2521bed..e80daac 100644
--- a/hadoop-hdds/test-utils/pom.xml
+++ b/hadoop-hdds/test-utils/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-hdds</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>hdds</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-hdds-test-utils</artifactId>
+  <artifactId>hdds-test-utils</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Distributed Data Store Test Utils</description>
   <name>Apache Ozone HDDS Test Utils</name>
diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-hdds/tools/pom.xml
index 39d1aae..1ce76e6 100644
--- a/hadoop-hdds/tools/pom.xml
+++ b/hadoop-hdds/tools/pom.xml
@@ -18,12 +18,12 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-hdds</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>hdds</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>hadoop-hdds-tools</artifactId>
+  <artifactId>hdds-tools</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Distributed Data Store Tools</description>
   <name>Apache Ozone HDDS Tools</name>
@@ -31,25 +31,25 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-framework</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-framework</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-container-service</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-container-service</artifactId>
     </dependency>
     <dependency>
       <artifactId>ratis-tools</artifactId>
diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml
index 88d2424..e7635d0 100644
--- a/hadoop-ozone/client/pom.xml
+++ b/hadoop-ozone/client/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-client</artifactId>
+  <artifactId>ozone-client</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Client</description>
   <name>Apache Ozone Client</name>
@@ -30,13 +30,13 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-common</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index 14cc02f..7f7576f 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-common</artifactId>
+  <artifactId>ozone-common</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Common</description>
   <name>Apache Ozone Common</name>
@@ -35,21 +35,21 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <artifactId>commons-compress</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-interface-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-interface-client</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -57,8 +57,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-test</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-test</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml
index 171a32c..345e1d6 100644
--- a/hadoop-ozone/csi/pom.xml
+++ b/hadoop-ozone/csi/pom.xml
@@ -18,11 +18,11 @@
 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-csi</artifactId>
+  <artifactId>ozone-csi</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone CSI service</description>
   <name>Apache Ozone CSI service</name>
@@ -41,8 +41,8 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-config</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-config</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.apache.hadoop</groupId>
@@ -104,8 +104,8 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       <version>${grpc-compile.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-client</artifactId>
       <exclusions>
         <exclusion>
           <groupId>com.google.guava</groupId>
diff --git a/hadoop-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml
index 9b161f3..872189e 100644
--- a/hadoop-ozone/datanode/pom.xml
+++ b/hadoop-ozone/datanode/pom.xml
@@ -17,11 +17,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-datanode</artifactId>
+  <artifactId>ozone-datanode</artifactId>
   <name>Apache Ozone Datanode</name>
   <packaging>jar</packaging>
   <version>1.2.0-SNAPSHOT</version>
@@ -32,8 +32,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-server</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-server</artifactId>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -43,8 +43,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-container-service</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-container-service</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.xml.bind</groupId>
diff --git a/hadoop-ozone/dev-support/checks/coverage.sh b/hadoop-ozone/dev-support/checks/coverage.sh
index 1374ad9..75d6126 100755
--- a/hadoop-ozone/dev-support/checks/coverage.sh
+++ b/hadoop-ozone/dev-support/checks/coverage.sh
@@ -42,8 +42,7 @@ rm -rf target/coverage-classes || true
 mkdir -p target/coverage-classes
 
 #Unzip all the classes from the last build
-find hadoop-ozone/dist/target/*/share/ozone/lib -name "hadoop-*.jar" | \
-    grep -E 'hadoop-ozone-|hadoop-hdds-' | \
+find hadoop-ozone/dist/target/*/share/ozone/lib -name 'hdds-*.jar' -or -name 'ozone-*.jar' | \
     grep -v -E 'shaded|hadoop2|hadoop3|tests' | \
     xargs -n1 unzip -o -q -d target/coverage-classes
 
diff --git a/hadoop-ozone/dev-support/checks/integration.sh b/hadoop-ozone/dev-support/checks/integration.sh
index 3673518..a8142ef 100755
--- a/hadoop-ozone/dev-support/checks/integration.sh
+++ b/hadoop-ozone/dev-support/checks/integration.sh
@@ -16,4 +16,4 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 CHECK=integration
-source "${DIR}/junit.sh" -pl :hadoop-ozone-integration-test,:mini-chaos-tests "$@"
+source "${DIR}/junit.sh" -pl :ozone-integration-test,:mini-chaos-tests "$@"
diff --git a/hadoop-ozone/dev-support/checks/unit.sh b/hadoop-ozone/dev-support/checks/unit.sh
index 22139b5..b3c46a9 100755
--- a/hadoop-ozone/dev-support/checks/unit.sh
+++ b/hadoop-ozone/dev-support/checks/unit.sh
@@ -16,4 +16,4 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 CHECK=unit
-source "${DIR}/junit.sh" -pl \!:hadoop-ozone-integration-test,\!:mini-chaos-tests "$@"
+source "${DIR}/junit.sh" -pl \!:ozone-integration-test,\!:mini-chaos-tests "$@"
diff --git a/hadoop-ozone/dev-support/docker/Dockerfile b/hadoop-ozone/dev-support/docker/Dockerfile
index 045e1f6..aa8e966 100644
--- a/hadoop-ozone/dev-support/docker/Dockerfile
+++ b/hadoop-ozone/dev-support/docker/Dockerfile
@@ -63,7 +63,7 @@ USER jenkins1000
 RUN cd /tmp && \
    git clone --depth=1 https://gitbox.apache.org/repos/asf/hadoop.git -b trunk && \
    cd /tmp/hadoop && \
-   mvn package dependency:go-offline -DskipTests -P hdds -pl :hadoop-ozone-dist -am && \
+   mvn package dependency:go-offline -DskipTests -P hdds -pl :ozone-dist -am && \
    rm -rf /tmp/.m2/repository/org/apache/hadoop/*hdds* && \
    rm -rf /tmp/.m2/repository/org/apache/hadoop/*ozone* && \
    find /tmp/.m2/repository -exec chmod o+wx {} \;
diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/CsiServer.xml b/hadoop-ozone/dev-support/intellij/runConfigurations/CsiServer.xml
index d3bb7ab..3c15338 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/CsiServer.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/CsiServer.xml
@@ -17,7 +17,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="CsiServer" type="Application" factoryName="Application" nameIsGenerated="true">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.csi.CsiServer" />
-    <module name="hadoop-ozone-csi" />
+    <module name="ozone-csi" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
     <option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties" />
     <extension name="coverage">
@@ -30,4 +30,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode1.xml b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode1.xml
index e3a9ec9..16580fa 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode1.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode1.xml
@@ -17,7 +17,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Datanode1" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.HddsDatanodeService" />
-    <module name="hadoop-ozone-datanode" />
+    <module name="ozone-datanode" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml --set ozone.metadata.dirs=/tmp/datanode1 --set hdds.datanode.dir=/tmp/datanode1/storage" />
     <option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties" />
     <extension name="coverage">
diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode2.xml b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode2.xml
index 7555a79..3d33020 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode2.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode2.xml
@@ -17,7 +17,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Datanode2" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.HddsDatanodeService" />
-    <module name="hadoop-ozone-datanode" />
+    <module name="ozone-datanode" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml --set ozone.metadata.dirs=/tmp/datanode2 --set hdds.datanode.dir=/tmp/datanode2/storage --set hdds.datanode.http-address=127.0.0.1:10021 --set dfs.container.ratis.ipc=10022 --set dfs.container.ipc=10023 --set dfs.container.ratis.server.port=10024 --set dfs.container.ratis.admin.port=10025 --set hdds.datanode.replication.port=10026" />
     <option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties" />
     <extension name="coverage">
diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode3.xml b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode3.xml
index 5789824..10b6682 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode3.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode3.xml
@@ -17,7 +17,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Datanode3" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.HddsDatanodeService" />
-    <module name="hadoop-ozone-datanode" />
+    <module name="ozone-datanode" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml --set ozone.metadata.dirs=/tmp/datanode3 --set hdds.datanode.dir=/tmp/datanode3/storage --set hdds.datanode.http-address=127.0.0.1:10031 --set dfs.container.ratis.ipc=10032 --set dfs.container.ipc=10033 --set dfs.container.ratis.server.port=10034 --set dfs.container.ratis.admin.port=10035 --set hdds.datanode.replication.port=10036" />
     <option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties" />
     <extension name="coverage">
diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/FreonStandalone.xml b/hadoop-ozone/dev-support/intellij/runConfigurations/FreonStandalone.xml
index 9d964d4..cc17c5f 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/FreonStandalone.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/FreonStandalone.xml
@@ -17,7 +17,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="FreonStandalone" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.freon.Freon" />
-    <module name="hadoop-ozone-tools" />
+    <module name="ozone-tools" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml rk" />
     <option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties" />
     <extension name="coverage">
@@ -30,4 +30,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneFsShell.xml b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneFsShell.xml
index 5d6e4ec..ad2dc6d 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneFsShell.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneFsShell.xml
@@ -20,7 +20,7 @@
       <env name="OZONE_CONF_DIR" value="$PROJECT_DIR$/hadoop-ozone/dev-support/intellij" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.fs.ozone.OzoneFsShell" />
-    <module name="hadoop-ozone-tools" />
+    <module name="ozone-tools" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml -ls -R o3fs://bucket1.vol1/" />
     <option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties -Xbootclasspath/a:$PROJECT_DIR$/hadoop-ozone/dev-support/intellij" />
     <extension name="coverage">
diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneManager.xml b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneManager.xml
index c2aaf1c..41b80a9 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneManager.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneManager.xml
@@ -17,7 +17,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="OzoneManager" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.om.OzoneManagerStarter" />
-    <module name="hadoop-ozone-ozone-manager" />
+    <module name="ozone-manager" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
     <option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties" />
     <extension name="coverage">
diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneManagerInit.xml b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneManagerInit.xml
index 70fab5d..1cff9a2 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneManagerInit.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneManagerInit.xml
@@ -17,7 +17,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="OzoneManagerInit" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.om.OzoneManagerStarter" />
-    <module name="hadoop-ozone-ozone-manager" />
+    <module name="ozone-manager" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml --init" />
     <option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties" />
     <extension name="coverage">
diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneShell.xml b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneShell.xml
index 32a0a4c..a3d0ce0 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneShell.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneShell.xml
@@ -17,7 +17,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="OzoneShell" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.shell.OzoneShell" />
-    <module name="hadoop-ozone-tools" />
+    <module name="ozone-tools" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml volume create /vol1" />
     <option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties" />
     <extension name="coverage">
diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/Recon.xml b/hadoop-ozone/dev-support/intellij/runConfigurations/Recon.xml
index 6c8e0ec..af19302 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/Recon.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Recon.xml
@@ -17,7 +17,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Recon" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.recon.ReconServer" />
-    <module name="hadoop-ozone-recon" />
+    <module name="ozone-recon" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
     <option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties" />
     <extension name="coverage">
@@ -30,4 +30,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/S3Gateway.xml b/hadoop-ozone/dev-support/intellij/runConfigurations/S3Gateway.xml
index 93f4a9d..f2f274d 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/S3Gateway.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/S3Gateway.xml
@@ -17,7 +17,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="S3Gateway" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.s3.Gateway" />
-    <module name="hadoop-ozone-s3gateway" />
+    <module name="ozone-s3gateway" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
     <option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties" />
     <extension name="coverage">
@@ -30,4 +30,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml b/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
index 46104d3..a4f894e 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
@@ -17,7 +17,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="StorageContainerManager" type="Application" factoryName="Application" nameIsGenerated="falsee">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
-    <module name="hadoop-hdds-server-scm" />
+    <module name="hdds-server-scm" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
     <option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties" />
     <extension name="coverage">
diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManagerInit.xml b/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManagerInit.xml
index f3ef26b..789fda5 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManagerInit.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManagerInit.xml
@@ -17,7 +17,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="StorageContainerManagerInit" type="Application" factoryName="Application" nameIsGenerated="false">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
-    <module name="hadoop-hdds-server-scm" />
+    <module name="hdds-server-scm" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml --init" />
     <option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties" />
     <extension name="coverage">
diff --git a/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching b/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching
index 408233a..c94e7d0 100755
--- a/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching
+++ b/hadoop-ozone/dist/dev-support/bin/dist-tar-stitching
@@ -38,8 +38,8 @@ function run()
   fi
 }
 
-run tar -c -f "hadoop-ozone-${VERSION}.tar" "ozone-${VERSION}"
-run gzip -f "hadoop-ozone-${VERSION}.tar"
+run tar -c -f "ozone-${VERSION}.tar" "ozone-${VERSION}"
+run gzip -f "ozone-${VERSION}.tar"
 echo
-echo "Ozone dist tar available at: ${BASEDIR}/hadoop-ozone-${VERSION}.tar.gz"
+echo "Ozone dist tar available at: ${BASEDIR}/ozone-${VERSION}.tar.gz"
 echo
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index 0addb0f..01d5d5c 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -17,11 +17,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-dist</artifactId>
+  <artifactId>ozone-dist</artifactId>
   <name>Apache Ozone Distribution</name>
   <packaging>jar</packaging>
   <version>1.2.0-SNAPSHOT</version>
@@ -73,8 +73,8 @@
               </outputDirectory>
               <includes>*.classpath</includes>
               <includeArtifactIds>
-                hadoop-hdds-server-scm,hadoop-ozone-common,hadoop-ozone-csi,hadoop-ozone-datanode,hadoop-ozone-insight,
-                hadoop-ozone-ozone-manager,hadoop-ozone-recon,hadoop-ozone-s3gateway,hadoop-ozone-tools
+                hdds-server-scm,ozone-common,ozone-csi,ozone-datanode,ozone-insight,
+                ozone-manager,ozone-recon,ozone-s3gateway,ozone-tools
               </includeArtifactIds>
             </configuration>
           </execution>
@@ -179,48 +179,48 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-tools</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-tools</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-scm</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-scm</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-container-service</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-container-service</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-s3gateway</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-s3gateway</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-csi</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-csi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-ozone-manager</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-manager</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-tools</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-tools</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-datanode</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-datanode</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-docs</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-docs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-insight</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-insight</artifactId>
     </dependency>
   </dependencies>
   <profiles>
@@ -233,12 +233,12 @@
       </activation>
       <dependencies>
         <dependency>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-ozone-filesystem-hadoop2</artifactId>
+          <groupId>org.apache.ozone</groupId>
+          <artifactId>ozone-filesystem-hadoop2</artifactId>
         </dependency>
         <dependency>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-ozone-filesystem-hadoop3</artifactId>
+          <groupId>org.apache.ozone</groupId>
+          <artifactId>ozone-filesystem-hadoop3</artifactId>
         </dependency>
       </dependencies>
     </profile>
@@ -252,8 +252,8 @@
 
       <dependencies>
         <dependency>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-ozone-recon</artifactId>
+          <groupId>org.apache.ozone</groupId>
+          <artifactId>ozone-recon</artifactId>
         </dependency>
       </dependencies>
     </profile>
@@ -300,8 +300,8 @@
                       <destFileName>jacoco-core.jar</destFileName>
                     </artifactItem>
                     <artifactItem>
-                      <groupId>org.apache.hadoop</groupId>
-                      <artifactId>hadoop-hdds-test-utils</artifactId>
+                      <groupId>org.apache.ozone</groupId>
+                      <artifactId>hdds-test-utils</artifactId>
                      </artifactItem>
                     </artifactItems>
                 </configuration>
@@ -334,7 +334,7 @@
                   <archiveBaseDirectory>../..</archiveBaseDirectory>
                   <appendAssemblyId>false</appendAssemblyId>
                   <attach>false</attach>
-                  <finalName>hadoop-ozone-${project.version}-src</finalName>
+                  <finalName>ozone-${project.version}-src</finalName>
                   <outputDirectory>target</outputDirectory>
                   <basedir>${project.basedir}/../..</basedir>
                   <!-- Not using descriptorRef and hadoop-assembly dependency -->
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-config b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-config
index b1b3238..3a6bdc5 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-config
@@ -16,9 +16,9 @@
 
 CORE-SITE.xml_fs.AbstractFileSystem.o3fs.impl=org.apache.hadoop.fs.ozone.OzFs
 CORE-SITE.xml_fs.AbstractFileSystem.ofs.impl=org.apache.hadoop.fs.ozone.RootedOzFs
-MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-hadoop2-@project.version@.jar
+MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop2-@project.version@.jar
 
-HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-hadoop2-@project.version@.jar
+HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop2-@project.version@.jar
 OZONE_CLASSPATH=
 
 no_proxy=om,scm,s3g,recon,kdc,localhost,127.0.0.1
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-config b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-config
index 38abf19..d2fa492 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-config
@@ -16,9 +16,9 @@
 
 CORE-SITE.xml_fs.AbstractFileSystem.o3fs.impl=org.apache.hadoop.fs.ozone.OzFs
 CORE-SITE.xml_fs.AbstractFileSystem.ofs.impl=org.apache.hadoop.fs.ozone.RootedOzFs
-MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-hadoop3-@project.version@.jar
+MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-@project.version@.jar
 
-HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-hadoop3-@project.version@.jar
+HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-@project.version@.jar
 OZONE_CLASSPATH=
 
 no_proxy=om,scm,s3g,recon,kdc,localhost,127.0.0.1
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-config b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-config
index 38abf19..d2fa492 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-config
@@ -16,9 +16,9 @@
 
 CORE-SITE.xml_fs.AbstractFileSystem.o3fs.impl=org.apache.hadoop.fs.ozone.OzFs
 CORE-SITE.xml_fs.AbstractFileSystem.ofs.impl=org.apache.hadoop.fs.ozone.RootedOzFs
-MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-hadoop3-@project.version@.jar
+MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-@project.version@.jar
 
-HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-hadoop3-@project.version@.jar
+HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-@project.version@.jar
 OZONE_CLASSPATH=
 
 no_proxy=om,scm,s3g,recon,kdc,localhost,127.0.0.1
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/README.md b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/README.md
index 63a09a9..ec5f512 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/README.md
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/README.md
@@ -47,7 +47,7 @@ docker-compose exec rm bash
 kinit -kt /etc/security/keytabs/hadoop.keytab hadoop/rm@EXAMPLE.COM
 export HADOOP_MAPRED_HOME=/opt/hadoop/share/hadoop/mapreduce
 
-export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:/opt/hadoop/share/hadoop/mapreduce/*:/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-lib-current-@project.version@.jar
+export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:/opt/hadoop/share/hadoop/mapreduce/*:/opt/ozone/share/ozone/lib/ozone-filesystem-lib-current-@project.version@.jar
 
 hadoop fs -mkdir /user
 hadoop fs -mkdir /user/hadoop
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config
index 8968196..e02ff7d 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config
@@ -80,7 +80,7 @@ MAPRED-SITE.XML_mapreduce.reduce.env=HADOOP_MAPRED_HOME=$HADOOP_HOME
 MAPRED-SITE.XML_mapreduce.map.memory.mb=2048
 MAPRED-SITE.XML_mapreduce.reduce.memory.mb=2048
 #MAPRED-SITE.XML_mapred.child.java.opts=-Xmx2048
-MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-hadoop3-@project.version@.jar
+MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-@project.version@.jar
 
 YARN-SITE.XML_yarn.app.mapreduce.am.staging-dir=/user
 YARN-SITE.XML_yarn.timeline-service.enabled=true
@@ -141,7 +141,7 @@ JSVC_HOME=/usr/bin
 SLEEP_SECONDS=5
 KERBEROS_ENABLED=true
 
-HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-hadoop3-@project.version@.jar
+HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-@project.version@.jar
 OZONE_CLASSPATH=
 OZONE_CONF_DIR=/etc/hadoop
 OZONE_LOG_DIR=/var/log/hadoop
diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
index 8096e47..570fd7c 100644
--- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
@@ -396,7 +396,7 @@ BSD 2-Clause
 
 
 --------------------------------------------------------------------------------
-hadoop-hdds-server-scm, hadoop-ozone-ozone-manager, hadoop-ozone-s3gateway and hadoop-hdds-server-framework
+hdds-server-scm, ozone-manager, ozone-s3gateway and hdds-server-framework
 contains the source of the following javascript/css components (See licenses/ for text of these licenses):
 
 Apache Software Foundation License 2.0
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt
index cad4e63..7166d2b 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -53,37 +53,37 @@ share/ozone/lib/guice-servlet.jar
 share/ozone/lib/hadoop-annotations.jar
 share/ozone/lib/hadoop-auth.jar
 share/ozone/lib/hadoop-common.jar
-share/ozone/lib/hadoop-hdds-client.jar
-share/ozone/lib/hadoop-hdds-common.jar
-share/ozone/lib/hadoop-hdds-config.jar
-share/ozone/lib/hadoop-hdds-container-service.jar
-share/ozone/lib/hadoop-hdds-docs.jar
-share/ozone/lib/hadoop-hdds-hadoop-dependency-client.jar
-share/ozone/lib/hadoop-hdds-hadoop-dependency-server.jar
-share/ozone/lib/hadoop-hdds-interface-admin.jar
-share/ozone/lib/hadoop-hdds-interface-client.jar
-share/ozone/lib/hadoop-hdds-interface-server.jar
-share/ozone/lib/hadoop-hdds-server-framework.jar
-share/ozone/lib/hadoop-hdds-server-scm.jar
-share/ozone/lib/hadoop-hdds-tools.jar
+share/ozone/lib/hdds-client.jar
+share/ozone/lib/hdds-common.jar
+share/ozone/lib/hdds-config.jar
+share/ozone/lib/hdds-container-service.jar
+share/ozone/lib/hdds-docs.jar
+share/ozone/lib/hdds-hadoop-dependency-client.jar
+share/ozone/lib/hdds-hadoop-dependency-server.jar
+share/ozone/lib/hdds-interface-admin.jar
+share/ozone/lib/hdds-interface-client.jar
+share/ozone/lib/hdds-interface-server.jar
+share/ozone/lib/hdds-server-framework.jar
+share/ozone/lib/hdds-server-scm.jar
+share/ozone/lib/hdds-tools.jar
 share/ozone/lib/hadoop-hdfs-client.jar
 share/ozone/lib/hadoop-hdfs.jar
-share/ozone/lib/hadoop-ozone-client.jar
-share/ozone/lib/hadoop-ozone-common.jar
-share/ozone/lib/hadoop-ozone-csi.jar
-share/ozone/lib/hadoop-ozone-datanode.jar
-share/ozone/lib/hadoop-ozone-filesystem-common.jar
-share/ozone/lib/hadoop-ozone-filesystem-hadoop2.jar
-share/ozone/lib/hadoop-ozone-filesystem-hadoop3.jar
-share/ozone/lib/hadoop-ozone-filesystem.jar
-share/ozone/lib/hadoop-ozone-insight.jar
-share/ozone/lib/hadoop-ozone-interface-client.jar
-share/ozone/lib/hadoop-ozone-interface-storage.jar
-share/ozone/lib/hadoop-ozone-ozone-manager.jar
-share/ozone/lib/hadoop-ozone-reconcodegen.jar
-share/ozone/lib/hadoop-ozone-recon.jar
-share/ozone/lib/hadoop-ozone-s3gateway.jar
-share/ozone/lib/hadoop-ozone-tools.jar
+share/ozone/lib/ozone-client.jar
+share/ozone/lib/ozone-common.jar
+share/ozone/lib/ozone-csi.jar
+share/ozone/lib/ozone-datanode.jar
+share/ozone/lib/ozone-filesystem-common.jar
+share/ozone/lib/ozone-filesystem-hadoop2.jar
+share/ozone/lib/ozone-filesystem-hadoop3.jar
+share/ozone/lib/ozone-filesystem.jar
+share/ozone/lib/ozone-insight.jar
+share/ozone/lib/ozone-interface-client.jar
+share/ozone/lib/ozone-interface-storage.jar
+share/ozone/lib/ozone-manager.jar
+share/ozone/lib/ozone-reconcodegen.jar
+share/ozone/lib/ozone-recon.jar
+share/ozone/lib/ozone-s3gateway.jar
+share/ozone/lib/ozone-tools.jar
 share/ozone/lib/hk2-api.jar
 share/ozone/lib/hk2-locator.jar
 share/ozone/lib/hk2-utils.jar
diff --git a/hadoop-ozone/dist/src/main/license/update-jar-report.sh b/hadoop-ozone/dist/src/main/license/update-jar-report.sh
index 0d2aa5c..9e0d9c4 100755
--- a/hadoop-ozone/dist/src/main/license/update-jar-report.sh
+++ b/hadoop-ozone/dist/src/main/license/update-jar-report.sh
@@ -30,4 +30,4 @@ cd "$OZONE_DIST_DIR"
 
 #sed expression removes the version. Usually license is not changed with version bumps
 #jacoco and test dependencies are excluded
-find . -type f -name "*.jar" | cut -c3- | perl -wpl -e 's/-[0-9]+(.[0-9]+)*(-([0-9a-z]+-)?SNAPSHOT)?+//g' | grep -v jacoco | grep -v hadoop-hdds-test-utils | sort > "$SCRIPTDIR"/$REPORT_NAME
+find . -type f -name "*.jar" | cut -c3- | perl -wpl -e 's/-[0-9]+(.[0-9]+)*(-([0-9a-z]+-)?SNAPSHOT)?+//g' | grep -v -e jacoco -e hdds-test-utils | sort > "$SCRIPTDIR"/$REPORT_NAME
diff --git a/hadoop-ozone/dist/src/main/smoketest/cli/classpath.robot b/hadoop-ozone/dist/src/main/smoketest/cli/classpath.robot
index 506aa03..9578d29 100644
--- a/hadoop-ozone/dist/src/main/smoketest/cli/classpath.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/cli/classpath.robot
@@ -26,21 +26,21 @@ Ignores HADOOP_CLASSPATH if OZONE_CLASSPATH is set
     [setup]    Create File         %{HDDS_LIB_JARS_DIR}/hadoop-classpath.jar
     Set Environment Variable   HADOOP_CLASSPATH  %{HDDS_LIB_JARS_DIR}/hadoop-classpath.jar
     Set Environment Variable   OZONE_CLASSPATH   ${EMPTY}
-    ${output} =         Execute          ozone classpath hadoop-ozone-insight
-                        Should Contain   ${output}   hadoop-hdds-interface
+    ${output} =         Execute          ozone classpath ozone-insight
+                        Should Contain   ${output}   hdds-interface
                         Should Not Contain   ${output}   %{HDDS_LIB_JARS_DIR}/hadoop-classpath.jar
     [teardown]    Remove File         %{HDDS_LIB_JARS_DIR}/hadoop-classpath.jar
 
 Picks up items from OZONE_CLASSPATH
     [setup]    Create File         %{HDDS_LIB_JARS_DIR}/ozone-classpath.jar
     Set Environment Variable   OZONE_CLASSPATH  %{HDDS_LIB_JARS_DIR}/ozone-classpath.jar
-    ${output} =         Execute          ozone classpath hadoop-ozone-insight
+    ${output} =         Execute          ozone classpath ozone-insight
                         Should Contain   ${output}   %{HDDS_LIB_JARS_DIR}/ozone-classpath.jar
     [teardown]    Remove File         %{HDDS_LIB_JARS_DIR}/ozone-classpath.jar
 
 Adds optional dir entries
-    [setup]    Create File         %{HDDS_LIB_JARS_DIR}/hadoop-ozone-insight/optional.jar
+    [setup]    Create File         %{HDDS_LIB_JARS_DIR}/ozone-insight/optional.jar
     Set Environment Variable   OZONE_CLASSPATH  ${EMPTY}
-    ${output} =         Execute          ozone classpath hadoop-ozone-insight
-                        Should Contain   ${output}   %{HDDS_LIB_JARS_DIR}/hadoop-ozone-insight/optional.jar
-    [teardown]    Remove File    %{HDDS_LIB_JARS_DIR}/hadoop-ozone-insight/optional.jar
+    ${output} =         Execute          ozone classpath ozone-insight
+                        Should Contain   ${output}   %{HDDS_LIB_JARS_DIR}/ozone-insight/optional.jar
+    [teardown]    Remove File    %{HDDS_LIB_JARS_DIR}/ozone-insight/optional.jar
diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone b/hadoop-ozone/dist/src/shell/ozone/ozone
index e8a7d0f..777de10 100755
--- a/hadoop-ozone/dist/src/shell/ozone/ozone
+++ b/hadoop-ozone/dist/src/shell/ozone/ozone
@@ -89,7 +89,7 @@ function ozonecmd_case
   case ${subcmd} in
     auditparser)
       OZONE_CLASSNAME=org.apache.hadoop.ozone.audit.parser.AuditParser
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
+      OZONE_RUN_ARTIFACT_NAME="ozone-tools"
     ;;
     classpath)
       if [[ "$#" -gt 0 ]]; then
@@ -114,7 +114,7 @@ function ozonecmd_case
       OZONE_DATANODE_OPTS="-Dlog4j.configurationFile=${OZONE_CONF_DIR}/dn-audit-log4j2.properties ${OZONE_DATANODE_OPTS}"
       OZONE_DATANODE_OPTS="-Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector ${OZONE_DATANODE_OPTS}"
       OZONE_CLASSNAME=org.apache.hadoop.ozone.HddsDatanodeService
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-datanode"
+      OZONE_RUN_ARTIFACT_NAME="ozone-datanode"
     ;;
     envvars)
       echo "JAVA_HOME='${JAVA_HOME}'"
@@ -131,10 +131,10 @@ function ozonecmd_case
     freon)
       OZONE_CLASSNAME=org.apache.hadoop.ozone.freon.Freon
       OZONE_FREON_OPTS="${OZONE_FREON_OPTS}"
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
+      OZONE_RUN_ARTIFACT_NAME="ozone-tools"
     ;;
     genesis)
-      ARTIFACT_LIB_DIR="${OZONE_HOME}/share/ozone/lib/hadoop-ozone-tools"
+      ARTIFACT_LIB_DIR="${OZONE_HOME}/share/ozone/lib/ozone-tools"
       mkdir -p "$ARTIFACT_LIB_DIR"
       if [[ ! -f "$ARTIFACT_LIB_DIR/jmh-core-1.23.jar" ]]; then
         echo "jmh-core jar is missing from $ARTIFACT_LIB_DIR, trying to download from maven central (License: GPL + classpath exception)"
@@ -147,11 +147,11 @@ function ozonecmd_case
       fi
 
       OZONE_CLASSNAME=org.apache.hadoop.ozone.genesis.Genesis
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
+      OZONE_RUN_ARTIFACT_NAME="ozone-tools"
     ;;
     getconf)
       OZONE_CLASSNAME=org.apache.hadoop.ozone.conf.OzoneGetConf;
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
+      OZONE_RUN_ARTIFACT_NAME="ozone-tools"
     ;;
     om)
       OZONE_SUBCMD_SUPPORTDAEMONIZATION="true"
@@ -160,17 +160,17 @@ function ozonecmd_case
       OZONE_OM_OPTS="${RATIS_OPTS} ${OZONE_OM_OPTS}"
       OZONE_OM_OPTS="${OZONE_OM_OPTS} -Dlog4j.configurationFile=${OZONE_CONF_DIR}/om-audit-log4j2.properties"
       OZONE_OM_OPTS="-Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector ${OZONE_OM_OPTS}"
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-ozone-manager"
+      OZONE_RUN_ARTIFACT_NAME="ozone-manager"
     ;;
     sh | shell)
       OZONE_CLASSNAME=org.apache.hadoop.ozone.shell.OzoneShell
       ozone_deprecate_envvar HDFS_OM_SH_OPTS OZONE_SH_OPTS
       OZONE_SH_OPTS="${OZONE_SH_OPTS} -Dhadoop.log.file=ozone-shell.log -Dlog4j.configuration=file:${ozone_shell_log4j}"
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
+      OZONE_RUN_ARTIFACT_NAME="ozone-tools"
     ;;
     s3)
       OZONE_CLASSNAME=org.apache.hadoop.ozone.shell.s3.S3Shell
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
+      OZONE_RUN_ARTIFACT_NAME="ozone-tools"
     ;;
     scm)
       OZONE_SUBCMD_SUPPORTDAEMONIZATION="true"
@@ -179,54 +179,54 @@ function ozonecmd_case
       OZONE_SCM_OPTS="${RATIS_OPTS} ${OZONE_SCM_OPTS}"
       OZONE_SCM_OPTS="${OZONE_SCM_OPTS} -Dlog4j.configurationFile=${OZONE_CONF_DIR}/scm-audit-log4j2.properties"
       OZONE_SCM_OPTS="-Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector ${OZONE_SCM_OPTS}"
-      OZONE_RUN_ARTIFACT_NAME="hadoop-hdds-server-scm"
+      OZONE_RUN_ARTIFACT_NAME="hdds-server-scm"
     ;;
     s3g)
       OZONE_SUBCMD_SUPPORTDAEMONIZATION="true"
       OZONE_CLASSNAME='org.apache.hadoop.ozone.s3.Gateway'
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-s3gateway"
+      OZONE_RUN_ARTIFACT_NAME="ozone-s3gateway"
     ;;
     csi)
       OZONE_SUBCMD_SUPPORTDAEMONIZATION="true"
       OZONE_CLASSNAME='org.apache.hadoop.ozone.csi.CsiServer'
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-csi"
+      OZONE_RUN_ARTIFACT_NAME="ozone-csi"
     ;;
     recon)
       OZONE_SUBCMD_SUPPORTDAEMONIZATION="true"
       OZONE_CLASSNAME='org.apache.hadoop.ozone.recon.ReconServer'
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-recon"
+      OZONE_RUN_ARTIFACT_NAME="ozone-recon"
     ;;
     fs)
       OZONE_CLASSNAME=org.apache.hadoop.fs.ozone.OzoneFsShell
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
+      OZONE_RUN_ARTIFACT_NAME="ozone-tools"
     ;;
     daemonlog)
       OZONE_CLASSNAME=org.apache.hadoop.log.LogLevel
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
+      OZONE_RUN_ARTIFACT_NAME="ozone-tools"
     ;;
     insight)
       OZONE_CLASSNAME=org.apache.hadoop.ozone.insight.Insight
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-insight"
+      OZONE_RUN_ARTIFACT_NAME="ozone-insight"
     ;;
     version)
       OZONE_CLASSNAME=org.apache.hadoop.ozone.util.OzoneVersionInfo
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
+      OZONE_RUN_ARTIFACT_NAME="ozone-tools"
     ;;
     genconf)
       OZONE_CLASSNAME=org.apache.hadoop.ozone.genconf.GenerateOzoneRequiredConfigurations
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
+      OZONE_RUN_ARTIFACT_NAME="ozone-tools"
     ;;
     dtutil)
       OZONE_CLASSNAME=org.apache.hadoop.security.token.DtUtilShell
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
+      OZONE_RUN_ARTIFACT_NAME="ozone-tools"
     ;;
     admin)
       OZONE_CLASSNAME=org.apache.hadoop.hdds.cli.OzoneAdmin
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
+      OZONE_RUN_ARTIFACT_NAME="ozone-tools"
     ;;
     debug)
       OZONE_CLASSNAME=org.apache.hadoop.ozone.debug.OzoneDebug
-      OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
+      OZONE_RUN_ARTIFACT_NAME="ozone-tools"
     ;;
     *)
       OZONE_CLASSNAME="${subcmd}"
diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
index dd690f4..acf66ce 100644
--- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
+++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
@@ -18,8 +18,8 @@
 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>hadoop-ozone-fault-injection-test</artifactId>
-    <groupId>org.apache.hadoop</groupId>
+    <artifactId>ozone-fault-injection-test</artifactId>
+    <groupId>org.apache.ozone</groupId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
   <version>1.2.0-SNAPSHOT</version>
@@ -34,29 +34,29 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-filesystem</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-filesystem</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-integration-test</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-integration-test</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-scm</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-scm</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-test</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-test</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/hadoop-ozone/fault-injection-test/network-tests/pom.xml b/hadoop-ozone/fault-injection-test/network-tests/pom.xml
index 46170e2..74fd3a6 100644
--- a/hadoop-ozone/fault-injection-test/network-tests/pom.xml
+++ b/hadoop-ozone/fault-injection-test/network-tests/pom.xml
@@ -18,11 +18,11 @@
 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone-fault-injection-test</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone-fault-injection-test</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-network-tests</artifactId>
+  <artifactId>ozone-network-tests</artifactId>
   <description>Apache Ozone Network Tests</description>
   <name>Apache Ozone Network Tests</name>
   <packaging>jar</packaging>
diff --git a/hadoop-ozone/fault-injection-test/pom.xml b/hadoop-ozone/fault-injection-test/pom.xml
index 7699508..78398d7 100644
--- a/hadoop-ozone/fault-injection-test/pom.xml
+++ b/hadoop-ozone/fault-injection-test/pom.xml
@@ -18,11 +18,11 @@
 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-fault-injection-test</artifactId>
+  <artifactId>ozone-fault-injection-test</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Fault Injection Tests</description>
   <name>Apache Ozone Fault Injection Tests</name>
diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml
index 7dc36eb..2e9117a 100644
--- a/hadoop-ozone/insight/pom.xml
+++ b/hadoop-ozone/insight/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-insight</artifactId>
+  <artifactId>ozone-insight</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Insight Tool</description>
   <name>Apache Ozone Insight Tool</name>
@@ -30,38 +30,38 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-ozone-manager</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-manager</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <!-- Genesis requires server side components -->
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-scm</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-scm</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-filesystem</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-filesystem</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-framework</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-framework</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-tools</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-tools</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.xml.bind</groupId>
@@ -90,8 +90,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-test</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-test</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml
index 933f97a..97e72ae 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-integration-test</artifactId>
+  <artifactId>ozone-integration-test</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Integration Tests</description>
   <name>Apache Ozone Integration Tests</name>
@@ -31,21 +31,21 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <dependencies>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-scm</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-scm</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-ozone-manager</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-manager</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -54,32 +54,32 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-s3gateway</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-s3gateway</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-csi</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-csi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-recon</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-recon</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-filesystem</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-filesystem</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-tools</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-tools</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-tools</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-tools</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -87,14 +87,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-ozone-manager</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-manager</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-common</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -151,20 +151,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-scm</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-scm</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-container-service</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-container-service</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-test</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-test</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/hadoop-ozone/interface-client/pom.xml b/hadoop-ozone/interface-client/pom.xml
index 283f035..d4b16fd 100644
--- a/hadoop-ozone/interface-client/pom.xml
+++ b/hadoop-ozone/interface-client/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-interface-client</artifactId>
+  <artifactId>ozone-interface-client</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Client interface</description>
   <name>Apache Ozone Client Interface</name>
@@ -34,8 +34,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <artifactId>protobuf-java</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-interface-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-interface-client</artifactId>
     </dependency>
   </dependencies>
   <build>
diff --git a/hadoop-ozone/interface-storage/pom.xml b/hadoop-ozone/interface-storage/pom.xml
index 14b82b4..c7ce7d2 100644
--- a/hadoop-ozone/interface-storage/pom.xml
+++ b/hadoop-ozone/interface-storage/pom.xml
@@ -18,11 +18,11 @@
     https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-interface-storage</artifactId>
+  <artifactId>ozone-interface-storage</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Storage Interface</description>
   <name>Apache Ozone Storage Interface</name>
@@ -30,8 +30,8 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-common</artifactId>
     </dependency>
 
     <dependency>
@@ -40,30 +40,30 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-interface-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-interface-client</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-framework</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-framework</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-common</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-scm</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-scm</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
 
diff --git a/hadoop-ozone/native-client/README.md b/hadoop-ozone/native-client/README.md
index 04bb6fa..d4482d9 100644
--- a/hadoop-ozone/native-client/README.md
+++ b/hadoop-ozone/native-client/README.md
@@ -73,9 +73,9 @@ For example
 
 CLASSPATH is not set. CLASSPATH can be set using the following command:
  
-           export CLASSPATH=$({OZONE_HOME}/hadoop-ozone/dist/target/ozone-0.5.0-SNAPSHOT/bin/ozone classpath hadoop-ozone-filesystem --glob)
+           export CLASSPATH=$({OZONE_HOME}/hadoop-ozone/dist/target/ozone-0.5.0-SNAPSHOT/bin/ozone classpath ozone-filesystem --glob)
 
-           export CLASSPATH=$CLASSPATH:{OZONE_HOME}/hadoop-ozone/dist/target/ozone-0.5.0-SNAPSHOT/share/ozone/lib/hadoop-ozone-filesystem-0.5.0-SNAPSHOT.jar
+           export CLASSPATH=$CLASSPATH:{OZONE_HOME}/hadoop-ozone/dist/target/ozone-0.5.0-SNAPSHOT/share/ozone/lib/ozone-filesystem-0.5.0-SNAPSHOT.jar
 
 LD_LIBRARY_PATH is not set. LD_LIBRARY_PATH can be set using the following command:  
 
diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml
index 3642eb8..11f5ec4 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-ozone-manager</artifactId>
+  <artifactId>ozone-manager</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Manager Server</description>
   <name>Apache Ozone Manager Server</name>
@@ -31,44 +31,44 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <dependencies>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-common</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-client</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-docs</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-docs</artifactId>
       <scope>provided</scope>
     </dependency>
 
     <!-- hdds.proto and generated files are required from there -->
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-interface-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-interface-client</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-interface-storage</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-interface-storage</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-framework</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-framework</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-server</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-server</artifactId>
     </dependency>
 
     <dependency>
@@ -87,19 +87,19 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-common</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-test</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-test</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-scm</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-scm</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
@@ -139,15 +139,15 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.apache.hadoop</groupId>
-                  <artifactId>hadoop-hdds-server-framework</artifactId>
+                  <groupId>org.apache.ozone</groupId>
+                  <artifactId>hdds-server-framework</artifactId>
                   <outputDirectory>${project.build.outputDirectory}
                   </outputDirectory>
                   <includes>webapps/static/**/*.*</includes>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.apache.hadoop</groupId>
-                  <artifactId>hadoop-hdds-docs</artifactId>
+                  <groupId>org.apache.ozone</groupId>
+                  <artifactId>hdds-docs</artifactId>
                   <outputDirectory>${project.build.outputDirectory}/webapps/ozoneManager</outputDirectory>
                   <includes>docs/**/*.*</includes>
                 </artifactItem>
@@ -167,7 +167,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
     </plugins>
     <testResources>
       <testResource>
-        <directory>${basedir}/../../hadoop-hdds/common/src/main/resources</directory>
+        <directory>${basedir}/../../hdds/common/src/main/resources</directory>
       </testResource>
       <testResource>
         <directory>${basedir}/src/test/resources</directory>
diff --git a/hadoop-ozone/ozonefs-common/pom.xml b/hadoop-ozone/ozonefs-common/pom.xml
index 7a1e8a1..dd676df 100644
--- a/hadoop-ozone/ozonefs-common/pom.xml
+++ b/hadoop-ozone/ozonefs-common/pom.xml
@@ -17,11 +17,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-filesystem-common</artifactId>
+  <artifactId>ozone-filesystem-common</artifactId>
   <name>Apache Ozone FileSystem Common</name>
   <packaging>jar</packaging>
   <version>1.2.0-SNAPSHOT</version>
@@ -38,8 +38,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-client</artifactId>
     </dependency>
     <dependency>
       <groupId>com.github.spotbugs</groupId>
@@ -47,40 +47,40 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-scm</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-scm</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-framework</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-framework</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-ozone-manager</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-manager</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-container-service</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-container-service</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml b/hadoop-ozone/ozonefs-hadoop2/pom.xml
index 6fca2f8..5b1fa0c 100644
--- a/hadoop-ozone/ozonefs-hadoop2/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml
@@ -17,11 +17,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-filesystem-hadoop2</artifactId>
+  <artifactId>ozone-filesystem-hadoop2</artifactId>
   <name>Apache Ozone FS Hadoop 2.x compatibility</name>
   <packaging>jar</packaging>
   <version>1.2.0-SNAPSHOT</version>
@@ -30,8 +30,8 @@
   </properties>
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-filesystem-shaded</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-filesystem-shaded</artifactId>
       <optional>true</optional>
       <exclusions>
         <exclusion>
@@ -39,7 +39,7 @@
           <artifactId>hadoop-common</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>org.apache.hadoop</groupId>
+          <groupId>org.apache.ozone</groupId>
           <artifactId>hadoop-hdfs-client</artifactId>
         </exclusion>
         <exclusion>
@@ -93,8 +93,8 @@
               <excludes>META-INF/versions/**/*.*</excludes>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.apache.hadoop</groupId>
-                  <artifactId>hadoop-ozone-filesystem-shaded</artifactId>
+                  <groupId>org.apache.ozone</groupId>
+                  <artifactId>ozone-filesystem-shaded</artifactId>
                   <version>${project.version}</version>
                 </artifactItem>
               </artifactItems>
diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml b/hadoop-ozone/ozonefs-hadoop3/pom.xml
index 700c58f..ce276cd 100644
--- a/hadoop-ozone/ozonefs-hadoop3/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop3/pom.xml
@@ -17,11 +17,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-filesystem-hadoop3</artifactId>
+  <artifactId>ozone-filesystem-hadoop3</artifactId>
   <name>Apache Ozone FS Hadoop 3.x compatibility</name>
   <packaging>jar</packaging>
   <version>1.2.0-SNAPSHOT</version>
@@ -30,8 +30,8 @@
   </properties>
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-filesystem-shaded</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-filesystem-shaded</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -76,8 +76,8 @@
               <excludes>META-INF/versions/**/*.*</excludes>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.apache.hadoop</groupId>
-                  <artifactId>hadoop-ozone-filesystem-shaded</artifactId>
+                  <groupId>org.apache.ozone</groupId>
+                  <artifactId>ozone-filesystem-shaded</artifactId>
                   <version>${project.version}</version>
                 </artifactItem>
               </artifactItems>
diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml b/hadoop-ozone/ozonefs-shaded/pom.xml
index 4b13c80..8bf012c 100644
--- a/hadoop-ozone/ozonefs-shaded/pom.xml
+++ b/hadoop-ozone/ozonefs-shaded/pom.xml
@@ -17,11 +17,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-filesystem-shaded</artifactId>
+  <artifactId>ozone-filesystem-shaded</artifactId>
   <name>Apache Ozone FileSystem Shaded</name>
   <packaging>jar</packaging>
   <version>1.2.0-SNAPSHOT</version>
@@ -32,8 +32,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-filesystem-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-filesystem-common</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.apache.hadoop</groupId>
diff --git a/hadoop-ozone/ozonefs/pom.xml b/hadoop-ozone/ozonefs/pom.xml
index 6366ba5..b0d3bdf 100644
--- a/hadoop-ozone/ozonefs/pom.xml
+++ b/hadoop-ozone/ozonefs/pom.xml
@@ -17,11 +17,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-filesystem</artifactId>
+  <artifactId>ozone-filesystem</artifactId>
   <name>Apache Ozone FileSystem</name>
   <packaging>jar</packaging>
   <version>1.2.0-SNAPSHOT</version>
@@ -67,12 +67,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-filesystem-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-filesystem-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-client</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 2bbf5e1..8116839 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -14,11 +14,11 @@
 --><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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-main-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone-main</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone</artifactId>
+  <artifactId>ozone</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Project</description>
   <name>Apache Ozone</name>
@@ -58,180 +58,180 @@
 
     <dependencies>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-common</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-common</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-client</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-client</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-interface-client</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-interface-client</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-interface-storage</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-interface-storage</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-ozone-manager</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-manager</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-s3gateway</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-s3gateway</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-csi</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-csi</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-datanode</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-datanode</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-tools</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-tools</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-filesystem</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-filesystem</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-filesystem-shaded</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-filesystem-shaded</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-filesystem-common</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-filesystem-common</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-filesystem-hadoop3</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-filesystem-hadoop3</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-filesystem-hadoop2</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-filesystem-hadoop2</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-config</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-config</artifactId>
         <version>${hdds.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-interface-client</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-interface-client</artifactId>
         <version>${hdds.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-test-utils</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-test-utils</artifactId>
         <version>${hdds.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-hadoop-dependency-client</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-hadoop-dependency-client</artifactId>
         <version>${hdds.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-hadoop-dependency-server</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-hadoop-dependency-server</artifactId>
         <version>${hdds.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-hadoop-dependency-test</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-hadoop-dependency-test</artifactId>
         <version>${hdds.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-common</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-common</artifactId>
         <version>${hdds.version}</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-integration-test</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-integration-test</artifactId>
         <version>${ozone.version}</version>
         <type>test-jar</type>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-ozone-manager</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-manager</artifactId>
         <version>${ozone.version}</version>
         <type>test-jar</type>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-common</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-common</artifactId>
         <version>${hdds.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-server-framework</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-server-framework</artifactId>
         <version>${hdds.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-server-scm</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-server-scm</artifactId>
         <version>${hdds.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-docs</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-docs</artifactId>
         <version>${hdds.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-container-service</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-container-service</artifactId>
         <version>${hdds.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-client</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-client</artifactId>
         <version>${hdds.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-tools</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-tools</artifactId>
         <version>${hdds.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-insight</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-insight</artifactId>
         <version>${hdds.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-recon</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-recon</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-container-service</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-container-service</artifactId>
         <version>${hdds.version}</version>
         <type>test-jar</type>
       </dependency>
       <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdds-server-scm</artifactId>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>hdds-server-scm</artifactId>
         <type>test-jar</type>
         <version>${hdds.version}</version>
       </dependency>
diff --git a/hadoop-ozone/recon-codegen/pom.xml b/hadoop-ozone/recon-codegen/pom.xml
index 56d582b..4da3369 100644
--- a/hadoop-ozone/recon-codegen/pom.xml
+++ b/hadoop-ozone/recon-codegen/pom.xml
@@ -16,17 +16,17 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>hadoop-ozone</artifactId>
-    <groupId>org.apache.hadoop</groupId>
+    <artifactId>ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>hadoop-ozone-reconcodegen</artifactId>
+  <artifactId>ozone-reconcodegen</artifactId>
   <name>Apache Ozone Recon CodeGen</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index 97ba63d..88fdfeb 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -16,13 +16,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
   <name>Apache Ozone Recon</name>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>hadoop-ozone-recon</artifactId>
+  <artifactId>ozone-recon</artifactId>
   <properties>
     <pnpm.version>5.18.9</pnpm.version>
   </properties>
@@ -177,8 +177,8 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-common</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>jersey-server</artifactId>
@@ -195,13 +195,13 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-reconcodegen</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-reconcodegen</artifactId>
       <version>${ozone.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-ozone-manager</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-manager</artifactId>
       <exclusions>
         <exclusion>
           <groupId>com.sun.jersey</groupId>
@@ -210,14 +210,14 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <!-- visible only for ContainerOperationClient -->
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-tools</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-tools</artifactId>
       <exclusions>
         <exclusion>
           <groupId>*</groupId>
@@ -226,8 +226,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-scm</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-scm</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.inject</groupId>
@@ -270,8 +270,8 @@
       <artifactId>jersey-hk2</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-common</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -286,8 +286,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-test</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-test</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index 2a75a37..fa276ad 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/pom.xml
@@ -17,11 +17,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-s3gateway</artifactId>
+  <artifactId>ozone-s3gateway</artifactId>
   <name>Apache Ozone S3 Gateway</name>
   <packaging>jar</packaging>
   <version>1.2.0-SNAPSHOT</version>
@@ -32,18 +32,18 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-common</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-framework</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-framework</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.weld.servlet</groupId>
@@ -91,8 +91,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-server</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-server</artifactId>
       <exclusions>
         <exclusion>
           <groupId>com.sun.jersey</groupId>
@@ -113,8 +113,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-test</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-test</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -160,12 +160,12 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-docs</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-docs</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -200,15 +200,15 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.apache.hadoop</groupId>
-                  <artifactId>hadoop-hdds-server-framework</artifactId>
+                  <groupId>org.apache.ozone</groupId>
+                  <artifactId>hdds-server-framework</artifactId>
                   <outputDirectory>${project.build.outputDirectory}
                   </outputDirectory>
                   <includes>webapps/static/**/*.*</includes>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.apache.hadoop</groupId>
-                  <artifactId>hadoop-hdds-docs</artifactId>
+                  <groupId>org.apache.ozone</groupId>
+                  <artifactId>hdds-docs</artifactId>
                   <outputDirectory>
                     ${project.build.outputDirectory}/webapps/static
                   </outputDirectory>
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index 47c8fb3..4ac2470 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/pom.xml
@@ -18,11 +18,11 @@
 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
     <version>1.2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-tools</artifactId>
+  <artifactId>ozone-tools</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Tools</description>
   <name>Apache Ozone Tools</name>
@@ -30,42 +30,42 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-ozone-manager</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-manager</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-common</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-test-utils</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <!-- Genesis requires server side components -->
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-scm</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-scm</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-tools</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-tools</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-client</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-filesystem</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-filesystem</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-framework</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-server-framework</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-recon</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-recon</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.springframework</groupId>
@@ -74,8 +74,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-server</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-server</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.ratis</groupId>
@@ -130,8 +130,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-hadoop-dependency-test</artifactId>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>hdds-hadoop-dependency-test</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 75eb649..e535476 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,8 +16,8 @@
 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">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.hadoop</groupId>
-  <artifactId>hadoop-main-ozone</artifactId>
+  <groupId>org.apache.ozone</groupId>
+  <artifactId>ozone-main</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <description>Apache Ozone Main</description>
   <name>Apache Ozone Main</name>

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org