Renamed __mapregister etc. to __map_register etc.