Fix conflicting var names