[Fix] Rename some variables