Rename a whole bunch of major functions