Update and rename CNAMES to CNAME