Fixing function names, which should have been done a gazillion years ago.