Fix expand_cluster_name