fix names affected by openflow refactoring