Fix Rename bug due on entity/time clashes

My bad. :(
> I think this still misses a case where you have same entity id across two different days.

I _think_ grouping by the first part of the key (ns + attribute + date) protects us from the rest of the cases?