Add check for retrigger after rename.

Change-Id: I2182e93e3882be58bdbd5eb229f6971b7a5d1374