Fix Rename bug due on entity/time clashes

My bad. :(
Worth adding a property `String` for this different entity?