Refatoring of the name variables