Add demangle and removeNamespaceName