Update and rename 1 to 2