fix names affected by openflow refactoring
I might have histories done, but I'm not sure the logic is sound.