Rename project and minor optimizations