diff --git a/docker/demo/setup_demo_container.sh b/docker/demo/setup_demo_container.sh
index 623fc2d79..212cf0977 100755
--- a/docker/demo/setup_demo_container.sh
+++ b/docker/demo/setup_demo_container.sh
@@ -20,4 +20,4 @@ cp /var/hoodie/ws/docker/demo/config/spark-defaults.conf $SPARK_CONF_DIR/.
 hadoop fs -mkdir -p /var/demo/
 hadoop fs -mkdir -p /tmp/spark-events
 hadoop fs -copyFromLocal  -f /var/hoodie/ws/docker/demo/config /var/demo/.
-chmod +x /var/hoodie/ws/hudi-hive/run_sync_tool.sh
+chmod +x /var/hoodie/ws/hudi-hive-sync/run_sync_tool.sh
diff --git a/hudi-cli/pom.xml b/hudi-cli/pom.xml
index b02a9d9a4..6f572bb96 100644
--- a/hudi-cli/pom.xml
+++ b/hudi-cli/pom.xml
@@ -142,7 +142,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-hive</artifactId>
+      <artifactId>hudi-hive-sync</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/hudi-hive/pom.xml b/hudi-hive-sync/pom.xml
similarity index 99%
rename from hudi-hive/pom.xml
rename to hudi-hive-sync/pom.xml
index 7224da037..d82f8fe83 100644
--- a/hudi-hive/pom.xml
+++ b/hudi-hive-sync/pom.xml
@@ -23,7 +23,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>hudi-hive</artifactId>
+  <artifactId>hudi-hive-sync</artifactId>
   <packaging>jar</packaging>
 
   <properties>
