Project names refactored