Fix Rename bug due on entity/time clashes