diff --git a/nefed.xml b/nefed.xml
index 0a2b9fb7047d6e55309502a797ffbc185e794fc9..e30d87f869730a3f0795e3e54de31c5efd579fa5 100644
--- a/nefed.xml
+++ b/nefed.xml
@@ -20724,7 +20724,7 @@
             <OrganizationURL xml:lang="en"> https://stores.pagedna.com/unl_print/ </OrganizationURL>
       </Organization>
       <ContactPerson contactType="technical">
-            <SurName>PageDNA Support</SurName>
+            <GivenName>PageDNA Support</GivenName>
             <EmailAddress>mailto:support@pagedna.com</EmailAddress>
       </ContactPerson>
       <ContactPerson contactType="administrative">
@@ -32382,7 +32382,7 @@
             <OrganizationURL xml:lang="en">https://badgr.com</OrganizationURL>
         </Organization>
         <ContactPerson contactType="support">
-            <SurName>TBD</SurName>
+            <GivenName>TBD</GivenName>
             <EmailAddress>its-sec-iam@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
@@ -32451,15 +32451,13 @@
             </KeyDescriptor>
             <ContactPerson contactType="technical">
                 <Company>PantrySoft</Company>
-                <GivenName>Chris</GivenName>
-                <SurName>Campbell</SurName>
+                <GivenName>Chris Campbell</GivenName>
                 <EmailAddress>chris@pantrysoft.com</EmailAddress>
                 <TelephoneNumber>406-549-0766</TelephoneNumber>
             </ContactPerson>
             <ContactPerson contactType="administrative">
                 <Company>PantrySoft</Company>
-                <GivenName>Bob</GivenName>
-                <SurName>Jaffe</SurName>
+                <GivenName>Bob Jaffe</GivenName>
                 <EmailAddress>bob@pantrysoft.com</EmailAddress>
                 <TelephoneNumber>406-549-0766</TelephoneNumber>
             </ContactPerson>
@@ -32510,8 +32508,7 @@
         </Organization>
         <ContactPerson contactType="administrative">
             <Company>University of Nebraska</Company>
-            <GivenName>Roger</GivenName>
-            <SurName>Korth</SurName>
+            <GivenName>Roger Korth</GivenName>
             <EmailAddress>rdkorth@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>
@@ -33093,8 +33090,7 @@
         </Organization>
         <ContactPerson contactType="Technical">
             <Company>Shorts Travel Management</Company>
-            <GivenName>Eric</GivenName>
-            <SurName>Olsen</SurName>
+            <GivenName>Eric Olsen</GivenName>
             <EmailAddress>it@shortstravel.com</EmailAddress>
             <TelephoneNumber>319.212.5371</TelephoneNumber>
         </ContactPerson>
@@ -33172,8 +33168,7 @@
         </Organization>
         <ContactPerson contactType="Technical">
             <Company>Shorts Travel Management</Company>
-            <GivenName>Eric</GivenName>
-            <SurName>Olsen</SurName>
+            <GivenName>Eric Olsen</GivenName>
             <EmailAddress>it@shortstravel.com</EmailAddress>
             <TelephoneNumber>319.212.5371</TelephoneNumber>
         </ContactPerson>
@@ -33252,8 +33247,7 @@
             <OrganizationDisplayName xml:lang="en-US">Web App2</OrganizationDisplayName>
         </Organization>
         <ContactPerson contactType="Technical">
-            <GivenName>Mike</GivenName>
-            <SurName>Link</SurName>
+            <GivenName>Mike Link</GivenName>
             <EmailAddress>mlink@nebraska.edu</EmailAddress>
         </ContactPerson>
     </EntityDescriptor>