fix variable names

Change-Id: If0470455180a391737cd91d7202eb08142fdba65