Improved demangling
Use demangling