fixed unescaped names