diff --git a/config/install/field.field.node.ill_institution.field_ill_city.yml b/config/install/core.base_field_override.node.ill_institution.title.yml
similarity index 62%
rename from config/install/field.field.node.ill_institution.field_ill_city.yml
rename to config/install/core.base_field_override.node.ill_institution.title.yml
index ff7ee50..f1c2798 100644
--- a/config/install/field.field.node.ill_institution.field_ill_city.yml
+++ b/config/install/core.base_field_override.node.ill_institution.title.yml
@@ -2,20 +2,20 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.node.field_ill_city
     - node.type.ill_institution
   enforced:
     module:
       - ill_corporate_forms
-id: node.ill_institution.field_ill_city
-field_name: field_ill_city
+id: node.ill_institution.title
+field_name: title
 entity_type: node
 bundle: ill_institution
-label: 'City'
+label: 'Library Name'
 description: ''
 required: true
-translatable: false
-default_value: {}
+translatable: true
+default_value:
+  - value: ''
 default_value_callback: ''
 settings: {}
 field_type: string
diff --git a/config/install/core.entity_form_display.node.ill_institution.default.yml b/config/install/core.entity_form_display.node.ill_institution.default.yml
index f04c133..268b842 100644
--- a/config/install/core.entity_form_display.node.ill_institution.default.yml
+++ b/config/install/core.entity_form_display.node.ill_institution.default.yml
@@ -2,36 +2,13 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.node.ill_institution.field_ill_ag_canada
-    - field.field.node.ill_institution.field_ill_city
-    - field.field.node.ill_institution.field_ill_consortia_groups
     - field.field.node.ill_institution.field_ill_contact_email
-    - field.field.node.ill_institution.field_ill_contact_institution
     - field.field.node.ill_institution.field_ill_contact_name
     - field.field.node.ill_institution.field_ill_contact_phone
-    - field.field.node.ill_institution.field_ill_country
-    - field.field.node.ill_institution.field_ill_department
-    - field.field.node.ill_institution.field_ill_docline
-    - field.field.node.ill_institution.field_ill_ex_libris
-    - field.field.node.ill_institution.field_ill_fax
-    - field.field.node.ill_institution.field_ill_has_ill_system
     - field.field.node.ill_institution.field_ill_email
-    - field.field.node.ill_institution.field_ill_system_software
-    - field.field.node.ill_institution.field_ill_lac_symbol
-    - field.field.node.ill_institution.field_ill_library_of_congress
-    - field.field.node.ill_institution.field_ill_library_type
-    - field.field.node.ill_institution.field_ill_messaging_method
-    - field.field.node.ill_institution.field_ill_oclc
-    - field.field.node.ill_institution.field_ill_other_symbol
-    - field.field.node.ill_institution.field_ill_phone
-    - field.field.node.ill_institution.field_ill_postal_code
-    - field.field.node.ill_institution.field_ill_province_state
-    - field.field.node.ill_institution.field_ill_special_arrangements
-    - field.field.node.ill_institution.field_ill_street
+    - field.field.node.ill_institution.field_ill_library_code
+    - field.field.node.ill_institution.field_ill_physical_address
     - node.type.ill_institution
-  module:
-    - options
-    - text
   enforced:
     module:
       - ill_corporate_forms
@@ -48,7 +25,7 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {}
-  field_ill_lac_symbol:
+  field_ill_library_code:
     type: string_textfield
     weight: 1
     region: content
@@ -56,165 +33,17 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {}
-  field_ill_ex_libris:
-    type: string_textfield
+  field_ill_physical_address:
+    type: string_textarea
     weight: 2
     region: content
     settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_ag_canada:
-    type: string_textfield
-    weight: 3
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_library_of_congress:
-    type: string_textfield
-    weight: 4
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_oclc:
-    type: string_textfield
-    weight: 5
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_docline:
-    type: string_textfield
-    weight: 6
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_other_symbol:
-    type: string_textfield
-    weight: 7
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_department:
-    type: string_textfield
-    weight: 8
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_street:
-    type: string_textfield
-    weight: 9
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_city:
-    type: string_textfield
-    weight: 10
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_province_state:
-    type: string_textfield
-    weight: 11
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_country:
-    type: string_textfield
-    weight: 12
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_postal_code:
-    type: string_textfield
-    weight: 13
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_phone:
-    type: string_textfield
-    weight: 14
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_fax:
-    type: string_textfield
-    weight: 15
-    region: content
-    settings:
-      size: 60
+      rows: 5
       placeholder: ''
     third_party_settings: {}
-  field_ill_library_type:
-    type: options_select
-    weight: 16
-    region: content
-    settings: {}
-    third_party_settings: {}
   field_ill_email:
     type: email_default
-    weight: 17
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_special_arrangements:
-    type: text_textarea
-    weight: 18
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_consortia_groups:
-    type: text_textarea
-    weight: 19
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_has_ill_system:
-    type: options_select
-    weight: 20
-    region: content
-    settings: {}
-    third_party_settings: {}
-  field_ill_system_software:
-    type: string_textfield
-    weight: 21
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_messaging_method:
-    type: string_textfield
-    weight: 22
+    weight: 3
     region: content
     settings:
       size: 60
@@ -222,15 +51,7 @@ content:
     third_party_settings: {}
   field_ill_contact_name:
     type: string_textfield
-    weight: 23
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
-  field_ill_contact_institution:
-    type: string_textfield
-    weight: 24
+    weight: 4
     region: content
     settings:
       size: 60
