Merge "Improved variable naming"
am: 4ef9d41066

* commit '4ef9d41066d8b4124c2c59752512adf24102634d':
  Improved variable naming