bigfix: rename some variable