am a88fb327: Merge "Modify intent names" into jb-ub-mail

* commit 'a88fb32724644bb33451b53be2c5a5187927e8ac':
  Modify intent names