fix cluster name pattern and cluster termination