BUG-5626: use Identifier instead of String