Rename function names to use camelcase