Should now properly map aliases.