Index: diagrams/interactions.dia
==================================================================
--- diagrams/interactions.dia
+++ diagrams/interactions.dia
@@ -982,16 +982,16 @@
     <dia:object type="Standard - Text" version="1" id="O23">
       <dia:attribute name="obj_pos">
         <dia:point val="7,12"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7,11.405;11.55,12.95"/>
+        <dia:rectangle val="7,11.3864;10.3736,12.9872"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#(2) Instantiate
+            <dia:string>#(2) Deploy
 slice#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
           </dia:attribute>
@@ -1055,16 +1055,16 @@
     <dia:object type="Standard - Text" version="1" id="O25">
       <dia:attribute name="obj_pos">
         <dia:point val="26,6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26,5.405;30.55,6.15"/>
+        <dia:rectangle val="26,5.38638;29.3736,6.18725"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#(2) Instantiate#</dia:string>
+            <dia:string>#(2) Deploy#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
           </dia:attribute>
           <dia:attribute name="height">
@@ -1094,16 +1094,16 @@
     <dia:object type="Standard - Text" version="1" id="O26">
       <dia:attribute name="obj_pos">
         <dia:point val="3,10"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="3,9.405;6.735,10.95"/>
+        <dia:rectangle val="3,9.38637;5.69113,10.9872"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#(3) Activate
+            <dia:string>#(3) Start
 slice#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
           </dia:attribute>
@@ -1134,16 +1134,16 @@
     <dia:object type="Standard - Text" version="1" id="O27">
       <dia:attribute name="obj_pos">
         <dia:point val="30,7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30,6.405;33.735,7.15"/>
+        <dia:rectangle val="30,6.38638;32.6911,7.18725"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#(3) Activate#</dia:string>
+            <dia:string>#(3) Start#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
           </dia:attribute>
           <dia:attribute name="height">
@@ -1330,16 +1330,16 @@
     <dia:object type="Standard - Text" version="1" id="O32">
       <dia:attribute name="obj_pos">
         <dia:point val="9,9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9,8.405;13.5875,9.95"/>
+        <dia:rectangle val="9,8.38637;11.5861,9.98725"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#(5) Deactivate
+            <dia:string>#(5) Stop
 slice#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
           </dia:attribute>
@@ -1370,16 +1370,16 @@
     <dia:object type="Standard - Text" version="1" id="O33">
       <dia:attribute name="obj_pos">
         <dia:point val="33,9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33,8.405;38.425,9.15"/>
+        <dia:rectangle val="33,8.38637;37.1611,9.18725"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#(6) Deinstantiate#</dia:string>
+            <dia:string>#(6) Undeploy#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
           </dia:attribute>
           <dia:attribute name="height">
@@ -1521,16 +1521,16 @@
     <dia:object type="Standard - Text" version="1" id="O37">
       <dia:attribute name="obj_pos">
         <dia:point val="5,7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5,6.405;10.425,7.95"/>
+        <dia:rectangle val="5,6.38638;9.16113,7.98725"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#(6) Deinstantiate
+            <dia:string>#(6) Undeploy
 slice#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
           </dia:attribute>
@@ -1561,16 +1561,16 @@
     <dia:object type="Standard - Text" version="1" id="O38">
       <dia:attribute name="obj_pos">
         <dia:point val="32,8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32,7.405;36.5875,8.15"/>
+        <dia:rectangle val="32,7.38638;34.5861,8.18725"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#(5) Deactivate#</dia:string>
+            <dia:string>#(5) Stop#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
           </dia:attribute>
           <dia:attribute name="height">

Index: script.txt
==================================================================
--- script.txt
+++ script.txt
@@ -178,25 +178,25 @@
    The researcher chooses two nodes and registers sliver descriptions for them
    in the previous slice.  Each one includes a public interface to the CN.
 
    This and all subsequent changes performed by the researcher are stored in
    the registry, which holds the config of all components in the testbed.
-2. The researcher tells the server to instantiate the slice.
+2. The researcher tells the server to deploy the slice.
 
    Each of the previous nodes gets a sliver description for it.  If enough
    resources are available, a container is created by applying the sliver
    configuration over the selected template.
-3. Once the researcher knows that slivers have been instantiated, the server
-   can be commanded to activate the slice.
+3. Once the researcher knows that slivers have been deployed, the server can
+   be commanded to start the slice.
 
-   When nodes get instructions to activate slivers they start containers.
+   When nodes get instructions to start slivers they start containers.
 
    Containers execute the setup & run programs provided by the researcher.
 4. Researchers interact straight with containers if needed (e.g. via SSH) and
    collect results from them.
-5. When finished, the researcher tells the server to deactivate the slice.
-6. And also to deinstantiate it.
+5. When finished, the researcher tells the server to stop the slice.
+6. And also to undeploy it.
 
    Nodes get instructions and they stop and remove containers, respectively.
 7. If the researcher wants to, the slice itself can be removed.
 
 This was a view of the testbed from a research perspective.  From the

Index: slides.svg
==================================================================
--- slides.svg
+++ slides.svg
cannot compute difference between binary files