diff --git a/.github/workflows/export-matcha-fa-en.yaml b/.github/workflows/export-matcha-fa-en.yaml
index 9d8dbc01..431bbc89 100644
--- a/.github/workflows/export-matcha-fa-en.yaml
+++ b/.github/workflows/export-matcha-fa-en.yaml
@@ -3,7 +3,7 @@ name: export-matcha-fa-en-to-onnx
 on:
   push:
     branches:
-      - export-matcha-tts-fa-en
+      - fix-ci
 
   workflow_dispatch:
 
@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  export-kokoro-to-onnx:
+  export-matcha-fa-en-to-onnx:
     if: github.repository_owner == 'k2-fsa' || github.repository_owner == 'csukuangfj'
     name: export matcha fa-en ${{ matrix.version }}
     runs-on: ${{ matrix.os }}
@@ -49,8 +49,8 @@ jobs:
           rm espeak-ng-data.tar.bz2
 
           src=scripts/matcha-tts/fa-en
-          dst1=matcha-tts-fa_en-male
-          dst2=matcha-tts-fa_en-female
+          dst1=matcha-tts-fa_en-musa # male
+          dst2=matcha-tts-fa_en-khadijah # female
 
           mkdir $dst1 $dst2
 
@@ -72,7 +72,7 @@ jobs:
           ls -lh $dst1.tar.bz2
           ls -lh $dst2.tar.bz2
 
-      - name: Publish to huggingface male
+      - name: Publish to huggingface male (musa)
         env:
           HF_TOKEN: ${{ secrets.HF_TOKEN }}
         uses: nick-fields/retry@v3
@@ -88,7 +88,7 @@ jobs:
             export GIT_LFS_SKIP_SMUDGE=1
             export GIT_CLONE_PROTECTION_ACTIVE=false
 
-            git clone https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/matcha-tts-fa_en-male huggingface
+            git clone https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/matcha-tts-fa_en-musa huggingface
             cd huggingface
             rm -rf ./*
             git fetch
@@ -97,7 +97,7 @@ jobs:
             git lfs track "cmn_dict"
             git lfs track "ru_dict"
 
-            cp -a ../matcha-tts-fa_en-male/* ./
+            cp -a ../matcha-tts-fa_en-musa/* ./
 
             git lfs track "*.onnx"
             git add .
@@ -107,9 +107,9 @@ jobs:
             git status
 
             git commit -m "add models"
-            git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/matcha-tts-fa_en-male main || true
+            git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/matcha-tts-fa_en-musa main || true
 
-      - name: Publish to huggingface male
+      - name: Publish to huggingface female (khadijah)
         env:
           HF_TOKEN: ${{ secrets.HF_TOKEN }}
         uses: nick-fields/retry@v3
@@ -125,7 +125,7 @@ jobs:
             export GIT_LFS_SKIP_SMUDGE=1
             export GIT_CLONE_PROTECTION_ACTIVE=false
 
-            git clone https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/matcha-tts-fa_en-female huggingface
+            git clone https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/matcha-tts-fa_en-khadijah huggingface
             cd huggingface
             rm -rf ./*
             git fetch
@@ -134,7 +134,7 @@ jobs:
             git lfs track "cmn_dict"
             git lfs track "ru_dict"
 
-            cp -a ../matcha-tts-fa_en-female/* ./
+            cp -a ../matcha-tts-fa_en-khadijah/* ./
 
             git lfs track "*.onnx"
             git add .
@@ -144,7 +144,7 @@ jobs:
             git status
 
             git commit -m "add models"
-            git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/matcha-tts-fa_en-female main || true
+            git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/matcha-tts-fa_en-khadijah main || true
 
       - name: Release
         if: github.repository_owner == 'csukuangfj'
diff --git a/.github/workflows/export-peng-cheng-starling.yaml b/.github/workflows/export-peng-cheng-starling.yaml
index c43de9f7..416291a0 100644
--- a/.github/workflows/export-peng-cheng-starling.yaml
+++ b/.github/workflows/export-peng-cheng-starling.yaml
@@ -3,7 +3,7 @@ name: export-peng-cheng-starling-to-onnx
 on:
   push:
     branches:
-      - export-peng-cheng-starling-2
+      - fix-ci-2
 
   workflow_dispatch:
 
@@ -59,6 +59,7 @@ jobs:
           mv -v $src/*.onnx $d
           cp -v $src/README.md $d
           cp -v $src/bpe.model $d
+          cp -v $src/tokens.txt $d
           cp -av $src/test_wavs $d
 
           ls -lh $d/
diff --git a/scripts/apk/build-apk-tts-engine.sh.in b/scripts/apk/build-apk-tts-engine.sh.in
index e55022ee..c301531e 100644
--- a/scripts/apk/build-apk-tts-engine.sh.in
+++ b/scripts/apk/build-apk-tts-engine.sh.in
@@ -63,7 +63,7 @@ sed -i.bak s/"lang = null"/"lang = \"$lang_iso_639_3\""/ ./TtsEngine.kt
   sed -i.bak s/"modelName = null"/"modelName = \"$model_name\""/ ./TtsEngine.kt
 {% endif %}
 
-{% if tts_model.model_name %}
+{% if tts_model.acoustic_model_name %}
   sed -i.bak s/"acousticModelName = null"/"acousticModelName = \"$acoustic_model_name\""/ ./TtsEngine.kt
 {% endif %}
 
diff --git a/scripts/apk/generate-tts-apk-script.py b/scripts/apk/generate-tts-apk-script.py
index f2fb96e3..696455d3 100755
--- a/scripts/apk/generate-tts-apk-script.py
+++ b/scripts/apk/generate-tts-apk-script.py
@@ -404,12 +404,12 @@ def get_matcha_models() -> List[TtsModel]:
             lang="en",
         ),
         TtsModel(
-            model_dir="matcha-tts-fa_en-male",
+            model_dir="matcha-tts-fa_en-musa",
             acoustic_model_name="model.onnx",
             lang="fa",
         ),
         TtsModel(
-            model_dir="matcha-tts-fa_en-female",
+            model_dir="matcha-tts-fa_en-khadijah",
             acoustic_model_name="model.onnx",
             lang="fa",
         ),