More function names to camelCase