Refactored method and functions names to camel case