refactoring on variable name and types

Change-Id: I15047c41b44150f2e2dd18432edffc0ce0dea629