Make name of params consistent and do a little refactoring

Change-Id: I49d109e48f20ae8638776ed68206f2f96def6b49
Related-Prod: PROD-31595
1 file changed