diff --git a/egs/ljspeech/TTS/matcha_tts/__init__.py b/egs/ljspeech/TTS/matcha/__init__.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/__init__.py
rename to egs/ljspeech/TTS/matcha/__init__.py
diff --git a/egs/ljspeech/TTS/matcha_tts/hifigan/LICENSE b/egs/ljspeech/TTS/matcha/hifigan/LICENSE
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/hifigan/LICENSE
rename to egs/ljspeech/TTS/matcha/hifigan/LICENSE
diff --git a/egs/ljspeech/TTS/matcha_tts/hifigan/README.md b/egs/ljspeech/TTS/matcha/hifigan/README.md
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/hifigan/README.md
rename to egs/ljspeech/TTS/matcha/hifigan/README.md
diff --git a/egs/ljspeech/TTS/matcha_tts/hifigan/__init__.py b/egs/ljspeech/TTS/matcha/hifigan/__init__.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/hifigan/__init__.py
rename to egs/ljspeech/TTS/matcha/hifigan/__init__.py
diff --git a/egs/ljspeech/TTS/matcha_tts/hifigan/config.py b/egs/ljspeech/TTS/matcha/hifigan/config.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/hifigan/config.py
rename to egs/ljspeech/TTS/matcha/hifigan/config.py
diff --git a/egs/ljspeech/TTS/matcha_tts/hifigan/denoiser.py b/egs/ljspeech/TTS/matcha/hifigan/denoiser.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/hifigan/denoiser.py
rename to egs/ljspeech/TTS/matcha/hifigan/denoiser.py
diff --git a/egs/ljspeech/TTS/matcha_tts/hifigan/env.py b/egs/ljspeech/TTS/matcha/hifigan/env.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/hifigan/env.py
rename to egs/ljspeech/TTS/matcha/hifigan/env.py
diff --git a/egs/ljspeech/TTS/matcha_tts/hifigan/meldataset.py b/egs/ljspeech/TTS/matcha/hifigan/meldataset.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/hifigan/meldataset.py
rename to egs/ljspeech/TTS/matcha/hifigan/meldataset.py
diff --git a/egs/ljspeech/TTS/matcha_tts/hifigan/models.py b/egs/ljspeech/TTS/matcha/hifigan/models.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/hifigan/models.py
rename to egs/ljspeech/TTS/matcha/hifigan/models.py
diff --git a/egs/ljspeech/TTS/matcha_tts/hifigan/xutils.py b/egs/ljspeech/TTS/matcha/hifigan/xutils.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/hifigan/xutils.py
rename to egs/ljspeech/TTS/matcha/hifigan/xutils.py
diff --git a/egs/ljspeech/TTS/matcha_tts/models/__init__.py b/egs/ljspeech/TTS/matcha/models/__init__.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/models/__init__.py
rename to egs/ljspeech/TTS/matcha/models/__init__.py
diff --git a/egs/ljspeech/TTS/matcha_tts/models/baselightningmodule.py b/egs/ljspeech/TTS/matcha/models/baselightningmodule.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/models/baselightningmodule.py
rename to egs/ljspeech/TTS/matcha/models/baselightningmodule.py
diff --git a/egs/ljspeech/TTS/matcha_tts/models/components/__init__.py b/egs/ljspeech/TTS/matcha/models/components/__init__.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/models/components/__init__.py
rename to egs/ljspeech/TTS/matcha/models/components/__init__.py
diff --git a/egs/ljspeech/TTS/matcha_tts/models/components/decoder.py b/egs/ljspeech/TTS/matcha/models/components/decoder.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/models/components/decoder.py
rename to egs/ljspeech/TTS/matcha/models/components/decoder.py
diff --git a/egs/ljspeech/TTS/matcha_tts/models/components/flow_matching.py b/egs/ljspeech/TTS/matcha/models/components/flow_matching.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/models/components/flow_matching.py
rename to egs/ljspeech/TTS/matcha/models/components/flow_matching.py
diff --git a/egs/ljspeech/TTS/matcha_tts/models/components/text_encoder.py b/egs/ljspeech/TTS/matcha/models/components/text_encoder.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/models/components/text_encoder.py
rename to egs/ljspeech/TTS/matcha/models/components/text_encoder.py
diff --git a/egs/ljspeech/TTS/matcha_tts/models/components/transformer.py b/egs/ljspeech/TTS/matcha/models/components/transformer.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/models/components/transformer.py
rename to egs/ljspeech/TTS/matcha/models/components/transformer.py
diff --git a/egs/ljspeech/TTS/matcha_tts/models/matcha_tts.py b/egs/ljspeech/TTS/matcha/models/matcha_tts.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/models/matcha_tts.py
rename to egs/ljspeech/TTS/matcha/models/matcha_tts.py
diff --git a/egs/ljspeech/TTS/matcha_tts/text/__init__.py b/egs/ljspeech/TTS/matcha/text/__init__.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/text/__init__.py
rename to egs/ljspeech/TTS/matcha/text/__init__.py
diff --git a/egs/ljspeech/TTS/matcha_tts/text/cleaners.py b/egs/ljspeech/TTS/matcha/text/cleaners.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/text/cleaners.py
rename to egs/ljspeech/TTS/matcha/text/cleaners.py
diff --git a/egs/ljspeech/TTS/matcha_tts/text/numbers.py b/egs/ljspeech/TTS/matcha/text/numbers.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/text/numbers.py
rename to egs/ljspeech/TTS/matcha/text/numbers.py
diff --git a/egs/ljspeech/TTS/matcha_tts/text/symbols.py b/egs/ljspeech/TTS/matcha/text/symbols.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/text/symbols.py
rename to egs/ljspeech/TTS/matcha/text/symbols.py
diff --git a/egs/ljspeech/TTS/matcha_tts/train-orig.py b/egs/ljspeech/TTS/matcha/train-orig.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/train-orig.py
rename to egs/ljspeech/TTS/matcha/train-orig.py
diff --git a/egs/ljspeech/TTS/matcha_tts/utils/__init__.py b/egs/ljspeech/TTS/matcha/utils/__init__.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/utils/__init__.py
rename to egs/ljspeech/TTS/matcha/utils/__init__.py
diff --git a/egs/ljspeech/TTS/matcha_tts/utils/audio.py b/egs/ljspeech/TTS/matcha/utils/audio.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/utils/audio.py
rename to egs/ljspeech/TTS/matcha/utils/audio.py
diff --git a/egs/ljspeech/TTS/matcha_tts/utils/generate_data_statistics.py b/egs/ljspeech/TTS/matcha/utils/generate_data_statistics.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/utils/generate_data_statistics.py
rename to egs/ljspeech/TTS/matcha/utils/generate_data_statistics.py
diff --git a/egs/ljspeech/TTS/matcha_tts/utils/get_durations_from_trained_model.py b/egs/ljspeech/TTS/matcha/utils/get_durations_from_trained_model.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/utils/get_durations_from_trained_model.py
rename to egs/ljspeech/TTS/matcha/utils/get_durations_from_trained_model.py
diff --git a/egs/ljspeech/TTS/matcha_tts/utils/instantiators.py b/egs/ljspeech/TTS/matcha/utils/instantiators.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/utils/instantiators.py
rename to egs/ljspeech/TTS/matcha/utils/instantiators.py
diff --git a/egs/ljspeech/TTS/matcha_tts/utils/logging_utils.py b/egs/ljspeech/TTS/matcha/utils/logging_utils.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/utils/logging_utils.py
rename to egs/ljspeech/TTS/matcha/utils/logging_utils.py
diff --git a/egs/ljspeech/TTS/matcha_tts/utils/model.py b/egs/ljspeech/TTS/matcha/utils/model.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/utils/model.py
rename to egs/ljspeech/TTS/matcha/utils/model.py
diff --git a/egs/ljspeech/TTS/matcha_tts/utils/monotonic_align/__init__.py b/egs/ljspeech/TTS/matcha/utils/monotonic_align/__init__.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/utils/monotonic_align/__init__.py
rename to egs/ljspeech/TTS/matcha/utils/monotonic_align/__init__.py
diff --git a/egs/ljspeech/TTS/matcha_tts/utils/monotonic_align/core.pyx b/egs/ljspeech/TTS/matcha/utils/monotonic_align/core.pyx
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/utils/monotonic_align/core.pyx
rename to egs/ljspeech/TTS/matcha/utils/monotonic_align/core.pyx
diff --git a/egs/ljspeech/TTS/matcha_tts/utils/monotonic_align/setup.py b/egs/ljspeech/TTS/matcha/utils/monotonic_align/setup.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/utils/monotonic_align/setup.py
rename to egs/ljspeech/TTS/matcha/utils/monotonic_align/setup.py
diff --git a/egs/ljspeech/TTS/matcha_tts/utils/pylogger.py b/egs/ljspeech/TTS/matcha/utils/pylogger.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/utils/pylogger.py
rename to egs/ljspeech/TTS/matcha/utils/pylogger.py
diff --git a/egs/ljspeech/TTS/matcha_tts/utils/rich_utils.py b/egs/ljspeech/TTS/matcha/utils/rich_utils.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/utils/rich_utils.py
rename to egs/ljspeech/TTS/matcha/utils/rich_utils.py
diff --git a/egs/ljspeech/TTS/matcha_tts/utils/utils.py b/egs/ljspeech/TTS/matcha/utils/utils.py
similarity index 100%
rename from egs/ljspeech/TTS/matcha_tts/utils/utils.py
rename to egs/ljspeech/TTS/matcha/utils/utils.py