Rename states to be more sensible.