CFY-1746 rename