Fixed function and var names