@@ -238,7 +59,7 @@ content:
     third_party_settings: {}
   field_ill_contact_email:
     type: email_default
-    weight: 25
+    weight: 5
     region: content
     settings:
       size: 60
@@ -246,7 +67,7 @@ content:
     third_party_settings: {}
   field_ill_contact_phone:
     type: string_textfield
-    weight: 26
+    weight: 6
     region: content
     settings:
       size: 60
diff --git a/config/install/core.entity_form_display.node.ill_institution_request.default.yml b/config/install/core.entity_form_display.node.ill_institution_request.default.yml
index 4ddda01..7e1b88c 100644
--- a/config/install/core.entity_form_display.node.ill_institution_request.default.yml
+++ b/config/install/core.entity_form_display.node.ill_institution_request.default.yml
@@ -21,7 +21,6 @@ dependencies:
     - field.field.node.ill_institution_request.field_ill_publication_date
     - field.field.node.ill_institution_request.field_ill_publisher
     - field.field.node.ill_institution_request.field_ill_req_email
-    - field.field.node.ill_institution_request.field_ill_req_phone
     - field.field.node.ill_institution_request.field_ill_source_of_information
     - field.field.node.ill_institution_request.field_ill_volume
     - node.type.ill_institution_request
@@ -36,14 +35,6 @@ targetEntityType: node
 bundle: ill_institution_request
 mode: default
 content:
-  title:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
   field_ill_partner_organization:
     type: options_select
     weight: 1
@@ -58,14 +49,6 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {}
-  field_ill_req_phone:
-    type: string_textfield
-    weight: 11
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {}
   field_ill_req_email:
     type: email_default
     weight: 12
@@ -252,4 +235,5 @@ content:
     weight: 39
     region: content
     third_party_settings: {}
-hidden: {}
+hidden:
+  title: true
diff --git a/config/install/core.entity_view_display.node.ill_institution.default.yml b/config/install/core.entity_view_display.node.ill_institution.default.yml
index 74a0adf..3b88b70 100644
--- a/config/install/core.entity_view_display.node.ill_institution.default.yml
+++ b/config/install/core.entity_view_display.node.ill_institution.default.yml
@@ -2,36 +2,13 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.node.ill_institution.field_ill_ag_canada
-    - field.field.node.ill_institution.field_ill_city
-    - field.field.node.ill_institution.field_ill_consortia_groups
     - field.field.node.ill_institution.field_ill_contact_email
-    - field.field.node.ill_institution.field_ill_contact_institution
     - field.field.node.ill_institution.field_ill_contact_name
     - field.field.node.ill_institution.field_ill_contact_phone
-    - field.field.node.ill_institution.field_ill_country
-    - field.field.node.ill_institution.field_ill_department
-    - field.field.node.ill_institution.field_ill_docline
-    - field.field.node.ill_institution.field_ill_ex_libris
-    - field.field.node.ill_institution.field_ill_fax
-    - field.field.node.ill_institution.field_ill_has_ill_system
     - field.field.node.ill_institution.field_ill_email
-    - field.field.node.ill_institution.field_ill_system_software
-    - field.field.node.ill_institution.field_ill_lac_symbol
-    - field.field.node.ill_institution.field_ill_library_of_congress
-    - field.field.node.ill_institution.field_ill_library_type
-    - field.field.node.ill_institution.field_ill_messaging_method
-    - field.field.node.ill_institution.field_ill_oclc
-    - field.field.node.ill_institution.field_ill_other_symbol
-    - field.field.node.ill_institution.field_ill_phone
-    - field.field.node.ill_institution.field_ill_postal_code
-    - field.field.node.ill_institution.field_ill_province_state
-    - field.field.node.ill_institution.field_ill_special_arrangements
-    - field.field.node.ill_institution.field_ill_street
+    - field.field.node.ill_institution.field_ill_library_code
+    - field.field.node.ill_institution.field_ill_physical_address
     - node.type.ill_institution
-  module:
-    - options
-    - text
   enforced:
     module:
       - ill_corporate_forms
@@ -40,184 +17,44 @@ targetEntityType: node
 bundle: ill_institution
 mode: default
 content:
-  field_ill_lac_symbol:
+  field_ill_library_code:
     type: string
     weight: 1
     region: content
     label: above
     settings: {}
     third_party_settings: {}
-  field_ill_ex_libris:
-    type: string
+  field_ill_physical_address:
+    type: basic_string
     weight: 2
     region: content
     label: above
     settings: {}
     third_party_settings: {}
-  field_ill_ag_canada:
-    type: string
-    weight: 3
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_library_of_congress:
-    type: string
-    weight: 4
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_oclc:
-    type: string
-    weight: 5
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_docline:
-    type: string
-    weight: 6
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_other_symbol:
-    type: string
-    weight: 7
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_department:
-    type: string
-    weight: 8
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_street:
-    type: string
-    weight: 9
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_city:
-    type: string
-    weight: 10
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_province_state:
-    type: string
-    weight: 11
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_country:
-    type: string
-    weight: 12
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_postal_code:
-    type: string
-    weight: 13
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_phone:
-    type: string
-    weight: 14
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_fax:
-    type: string
-    weight: 15
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_library_type:
-    type: list_default
-    weight: 16
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
   field_ill_email:
     type: email_mailto
