Do we really need two name fields here? If not, can we merge them while we're doing this stuff anyway?