change of the function names to camel style