diff --git a/test/data/software/Test_Result_Codemeta.xml b/test/data/software/Test_Result_Codemeta.xml
index aa16a33..f2d4bb0 100644
--- a/test/data/software/Test_Result_Codemeta.xml
+++ b/test/data/software/Test_Result_Codemeta.xml
@@ -14,13 +14,9 @@
    </swhdeposit:deposit>
     <codemeta:author>
       <codemeta:name>Kursa, Miron Bartosz</codemeta:name>
-      <codemeta:givenName>Miron Bartosz</codemeta:givenName>
-      <codemeta:familyName>Kursa</codemeta:familyName>
    </codemeta:author>
    <codemeta:author>
       <codemeta:name>Rudnicki, Witold Remigiusz</codemeta:name>
-      <codemeta:givenName>Witold Remigiusz</codemeta:givenName>
-      <codemeta:familyName>Rudnicki</codemeta:familyName>
    </codemeta:author>
    <codemeta:name>Boruta</codemeta:name>
    <codemeta:description>zbMATH Open Web Interface contents unavailable due to conflicting licenses.</codemeta:description>
diff --git a/xslt/software/xslt-software-Codemeta.xslt b/xslt/software/xslt-software-Codemeta.xslt
index 5e18b96..6811b37 100644
--- a/xslt/software/xslt-software-Codemeta.xslt
+++ b/xslt/software/xslt-software-Codemeta.xslt
@@ -104,12 +104,6 @@
         <codemeta:name>
             <xsl:value-of select="."/>
         </codemeta:name>
-        <codemeta:givenName>
-            <xsl:value-of select="normalize-space(substring-after(., ','))"/>
-        </codemeta:givenName>
-        <codemeta:familyName>
-            <xsl:value-of select="substring-before(., ',')"/>
-        </codemeta:familyName>
         </codemeta:author>
     </xsl:template>