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

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