Fixed conflicting var names