Renamed states and data