FIX conflicting var/func names