Update function names to camel case