Update and rename CNAME2 to CNAME