rename some variable

Change-Id: I3ef75c7e4b61ea8e62ca8be7848078e6826616d8