Fix cpp names demangling

Let's bring the demangling back!

![demangle](https://cloud.githubusercontent.com/assets/56672/4336041/e3e27d02-4002-11e4-9342-cee8d8d7fdde.jpeg)