diff --git a/mininet/link.py b/mininet/link.py
index 59cb9ecee..e8b0190ee 100644
--- a/mininet/link.py
+++ b/mininet/link.py
@@ -146,6 +146,9 @@ def isUp( self, setUp=False ):
 
     def rename( self, newname ):
         "Rename interface"
+        if self.node and self.name in self.node.nameToIntf:
+            # rename intf in node's nameToIntf
+            self.node.nameToIntf[newname] = self.node.nameToIntf.pop(self.name)
         self.ifconfig( 'down' )
         result = self.cmd( 'ip link set', self.name, 'name', newname )
         self.name = newname