-    weight: 17
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_special_arrangements:
-    type: text_default
-    weight: 18
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_consortia_groups:
-    type: text_default
-    weight: 19
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_has_ill_system:
-    type: list_default
-    weight: 20
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_system_software:
-    type: string
-    weight: 21
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_messaging_method:
-    type: string
-    weight: 22
+    weight: 3
     region: content
     label: above
     settings: {}
     third_party_settings: {}
   field_ill_contact_name:
     type: string
-    weight: 23
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
-  field_ill_contact_institution:
-    type: string
-    weight: 24
+    weight: 4
     region: content
     label: above
     settings: {}
     third_party_settings: {}
   field_ill_contact_email:
     type: email_mailto
-    weight: 25
+    weight: 5
     region: content
     label: above
     settings: {}
     third_party_settings: {}
   field_ill_contact_phone:
     type: string
-    weight: 26
+    weight: 6
     region: content
     label: above
     settings: {}
diff --git a/config/install/core.entity_view_display.node.ill_institution_request.default.yml b/config/install/core.entity_view_display.node.ill_institution_request.default.yml
index f6d7791..c7e3c90 100644
--- a/config/install/core.entity_view_display.node.ill_institution_request.default.yml
+++ b/config/install/core.entity_view_display.node.ill_institution_request.default.yml
@@ -21,7 +21,6 @@ dependencies:
     - field.field.node.ill_institution_request.field_ill_publication_date
     - field.field.node.ill_institution_request.field_ill_publisher
     - field.field.node.ill_institution_request.field_ill_req_email
-    - field.field.node.ill_institution_request.field_ill_req_phone
     - field.field.node.ill_institution_request.field_ill_source_of_information
     - field.field.node.ill_institution_request.field_ill_volume
     - node.type.ill_institution_request
@@ -50,13 +49,6 @@ content:
     label: above
     settings: {}
     third_party_settings: {}
-  field_ill_req_phone:
-    type: string
-    weight: 11
-    region: content
-    label: above
-    settings: {}
-    third_party_settings: {}
   field_ill_req_email:
     type: email_mailto
     weight: 12
diff --git a/config/install/field.field.node.ill_institution.field_ill_ag_canada.yml b/config/install/field.field.node.ill_institution.field_ill_ag_canada.yml
deleted file mode 100644
index 091d469..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_ag_canada.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_ag_canada
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_ag_canada
-field_name: field_ill_ag_canada
-entity_type: node
-bundle: ill_institution
-label: 'Agriculture Canada (CDCAA)'
-description: ''
-required: false
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: string
diff --git a/config/install/field.field.node.ill_institution.field_ill_consortia_groups.yml b/config/install/field.field.node.ill_institution.field_ill_consortia_groups.yml
deleted file mode 100644
index 1d6a32e..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_consortia_groups.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_consortia_groups
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_consortia_groups
-field_name: field_ill_consortia_groups
-entity_type: node
-bundle: ill_institution
-label: 'Consortia/Groups'
-description: ''
-required: false
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: text_long
diff --git a/config/install/field.field.node.ill_institution.field_ill_contact_email.yml b/config/install/field.field.node.ill_institution.field_ill_contact_email.yml
index fd8e81b..ec5ea83 100644
--- a/config/install/field.field.node.ill_institution.field_ill_contact_email.yml
+++ b/config/install/field.field.node.ill_institution.field_ill_contact_email.yml
@@ -11,9 +11,9 @@ id: node.ill_institution.field_ill_contact_email
 field_name: field_ill_contact_email
 entity_type: node
 bundle: ill_institution
-label: 'Contact Email'
+label: 'Contact Email Address'
 description: ''
-required: false
+required: true
 translatable: false
 default_value: {}
 default_value_callback: ''
diff --git a/config/install/field.field.node.ill_institution.field_ill_contact_institution.yml b/config/install/field.field.node.ill_institution.field_ill_contact_institution.yml
deleted file mode 100644
index 79480be..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_contact_institution.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_contact_institution
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_contact_institution
-field_name: field_ill_contact_institution
-entity_type: node
-bundle: ill_institution
-label: 'Contact Institution'
-description: ''
-required: true
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: string
diff --git a/config/install/field.field.node.ill_institution.field_ill_contact_phone.yml b/config/install/field.field.node.ill_institution.field_ill_contact_phone.yml
index 99f61e9..52c127a 100644
--- a/config/install/field.field.node.ill_institution.field_ill_contact_phone.yml
+++ b/config/install/field.field.node.ill_institution.field_ill_contact_phone.yml
@@ -11,9 +11,9 @@ id: node.ill_institution.field_ill_contact_phone
 field_name: field_ill_contact_phone
 entity_type: node
 bundle: ill_institution
-label: 'Contact Phone'
+label: 'Contact Phone Number'
 description: ''
-required: false
+required: true
 translatable: false
 default_value: {}
 default_value_callback: ''
