Renamed some state names