Moved the transformation of the name.