cleanup: name mangling