Thor/roxie cluster name changes