diff --git a/dbcon/mysql/ha_mcs_impl.cpp b/dbcon/mysql/ha_mcs_impl.cpp
index 6acc214ea..dc7b5257f 100644
--- a/dbcon/mysql/ha_mcs_impl.cpp
+++ b/dbcon/mysql/ha_mcs_impl.cpp
@@ -3042,7 +3042,7 @@ void ha_mcs_impl_start_bulk_insert(ha_rows rows, TABLE* table, bool is_cache_ins
 
         if (ci->isCacheInsert)
         {
-            if (get_use_cpimport_for_cache_inserts(thd))
+            if (get_cache_use_import(thd))
                 ci->useCpimport = mcs_use_import_for_batchinsert_mode_t::ALWAYS;
             else
                 ci->useCpimport = mcs_use_import_for_batchinsert_mode_t::OFF;
diff --git a/dbcon/mysql/ha_mcs_sysvars.cpp b/dbcon/mysql/ha_mcs_sysvars.cpp
index 517163ce5..2a247405b 100644
--- a/dbcon/mysql/ha_mcs_sysvars.cpp
+++ b/dbcon/mysql/ha_mcs_sysvars.cpp
@@ -352,7 +352,7 @@ static MYSQL_THDVAR_BOOL(
 );
 
 static MYSQL_THDVAR_BOOL(
-    use_cpimport_for_cache_inserts,
+    cache_use_import,
     PLUGIN_VAR_RQCMDARG,
     "Use cpimport for the cache flush into ColumnStore",
     NULL,
@@ -400,7 +400,7 @@ st_mysql_sys_var* mcs_system_variables[] =
   MYSQL_SYSVAR(varbin_always_hex),
   MYSQL_SYSVAR(replication_slave),
   MYSQL_SYSVAR(cache_inserts),
-  MYSQL_SYSVAR(use_cpimport_for_cache_inserts),
+  MYSQL_SYSVAR(cache_use_import),
   MYSQL_SYSVAR(cache_flush_threshold),
   NULL
 };
@@ -663,13 +663,13 @@ void set_cache_inserts(THD* thd, bool value)
     THDVAR(thd, cache_inserts) = value;
 }
 
-bool get_use_cpimport_for_cache_inserts(THD* thd)
+bool get_cache_use_import(THD* thd)
 {
-    return ( thd == NULL ) ? false : THDVAR(thd, use_cpimport_for_cache_inserts);
+    return ( thd == NULL ) ? false : THDVAR(thd, cache_use_import);
 }
-void set_use_cpimport_for_cache_inserts(THD* thd, bool value)
+void set_cache_use_import(THD* thd, bool value)
 {
-    THDVAR(thd, use_cpimport_for_cache_inserts) = value;
+    THDVAR(thd, cache_use_import) = value;
 }
 
 ulonglong get_cache_flush_threshold(THD* thd)
diff --git a/dbcon/mysql/ha_mcs_sysvars.h b/dbcon/mysql/ha_mcs_sysvars.h
index a1a3a8d2a..2ffba9fbd 100644
--- a/dbcon/mysql/ha_mcs_sysvars.h
+++ b/dbcon/mysql/ha_mcs_sysvars.h
@@ -133,8 +133,8 @@ void set_replication_slave(THD* thd, bool value);
 bool get_cache_inserts(THD* thd);
 void set_cache_inserts(THD* thd, bool value);
 
-bool get_use_cpimport_for_cache_inserts(THD* thd);
-void set_use_cpimport_for_cache_inserts(THD* thd, bool value);
+bool get_cache_use_import(THD* thd);
+void set_cache_use_import(THD* thd, bool value);
 
 ulonglong get_cache_flush_threshold(THD* thd);
 void set_cache_flush_threshold(THD* thd, ulonglong value);