Rename states, add initialization