Update and rename YES 2.1 to YES 2.2