ENG-4825: Take pmartel feedback and mass-rename variables.