diff --git a/xml/doc/examples/examplequickscope.xml b/xml/doc/examples/examplequickscope.xml
index a32305b..826a20c 100644
--- a/xml/doc/examples/examplequickscope.xml
+++ b/xml/doc/examples/examplequickscope.xml
@@ -35,7 +35,7 @@
         <country>TP Country</country>
     </third_party>
 
-    <pentest_info>
+    <activity_info>
         <!-- How long would you like the test to be? (in days) -->
         <days>6</days>
         <!-- How many persondays (if you don't know, try days * number of assigned pentesters) -->
@@ -58,5 +58,5 @@
         <!-- rate (to be filled in by ROS ;) -->
         <rate>40000</rate>
 
-    </pentest_info>
+    </activity_info>
 </quickscope>
diff --git a/xml/dtd/quickscope.xsd b/xml/dtd/quickscope.xsd
index 5a7cdc1..3fed015 100644
--- a/xml/dtd/quickscope.xsd
+++ b/xml/dtd/quickscope.xsd
@@ -9,7 +9,7 @@
         <xs:element ref="client"/>
         <xs:element ref="meta"/>
         <xs:element ref="third_party" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="pentest_info"/>
+        <xs:element ref="activity_info"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -38,7 +38,7 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="pentest_info">
+  <xs:element name="activity_info">
     <xs:complexType>
       <xs:sequence>
         <xs:element ref="days"/>
diff --git a/xml/source/quickscope.xml b/xml/source/quickscope.xml
index 841dd60..e6682ad 100644
--- a/xml/source/quickscope.xml
+++ b/xml/source/quickscope.xml
@@ -35,7 +35,7 @@
       <country>XXX</country>
   </third_party> -->
   <!-- ___________________________________ -->
-  <pentest_info>
+  <activity_info>
     <!-- How long would you like the test to be? (in days) -->
     <days>0</days>
     <!-- How many persondays (if you don't know, try days * number of assigned pentesters) -->
@@ -59,5 +59,5 @@
 
     <!-- rate (to be filled in by ROS ;) -->
     <rate>0</rate>
-  </pentest_info>
+  </activity_info>
 </quickscope>
diff --git a/xml/xslt/qs2offerte.xsl b/xml/xslt/qs2offerte.xsl
index 6240ef2..52e7350 100644
--- a/xml/xslt/qs2offerte.xsl
+++ b/xml/xslt/qs2offerte.xsl
@@ -86,35 +86,35 @@
                 <pentestinfo>
                     <!-- copy various variables from quickscope -->
                     <duration>
-                        <xsl:value-of select="/*/pentest_info/days"/>
+                        <xsl:value-of select="/*/activity_info/days"/>
                     </duration>
                     <xsl:comment>duration of pentest, in working days</xsl:comment>
                     <persondays>
-                        <xsl:value-of select="/*/pentest_info/persondays"/>
+                        <xsl:value-of select="/*/activity_info/persondays"/>
                     </persondays>
                     <xsl:comment>duration of pentest, in persondays</xsl:comment>
                     <test_planning>
-                        <xsl:value-of select="/*/pentest_info/planning"/>
+                        <xsl:value-of select="/*/activity_info/planning"/>
                     </test_planning>
                     <xsl:comment>date or date range in text, e.g. May 18th until May 25th, 2016</xsl:comment>
                     <report_due>
-                        <xsl:value-of select="/*/pentest_info/delivery"/>
+                        <xsl:value-of select="/*/activity_info/delivery"/>
                     </report_due>
                     <xsl:comment>date or date range in text, e.g. May 18th until May 25th, 2016</xsl:comment>
                     <nature>
-                        <xsl:value-of select="/*/pentest_info/nature"/>
+                        <xsl:value-of select="/*/activity_info/nature"/>
                     </nature>
                     <type>
-                        <xsl:value-of select="/*/pentest_info/type"/>
+                        <xsl:value-of select="/*/activity_info/type"/>
                     </type>
                     <xsl:comment>please choose one of the following: black-box, grey-box, crystal-box</xsl:comment>
                     <fee denomination="eur">
-                        <xsl:value-of select="/*/pentest_info/rate"/>
+                        <xsl:value-of select="/*/activity_info/rate"/>
                     </fee>
                     <xsl:comment>(eur|usd|gbp)</xsl:comment>
-                    <xsl:if test="*/pentest_info/application_name">
+                    <xsl:if test="*/activity_info/application_name">
                         <target_application>
-                            <xsl:value-of select="/*/pentest_info/application_name"/>
+                            <xsl:value-of select="/*/activity_info/application_name"/>
                         </target_application>
                         <xsl:comment>name of application/service to be tested (if any; if none, DELETE target_application element)</xsl:comment>
                     </xsl:if>
@@ -147,7 +147,7 @@
                 </xsl:element>
             </xsl:for-each>
             
-            <xsl:if test="/*/pentest_info/codeaudit/@perform = 'yes'">
+            <xsl:if test="/*/activity_info/codeaudit/@perform = 'yes'">
                 <xsl:for-each
                 select="$snippetSelectionRoot/selection[@subtype = $docSubType]/snippet_group[@set = 'additionalcodeaudit']/snippet">
                 <xsl:element name="xi:include">
@@ -213,7 +213,7 @@
                     </xsl:call-template>
                 </xsl:attribute>
             </xsl:element>-->
-            <!--<xsl:if test="/*/pentest_info/codeaudit/@perform = 'yes'">
+            <!--<xsl:if test="/*/activity_info/codeaudit/@perform = 'yes'">
                 <xsl:element name="xi:include">
                     <xsl:attribute name="href">
                         <xsl:call-template name="docCheck">
diff --git a/xml/xslt/rep2off.xsl b/xml/xslt/rep2off.xsl
index fd09aa7..36c2cc0 100644
--- a/xml/xslt/rep2off.xsl
+++ b/xml/xslt/rep2off.xsl
@@ -82,7 +82,7 @@
                     <test_planning>
                         <xsl:choose>
                             <xsl:when test="/*/pentestinfo/test_planning">
-                                <xsl:value-of select="/*/pentest_info/test_planning"/>
+                                <xsl:value-of select="/*/activity_info/test_planning"/>
                             </xsl:when>
                             <xsl:otherwise>TBD</xsl:otherwise>
                         </xsl:choose>
@@ -91,7 +91,7 @@
                     <report_due>
                         <xsl:choose>
                             <xsl:when test="/*/pentestinfo/report_due">
-                                <xsl:value-of select="/*/pentest_info/report_due"/>
+                                <xsl:value-of select="/*/activity_info/report_due"/>
                             </xsl:when>
                             <xsl:otherwise>TBD</xsl:otherwise>
                         </xsl:choose>
@@ -100,7 +100,7 @@
                     <nature>
                         <xsl:choose>
                             <xsl:when test="/*/pentestinfo/nature">
-                                <xsl:value-of select="/*/pentest_info/nature"/>
+                                <xsl:value-of select="/*/activity_info/nature"/>
                             </xsl:when>
                             <xsl:otherwise>time-boxed</xsl:otherwise>
                         </xsl:choose>
@@ -108,7 +108,7 @@
                     <type>
                         <xsl:choose>
                             <xsl:when test="/*/pentestinfo/type">
-                                <xsl:value-of select="/*/pentest_info/type"/>
+                                <xsl:value-of select="/*/activity_info/type"/>
                             </xsl:when>
                             <xsl:otherwise>crystal-box</xsl:otherwise>
                         </xsl:choose>
@@ -116,9 +116,9 @@
                     <xsl:comment>please choose one of the following: black-box, grey-box, crystal-box</xsl:comment>
                     <fee denomination="eur">0</fee>
                     <xsl:comment>(eur|usd|gbp)</xsl:comment>
-                    <xsl:if test="*/pentest_info/target_application">
+                    <xsl:if test="*/activity_info/target_application">
                         <target_application>
-                            <xsl:value-of select="/*/pentest_info/target_application"/>
+                            <xsl:value-of select="/*/activity_info/target_application"/>
                         </target_application>
                     </xsl:if>
                 </pentestinfo>