Fix function names
Functions renamed with snake_case