Merge "Rename variables for better understanding" into tm-qpr-dev