Update and rename YES to YES 2.0