Fixed function names to be snake cased