fix conflict in Escape/UnescapeTypeName