diff --git a/core/src/demo/xmake.c b/core/src/cli/xmake.c
similarity index 100%
rename from core/src/demo/xmake.c
rename to core/src/cli/xmake.c
diff --git a/core/src/demo/xmake.ico b/core/src/cli/xmake.ico
similarity index 100%
rename from core/src/demo/xmake.ico
rename to core/src/cli/xmake.ico
diff --git a/core/src/demo/xmake.lua b/core/src/cli/xmake.lua
similarity index 99%
rename from core/src/demo/xmake.lua
rename to core/src/cli/xmake.lua
index f519dd88afc..e093191a69e 100644
--- a/core/src/demo/xmake.lua
+++ b/core/src/cli/xmake.lua
@@ -1,4 +1,4 @@
-target("demo")
+target("cli")
 
     -- disable this target if only build libaries
     if has_config("onlylib") then
diff --git a/core/src/demo/xmake.rc b/core/src/cli/xmake.rc
similarity index 100%
rename from core/src/demo/xmake.rc
rename to core/src/cli/xmake.rc
diff --git a/core/src/demo/xmake.sh b/core/src/cli/xmake.sh
similarity index 99%
rename from core/src/demo/xmake.sh
rename to core/src/cli/xmake.sh
index 05b1047ca13..531a6e86a63 100755
--- a/core/src/demo/xmake.sh
+++ b/core/src/cli/xmake.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-target "demo"
+target "cli"
     add_deps "xmake"
     set_kind "binary"
     set_basename "xmake"
diff --git a/core/xmake.lua b/core/xmake.lua
index eebec946d29..7984a40fda0 100644
--- a/core/xmake.lua
+++ b/core/xmake.lua
@@ -131,7 +131,7 @@ if is_plat("windows") then
 end
 
 -- add projects
-includes("src/sv", "src/lz4", "src/tbox", "src/xmake", "src/demo")
+includes("src/sv", "src/lz4", "src/tbox", "src/xmake", "src/cli")
 if has_config("lua_cjson") then
     includes("src/lua-cjson")
 end
diff --git a/core/xmake.sh b/core/xmake.sh
index b9320f32908..4eeae317d5b 100755
--- a/core/xmake.sh
+++ b/core/xmake.sh
@@ -228,4 +228,4 @@ if ! has_config "external"; then
     includes "src/tbox"
 fi
 includes "src/xmake"
-includes "src/demo"
+includes "src/cli"
diff --git a/core/xpack.lua b/core/xpack.lua
index c9d51b852da..0f704f49e3c 100644
--- a/core/xpack.lua
+++ b/core/xpack.lua
@@ -6,9 +6,9 @@ xpack("xmake")
     set_author("ruki <waruqi@gmail.com>")
     set_licensefile("../LICENSE.md")
     set_formats("nsis", "wix", "zip")
-    add_targets("demo")
+    add_targets("cli")
     set_bindir(".")
-    set_iconfile("src/demo/xmake.ico")
+    set_iconfile("src/cli/xmake.ico")
 
     add_components("LongPath")
 
diff --git a/scripts/rpmbuild/0001-use-static-libsv-and-tbox.patch b/scripts/rpmbuild/0001-use-static-libsv-and-tbox.patch
index 3ce8ba97a69..cab072fa556 100644
--- a/scripts/rpmbuild/0001-use-static-libsv-and-tbox.patch
+++ b/scripts/rpmbuild/0001-use-static-libsv-and-tbox.patch
@@ -24,4 +24,4 @@ index 2ae2e686b..6ea8c1b69 100755
 +    includes "src/tbox"
  fi
  includes "src/xmake"
- includes "src/demo"
+ includes "src/cli"