Refactored project and scheme names