fix variable names, add partner name and uri