Remove bad naming references.