Fix still more screwed up identifiers.