am a7ebd27b: Merge "Fix bad variable names."

* commit 'a7ebd27bc5436942d2801619473f4c4633ce2df5':
  Fix bad variable names.