rename a bunch of functions giving more uniform names.