Update and rename CNAME__ to CNAME