Hack around 'go' arriving before we have started, and use same upstream name.