Update to cluster naming