Fix identifiers containing and or or