State2 -> Refactor the rest of the object names.