Handle renaming among siblings

Change-Id: I4ad9ae93635a02a70252d017d75684b8027d9af6