Makes the names consistent between declaration and definition and adjusts them to follow our code formatting guidelines. Now all functions in the translation unit follow our formatting guidelines.