diff --git a/config/install/field.field.node.ill_institution.field_ill_country.yml b/config/install/field.field.node.ill_institution.field_ill_country.yml
deleted file mode 100644
index 0753e20..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_country.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_country
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_country
-field_name: field_ill_country
-entity_type: node
-bundle: ill_institution
-label: 'Country'
-description: ''
-required: true
-translatable: false
-default_value:
-  -
-    value: Canada
-default_value_callback: ''
-settings: {}
-field_type: string
diff --git a/config/install/field.field.node.ill_institution.field_ill_department.yml b/config/install/field.field.node.ill_institution.field_ill_department.yml
deleted file mode 100644
index 4ba48b2..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_department.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_department
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_department
-field_name: field_ill_department
-entity_type: node
-bundle: ill_institution
-label: 'Department'
-description: ''
-required: false
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: string
diff --git a/config/install/field.field.node.ill_institution.field_ill_docline.yml b/config/install/field.field.node.ill_institution.field_ill_docline.yml
deleted file mode 100644
index e325a5d..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_docline.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_docline
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_docline
-field_name: field_ill_docline
-entity_type: node
-bundle: ill_institution
-label: 'Docline'
-description: ''
-required: false
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: string
diff --git a/config/install/field.field.node.ill_institution.field_ill_email.yml b/config/install/field.field.node.ill_institution.field_ill_email.yml
index e0b83fc..992ff6d 100644
--- a/config/install/field.field.node.ill_institution.field_ill_email.yml
+++ b/config/install/field.field.node.ill_institution.field_ill_email.yml
@@ -11,7 +11,7 @@ id: node.ill_institution.field_ill_email
 field_name: field_ill_email
 entity_type: node
 bundle: ill_institution
-label: 'ILL Email'
+label: 'Email Address'
 description: ''
 required: true
 translatable: false
diff --git a/config/install/field.field.node.ill_institution.field_ill_ex_libris.yml b/config/install/field.field.node.ill_institution.field_ill_ex_libris.yml
deleted file mode 100644
index fba31ca..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_ex_libris.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_ex_libris
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_ex_libris
-field_name: field_ill_ex_libris
-entity_type: node
-bundle: ill_institution
-label: 'Ex Libris (AVISO)'
-description: ''
-required: false
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: string
diff --git a/config/install/field.field.node.ill_institution.field_ill_fax.yml b/config/install/field.field.node.ill_institution.field_ill_fax.yml
deleted file mode 100644
index aa792aa..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_fax.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_fax
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_fax
-field_name: field_ill_fax
-entity_type: node
-bundle: ill_institution
-label: 'Fax'
-description: ''
-required: false
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: string
diff --git a/config/install/field.field.node.ill_institution.field_ill_has_ill_system.yml b/config/install/field.field.node.ill_institution.field_ill_has_ill_system.yml
deleted file mode 100644
index a10c513..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_has_ill_system.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_has_ill_system
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_has_ill_system
-field_name: field_ill_has_ill_system
-entity_type: node
-bundle: ill_institution
-label: 'Has ILL System'
-description: ''
-required: false
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: list_string
diff --git a/config/install/field.field.node.ill_institution.field_ill_lac_symbol.yml b/config/install/field.field.node.ill_institution.field_ill_lac_symbol.yml
deleted file mode 100644
index 483aaf2..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_lac_symbol.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_lac_symbol
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_lac_symbol
-field_name: field_ill_lac_symbol
-entity_type: node
-bundle: ill_institution
-label: 'LAC Symbol (NLC-BNC)'
-description: ''
-required: false
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: string
diff --git a/config/install/field.field.node.ill_institution.field_ill_phone.yml b/config/install/field.field.node.ill_institution.field_ill_library_code.yml
similarity index 66%
rename from config/install/field.field.node.ill_institution.field_ill_phone.yml
rename to config/install/field.field.node.ill_institution.field_ill_library_code.yml
index 74b7034..214066f 100644
--- a/config/install/field.field.node.ill_institution.field_ill_phone.yml
+++ b/config/install/field.field.node.ill_institution.field_ill_library_code.yml
@@ -2,16 +2,16 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.node.field_ill_phone
+    - field.storage.node.field_ill_library_code
     - node.type.ill_institution
   enforced:
     module:
       - ill_corporate_forms
-id: node.ill_institution.field_ill_phone
-field_name: field_ill_phone
+id: node.ill_institution.field_ill_library_code
+field_name: field_ill_library_code
 entity_type: node
 bundle: ill_institution
-label: 'Phone'
+label: 'Library Code'
 description: ''
 required: true
 translatable: false
