Rework of names functions.