Updated some state lingo to be more clear