Resort servers on rename and init