Fix some confusing function names.