rename some variable

Change-Id: If91a4e0ee99bc9f1e7d72bf25fe7b17853a52cf6