Merge "Rename variables and methods for clarity." into jb-mr1-dev