More renameApplication changes from stage.sh