Leverage the upstream name in a few other defaults