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