Changed function and var names to better match programming convention.