Fixed cluster renaming procedure