Edited function names to camel case