Ported some aliases from old config