Cleanup and rename to our new, secret project name