"Ambiguous name" error doesn't always select the right alias

[mitchellwrosen]

When we complain about an ambiguous suffix foo that could refer to one.foo or two.foo, we should always use names one.foo and two.foo (as opposed to an alias).