Haphazardly search/replaced some function names. Hope I didn't break anything