Merge "Update naming for the AlternateBouncer" into tm-qpr-dev