Fix ugly camelcase function names