Fix Rename bug due on entity/time clashes

My bad. :(
Also wondering if I should add a an actual priority clash to the cli test, or just rely on the unit tests.