diff --git a/config/install/field.field.node.ill_institution.field_ill_library_of_congress.yml b/config/install/field.field.node.ill_institution.field_ill_library_of_congress.yml
deleted file mode 100644
index e3b1e0e..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_library_of_congress.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_library_of_congress
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_library_of_congress
-field_name: field_ill_library_of_congress
-entity_type: node
-bundle: ill_institution
-label: 'Library of Congress (NUC)'
-description: ''
-required: false
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: string
diff --git a/config/install/field.field.node.ill_institution.field_ill_library_type.yml b/config/install/field.field.node.ill_institution.field_ill_library_type.yml
deleted file mode 100644
index 670966a..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_library_type.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_library_type
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_library_type
-field_name: field_ill_library_type
-entity_type: node
-bundle: ill_institution
-label: 'Library Type'
-description: ''
-required: false
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: list_string
diff --git a/config/install/field.field.node.ill_institution.field_ill_messaging_method.yml b/config/install/field.field.node.ill_institution.field_ill_messaging_method.yml
deleted file mode 100644
index 0d50e9d..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_messaging_method.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_messaging_method
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_messaging_method
-field_name: field_ill_messaging_method
-entity_type: node
-bundle: ill_institution
-label: 'Messaging Method'
-description: ''
-required: false
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: string
diff --git a/config/install/field.field.node.ill_institution.field_ill_oclc.yml b/config/install/field.field.node.ill_institution.field_ill_oclc.yml
deleted file mode 100644
index 3b481b4..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_oclc.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_oclc
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_oclc
-field_name: field_ill_oclc
-entity_type: node
-bundle: ill_institution
-label: 'OCLC'
-description: ''
-required: false
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: string
diff --git a/config/install/field.field.node.ill_institution.field_ill_other_symbol.yml b/config/install/field.field.node.ill_institution.field_ill_other_symbol.yml
deleted file mode 100644
index 03a89c1..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_other_symbol.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_other_symbol
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_other_symbol
-field_name: field_ill_other_symbol
-entity_type: node
-bundle: ill_institution
-label: 'Other Symbol'
-description: ''
-required: false
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: string
diff --git a/config/install/field.field.node.ill_institution.field_ill_postal_code.yml b/config/install/field.field.node.ill_institution.field_ill_physical_address.yml
similarity index 58%
rename from config/install/field.field.node.ill_institution.field_ill_postal_code.yml
rename to config/install/field.field.node.ill_institution.field_ill_physical_address.yml
index 1bd8751..460c537 100644
--- a/config/install/field.field.node.ill_institution.field_ill_postal_code.yml
+++ b/config/install/field.field.node.ill_institution.field_ill_physical_address.yml
@@ -2,20 +2,20 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.node.field_ill_postal_code
+    - field.storage.node.field_ill_physical_address
     - node.type.ill_institution
   enforced:
     module:
       - ill_corporate_forms
-id: node.ill_institution.field_ill_postal_code
-field_name: field_ill_postal_code
+id: node.ill_institution.field_ill_physical_address
+field_name: field_ill_physical_address
 entity_type: node
 bundle: ill_institution
-label: 'Postal Code'
+label: 'Physical Library Address'
 description: ''
 required: true
 translatable: false
 default_value: {}
 default_value_callback: ''
 settings: {}
-field_type: string
+field_type: string_long
diff --git a/config/install/field.field.node.ill_institution.field_ill_province_state.yml b/config/install/field.field.node.ill_institution.field_ill_province_state.yml
deleted file mode 100644
index 26d715f..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_province_state.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_province_state
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_province_state
-field_name: field_ill_province_state
-entity_type: node
-bundle: ill_institution
-label: 'Province/State'
-description: ''
-required: true
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: string
diff --git a/config/install/field.field.node.ill_institution.field_ill_special_arrangements.yml b/config/install/field.field.node.ill_institution.field_ill_special_arrangements.yml
deleted file mode 100644
index 1f72232..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_special_arrangements.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_special_arrangements
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_special_arrangements
-field_name: field_ill_special_arrangements
-entity_type: node
-bundle: ill_institution
-label: 'Special Arrangements'
-description: ''
-required: false
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: text_long
diff --git a/config/install/field.field.node.ill_institution.field_ill_street.yml b/config/install/field.field.node.ill_institution.field_ill_street.yml
deleted file mode 100644
index ec54f82..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_street.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_street
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_street
-field_name: field_ill_street
-entity_type: node
-bundle: ill_institution
-label: 'Street'
-description: ''
-required: true
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: string
diff --git a/config/install/field.field.node.ill_institution.field_ill_system_software.yml b/config/install/field.field.node.ill_institution.field_ill_system_software.yml
deleted file mode 100644
index fd78a4b..0000000
--- a/config/install/field.field.node.ill_institution.field_ill_system_software.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_system_software
-    - node.type.ill_institution
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution.field_ill_system_software
-field_name: field_ill_system_software
-entity_type: node
-bundle: ill_institution
-label: 'ILL System Software'
-description: ''
-required: false
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: string
diff --git a/config/install/field.field.node.ill_institution_request.field_ill_partner_organization.yml b/config/install/field.field.node.ill_institution_request.field_ill_partner_organization.yml
index f2e9f8a..09fd36d 100644
--- a/config/install/field.field.node.ill_institution_request.field_ill_partner_organization.yml
+++ b/config/install/field.field.node.ill_institution_request.field_ill_partner_organization.yml
@@ -12,8 +12,8 @@ id: node.ill_institution_request.field_ill_partner_organization
 field_name: field_ill_partner_organization
 entity_type: node
 bundle: ill_institution_request
-label: 'Partner Organization'
-description: 'Select the partner institution, or choose Other to enter manually.'
+label: 'Borrowing Library'
+description: 'Select the borrowing library, or choose Other to enter manually.'
 required: true
 translatable: false
 default_value: {}
