Fix out alias and add upstream alias