name mangling update/fix
2 files changed