Use parameter instead of option for CLI parameters

Change-Id: Ie494e326d708da4382d76ea8840175d4bd9bc2fb
Merge "Use parameter instead of option for CLI parameters"