Update and rename __CNAME_TO__BE to CNAME