Namechange and whitespace removal.