Refactor states names