diff --git a/nefed.xml b/nefed.xml
index 4433aa3803c866585f1491c96d8cd45ca50ce40b..65a4fc5ff6adfdd80dee9d691ac6d0a61c4b8a22 100644
--- a/nefed.xml
+++ b/nefed.xml
@@ -2049,6 +2049,7 @@
         <ContactPerson contactType="technical">
             <Company>University
                 of Nebraska-Lincoln</Company>
+            <GivenName>UNL Admin</GivenName>
             <EmailAddress>admin@unl.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
@@ -3296,8 +3297,7 @@
         </SPSSODescriptor>
         <ContactPerson contactType="administrative">
             <GivenName>
-                Nick</GivenName>
-            <SurName>Barry</SurName>
+                Nick Barry</GivenName>
             <EmailAddress>mailto:nbarry@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
@@ -3313,8 +3313,7 @@
         </ContactPerson>
         <ContactPerson contactType="technical">
             <GivenName>
-                Alan</GivenName>
-            <SurName>Nelson</SurName>
+                Alan Nelson</GivenName>
             <EmailAddress>mailto:alan.nelson@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
@@ -3439,14 +3438,12 @@
         </SPSSODescriptor>
         <ContactPerson contactType="administrative">
             <GivenName>
-                Roger</GivenName>
-            <SurName>Korth</SurName>
+                Roger Korth</GivenName>
             <EmailAddress>rkorth@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
             <GivenName>
-                Anthony</GivenName>
-            <SurName>Gano</SurName>
+                Anthony Gano</GivenName>
             <EmailAddress>agano@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="other"
@@ -3457,8 +3454,7 @@
         </ContactPerson>
         <ContactPerson contactType="technical">
             <GivenName>
-                Steve</GivenName>
-            <SurName>Anthony</SurName>
+                Steve Anthony</GivenName>
             <EmailAddress>santhony@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
@@ -3536,15 +3532,12 @@
                 index="0" isDefault="true" />
         </SPSSODescriptor>
         <ContactPerson contactType="administrative">
-            <GivenName>Eric</GivenName>
-            <SurName>Haffey</SurName>
+            <GivenName>Eric Haffey</GivenName>
             <EmailAddress>
                 eric.haffey@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
-            <GivenName>Heidi</GivenName>
-            <SurName>
-                Hausserman</SurName>
+            <GivenName>Heidi Hausserman</GivenName> 
             <EmailAddress>hhaussermann@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="other"
@@ -3555,8 +3548,7 @@
         </ContactPerson>
         <ContactPerson contactType="technical">
             <GivenName>
-                Anna</GivenName>
-            <SurName>Berg</SurName>
+                Anna Berg</GivenName>
             <EmailAddress>aberg@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
@@ -3634,15 +3626,12 @@
                 index="0" isDefault="true" />
         </SPSSODescriptor>
         <ContactPerson contactType="administrative">
-            <GivenName>Eric</GivenName>
-            <SurName>Haffey</SurName>
+            <GivenName>Eric Haffey</GivenName>
             <EmailAddress>
                 eric.haffey@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
-            <GivenName>Heidi</GivenName>
-            <SurName>
-                Hausserman</SurName>
+            <GivenName>Heidi Hausserman</GivenName>
             <EmailAddress>hhaussermann@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="other"
@@ -3653,8 +3642,7 @@
         </ContactPerson>
         <ContactPerson contactType="technical">
             <GivenName>
-                Anna</GivenName>
-            <SurName>Berg</SurName>
+                Anna Berg</GivenName>
             <EmailAddress>aberg@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
@@ -3732,27 +3720,22 @@
                 index="0" isDefault="true" />
         </SPSSODescriptor>
         <ContactPerson contactType="administrative">
-            <GivenName>Eric</GivenName>
-            <SurName>Haffey</SurName>
+            <GivenName>Eric Haffey</GivenName>
             <EmailAddress>
                 eric.haffey@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
