Include UniqueId in rename events... (bug #2306)