Fix name mangling issues