We already set name so fix this logic