rename local variables

Change-Id: Ia3b8ddcd62a9de3235fc8a72abf06d234c105e79