Fixup name-space collisions for cleanup handlers