diff --git a/config/install/field.field.node.ill_institution_request.field_ill_req_phone.yml b/config/install/field.field.node.ill_institution_request.field_ill_req_phone.yml
deleted file mode 100644
index 49ffbf7..0000000
--- a/config/install/field.field.node.ill_institution_request.field_ill_req_phone.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ill_req_phone
-    - node.type.ill_institution_request
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.ill_institution_request.field_ill_req_phone
-field_name: field_ill_req_phone
-entity_type: node
-bundle: ill_institution_request
-label: 'Phone'
-description: ''
-required: true
-translatable: false
-default_value: {}
-default_value_callback: ''
-settings: {}
-field_type: string
diff --git a/config/install/field.storage.node.field_ill_city.yml b/config/install/field.storage.node.field_ill_city.yml
deleted file mode 100644
index 8d15a7d..0000000
--- a/config/install/field.storage.node.field_ill_city.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_city
-field_name: field_ill_city
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_contact_institution.yml b/config/install/field.storage.node.field_ill_contact_institution.yml
deleted file mode 100644
index dd7578e..0000000
--- a/config/install/field.storage.node.field_ill_contact_institution.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_contact_institution
-field_name: field_ill_contact_institution
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_country.yml b/config/install/field.storage.node.field_ill_country.yml
deleted file mode 100644
index 491b18b..0000000
--- a/config/install/field.storage.node.field_ill_country.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_country
-field_name: field_ill_country
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_department.yml b/config/install/field.storage.node.field_ill_department.yml
deleted file mode 100644
index 2a49183..0000000
--- a/config/install/field.storage.node.field_ill_department.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_department
-field_name: field_ill_department
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_docline.yml b/config/install/field.storage.node.field_ill_docline.yml
deleted file mode 100644
index 9c1a2ea..0000000
--- a/config/install/field.storage.node.field_ill_docline.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_docline
-field_name: field_ill_docline
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_ex_libris.yml b/config/install/field.storage.node.field_ill_ex_libris.yml
deleted file mode 100644
index f95cc71..0000000
--- a/config/install/field.storage.node.field_ill_ex_libris.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_ex_libris
-field_name: field_ill_ex_libris
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_fax.yml b/config/install/field.storage.node.field_ill_fax.yml
deleted file mode 100644
index bf5275f..0000000
--- a/config/install/field.storage.node.field_ill_fax.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_fax
-field_name: field_ill_fax
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_has_ill_system.yml b/config/install/field.storage.node.field_ill_has_ill_system.yml
deleted file mode 100644
index 826fb65..0000000
--- a/config/install/field.storage.node.field_ill_has_ill_system.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-    - options
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_has_ill_system
-field_name: field_ill_has_ill_system
-entity_type: node
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: 'yes'
-      label: 'Yes'
-    -
-      value: 'no'
-      label: 'No'
-    -
-      value: 'unknown'
-      label: 'Unknown'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_lac_symbol.yml b/config/install/field.storage.node.field_ill_lac_symbol.yml
deleted file mode 100644
index 33b2db2..0000000
--- a/config/install/field.storage.node.field_ill_lac_symbol.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_lac_symbol
-field_name: field_ill_lac_symbol
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_ag_canada.yml b/config/install/field.storage.node.field_ill_library_code.yml
similarity index 83%
rename from config/install/field.storage.node.field_ill_ag_canada.yml
rename to config/install/field.storage.node.field_ill_library_code.yml
index c3004d9..2396e9f 100644
--- a/config/install/field.storage.node.field_ill_ag_canada.yml
+++ b/config/install/field.storage.node.field_ill_library_code.yml
@@ -6,8 +6,8 @@ dependencies:
   enforced:
     module:
       - ill_corporate_forms
-id: node.field_ill_ag_canada
-field_name: field_ill_ag_canada
+id: node.field_ill_library_code
+field_name: field_ill_library_code
 entity_type: node
 type: string
 settings:
diff --git a/config/install/field.storage.node.field_ill_library_of_congress.yml b/config/install/field.storage.node.field_ill_library_of_congress.yml
deleted file mode 100644
index 72c679a..0000000
--- a/config/install/field.storage.node.field_ill_library_of_congress.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_library_of_congress
-field_name: field_ill_library_of_congress
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_library_type.yml b/config/install/field.storage.node.field_ill_library_type.yml
deleted file mode 100644
index db02ef6..0000000
--- a/config/install/field.storage.node.field_ill_library_type.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-    - options
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_library_type
-field_name: field_ill_library_type
-entity_type: node
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: 'university'
-      label: 'University'
-    -
-      value: 'public'
-      label: 'Public'
-    -
-      value: 'hospital'
-      label: 'Hospital'
-    -
-      value: 'government'
-      label: 'Government'
-    -
-      value: 'national'
-      label: 'National'
-    -
-      value: 'school_board'
-      label: 'School Board'
-    -
-      value: 'college'
-      label: 'College'
-    -
-      value: 'business'
-      label: 'Business'
-    -
-      value: 'business_law'
-      label: 'Business/Law'
-    -
-      value: 'research'
-      label: 'Research'
-    -
-      value: 'document_delivery'
-      label: 'Document Delivery'
-    -
-      value: 'other'
-      label: 'Other'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_messaging_method.yml b/config/install/field.storage.node.field_ill_messaging_method.yml
deleted file mode 100644
index 8128d1c..0000000
--- a/config/install/field.storage.node.field_ill_messaging_method.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_messaging_method
-field_name: field_ill_messaging_method
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_oclc.yml b/config/install/field.storage.node.field_ill_oclc.yml
deleted file mode 100644
index 9dfefb6..0000000
--- a/config/install/field.storage.node.field_ill_oclc.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_oclc
-field_name: field_ill_oclc
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_other_symbol.yml b/config/install/field.storage.node.field_ill_other_symbol.yml
deleted file mode 100644
index 5185a16..0000000
--- a/config/install/field.storage.node.field_ill_other_symbol.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_other_symbol
-field_name: field_ill_other_symbol
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_phone.yml b/config/install/field.storage.node.field_ill_phone.yml
deleted file mode 100644
index 6a99b24..0000000
--- a/config/install/field.storage.node.field_ill_phone.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_phone
-field_name: field_ill_phone
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_consortia_groups.yml b/config/install/field.storage.node.field_ill_physical_address.yml
similarity index 69%
rename from config/install/field.storage.node.field_ill_consortia_groups.yml
rename to config/install/field.storage.node.field_ill_physical_address.yml
index 6284fa1..e6a1f0b 100644
--- a/config/install/field.storage.node.field_ill_consortia_groups.yml
+++ b/config/install/field.storage.node.field_ill_physical_address.yml
@@ -3,16 +3,15 @@ status: true
 dependencies:
   module:
     - node
