diff --git a/public/prefixes/doi_datacite.xslt b/public/prefixes/doi_datacite.xslt
index df4aa79..ef40815 100644
--- a/public/prefixes/doi_datacite.xslt
+++ b/public/prefixes/doi_datacite.xslt
@@ -342,12 +342,17 @@
                     <xsl:text>)</xsl:text>
                 </xsl:if>
             </creatorName>
-            <givenName>
-                <xsl:value-of select="@FirstName" />
-            </givenName>
-            <familyName>
-                <xsl:value-of select="@LastName" />
-            </familyName>
+
+            <xsl:if test="@NameType = 'Personal'">
+                <givenName>
+                    <xsl:value-of select="@FirstName" />
+                </givenName>
+                <familyName>
+                    <xsl:value-of select="@LastName" />
+                </familyName>
+                 <affiliation>GBA</affiliation>
+            </xsl:if>
+
             <xsl:if test="@IdentifierOrcid != ''">
                 <nameIdentifier schemeURI="http://orcid.org/" nameIdentifierScheme="ORCID">
                     <xsl:value-of select="@IdentifierOrcid" />
@@ -356,7 +361,7 @@
             <!-- 
         <nameType><xsl:value-of select="@NameType" /></nameType>
       </xsl:if> -->
-            <affiliation>GBA</affiliation>
+           
         </creator>
     </xsl:template>
 
diff --git a/public/prefixes/oai_datacite.xslt b/public/prefixes/oai_datacite.xslt
index 78abaed..0d339a7 100644
--- a/public/prefixes/oai_datacite.xslt
+++ b/public/prefixes/oai_datacite.xslt
@@ -345,12 +345,17 @@
                     <xsl:text>)</xsl:text>
                 </xsl:if>
             </creatorName>
-            <givenName>
-                <xsl:value-of select="@FirstName" />
-            </givenName>
-            <familyName>
-                <xsl:value-of select="@LastName" />
-            </familyName>
+
+            <xsl:if test="@NameType = 'Personal'">
+                <givenName>
+                    <xsl:value-of select="@FirstName" />
+                </givenName>
+                <familyName>
+                    <xsl:value-of select="@LastName" />
+                </familyName>
+                 <affiliation>GBA</affiliation>
+            </xsl:if>
+
             <xsl:if test="@IdentifierOrcid != ''">
                 <nameIdentifier schemeURI="http://orcid.org/" nameIdentifierScheme="ORCID">
                     <xsl:value-of select="@IdentifierOrcid" />
@@ -359,7 +364,7 @@
             <!-- 
         <nameType><xsl:value-of select="@NameType" /></nameType>
       </xsl:if> -->
-            <affiliation>GBA</affiliation>
+           
         </creator>
     </xsl:template>