Fix symbols with different display name

Note: I'd like to keep the commented tracing code for a while.
Cleared --> normalized/cleaned?