Make renaming of instances much much much quicker