Update and rename B1 to B2