Proper convention mapping handling.