Add cluster name to state

see #5622