Change example so CLI names match object arguments

I would like to extract the arguments automatically from the
example command line arguments.  If the names matched, it would
be much easier.

Change-Id: I0877fe8a0b6f5a61505fdecddd2f72ee8c505d29
Merge "Change example so CLI names match object arguments"