fix a few closure name clashes