Handle identifiers containing an underscore