-            <GivenName>Heidi</GivenName>
-            <SurName>
-                Hausserman</SurName>
+            <GivenName>Heidi Hausserman</GivenName>
             <EmailAddress>hhaussermann@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="other"
             xmlns:remd="http://refeds.org/metadata" recontactType="http://refeds.org/metadata/contactType/security">
-            <GivenName>University
-                of Nebraska Security Team</GivenName>
+            <GivenName>University of Nebraska Security Team</GivenName>
             <EmailAddress>mailto:security@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="technical">
             <GivenName>
-                Anna</GivenName>
-            <SurName>Berg</SurName>
+                Anna Berg</GivenName>
             <EmailAddress>aberg@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
@@ -3830,27 +3813,22 @@
                 index="0" isDefault="true" />
         </SPSSODescriptor>
         <ContactPerson contactType="administrative">
-            <GivenName>Eric</GivenName>
-            <SurName>Haffey</SurName>
+            <GivenName>Eric Haffey</GivenName>
             <EmailAddress>
                 eric.haffey@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
-            <GivenName>Heidi</GivenName>
-            <SurName>
-                Hausserman</SurName>
+            <GivenName>Heidi Hausserman</GivenName>
             <EmailAddress>hhaussermann@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="other"
             xmlns:remd="http://refeds.org/metadata" recontactType="http://refeds.org/metadata/contactType/security">
-            <GivenName>University
-                of Nebraska Security Team</GivenName>
+            <GivenName>University of Nebraska Security Team</GivenName>
             <EmailAddress>mailto:security@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="technical">
             <GivenName>
-                Anna</GivenName>
-            <SurName>Berg</SurName>
+                Anna Berg</GivenName>
             <EmailAddress>aberg@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
@@ -3928,27 +3906,22 @@
                 index="0" isDefault="true" />
         </SPSSODescriptor>
         <ContactPerson contactType="administrative">
-            <GivenName>Eric</GivenName>
-            <SurName>Haffey</SurName>
+            <GivenName>Eric Haffey</GivenName>
             <EmailAddress>
                 eric.haffey@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
-            <GivenName>Heidi</GivenName>
-            <SurName>
-                Hausserman</SurName>
+            <GivenName>Heidi Hausserman</GivenName>
             <EmailAddress>hhaussermann@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="other"
             xmlns:remd="http://refeds.org/metadata" recontactType="http://refeds.org/metadata/contactType/security">
-            <GivenName>University
-                of Nebraska Security Team</GivenName>
+            <GivenName>University of Nebraska Security Team</GivenName>
             <EmailAddress>mailto:security@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="technical">
             <GivenName>
-                Anna</GivenName>
-            <SurName>Berg</SurName>
+                Anna Berg</GivenName>
             <EmailAddress>aberg@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
@@ -4230,21 +4203,17 @@
         </Organization>
         <ContactPerson contactType="support">
             <Company>Lucid Software</Company>
-            <GivenName>
-                Lucid</GivenName>
-            <SurName>Support</SurName>
+            <GivenName>Lucid Support</GivenName>
             <EmailAddress>support@lucidchart.com</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="administrative">
             <GivenName>
-                Brian</GivenName>
-            <SurName>Cox</SurName>
+                Brian Cox</GivenName>
             <EmailAddress>bcox@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="technical">
             <GivenName>
-                Bret</GivenName>
-            <SurName>Korth</SurName>
+                Bret North</GivenName>
             <EmailAddress>bkorth@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
@@ -4464,20 +4433,17 @@
         </Organization>
         <ContactPerson contactType="administrative">
             <GivenName>
-                Mike</GivenName>
-            <SurName>Dobozy</SurName>
+                Mike Dobozy</GivenName>
             <EmailAddress>mike.dobozy@armssoftware.com</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
             <GivenName>
-                Mike</GivenName>
-            <SurName>Dobozy</SurName>
+                Mike Dobozy</GivenName>
             <EmailAddress>mike.dobozy@armssoftware.com</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="technical">
             <GivenName>
-                Mike</GivenName>
-            <SurName>Dobozy</SurName>
+                Mike Dobozy</GivenName>
             <EmailAddress>mike.dobozy@armssoftware.com</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
