Code cleanup

* match param names

Change-Id: Ib75197a3c6bcc735049c6724dce6c240684108ae
7 files changed