Little rework of the nicknames (Fr)