Rename one or two functions to follow convention