Clean out some bad function names