-    - text
   enforced:
     module:
       - ill_corporate_forms
-id: node.field_ill_consortia_groups
-field_name: field_ill_consortia_groups
+id: node.field_ill_physical_address
+field_name: field_ill_physical_address
 entity_type: node
-type: text_long
+type: string_long
 settings: {}
-module: text
+module: core
 locked: false
 cardinality: 1
 translatable: true
diff --git a/config/install/field.storage.node.field_ill_postal_code.yml b/config/install/field.storage.node.field_ill_postal_code.yml
deleted file mode 100644
index 6144c31..0000000
--- a/config/install/field.storage.node.field_ill_postal_code.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_postal_code
-field_name: field_ill_postal_code
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_province_state.yml b/config/install/field.storage.node.field_ill_province_state.yml
deleted file mode 100644
index 00b0ad5..0000000
--- a/config/install/field.storage.node.field_ill_province_state.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_province_state
-field_name: field_ill_province_state
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_req_phone.yml b/config/install/field.storage.node.field_ill_req_phone.yml
deleted file mode 100644
index 0cfe49d..0000000
--- a/config/install/field.storage.node.field_ill_req_phone.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_req_phone
-field_name: field_ill_req_phone
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_special_arrangements.yml b/config/install/field.storage.node.field_ill_special_arrangements.yml
deleted file mode 100644
index 29a696b..0000000
--- a/config/install/field.storage.node.field_ill_special_arrangements.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-    - text
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_special_arrangements
-field_name: field_ill_special_arrangements
-entity_type: node
-type: text_long
-settings: {}
-module: text
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_street.yml b/config/install/field.storage.node.field_ill_street.yml
deleted file mode 100644
index a53a61d..0000000
--- a/config/install/field.storage.node.field_ill_street.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_street
-field_name: field_ill_street
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_ill_system_software.yml b/config/install/field.storage.node.field_ill_system_software.yml
deleted file mode 100644
index 4fc8f69..0000000
--- a/config/install/field.storage.node.field_ill_system_software.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - ill_corporate_forms
-id: node.field_ill_system_software
-field_name: field_ill_system_software
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {}
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/node.type.ill_institution.yml b/config/install/node.type.ill_institution.yml
index 2227a7a..4c513fb 100644
--- a/config/install/node.type.ill_institution.yml
+++ b/config/install/node.type.ill_institution.yml
@@ -11,3 +11,4 @@ help: ''
 new_revision: true
 preview_mode: 1
 display_submitted: true
+title_label: 'Library Name'
diff --git a/config/install/views.view.ill_institution_requests.yml b/config/install/views.view.ill_institution_requests.yml
index 725be54..423cd67 100644
--- a/config/install/views.view.ill_institution_requests.yml
+++ b/config/install/views.view.ill_institution_requests.yml
@@ -5,7 +5,7 @@ dependencies:
     - field.storage.node.field_ill_email
     - field.storage.node.field_ill_item_type
     - field.storage.node.field_ill_partner_organization
-    - field.storage.node.field_ill_phone
+    - field.storage.node.field_ill_contact_phone
     - node.type.ill_institution_request
   module:
     - node
@@ -103,7 +103,7 @@ display:
           group_type: group
           admin_label: ''
           plugin_id: field
-          label: 'Partner Organization'
+          label: 'Borrowing Library'
           exclude: false
           alter:
             alter_text: false
@@ -295,7 +295,7 @@ display:
           group_type: group
           admin_label: ''
           plugin_id: field
-          label: 'ILL Email'
+          label: 'Email Address'
           exclude: false
           alter:
             alter_text: false
@@ -349,15 +349,15 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        field_ill_phone:
-          id: field_ill_phone
-          table: node__field_ill_phone
-          field: field_ill_phone
+        field_ill_contact_phone:
+          id: field_ill_contact_phone
+          table: node__field_ill_contact_phone
+          field: field_ill_contact_phone
           relationship: field_ill_partner_organization
           group_type: group
           admin_label: ''
           plugin_id: field
-          label: Phone
+          label: 'Contact Phone Number'
           exclude: false
           alter:
             alter_text: false
@@ -527,7 +527,7 @@ display:
           exposed: true
           expose:
             operator_id: title_op
-            label: 'Partner Organization'
+            label: 'Borrowing Library'
             description: ''
             use_operator: false
             operator: title_op
@@ -654,7 +654,7 @@ display:
             field_ill_item_type: field_ill_item_type
             created: created
             field_ill_email: field_ill_email
-            field_ill_phone: field_ill_phone
+            field_ill_contact_phone: field_ill_contact_phone
           default: created
           info:
             title:
@@ -692,7 +692,7 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
-            field_ill_phone:
+            field_ill_contact_phone:
               sortable: false
               default_sort_order: asc
               align: ''
