Fixed escaped names