diff --git a/hudi-hive/run_sync_tool.sh b/hudi-hive-sync/run_sync_tool.sh
similarity index 100%
rename from hudi-hive/run_sync_tool.sh
rename to hudi-hive-sync/run_sync_tool.sh
diff --git a/hudi-hive/src/assembly/src.xml b/hudi-hive-sync/src/assembly/src.xml
similarity index 100%
rename from hudi-hive/src/assembly/src.xml
rename to hudi-hive-sync/src/assembly/src.xml
diff --git a/hudi-hive/src/main/java/org/apache/hudi/hive/HiveSyncConfig.java b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HiveSyncConfig.java
similarity index 100%
rename from hudi-hive/src/main/java/org/apache/hudi/hive/HiveSyncConfig.java
rename to hudi-hive-sync/src/main/java/org/apache/hudi/hive/HiveSyncConfig.java
diff --git a/hudi-hive/src/main/java/org/apache/hudi/hive/HiveSyncTool.java b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HiveSyncTool.java
similarity index 100%
rename from hudi-hive/src/main/java/org/apache/hudi/hive/HiveSyncTool.java
rename to hudi-hive-sync/src/main/java/org/apache/hudi/hive/HiveSyncTool.java
diff --git a/hudi-hive/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java
similarity index 100%
rename from hudi-hive/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java
rename to hudi-hive-sync/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java
diff --git a/hudi-hive/src/main/java/org/apache/hudi/hive/HoodieHiveSyncException.java b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HoodieHiveSyncException.java
similarity index 100%
rename from hudi-hive/src/main/java/org/apache/hudi/hive/HoodieHiveSyncException.java
rename to hudi-hive-sync/src/main/java/org/apache/hudi/hive/HoodieHiveSyncException.java
diff --git a/hudi-hive/src/main/java/org/apache/hudi/hive/MultiPartKeysValueExtractor.java b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/MultiPartKeysValueExtractor.java
similarity index 100%
rename from hudi-hive/src/main/java/org/apache/hudi/hive/MultiPartKeysValueExtractor.java
rename to hudi-hive-sync/src/main/java/org/apache/hudi/hive/MultiPartKeysValueExtractor.java
diff --git a/hudi-hive/src/main/java/org/apache/hudi/hive/NonPartitionedExtractor.java b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/NonPartitionedExtractor.java
similarity index 100%
rename from hudi-hive/src/main/java/org/apache/hudi/hive/NonPartitionedExtractor.java
rename to hudi-hive-sync/src/main/java/org/apache/hudi/hive/NonPartitionedExtractor.java
diff --git a/hudi-hive/src/main/java/org/apache/hudi/hive/PartitionValueExtractor.java b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/PartitionValueExtractor.java
similarity index 100%
rename from hudi-hive/src/main/java/org/apache/hudi/hive/PartitionValueExtractor.java
rename to hudi-hive-sync/src/main/java/org/apache/hudi/hive/PartitionValueExtractor.java
diff --git a/hudi-hive/src/main/java/org/apache/hudi/hive/SchemaDifference.java b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/SchemaDifference.java
similarity index 100%
rename from hudi-hive/src/main/java/org/apache/hudi/hive/SchemaDifference.java
rename to hudi-hive-sync/src/main/java/org/apache/hudi/hive/SchemaDifference.java
diff --git a/hudi-hive/src/main/java/org/apache/hudi/hive/SlashEncodedDayPartitionValueExtractor.java b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/SlashEncodedDayPartitionValueExtractor.java
similarity index 100%
rename from hudi-hive/src/main/java/org/apache/hudi/hive/SlashEncodedDayPartitionValueExtractor.java
rename to hudi-hive-sync/src/main/java/org/apache/hudi/hive/SlashEncodedDayPartitionValueExtractor.java
diff --git a/hudi-hive/src/main/java/org/apache/hudi/hive/util/ColumnNameXLator.java b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/util/ColumnNameXLator.java
similarity index 100%
rename from hudi-hive/src/main/java/org/apache/hudi/hive/util/ColumnNameXLator.java
rename to hudi-hive-sync/src/main/java/org/apache/hudi/hive/util/ColumnNameXLator.java
diff --git a/hudi-hive/src/main/java/org/apache/hudi/hive/util/SchemaUtil.java b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/util/SchemaUtil.java
similarity index 100%
rename from hudi-hive/src/main/java/org/apache/hudi/hive/util/SchemaUtil.java
rename to hudi-hive-sync/src/main/java/org/apache/hudi/hive/util/SchemaUtil.java
diff --git a/hudi-hive/src/test/java/org/apache/hudi/hive/TestHiveSyncTool.java b/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestHiveSyncTool.java
similarity index 100%
rename from hudi-hive/src/test/java/org/apache/hudi/hive/TestHiveSyncTool.java
rename to hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestHiveSyncTool.java
diff --git a/hudi-hive/src/test/java/org/apache/hudi/hive/TestUtil.java b/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestUtil.java
similarity index 100%
rename from hudi-hive/src/test/java/org/apache/hudi/hive/TestUtil.java
rename to hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestUtil.java
diff --git a/hudi-hive/src/test/java/org/apache/hudi/hive/util/HiveTestService.java b/hudi-hive-sync/src/test/java/org/apache/hudi/hive/util/HiveTestService.java
similarity index 100%
rename from hudi-hive/src/test/java/org/apache/hudi/hive/util/HiveTestService.java
rename to hudi-hive-sync/src/test/java/org/apache/hudi/hive/util/HiveTestService.java
diff --git a/hudi-hive/src/test/resources/log4j-surefire-quiet.properties b/hudi-hive-sync/src/test/resources/log4j-surefire-quiet.properties
similarity index 100%
rename from hudi-hive/src/test/resources/log4j-surefire-quiet.properties
rename to hudi-hive-sync/src/test/resources/log4j-surefire-quiet.properties
diff --git a/hudi-hive/src/test/resources/log4j-surefire.properties b/hudi-hive-sync/src/test/resources/log4j-surefire.properties
similarity index 100%
rename from hudi-hive/src/test/resources/log4j-surefire.properties
rename to hudi-hive-sync/src/test/resources/log4j-surefire.properties
diff --git a/hudi-spark/pom.xml b/hudi-spark/pom.xml
index 118cb7f9a..a66dfdced 100644
--- a/hudi-spark/pom.xml
+++ b/hudi-spark/pom.xml
@@ -177,7 +177,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-hive</artifactId>
+      <artifactId>hudi-hive-sync</artifactId>
       <version>${project.version}</version>
     </dependency>
 
