diff --git a/datastore/keyvalue/clixon_keyvalue.c b/datastore/keyvalue/clixon_keyvalue.c
index 46e9f0b0..68b2527d 100644
--- a/datastore/keyvalue/clixon_keyvalue.c
+++ b/datastore/keyvalue/clixon_keyvalue.c
@@ -1552,14 +1552,14 @@ kv_delete(xmldb_handle xh,
     return retval;
 }
 
-/*! Initialize database 
+/*! Create / Initialize database 
  * @param[in]  xh      XMLDB handle
  * @param[in]  db  Database
  * @retval  0  OK
  * @retval -1  Error
  */
 int 
-kv_init(xmldb_handle xh, 
+kv_create(xmldb_handle xh, 
 	char         *db)
 {
     int           retval = -1;
@@ -1618,7 +1618,7 @@ static const struct xmldb_api api = {
     kv_islocked,
     kv_exists,
     kv_delete,
-    kv_init,
+    kv_create,
 };
 
 
diff --git a/datastore/text/clixon_xmldb_text.c b/datastore/text/clixon_xmldb_text.c
index 3de5bd2e..d9c86ac5 100644
--- a/datastore/text/clixon_xmldb_text.c
+++ b/datastore/text/clixon_xmldb_text.c
@@ -1216,14 +1216,14 @@ text_delete(xmldb_handle xh,
     return retval;
 }
 
-/*! Initialize database 
+/*! Create / init database 
  * @param[in]  xh  XMLDB handle
  * @param[in]  db  Database
  * @retval  0  OK
  * @retval -1  Error
  */
 int 
-text_init(xmldb_handle xh, 
+text_create(xmldb_handle xh, 
 	  char         *db)
 {
     int                 retval = -1;
@@ -1246,7 +1246,7 @@ text_init(xmldb_handle xh,
     return retval;
 }
 
-/*! plugin init function */
+/*! plugin exit function */
 int
 text_plugin_exit(void)
 {
@@ -1287,7 +1287,7 @@ static const struct xmldb_api api = {
     text_islocked,
     text_exists,
     text_delete,
-    text_init,
+    text_create,
 };
 
 
diff --git a/lib/src/clixon_xml_db.c b/lib/src/clixon_xml_db.c
index edddd975..9bc2c2c0 100644
--- a/lib/src/clixon_xml_db.c
+++ b/lib/src/clixon_xml_db.c
@@ -670,7 +670,7 @@ xmldb_create(clicon_handle h,
 	clicon_err(OE_DB, 0, "No xmldb plugin");
 	goto done;
     }
-    if (xa->xa_init_fn == NULL){
+    if (xa->xa_create_fn == NULL){
 	clicon_err(OE_DB, 0, "No xmldb function");
 	goto done;
     }
@@ -678,7 +678,7 @@ xmldb_create(clicon_handle h,
 	clicon_err(OE_DB, 0, "Not connected to datastore plugin");
 	goto done;
     }
-    retval = xa->xa_init_fn(xh, db);
+    retval = xa->xa_create_fn(xh, db);
  done:
     return retval;
 }