@@ -4576,20 +4542,17 @@
         </Organization>
         <ContactPerson contactType="administrative">
             <GivenName>
-                Mike</GivenName>
-            <SurName>Dobozy</SurName>
+                Mike Dobozy</GivenName>
             <EmailAddress>mike.dobozy@armssoftware.com</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
             <GivenName>
-                Mike</GivenName>
-            <SurName>Dobozy</SurName>
+                Mike Dobozy</GivenName>
             <EmailAddress>mike.dobozy@armssoftware.com</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="technical">
             <GivenName>
-                Mike</GivenName>
-            <SurName>Dobozy</SurName>
+                Mike Dobozy</GivenName>
             <EmailAddress>mike.dobozy@armssoftware.com</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
@@ -5976,7 +5939,7 @@
                 https://www.instructure.com/</OrganizationURL>
         </Organization>
         <ContactPerson contactType="technical">
-            <SurName>Administrator</SurName>
+            <GivenName>Administrator</GivenName>
             <EmailAddress>
                 info@instructure.com</EmailAddress>
         </ContactPerson>
@@ -6001,7 +5964,7 @@
                 security@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="technical">
-            <SurName>Administrator</SurName>
+            <GivenName>Administrator</GivenName>
             <EmailAddress>
                 info@instructure.com</EmailAddress>
         </ContactPerson>
@@ -7245,8 +7208,7 @@
         <ContactPerson contactType="administrative">
             <Company>NGWeb Solutions LLC</Company>
             <GivenName>
-                Jim</GivenName>
-            <SurName>Grace</SurName>
+                Jim Grace</GivenName>
             <EmailAddress>jim.grace@ngwebsolutions.com</EmailAddress>
             <TelephoneNumber>
                 904-613-4759</TelephoneNumber>
@@ -8368,20 +8330,20 @@
         <ContactPerson contactType="support">
             <Company>OverDrive
                 Inc.</Company>
+                <GivenName>Authentication Support</GivenName>
             <EmailAddress>authenticationsupport@overdrive.com</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
-            <Company>Rich
-                Leiter</Company>
+            <GivenName>Rich Leiter</GivenName>
             <EmailAddress>rich.leiter@unl.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
-            <Company>Keenan
-                Weber</Company>
+            <GivenName>Keenan
+                Weber</GivenName>
             <EmailAddress>kweber9@unl.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
-            <Company>Anders Brooks</Company>
+            <GivenName>Anders Brooks</GivenName>
             <EmailAddress>
                 anders.brooks@lexisnexis.com</EmailAddress>
         </ContactPerson>
@@ -10018,20 +9980,17 @@
         </Organization>
         <ContactPerson contactType="administrative">
             <GivenName>
-                Gene</GivenName>
-            <SurName>Beardslee</SurName>
+                Gene Beardslee</GivenName>
             <EmailAddress>gbeardslee@peru.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="technical">
             <GivenName>
-                Curtis</GivenName>
-            <SurName>Karel</SurName>
+                Curtis Karel</GivenName>
             <EmailAddress>ckarel@peru.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
             <GivenName>
-                Kathy</GivenName>
-            <SurName>Tynon</SurName>
+                Kathy Tynon</GivenName>
             <EmailAddress>ktynon@peru.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
@@ -10093,20 +10052,17 @@
         </Organization>
         <ContactPerson contactType="administrative">
             <GivenName>
-                Gene</GivenName>
-            <SurName>Beardslee</SurName>
+                Gene Beardslee</GivenName>
             <EmailAddress>gbeardslee@peru.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="technical">
             <GivenName>
-                Curtis</GivenName>
-            <SurName>Karel</SurName>
+                Curtis Karel</GivenName>
             <EmailAddress>ckarel@peru.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
             <GivenName>
-                Kathy</GivenName>
-            <SurName>Tynon</SurName>
+                Kathy Tynon</GivenName>
             <EmailAddress>ktynon@peru.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
