wrong name fix and redundancy removal.