Added NameFormat field to formatting
Added Name field to WWN formatting list