Transfer name as an option rather than part of the struct