Remap a few aliases for clarity