Fix late-night type/function names.