diff --git a/arkoala-arkts/loader/src/loader.ts b/arkoala-arkts/loader/src/loader.ts
index 084ff46b73948ca3842e02f606b03534baa4932d..c59eab18a468b4c3cb54c9a4fe291bd8ad5bbe27 100644
--- a/arkoala-arkts/loader/src/loader.ts
+++ b/arkoala-arkts/loader/src/loader.ts
@@ -156,12 +156,13 @@ checkLoader(
     vm, app, params,
     (process && process.argv.length > 4) ? parseInt(process.argv[4]) : undefined)
     .then(control => {
+        console.log(`Started ${app}...`)
         switch (app) {
-            case "TrivialApp": {
+            case "ComExampleTrivialApplication": {
                 trivialChecker(control)
                 break;
             }
-            case "NavigationApp": {
+            case "ComExampleNavigationApplication": {
                 navigationChecker(control)
                 break;
             }
diff --git a/arkoala-arkts/navigation/navigation/AppScope/app.json5 b/arkoala-arkts/navigation/navigation/AppScope/app.json5
index c9219fbc384c1823514ea1cf07e50676ffce92a4..65da203285f5e22001a9acd38409e035227dfd54 100644
--- a/arkoala-arkts/navigation/navigation/AppScope/app.json5
+++ b/arkoala-arkts/navigation/navigation/AppScope/app.json5
@@ -1,6 +1,6 @@
 {
   "app": {
-    "bundleName": "com.example.shopping.application",
+    "bundleName": "com.example.navigation.application",
     "vendor": "example",
     "versionCode": 1000000,
     "versionName": "1.0.0",
diff --git a/arkoala-arkts/navigation/user/src/Page.ts b/arkoala-arkts/navigation/user/src/Page.ts
index 1ef0c025fc62776e3b2b387bc780fd7a39056e5a..fddb5f1fd24c1eb295d999033ae00839bd71abbd 100644
--- a/arkoala-arkts/navigation/user/src/Page.ts
+++ b/arkoala-arkts/navigation/user/src/Page.ts
@@ -1,7 +1,7 @@
 import { NavigationPage } from "app/navigation"
 import { UserView, UserViewBuilder } from "@koalaui/arkts-arkui"
 
-export class ViewNavigationApp extends UserView {
+export class ComExampleNavigationApplication extends UserView {
     private params: String
     constructor(params: String) {
         super()
diff --git a/arkoala-arkts/navigation/user/src/ets/etsconfig.json b/arkoala-arkts/navigation/user/src/ets/etsconfig.json
index 2e88d85ca28eddbc4e88c859887a1235d1275d80..8c8b162b4fe9b32f34daace4a8dabeb90c280fba 100644
--- a/arkoala-arkts/navigation/user/src/ets/etsconfig.json
+++ b/arkoala-arkts/navigation/user/src/ets/etsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../../../arkui/config/etsconfig-base.json",
+    "extends": "../../../../arkui/config/etsconfig-base.json",
     "include": [
         "./**/*.ets"
     ],
diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json
index 4c748baecb57e102d6e990cacc44b04a3d9d2a20..9ffcaff2a173d6db36aba3097f360148520d0d4c 100644
--- a/arkoala-arkts/package.json
+++ b/arkoala-arkts/package.json
@@ -68,14 +68,15 @@
         "aot:arm32:arkoala": "npm run link:arkoala && npm run -C ../incremental/tools/fast-arktsc compile && node ../incremental/tools/fast-arktsc --only-aot build/arkoala.abc --aot-target arm",
         "aot:arm64:arkoala": "npm run link:arkoala && npm run -C ../incremental/tools/fast-arktsc compile && node ../incremental/tools/fast-arktsc --only-aot build/arkoala.abc --aot-target arm64",
         "build:user": "npm run build:user --prefix trivial/user && mkdir -p ./build && cp -r trivial/user/build/user.abc ./build/",
-        "build:shopping": "npm run build:shopping --prefix shopping/user && mkdir -p ./build && cp -r shopping/user/build/shopping.abc ./build/",
+        "build:navigation": "npm run build:user --prefix navigation/user && mkdir -p ./build && cp -r navigation/user/build/user.abc ./build/navigation.abc",
+        "build:shopping": "npm run build:user --prefix shopping/user && mkdir -p ./build && cp -r shopping/user/build/user.abc ./build/shopping.abc",
         "aot:host:shopping": "npm run build:shopping && npm run -C ../incremental/tools/fast-arktsc compile && npm run aot:host:arkoala && node ../incremental/tools/fast-arktsc --only-aot build/shopping.abc --aot-libs ./build/arkoala.abc",
         "aot:arm32:shopping": "npm run build:shopping && npm run -C ../incremental/tools/fast-arktsc compile && npm run aot:host:arkoala && node ../incremental/tools/fast-arktsc --only-aot build/shopping.abc --aot-libs ./build/arkoala.abc --aot-target arm",
         "aot:arm64:shopping": "npm run build:shopping && npm run -C ../incremental/tools/fast-arktsc compile && npm run aot:host:arkoala && node ../incremental/tools/fast-arktsc --only-aot build/shopping.abc --aot-libs ./build/arkoala.abc --aot-target arm64",
-        "run:node:user": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:TrivialApp",
-        "run:node:user:navigation": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:NavigationApp",
-        "run:node:shopping": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:ShoppingApp",
-        "run:node:ci": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:TrivialApp 10",
+        "run:node:user": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:ComExampleTrivialApplication",
+        "run:node:user:navigation": "npm run build:navigation && ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:ComExampleNavigationApplication",
+        "run:node:shopping": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:ComExampleShoppingApplication",
+        "run:node:ci": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:ComExampleTrivialApplication 10",
         "trivial:all:node": "npm run compile:native:node-host && npm run build:arkoala && npm run build:user && npm run build:loader:node && npm run run:node:user",
         "trivial:all:node:navigation": "npm run compile:native:node-host && npm run build:arkoala && npm run build:user && npm run build:loader:node && npm run run:node:user:navigation",
         "trivial:node": "npm run build:user && npm run build:loader:node && npm run run:node:user",
@@ -94,7 +95,7 @@
         "shopping:har-universal": "npm run user:har:universal --prefix shopping",
         "clean": "rimraf build",
         "clean:native": "npm run clean --prefix ../arkoala/framework",
-        "clean:all": "npm run clean && npm run clean:common && npm run clean:incremental && npm run clean:interop && npm run clean:arkui-common && npm run clean:arkui-no-common && npm run clean:native && npm run clean --prefix har && npm run clean --prefix user && npm run clean:shopping",
+        "clean:all": "npm run clean && npm run clean:common && npm run clean:incremental && npm run clean:interop && npm run clean:arkui-common && npm run clean:arkui-no-common && npm run clean:native && npm run clean --prefix har && npm run clean --prefix trivial/user && npm run clean:shopping",
         "perf:trivial": "npm run build:user && ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk valgrind --tool=cachegrind --valgrind-stacksize=8000000 --main-stacksize=100000000 node build/index.js panda:TrivialApp 2>/dev/null && ls -lh cachegrind.out.* && echo 'Use cg_annotate to inspect'"
     }
 }