Renaming project and additional cleanup.