Merge "Rename split classes/variables for consistency" into tm-qpr-dev