I don't think we should use `escapedName` here - it could lead to issues. Better use `entry.name` again.