am abf05cc0: am fdfe73ff: Merge "Use more descriptive names for some internal fields" into lmp-dev

* commit 'abf05cc0da1ead7e270a7c99bf9f000dabf91f5b':
  Use more descriptive names for some internal fields