Update and rename CNAMEx to CNAME