diff --git a/config/install/views.view.ill_institutions.yml b/config/install/views.view.ill_institutions.yml
index e2f220e..a5f5d5b 100644
--- a/config/install/views.view.ill_institutions.yml
+++ b/config/install/views.view.ill_institutions.yml
@@ -37,7 +37,7 @@ display:
           entity_type: node
           entity_field: title
           plugin_id: field
-          label: Title
+          label: 'Library Name'
           exclude: false
           alter:
             alter_text: false
@@ -100,7 +100,7 @@ display:
           group_type: group
           admin_label: ''
           plugin_id: field
-          label: 'ILL Email'
+          label: 'Email Address'
           exclude: false
           alter:
             alter_text: false
@@ -162,7 +162,7 @@ display:
           group_type: group
           admin_label: ''
           plugin_id: field
-          label: 'Contact Email'
+          label: 'Contact Email Address'
           exclude: false
           alter:
             alter_text: false
@@ -331,7 +331,7 @@ display:
           exposed: true
           expose:
             operator_id: title_op
-            label: Title
+            label: 'Library Name'
             description: ''
             use_operator: false
             operator: title_op
@@ -370,7 +370,7 @@ display:
           exposed: true
           expose:
             operator_id: field_ill_contact_email_value_op
-            label: 'Contact Email'
+            label: 'Contact Email Address'
             description: ''
             use_operator: false
             operator: field_ill_contact_email_value_op
@@ -409,7 +409,7 @@ display:
           exposed: true
           expose:
             operator_id: field_ill_email_value_op
-            label: 'ILL Email'
+            label: 'Email Address'
             description: ''
             use_operator: false
             operator: field_ill_email_value_op
diff --git a/ill_corporate_forms.module b/ill_corporate_forms.module
index 8df2986..f62a482 100644
--- a/ill_corporate_forms.module
+++ b/ill_corporate_forms.module
@@ -13,6 +13,10 @@ use Drupal\Core\Form\FormStateInterface;
 function ill_corporate_forms_form_node_ill_institution_request_form_alter(array &$form, FormStateInterface $form_state, string $form_id): void {
   _ill_corporate_forms_add_item_type_states($form);
   $form['#validate'][] = '_ill_corporate_forms_validate_partner_email';
+  $form['#validate'][] = '_ill_corporate_forms_validate_institution_code';
+
+  // Hide the title field; presave hook will populate it.
+  $form['title']['#access'] = FALSE;
 }
 
 /**
@@ -21,6 +25,10 @@ function ill_corporate_forms_form_node_ill_institution_request_form_alter(array
 function ill_corporate_forms_form_node_ill_institution_request_edit_form_alter(array &$form, FormStateInterface $form_state, string $form_id): void {
   _ill_corporate_forms_add_item_type_states($form);
   $form['#validate'][] = '_ill_corporate_forms_validate_partner_email';
+  $form['#validate'][] = '_ill_corporate_forms_validate_institution_code';
+
+  // Hide the title field; presave hook will populate it.
+  $form['title']['#access'] = FALSE;
 }
 
 /**
@@ -90,6 +98,68 @@ function _ill_corporate_forms_add_item_type_states(array &$form): void {
   }
 }
 
+/**
+ * Implements hook_ENTITY_TYPE_presave() for node entities.
+ *
+ * Sets the request title to the Borrowing Library name before saving.
+ */
+function ill_corporate_forms_node_presave(\Drupal\node\NodeInterface $node): void {
+  if ($node->bundle() !== 'ill_institution_request') {
+    return;
+  }
+
+  $partner_nid = $node->get('field_ill_partner_organization')->target_id;
+  if ($partner_nid) {
+    $partner_node = \Drupal::entityTypeManager()->getStorage('node')->load($partner_nid);
+    if ($partner_node) {
+      $node->setTitle($partner_node->getTitle());
+      return;
+    }
+  }
+
+  // Fallback if no borrowing library is set.
+  $node->setTitle('ILL Request');
+}
+
+/**
+ * Validates that the entered institution code matches the Borrowing Library's library code.
+ */
+function _ill_corporate_forms_validate_institution_code(array &$form, FormStateInterface $form_state): void {
+  $partner_value = $form_state->getValue('field_ill_partner_organization');
+  $code_value = $form_state->getValue('field_ill_institution_code');
+
+  // Extract the partner node ID.
+  $partner_nid = NULL;
+  if (is_array($partner_value) && isset($partner_value[0]['target_id'])) {
+    $partner_nid = $partner_value[0]['target_id'];
+  }
+
+  // Extract the submitted institution code.
+  $submitted_code = '';
+  if (is_array($code_value) && isset($code_value[0]['value'])) {
+    $submitted_code = $code_value[0]['value'];
+  }
+  elseif (is_string($code_value)) {
+    $submitted_code = $code_value;
+  }
+
+  if (empty($partner_nid) || empty($submitted_code)) {
+    return;
+  }
+
+  // Load the Borrowing Library and compare codes.
+  $partner_node = \Drupal::entityTypeManager()->getStorage('node')->load($partner_nid);
+  if (!$partner_node || $partner_node->bundle() !== 'ill_institution') {
+    return;
+  }
+
+  $library_code = $partner_node->get('field_ill_library_code')->value;
+  if (!empty($library_code) && mb_strtolower($submitted_code) !== mb_strtolower($library_code)) {
+    $form_state->setErrorByName('field_ill_institution_code',
+      t('The institution code entered does not match the library code on file for the selected borrowing library.'));
+  }
+}
+
 /**
  * Validates that the submitted email matches the partner organization's ILL email.
  */