cleanup and fix for project name