Renamed and converted headers