Cluster name moved into an attribute