Whoops fix up some function names that I decided to rename in the last commit.