CFY-577 rename