am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev

* commit '1d98fbf27258cbe98e9f7226cc6baedd83a80d3d':
  Update API naming to follow style guide.