Changed function names to camelCase