@@ -10196,20 +10152,17 @@
         </Organization>
         <ContactPerson contactType="administrative">
             <GivenName>
-                Gene</GivenName>
-            <SurName>Beardslee</SurName>
+                Gene Beardslee</GivenName>
             <EmailAddress>gbeardslee@peru.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="technical">
             <GivenName>
-                Curtis</GivenName>
-            <SurName>Karel</SurName>
+                Curtis Karel</GivenName>
             <EmailAddress>ckarel@peru.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
             <GivenName>
-                Kathy</GivenName>
-            <SurName>Tynon</SurName>
+                Kathy Tynon</GivenName>
             <EmailAddress>ktynon@peru.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="other" recontactType="http://refeds.org/metadata/contactType/security">
@@ -11631,21 +11584,19 @@
             <OrganizationURL xml:lang="en">www.docusign.com</OrganizationURL>
         </Organization>
         <ContactPerson contactType="technical">
+            <Company>DocuSign, Inc.</Company>
             <GivenName>Technical
                 Support</GivenName>
-            <SurName>DocuSign, Inc.</SurName>
             <EmailAddress>support@docusign.com</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="administrative">
             <GivenName>
-                Todd</GivenName>
-            <SurName>Jensen</SurName>
+                Todd Jensen</GivenName>
             <EmailAddress>todd.jensen@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
             <GivenName>
-                ITS</GivenName>
-            <SurName>Support</SurName>
+                ITS Support</GivenName>
             <EmailAddress>support@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
@@ -11760,21 +11711,19 @@
             <OrganizationURL xml:lang="en">www.docusign.com</OrganizationURL>
         </Organization>
         <ContactPerson contactType="technical">
+            <Company>DocuSign, Inc.</Company>
             <GivenName>Technical
                 Support</GivenName>
-            <SurName>DocuSign, Inc.</SurName>
             <EmailAddress>support@docusign.com</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="administrative">
             <GivenName>
-                Todd</GivenName>
-            <SurName>Jensen</SurName>
+                Todd Jensen</GivenName>
             <EmailAddress>todd.jensen@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
             <GivenName>
-                ITS</GivenName>
-            <SurName>Support</SurName>
+                ITS Support</GivenName>
             <EmailAddress>support@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
@@ -12400,21 +12349,16 @@
                 http://www.malwarebytes.com</OrganizationURL>
         </Organization>
         <ContactPerson contactType="technical">
-            <GivenName>Malwarebytes</GivenName>
-            <SurName>
-                Support</SurName>
+            <Company>Malwarebytes</Company>
+            <GivenName>Malwarebytes Support</GivenName>
             <EmailAddress>support@malwarebytes.com</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="technical">
-            <GivenName>Joe</GivenName>
-            <SurName>
-                Victoria</SurName>
+            <GivenName>Joe Victoria</GivenName>
             <EmailAddress>jvictoria@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="administrative">
-            <GivenName>Nick</GivenName>
-            <SurName>
-                Glade</SurName>
+            <GivenName>Nick Glade</GivenName>
             <EmailAddress>nglade@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
@@ -12723,6 +12667,7 @@
         <ContactPerson contactType="administrative">
             <Company>
                 Gartner.com</Company>
+            <GivenName>Gartner Client Setup</GivenName>
             <EmailAddress>client.setup@gartner.com</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
@@ -13616,8 +13561,7 @@
         <ContactPerson contactType="administrative">
             <Company>Dow
                 Jones</Company>
-            <GivenName>IAS</GivenName>
-            <SurName>Team</SurName>
+            <GivenName>IAS Team</GivenName>
             <EmailAddress>IASupport@dowjones.com</EmailAddress>
             <TelephoneNumber>
                 1800-369-0166</TelephoneNumber>
@@ -19648,8 +19592,7 @@
         </Organization>
         <ContactPerson contactType="administrative">
             <GivenName>
-                Todd</GivenName>
-            <SurName>Jensen</SurName>
+                Todd Jensen</GivenName>
             <EmailAddress>mailto:todd.jensen@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
