Fix symbols with different display name

Note: I'd like to keep the commented tracing code for a while.
Can you use `String.Contains` instead of `IndexOf` here?