Updated functions to camel case