just rename some vars.