Rename or not rename ?