Renamed some aliases for consistency.