Fixed regex for identifiers