diff --git a/docker/Dockerfile b/docker/Dockerfile
index dd844f77a..8f17dca93 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -143,7 +143,7 @@ COPY --from=ld_image /logdevice/common/test/ssl_certs/ /logdevice/common/test/ss
 
 COPY --from=builder /root/.cabal/bin/hstream-server \
                     /root/.cabal/bin/hstream-server-old \
-                    /root/.cabal/bin/hstream-kafka-cli \
+                    /root/.cabal/bin/hstream-kafka \
                     /root/.cabal/bin/hstream \
                     /root/.cabal/bin/hadmin \
                     /root/.cabal/bin/hstore-bench-writter \
@@ -165,7 +165,7 @@ RUN mkdir -p /etc/bash_completion.d && \
     grep -wq '^source /etc/profile.d/bash_completion.sh' /etc/bash.bashrc || echo 'source /etc/profile.d/bash_completion.sh' >> /etc/bash.bashrc && \
     /usr/local/bin/hadmin --bash-completion-script /usr/local/bin/hadmin > /etc/bash_completion.d/hadmin && \
     /usr/local/bin/hadmin-store --bash-completion-script /usr/local/bin/hadmin-store > /etc/bash_completion.d/hadmin-store && \
-    /usr/local/bin/hstream-kafka-cli --bash-completion-script /usr/local/bin/hstream-kafka-cli > /etc/bash_completion.d/hstream-kafka-cli && \
+    /usr/local/bin/hkcli --bash-completion-script /usr/local/bin/hkcli > /etc/bash_completion.d/hkcli && \
     /usr/local/bin/hstream --bash-completion-script /usr/local/bin/hstream > /etc/bash_completion.d/hstream
 
 EXPOSE 6560 6570
diff --git a/hstream-kafka/HStream/Kafka/Client/Api.hs b/hstream-kafka/HStream/Kafka/Client/Api.hs
index 609e17f42..36125f658 100644
--- a/hstream-kafka/HStream/Kafka/Client/Api.hs
+++ b/hstream-kafka/HStream/Kafka/Client/Api.hs
@@ -20,7 +20,7 @@ import qualified Kafka.Protocol.Message  as K
 import qualified Kafka.Protocol.Service  as K
 
 clientId :: K.NullableString
-clientId  = Just "hstream-kafka-cli"
+clientId  = Just "hstream-kafka"
 
 withSendAndRecv :: String -> Int -> (ClientHandler -> IO a) -> IO a
 withSendAndRecv host port =
diff --git a/hstream/hstream.cabal b/hstream/hstream.cabal
index 026bd2611..a5ecc9c32 100644
--- a/hstream/hstream.cabal
+++ b/hstream/hstream.cabal
@@ -343,7 +343,7 @@ executable hstream
   default-language: Haskell2010
   ghc-options:      -threaded -rtsopts -with-rtsopts=-N
 
-executable hstream-kafka-cli
+executable hstream-kafka
   if flag(hstream_enable_asan)
     import: shared-properties, link-asan