CFNameCoordMap refactor.