diff --git a/cpp/src/thrift/VectorService.thrift b/cpp/src/thrift/VectorService.thrift
index 36bab9c69f..4608e288f2 100644
--- a/cpp/src/thrift/VectorService.thrift
+++ b/cpp/src/thrift/VectorService.thrift
@@ -3,6 +3,16 @@
  * Unauthorized copying of this file, via any medium is strictly prohibited.
  * Proprietary and confidential.
  ******************************************************************************/
+namespace cl zilliz
+namespace cpp zilliz
+namespace py zilliz
+namespace d zilliz
+namespace dart zilliz
+namespace java zilliz
+namespace perl zilliz
+namespace php zilliz
+namespace haxe zilliz
+namespace netcore zilliz
 
 enum VecErrCode {
     SUCCESS = 0,
diff --git a/cpp/src/thrift/gen-cpp/VecService.cpp b/cpp/src/thrift/gen-cpp/VecService.cpp
index 71168f9d25..78c1021af2 100644
--- a/cpp/src/thrift/gen-cpp/VecService.cpp
+++ b/cpp/src/thrift/gen-cpp/VecService.cpp
@@ -6,7 +6,7 @@
  */
 #include "VecService.h"
 
-
+namespace zilliz {
 
 
 VecService_add_group_args::~VecService_add_group_args() throw() {
@@ -4673,5 +4673,5 @@ void VecServiceConcurrentClient::recv_search_binary_vector_batch(VecSearchResult
   } // end while(true)
 }
 
-
+} // namespace
 
diff --git a/cpp/src/thrift/gen-cpp/VecService.h b/cpp/src/thrift/gen-cpp/VecService.h
index d1bfc68d9d..be30631e6a 100644
--- a/cpp/src/thrift/gen-cpp/VecService.h
+++ b/cpp/src/thrift/gen-cpp/VecService.h
@@ -11,7 +11,7 @@
 #include <thrift/async/TConcurrentClientSyncInfo.h>
 #include "VectorService_types.h"
 
-
+namespace zilliz {
 
 #ifdef _MSC_VER
   #pragma warning( push )
@@ -1725,6 +1725,6 @@ class VecServiceConcurrentClient : virtual public VecServiceIf {
   #pragma warning( pop )
 #endif
 
-
+} // namespace
 
 #endif
diff --git a/cpp/src/thrift/gen-cpp/VecService_server.skeleton.cpp b/cpp/src/thrift/gen-cpp/VecService_server.skeleton.cpp
index 8cd2e03b16..f87088d388 100644
--- a/cpp/src/thrift/gen-cpp/VecService_server.skeleton.cpp
+++ b/cpp/src/thrift/gen-cpp/VecService_server.skeleton.cpp
@@ -12,6 +12,8 @@ using namespace ::apache::thrift::protocol;
 using namespace ::apache::thrift::transport;
 using namespace ::apache::thrift::server;
 
+using namespace  ::zilliz;
+
 class VecServiceHandler : virtual public VecServiceIf {
  public:
   VecServiceHandler() {
diff --git a/cpp/src/thrift/gen-cpp/VectorService_constants.cpp b/cpp/src/thrift/gen-cpp/VectorService_constants.cpp
index b9275d5961..3ae3e76ba9 100644
--- a/cpp/src/thrift/gen-cpp/VectorService_constants.cpp
+++ b/cpp/src/thrift/gen-cpp/VectorService_constants.cpp
@@ -6,12 +6,12 @@
  */
 #include "VectorService_constants.h"
 
-
+namespace zilliz {
 
 const VectorServiceConstants g_VectorService_constants;
 
 VectorServiceConstants::VectorServiceConstants() {
 }
 
-
+} // namespace
 
diff --git a/cpp/src/thrift/gen-cpp/VectorService_constants.h b/cpp/src/thrift/gen-cpp/VectorService_constants.h
index 501980cbfe..3b950c228e 100644
--- a/cpp/src/thrift/gen-cpp/VectorService_constants.h
+++ b/cpp/src/thrift/gen-cpp/VectorService_constants.h
@@ -9,7 +9,7 @@
 
 #include "VectorService_types.h"
 
-
+namespace zilliz {
 
 class VectorServiceConstants {
  public:
@@ -19,6 +19,6 @@ class VectorServiceConstants {
 
 extern const VectorServiceConstants g_VectorService_constants;
 
-
+} // namespace
 
 #endif
diff --git a/cpp/src/thrift/gen-cpp/VectorService_types.cpp b/cpp/src/thrift/gen-cpp/VectorService_types.cpp
index 61a4f4e081..1db0f177ed 100644
--- a/cpp/src/thrift/gen-cpp/VectorService_types.cpp
+++ b/cpp/src/thrift/gen-cpp/VectorService_types.cpp
@@ -11,7 +11,7 @@
 
 #include <thrift/TToString.h>
 
-
+namespace zilliz {
 
 int _kVecErrCodeValues[] = {
   VecErrCode::SUCCESS,
@@ -1793,4 +1793,4 @@ void VecSearchFilter::printTo(std::ostream& out) const {
   out << ")";
 }
 
-
+} // namespace
diff --git a/cpp/src/thrift/gen-cpp/VectorService_types.h b/cpp/src/thrift/gen-cpp/VectorService_types.h
index cbc996f07c..b59d95c476 100644
--- a/cpp/src/thrift/gen-cpp/VectorService_types.h
+++ b/cpp/src/thrift/gen-cpp/VectorService_types.h
@@ -18,7 +18,7 @@
 #include <thrift/stdcxx.h>
 
 
-
+namespace zilliz {
 
 struct VecErrCode {
   enum type {
@@ -648,6 +648,6 @@ void swap(VecSearchFilter &a, VecSearchFilter &b);
 
 std::ostream& operator<<(std::ostream& out, const VecSearchFilter& obj);
 
-
+} // namespace
 
 #endif
diff --git a/cpp/test_client/src/ClientTest.cpp b/cpp/test_client/src/ClientTest.cpp
index 7ef62a0680..37f1764afc 100644
--- a/cpp/test_client/src/ClientTest.cpp
+++ b/cpp/test_client/src/ClientTest.cpp
@@ -12,6 +12,7 @@
 
 #include <time.h>
 
+using namespace zilliz;
 using namespace zilliz::vecwise;
 
 namespace {