[minor] rename some vars