diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c
index 6705d16d..46b66f1b 100644
--- a/apps/cli/cli_generate.c
+++ b/apps/cli/cli_generate.c
@@ -1404,7 +1404,7 @@ yang2cli_yspec(clicon_handle      h,
         }
 
         /* Parse the buffer using cligen parser. load cli syntax */
-        if (cligen_parse_str(cli_cligen(h), cbuf_get(cb), "yang2cli", pt, NULL) < 0){
+        if (clispec_parse_str(cli_cligen(h), cbuf_get(cb), "yang2cli", NULL, pt, NULL) < 0){
             fprintf(stderr, "%s\n", cbuf_get(cb));
             goto done;
         }
diff --git a/apps/cli/cli_handle.c b/apps/cli/cli_handle.c
index 2ba72a95..003efd68 100644
--- a/apps/cli/cli_handle.c
+++ b/apps/cli/cli_handle.c
@@ -174,7 +174,7 @@ cli_parse_file(clicon_handle h,
 {
     cligen_handle ch = cligen(h);
 
-    return cligen_parse_file(ch, f, name, pt, globals);
+    return clispec_parse_file(ch, f, name, NULL, pt, globals);
 }
 
 int
diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c
index 8ae9fd5b..535d9d3b 100644
--- a/apps/cli/cli_main.c
+++ b/apps/cli/cli_main.c
@@ -282,9 +282,9 @@ autocli_trees_default(clicon_handle h)
         clicon_err(OE_UNIX, errno, "pt_new");
         goto done;
     }
-    if (cligen_parse_str(cli_cligen(h),
+    if (clispec_parse_str(cli_cligen(h),
                          "@basemodel, @remove:act-prekey, @remove:act-list, @remove:act-leafconst, @remove:ac-state;",
-                         "datamodel", pt, NULL) < 0)
+                         "datamodel", NULL, pt, NULL) < 0)
         goto done;
     if (cligen_ph_parsetree_set(ph, pt) < 0)
         goto done;
@@ -297,9 +297,9 @@ autocli_trees_default(clicon_handle h)
         clicon_err(OE_UNIX, errno, "pt_new");
         goto done;
     }
-    if (cligen_parse_str(cli_cligen(h),
+    if (clispec_parse_str(cli_cligen(h),
                          "@basemodel, @remove:act-leafvar, @remove:ac-state;",
-                         "datamodelshow", pt, NULL) < 0)
+                         "datamodelshow", NULL, pt, NULL) < 0)
         goto done;
     if (cligen_ph_parsetree_set(ph, pt) < 0)
         goto done;
@@ -311,9 +311,9 @@ autocli_trees_default(clicon_handle h)
         clicon_err(OE_UNIX, errno, "pt_new");
         goto done;
     }
-    if (cligen_parse_str(cli_cligen(h),
+    if (clispec_parse_str(cli_cligen(h),
                          "@basemodel, @remove:act-leafvar;",
-                         "datamodelstate", pt, NULL) < 0)
+                         "datamodelstate", NULL, pt, NULL) < 0)
         goto done;
     if (cligen_ph_parsetree_set(ph, pt) < 0)
         goto done;
@@ -352,7 +352,7 @@ autocli_trees_default(clicon_handle h)
     if (mode == 0)
         cprintf(cb, ", @remove:ac-leaf");
     cprintf(cb, ";");
-    if (cligen_parse_str(cli_cligen(h), cbuf_get(cb), "datamodelmode", pt, NULL) < 0)
+    if (clispec_parse_str(cli_cligen(h), cbuf_get(cb), "datamodelmode", NULL, pt, NULL) < 0)
         goto done;
     if (cligen_ph_parsetree_set(ph, pt) < 0)
         goto done;