Rename some local vars to start with a lowercase letter

Change-Id: I6e5975ed7351c1439eda19afaba5120c6afa50f1