Fix various name mangling issues

All tests and partests pass on 2.11