Make upstream name consistent