Remove underscores from function names