diff --git a/hudi-utilities/pom.xml b/hudi-utilities/pom.xml
index 42f2b58df..f82243b07 100644
--- a/hudi-utilities/pom.xml
+++ b/hudi-utilities/pom.xml
@@ -105,7 +105,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-hive</artifactId>
+      <artifactId>hudi-hive-sync</artifactId>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>
@@ -342,7 +342,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-hive</artifactId>
+      <artifactId>hudi-hive-sync</artifactId>
       <version>${project.version}</version>
       <classifier>tests</classifier>
       <type>test-jar</type>
diff --git a/packaging/hudi-hive-bundle/pom.xml b/packaging/hudi-hive-bundle/pom.xml
index 0d87ecbb8..668270aac 100644
--- a/packaging/hudi-hive-bundle/pom.xml
+++ b/packaging/hudi-hive-bundle/pom.xml
@@ -66,7 +66,7 @@
                 <includes>
                   <include>org.apache.hudi:hudi-common</include>
                   <include>org.apache.hudi:hudi-hadoop-mr</include>
-                  <include>org.apache.hudi:hudi-hive</include>
+                  <include>org.apache.hudi:hudi-hive-sync</include>
 
                   <include>com.beust:jcommander</include>
                   <include>org.apache.parquet:parquet-avro</include>
@@ -117,7 +117,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-hive</artifactId>
+      <artifactId>hudi-hive-sync</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
diff --git a/packaging/hudi-spark-bundle/pom.xml b/packaging/hudi-spark-bundle/pom.xml
index 0222b9264..4b59c56b3 100644
--- a/packaging/hudi-spark-bundle/pom.xml
+++ b/packaging/hudi-spark-bundle/pom.xml
@@ -67,7 +67,7 @@
                   <include>org.apache.hudi:hudi-common</include>
                   <include>org.apache.hudi:hudi-client</include>
                   <include>org.apache.hudi:hudi-spark_${scala.binary.version}</include>
-                  <include>org.apache.hudi:hudi-hive</include>
+                  <include>org.apache.hudi:hudi-hive-sync</include>
                   <include>org.apache.hudi:hudi-hadoop-mr</include>
                   <include>org.apache.hudi:hudi-timeline-service</include>
 
@@ -208,7 +208,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-hive</artifactId>
+      <artifactId>hudi-hive-sync</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/packaging/hudi-utilities-bundle/pom.xml b/packaging/hudi-utilities-bundle/pom.xml
index 7724ba08f..2da82f203 100644
--- a/packaging/hudi-utilities-bundle/pom.xml
+++ b/packaging/hudi-utilities-bundle/pom.xml
@@ -69,7 +69,7 @@
                   <include>org.apache.hudi:hudi-client</include>
                   <include>org.apache.hudi:hudi-utilities_${scala.binary.version}</include>
                   <include>org.apache.hudi:hudi-spark_${scala.binary.version}</include>
-                  <include>org.apache.hudi:hudi-hive</include>
+                  <include>org.apache.hudi:hudi-hive-sync</include>
                   <include>org.apache.hudi:hudi-hadoop-mr</include>
                   <include>org.apache.hudi:hudi-timeline-service</include>
 
@@ -189,7 +189,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hudi</groupId>
-      <artifactId>hudi-hive</artifactId>
+      <artifactId>hudi-hive-sync</artifactId>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>
diff --git a/pom.xml b/pom.xml
index 71979f199..33759cc94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
     <module>hudi-cli</module>
     <module>hudi-client</module>
     <module>hudi-hadoop-mr</module>
-    <module>hudi-hive</module>
+    <module>hudi-hive-sync</module>
     <module>hudi-spark</module>
     <module>hudi-timeline-service</module>
     <module>hudi-utilities</module>