Renamed and fixed content