Merge "Fix: Inaccurate mangled names."