Added C++ un-mangling