Remove cluster mbaas instances from project templates
Some renaming