Update and rename CNAME21 to CNAME