Merge "Improved variable naming" am: 4ef9d41066
am: bc57510e9f

* commit 'bc57510e9f359929a55130d8a35c61a84dad4568':
  Improved variable naming