Fix duplicately named upstream.