'Add contact' forces 'Forename Surname'

When adding a contact, the form asks for a Forename and Surname (en-gb), but I would like to add non-person contacts as well, such as businesses.

I would propose adding a Full Name (or Display Name) field. This can be filled with the contents of Forename and Surname if they are input, but can also be overridden by the user. Forename and Surname should not be required fields, Full Name should. (This is also how Thunderbird uses these fields.)