Fix Rename bug due on entity/time clashes

My bad. :(
Not sure how worried we are about adding more of these and slowing down the normal build.