Revert "No longer need to replace the suite name"

This reverts commit 40ba1891d8d304bf838be7ff3a8372d10de8141a.
To latest