Renamed all data contracts