Revert "Revert "Change of name""

This reverts commit f1880f839030a11f94475f9024e9ccdcd0c894e2.