Cleaning up broken stuff due to project renaming