Update and rename version1 to version2