Make project names consistent. Merged with In-App-Purchase changes