Merge "Update variable naming for updated API" into tm-qpr-dev