Correct totally screwed up identifiers.