Renamed some C types