Would suggest we add a new field to the patron record called "organization".  Currently we are storing organization names in the surname field.  This is inaccurate, and causes some issues between validation (maybe custom validation) and switching from a patron type record and an organization record, especially if anything was left in a first name field at the time.  Having a separate organization field would also allow us to correctly record an organization name and a contact at that organization.  There are ways around this currently, but typical databases usually include a separate field for an organization name.

This would also allow us to more accurately identify organizations with a specific contact person and include lines like "c/o: Joe Smith" under the organization name in notifications.