Changing function names to do camelCase consistently.
Major work on these functions.