Name mangling bug fix