Fix Rename bug due on entity/time clashes

My bad. :(
I would want there to be the unit test that checks it explicitly anyway - don't mind too much. If it isn't too hard, it obviously wouldn't hurt.