Merge "Rename options for shorter names." am: bc58b020c8
am: b4bfd7f529

* commit 'b4bfd7f529d1376c841b3c079daf57785c6497df':
  Rename options for shorter names.