rearrange type mappings