Renaming project, and fixing the cleanup regex (which had been matching EVERYTHING).