Convert some function names to CamelCase