Update var names to avoid clashes