TODO: 2.3 Better support for same name resolves