Change some function names and fix some formatting.