Better alias mapping.