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

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