Update and rename CNMAE to CNAME