fix identifiers