@@ -19664,8 +19607,7 @@
         </ContactPerson>
         <ContactPerson contactType="technical">
             <GivenName>
-                Eric</GivenName>
-            <SurName>Rasmussen</SurName>
+                Eric Rasmussen</GivenName>
             <EmailAddress>mailto:erasmussen@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
@@ -20693,6 +20635,7 @@
         </ContactPerson>
         <ContactPerson contactType="support">
             <Company>Kahua Support</Company>
+            <GivenName>Kahua Support</GivenName>
             <EmailAddress>
                 support@kahua.com</EmailAddress>
         </ContactPerson>
@@ -20928,8 +20871,9 @@
                 https://printorders.nebraska.edu/unl/ </OrganizationURL>
         </Organization>
         <ContactPerson contactType="technical">
-            <SurName>PageDNA
-                Support</SurName>
+            <Company>PageDNA</Company>
+            <GivenName>PageDNA
+                Support</GivenName>
             <EmailAddress>mailto:support@pagedna.com</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="administrative">
@@ -21176,8 +21120,8 @@
             <OrganizationURL xml:lang="en">https://follett.com/</OrganizationURL>
         </Organization>
         <ContactPerson contactType="technical">
-            <SurName>Haitham
-                Saidi</SurName>
+            <GivenName>Haitham
+                Saidi</GivenName>
             <EmailAddress>hsaidi@follett.com</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="administrative">
@@ -21241,6 +21185,7 @@
         <ContactPerson contactType="support">
             <Company>NU ITS Telecom
                 Engineering</Company>
+            <GivenName>Engineering Telecom</GivenName>
             <EmailAddress>its-tel-engineering@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="administrative">
@@ -22756,8 +22701,7 @@
                 index="1" />
         </SPSSODescriptor>
         <ContactPerson contactType="administrative">
-            <GivenName>Roger</GivenName>
-            <SurName>Korth</SurName>
+            <GivenName>Roger Korth</GivenName>
             <EmailAddress>
                 rkorth@nebraska.edu</EmailAddress>
         </ContactPerson>
@@ -22953,6 +22897,7 @@
         <ContactPerson contactType="support">
             <Company>NU ITS Telecom
                 Engineering</Company>
+            <GivenName>Engineering Telecom</GivenName>
             <EmailAddress>its-tel-engineering@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="administrative">
@@ -23197,7 +23142,7 @@
                 ewingert@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
-            <Company>Eric Wingert</Company>
+            <GivenName>Eric Wingert</GivenName>
             <EmailAddress>
                 ewingert@nebraska.edu</EmailAddress>
         </ContactPerson>
@@ -23359,7 +23304,7 @@
                 ewingert@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
-            <Company>Eric Wingert</Company>
+            <GivenName>Eric Wingert</GivenName>
             <EmailAddress>
                 ewingert@nebraska.edu</EmailAddress>
         </ContactPerson>
@@ -23436,8 +23381,8 @@
             <EmailAddress>ewingert@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
-            <Company>Eric
-                Wingert</Company>
+            <GivenName>Eric
+                Wingert</GivenName>
             <EmailAddress>ewingert@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="administrative">
@@ -23513,8 +23458,8 @@
             <EmailAddress>ewingert@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
-            <Company>Eric
-                Wingert</Company>
+            <GivenName>Eric
+                Wingert</GivenName>
             <EmailAddress>ewingert@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="administrative">
@@ -25348,8 +25293,7 @@
         </SPSSODescriptor>
         <ContactPerson contactType="administrative">
             <GivenName>
-                Nick</GivenName>
-            <SurName>Barry</SurName>
+                Nick Barry</GivenName>
             <EmailAddress>nbarry@nebraska.edu</EmailAddress>
         </ContactPerson>
         <ContactPerson contactType="support">
@@ -25364,8 +25308,7 @@
         </ContactPerson>
         <ContactPerson contactType="technical">
             <GivenName>
-                Alan</GivenName>
-            <SurName>Nelson</SurName>
+                Alan Nelson</GivenName>
             <EmailAddress>alan.nelson@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>