diff --git a/Sample rules/X++/Neo4j Extractors/MapMethodNodes.xq b/Sample rules/X++/Neo4j Extractors/MapMethodNodes.xq
index d080906..430268f 100644
--- a/Sample rules/X++/Neo4j Extractors/MapMethodNodes.xq	
+++ b/Sample rules/X++/Neo4j Extractors/MapMethodNodes.xq	
@@ -23,7 +23,6 @@ let $r := <MethodsOnMaps>
     return <Record>
         <Artifact name='Artifact:ID'>{lower-case("/" || $a/@Package || "/maps/" || $a/@Name || "/methods/" || $m/@Name) }</Artifact>
         <Package name='Package'>{lower-case($a/@Package)}</Package>
-        <Artifact name='Artifact'>{lower-case($a/@Artifact)}</Artifact>
         <Map name='Map'>{lower-case($a/@Name)}</Map>
         <Method name='Name'>{lower-case($m/@Name)}</Method>
         <Kind name="Kind">Method</Kind>
diff --git a/Sample rules/X++/Neo4j Extractors/QueryMethodNodes.xq b/Sample rules/X++/Neo4j Extractors/QueryMethodNodes.xq
index 08493ec..3488dae 100644
--- a/Sample rules/X++/Neo4j Extractors/QueryMethodNodes.xq	
+++ b/Sample rules/X++/Neo4j Extractors/QueryMethodNodes.xq	
@@ -24,7 +24,8 @@ let $r := <MethodsOnQueries>
     return <Record>
         <Artifact name="Artifact:ID">{lower-case("/" || $a/../@Package || "/queries/" || $name || "/methods/" || $m/@Name) }</Artifact>
         <Package name='Package'>{lower-case(data($a/../@Package))}</Package>
-        <Name name='Name'>{lower-case($m/@Name)}</Name>
+        <Query name='Query'>{lower-case($a/@Name)}</Query>
+        <Method name='Name'>{lower-case($m/@Name)}</Method>
         <Kind name="Kind">Method</Kind>
         <IsAbstract name='IsAbstract:Boolean'>{lower-case($m/@IsAbstract)}</IsAbstract>
         <IsStatic name='IsStatic:Boolean'>{lower-case($m/@IsStatic)}</IsStatic>