diff --git a/hadoop-hdds/docs/content/OzoneFS.md b/hadoop-hdds/docs/content/OzoneFS.md
index b7f8a742297..84884341ecc 100644
--- a/hadoop-hdds/docs/content/OzoneFS.md
+++ b/hadoop-hdds/docs/content/OzoneFS.md
@@ -56,7 +56,7 @@ This will make this bucket to be the default file system for HDFS dfs commands a
 You also need to add the ozone-filesystem.jar file to the classpath:
 
 {{< highlight bash >}}
-export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/hadoop-ozone-filesystem-lib-.*.jar:$HADOOP_CLASSPATH
+export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/hadoop-ozone-filesystem-lib-current.*.jar:$HADOOP_CLASSPATH
 {{< /highlight >}}
 
 
@@ -82,7 +82,7 @@ Please note that any keys created/deleted in the bucket using methods apart from
 
 There are two ozonefs files which includes all the dependencies:
 
- * share/ozone/lib/hadoop-ozone-filesystem-lib-VERSION.jar
+ * share/ozone/lib/hadoop-ozone-filesystem-lib-current-VERSION.jar
  * share/ozone/lib/hadoop-ozone-filesystem-lib-legacy-VERSION.jar
 
  The first one contains all the required dependency to use ozonefs with a
diff --git a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
index dc2819b6f83..9a470d54800 100755
--- a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
+++ b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
@@ -110,7 +110,6 @@ run cp "${ROOT}/hadoop-ozone/common/src/main/bin/stop-ozone.sh" "sbin/"
 run mkdir -p "./share/hadoop/ozoneplugin"
 run cp "${ROOT}/hadoop-ozone/objectstore-service/target/hadoop-ozone-objectstore-service-${HDDS_VERSION}-plugin.jar" "./share/hadoop/ozoneplugin/hadoop-ozone-datanode-plugin-${HDDS_VERSION}.jar"
 
-
 # Optional documentation, could be missing
 cp -r "${ROOT}/hadoop-hdds/docs/target/classes/docs" ./
 
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index c8a34a4660c..5e9cbf56596 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -204,7 +204,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-filesystem-lib</artifactId>
+      <artifactId>hadoop-ozone-filesystem-lib-current</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
diff --git a/hadoop-ozone/dist/src/main/compose/ozonefs/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonefs/docker-compose.yaml
index 62bbd62c44f..5d54ecf31ab 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonefs/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonefs/docker-compose.yaml
@@ -56,7 +56,7 @@ services:
       env_file:
          - ./docker-config
       environment:
-         HADOOP_CLASSPATH: /opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-lib-0*.jar
+         HADOOP_CLASSPATH: /opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-lib-current*.jar
       command: ["watch","-n","100000","ls"]
    hadoop2:
       image: flokkr/hadoop:2.9.0
diff --git a/hadoop-ozone/ozonefs-lib/pom.xml b/hadoop-ozone/ozonefs-lib-current/pom.xml
similarity index 98%
rename from hadoop-ozone/ozonefs-lib/pom.xml
rename to hadoop-ozone/ozonefs-lib-current/pom.xml
index b1cbaf872d3..2fe09cb30d0 100644
--- a/hadoop-ozone/ozonefs-lib/pom.xml
+++ b/hadoop-ozone/ozonefs-lib-current/pom.xml
@@ -21,7 +21,7 @@
     <artifactId>hadoop-ozone</artifactId>
     <version>0.4.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-filesystem-lib</artifactId>
+  <artifactId>hadoop-ozone-filesystem-lib-current</artifactId>
   <name>Apache Hadoop Ozone FileSystem Single Jar Library</name>
   <packaging>jar</packaging>
   <description>This projects creates an uber jar from ozonefs with all the
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index b18f901bb4b..91988ed06dd 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -40,7 +40,7 @@
     <module>client</module>
     <module>ozone-manager</module>
     <module>ozonefs</module>
-    <module>ozonefs-lib</module>
+    <module>ozonefs-lib-current</module>
     <module>ozonefs-lib-legacy</module>
     <module>tools</module>
     <module>integration-test</module>
@@ -103,7 +103,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-filesystem-lib</artifactId>
+        <artifactId>hadoop-ozone-filesystem-lib-current</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>