diff --git a/kyuubi-hive-beeline/pom.xml b/kyuubi-hive-beeline/pom.xml
index ea26f6e4f..28a784f95 100644
--- a/kyuubi-hive-beeline/pom.xml
+++ b/kyuubi-hive-beeline/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-beeline</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-common</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-jdbc</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-service-rpc</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-service</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -104,7 +104,7 @@
         <dependency>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
-            <version>${hive.cli.thrift.version}</version>
+            <version>${hive.client.thrift.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -117,7 +117,7 @@
         <dependency>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libfb303</artifactId>
-            <version>${hive.cli.fb303.version}</version>
+            <version>${hive.client.fb303.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -130,13 +130,13 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>${hive.cli.guava.version}</version>
+            <version>${hive.client.guava.version}</version>
         </dependency>
 
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
-            <version>${hive.cli.commons-cli.version}</version>
+            <version>${hive.client.commons-cli.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -148,7 +148,7 @@
         <dependency>
             <groupId>jline</groupId>
             <artifactId>jline</artifactId>
-            <version>${hive.cli.jline.version}</version>
+            <version>${hive.client.jline.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -160,7 +160,7 @@
         <dependency>
             <groupId>net.sf.supercsv</groupId>
             <artifactId>super-csv</artifactId>
-            <version>${hive.cli.supercsv.version}</version>
+            <version>${hive.client.supercsv.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
diff --git a/kyuubi-hive-jdbc-shaded/pom.xml b/kyuubi-hive-jdbc-shaded/pom.xml
index 7bb27cd39..56490a6ff 100644
--- a/kyuubi-hive-jdbc-shaded/pom.xml
+++ b/kyuubi-hive-jdbc-shaded/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-storage-api</artifactId>
-            <version>${hive.cli.storage-api.version}</version>
+            <version>${hive.client.storage-api.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-service-rpc</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.apache.hive.shims</groupId>
             <artifactId>hive-shims-common</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>org.apache.hive.shims</groupId>
             <artifactId>hive-shims-0.23</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-common</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-metastore</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -122,7 +122,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-serde</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -135,7 +135,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-service</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -148,28 +148,28 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>${hive.cli.commons-codec.version}</version>
+            <version>${hive.client.commons-codec.version}</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>${hive.cli.commons-lang.version}</version>
+            <version>${hive.client.commons-lang.version}</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>${hive.cli.guava.version}</version>
+            <version>${hive.client.guava.version}</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
-            <version>${hive.cli.curator.version}</version>
+            <version>${hive.client.curator.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -182,7 +182,7 @@
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-client</artifactId>
-            <version>${hive.cli.curator.version}</version>
+            <version>${hive.client.curator.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -195,7 +195,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>${hive.cli.httpcomponents-client.version}</version>
+            <version>${hive.client.httpcomponents-client.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -208,14 +208,14 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>${hive.cli.httpcomponents-core.version}</version>
+            <version>${hive.client.httpcomponents-core.version}</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
-            <version>${hive.cli.thrift.version}</version>
+            <version>${hive.client.thrift.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -228,7 +228,7 @@
         <dependency>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libfb303</artifactId>
-            <version>${hive.cli.fb303.version}</version>
+            <version>${hive.client.fb303.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -241,7 +241,7 @@
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
-            <version>${hive.cli.zookeeper.version}</version>
+            <version>${hive.client.zookeeper.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
diff --git a/kyuubi-hive-jdbc/pom.xml b/kyuubi-hive-jdbc/pom.xml
index ef6abfc13..139fa9171 100644
--- a/kyuubi-hive-jdbc/pom.xml
+++ b/kyuubi-hive-jdbc/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-storage-api</artifactId>
-            <version>${hive.cli.storage-api.version}</version>
+            <version>${hive.client.storage-api.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-service-rpc</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.hive.shims</groupId>
             <artifactId>hive-shims-common</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>org.apache.hive.shims</groupId>
             <artifactId>hive-shims-0.23</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-common</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-metastore</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -112,7 +112,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-serde</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -124,7 +124,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-service</artifactId>
-            <version>${hive.cli.version}</version>
+            <version>${hive.client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -136,25 +136,25 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>${hive.cli.commons-codec.version}</version>
+            <version>${hive.client.commons-codec.version}</version>
         </dependency>
 
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>${hive.cli.commons-lang.version}</version>
+            <version>${hive.client.commons-lang.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>${hive.cli.guava.version}</version>
+            <version>${hive.client.guava.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
-            <version>${hive.cli.curator.version}</version>
+            <version>${hive.client.curator.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -166,7 +166,7 @@
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-client</artifactId>
-            <version>${hive.cli.curator.version}</version>
+            <version>${hive.client.curator.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -178,7 +178,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>${hive.cli.httpcomponents-client.version}</version>
+            <version>${hive.client.httpcomponents-client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -190,13 +190,13 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>${hive.cli.httpcomponents-core.version}</version>
+            <version>${hive.client.httpcomponents-core.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
-            <version>${hive.cli.thrift.version}</version>
+            <version>${hive.client.thrift.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -208,7 +208,7 @@
         <dependency>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libfb303</artifactId>
-            <version>${hive.cli.fb303.version}</version>
+            <version>${hive.client.fb303.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -220,7 +220,7 @@
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
-            <version>${hive.cli.zookeeper.version}</version>
+            <version>${hive.client.zookeeper.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
diff --git a/pom.xml b/pom.xml
index 710fa47d5..dbd3cab94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,21 +137,21 @@
         <zookeeper.version>3.4.14</zookeeper.version>
 
         <!-- apply to kyuubi-hive-jdbc/kyuubi-hive-beeline module -->
-        <hive.cli.version>2.3.9</hive.cli.version>
-        <hive.cli.version>2.3.9</hive.cli.version>
-        <hive.cli.commons-lang.version>2.6</hive.cli.commons-lang.version>
-        <hive.cli.commons-cli.version>1.2</hive.cli.commons-cli.version>
-        <hive.cli.commons-codec.version>1.15</hive.cli.commons-codec.version>
-        <hive.cli.curator.version>2.12.0</hive.cli.curator.version>
-        <hive.cli.guava.version>14.0.1</hive.cli.guava.version>
-        <hive.cli.httpcomponents-client.version>4.5.13</hive.cli.httpcomponents-client.version>
-        <hive.cli.httpcomponents-core.version>4.4.13</hive.cli.httpcomponents-core.version>
-        <hive.cli.jline.version>2.12</hive.cli.jline.version>
-        <hive.cli.storage-api.version>2.4.0</hive.cli.storage-api.version>
-        <hive.cli.supercsv.version>2.2.0</hive.cli.supercsv.version>
-        <hive.cli.thrift.version>0.9.3</hive.cli.thrift.version>
-        <hive.cli.fb303.version>0.9.3</hive.cli.fb303.version>
-        <hive.cli.zookeeper.version>3.4.14</hive.cli.zookeeper.version>
+        <hive.client.version>2.3.9</hive.client.version>
+        <hive.client.version>2.3.9</hive.client.version>
+        <hive.client.commons-lang.version>2.6</hive.client.commons-lang.version>
+        <hive.client.commons-cli.version>1.2</hive.client.commons-cli.version>
+        <hive.client.commons-codec.version>1.15</hive.client.commons-codec.version>
+        <hive.client.curator.version>2.12.0</hive.client.curator.version>
+        <hive.client.guava.version>14.0.1</hive.client.guava.version>
+        <hive.client.httpcomponents-client.version>4.5.13</hive.client.httpcomponents-client.version>
+        <hive.client.httpcomponents-core.version>4.4.13</hive.client.httpcomponents-core.version>
+        <hive.client.jline.version>2.12</hive.client.jline.version>
+        <hive.client.storage-api.version>2.4.0</hive.client.storage-api.version>
+        <hive.client.supercsv.version>2.2.0</hive.client.supercsv.version>
+        <hive.client.thrift.version>0.9.3</hive.client.thrift.version>
+        <hive.client.fb303.version>0.9.3</hive.client.fb303.version>
+        <hive.client.zookeeper.version>3.4.14</hive.client.zookeeper.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jars.target.dir>${project.build.directory}/scala-${scala.binary.version}/jars</jars.target.dir>