Use -n, --cluster-name everywhere consistently

Sometimes, it is -n, --cluster-name, and sometimes, it is -n, --name. This needs to be fixed.