changed gamestate names to more convenient names