parameterise upstream name
fix variable name
template fix