Merge "Rename the methods to easier understand what they do" into tm-qpr-dev