(no-ticket) Unicode problem instance name and kind fix

Change-Id: I9ed43477cd4bf809b04def7c28cb2199e4f399f9