diff --git a/index.html b/index.html
index 31c689e..202207b 100644
--- a/index.html
+++ b/index.html
@@ -86,27 +86,38 @@ <h1>RADICAL Cybertools</h1>
     </div>
 
     <div class="content-section-b" id="RADICALPilot">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-7 col-lg-offset-1 col-sm-push-4 col-sm-6">
-                    <div class="clearfix"></div>
-                    <h2 class="section-heading">RADICAL-Pilot</h2>
-                    <p class="infoblurb">RADICAL-Pilot uses pilots in order to achieve the scalable execution of large numbers of tasks. A pilot is a job submitted to a machine in order to acquire exclusive use of a chunk of its resources. Once the pilot becomes active, it can execute the tasks specified by the user. Instead of having each task waiting on a machine to be executed, the user only has to wait once with a pilot! RADICAL-Pilot allows users to specify resources in the form of pilots and their tasks separately so the user can wait once and run everything.
-                    <p>
-                      <a class="btn btn-pilot" role="button" href="./radical-pilot/basic_example.html">Basic Example</a>
-                      <a class="btn btn-pilot" role="button" href="./radical-pilot/quick_start.html">Getting Started</a>
-                      <a class="btn btn-pilot" role="button" href="./radical-pilot/index.html">More Info</a>
-                      <a class="btn btn-pilot" role="button" href="http://radicalpilot.readthedocs.org/">Documentation</a>
-                      <a class="btn btn-pilot" role="button" href="https://github.com/radical-cybertools/radical.pilot">Github Project</a>
-                    </p>                
-
-                       </div>
-                <div class="col-lg-4 col-sm-pull-8 col-sm-6">
-                    <a href="img/radical-pilot.png"><img class="img-responsive" src="img/radical-pilot.png" alt=""></a>
-                </div>
+      <div class="container">
+        <div class="row">
+          <div class="col-lg-7 col-lg-offset-1 col-sm-push-4 col-sm-6">
+            <div class="clearfix"></div>
+              <h2 class="section-heading">RADICAL-Pilot</h2>
+              <p class="infoblurb">
+
+              RADICAL-Pilot (RP) is a scalable and flexible Pilot-Job system
+              that provides application-level resource management capabilities
+              on HPC resources.  RP interfaces to various low level resource
+              managers like Slurm, PBS(Pro), Torque, LSF, and Cobalt, and also
+              to various task execution backends like Slurm, OpenMPI, MPICH,
+              PRTE, JSRUN, Flux, Dragon, and others.  Next to managing
+              executable tasks, RP can also run Python function on the target
+              resources if the execution backend supports it (e.g. for Raptor,
+              Dragon).
+
+              <p>
+                <a class="btn btn-pilot" role="button" href="./radical-pilot/basic_example.html">Basic Example</a>
+                <a class="btn btn-pilot" role="button" href="./radical-pilot/quick_start.html">Getting Started</a>
+                <a class="btn btn-pilot" role="button" href="./radical-pilot/index.html">More Info</a>
+                <a class="btn btn-pilot" role="button" href="http://radicalpilot.readthedocs.org/">Documentation</a>
+                <a class="btn btn-pilot" role="button" href="https://github.com/radical-cybertools/radical.pilot">Github Project</a>
+              </p>
+
             </div>
+          <div class="col-lg-4 col-sm-pull-8 col-sm-6">
+            <a href="img/radical-pilot.png"><img class="img-responsive" src="img/radical-pilot.png" alt=""></a>
+          </div>
         </div>
-        <!-- /.container -->
+      </div>
+      <!-- /.container -->
     </div>
     <!-- /.content-section-b -->
 
@@ -125,7 +136,7 @@ <h2 class="section-heading">Ensemble Toolkit</h2>
                       <a class="btn btn-enmd" role="button" href="./entk/index.html">More Info</a>
                       <a class="btn btn-enmd" role="button" href="https://radicalentk.readthedocs.io/">Documentation</a>
                       <a class="btn btn-enmd" role="button" href="https://github.com/radical-cybertools/radical.entk">Github Project </a>
-                    </p>   
+                    </p>
                 </div>
                 <div class="col-lg-4 col-sm-pull-8 col-sm-6">
                     <a href="img/radical-enmd.png"><img class="img-responsive" src="img/radical-enmd.png" alt=""></a>
@@ -143,11 +154,11 @@ <h2 class="section-heading">Ensemble Toolkit</h2>
                     <div class="clearfix"></div>
                     <h2 class="section-heading">RADICAL-SAGA</h2>
                     <p class="infoblurb">RADICAL-SAGA is the <i>infrastructure access
-                    layer</i> of the RADICAL Cybertools stack. It provides 
-                    a homogeneous programming interface to the majority of production 
-                    HPC queuing systems, Grid- and Cloud-services. 
+                    layer</i> of the RADICAL Cybertools stack. It provides
+                    a homogeneous programming interface to the majority of production
+                    HPC queuing systems, Grid- and Cloud-services.
                     RADICAL-SAGA supports XSDE and OSG resources as well
-                    as academic and commercial cloud computing platforms. 
+                    as academic and commercial cloud computing platforms.
                     </p>
                     <p><a class="btn btn-saga" role="button" href="./saga-python/index.html">
                     More Info</a>
@@ -168,7 +179,7 @@ <h2 class="section-heading">RADICAL-SAGA</h2>
 
     <div id="footer">
       <div class="container">
-        <p align="center">Copyright &copy; 2014-2016 <a href="http://radical.rutgers.edu">RADICAL Research</a> at 
+        <p align="center">Copyright &copy; 2014-2016 <a href="http://radical.rutgers.edu">RADICAL Research</a> at
           <a href="http://www.rutgers.edu">
           Rutgers University </a></p>
       </div>
diff --git a/radical-pilot/basic_example.html b/radical-pilot/basic_example.html
index ede78cb..4c19b5d 100644
--- a/radical-pilot/basic_example.html
+++ b/radical-pilot/basic_example.html
@@ -69,9 +69,9 @@
     <!-- ========== -->
     <script>
 var Executed = 0;
-function execute1(){    
+function execute1(){
         document.getElementById("output1").innerHTML = '';
-        setTimeout(myTimeout1, (Math.random()*1000)) 
+        setTimeout(myTimeout1, (Math.random()*1000))
 }
 function myTimeout1() {
   document.getElementById("output1").innerHTML = '<div class="output"><div class="output_area"><div class="prompt"></div><div class="output_subarea output_stream output_stdout output_text"><pre>0.42</pre></div></div></div>';
@@ -83,7 +83,7 @@
 
 }
 function myTimeout2() {
-    document.getElementById("output2").innerHTML = '<div class="output"><div class="output_area"><div class="prompt"></div><div class="output_subarea output_stream output_stdout output_text"><pre>Session id: rp.session.ip-10-144-47-195.radical.016754.0005<br>Pilot Manager: pmgr.0005<br>Unit Manager: umgr.0005</pre></div></div></div>';
+    document.getElementById("output2").innerHTML = '<div class="output"><div class="output_area"><div class="prompt"></div><div class="output_subarea output_stream output_stdout output_text"><pre>Session id: rp.session.ip-10-144-47-195.radical.016754.0005<br>Pilot Manager: pmgr.0005<br>Task Manager: tmgr.0005</pre></div></div></div>';
         Executed=2;
 }
 
@@ -97,14 +97,14 @@
         }
 }
 function myTimeout3() {
-    document.getElementById("output3").innerHTML = '<div class="output"><div class="output_area"><div class="output_html rendered_html output_subarea output_execute_result"><div><table border="1" class="dataframe"><thead><tr style="text-align: right;"><th></th><th>Value</th></tr></thead><tbody><tr><th>uid</th><td>umgr.0005</td></tr><tr><th>scheduler</th><td>RoundRobinScheduler</td></tr><tr><th>scheduler_details</th><td>NO SCHEDULER DETAILS (Not Implemented)</td></tr></tbody></table></div></div></div></div>';
+    document.getElementById("output3").innerHTML = '<div class="output"><div class="output_area"><div class="output_html rendered_html output_subarea output_execute_result"><div><table border="1" class="dataframe"><thead><tr style="text-align: right;"><th></th><th>Value</th></tr></thead><tbody><tr><th>uid</th><td>tmgr.0005</td></tr><tr><th>scheduler</th><td>RoundRobinScheduler</td></tr><tr><th>scheduler_details</th><td>NO SCHEDULER DETAILS (Not Implemented)</td></tr></tbody></table></div></div></div></div>';
     Executed = 2;
 }
 
-function execute4(){ 
+function execute4(){
         document.getElementById("output4").innerHTML = '';
         if (Executed > 1){
-                setTimeout(myTimeout4, (Math.random()*1000)) 
+                setTimeout(myTimeout4, (Math.random()*1000))
             }
         else{
             document.getElementById("output4").innerHTML='<div class="output"><div class="output_area"><div class="prompt"></div><div class="output_subarea output_stream output_stdout output_text"><pre>Please execute previous Shells</pre></div></div></div>';
@@ -116,7 +116,7 @@
 }
 
 
-function execute5(){    
+function execute5(){
         document.getElementById("output5").innerHTML = '';
         if( Executed > 2){
             Executed = 4; }
@@ -128,21 +128,21 @@
 function execute6() {
         document.getElementById("output6").innerHTML = '';
         if (Executed > 3){
-                setTimeout(myTimeout6, 2000) 
-                setTimeout(myTimeout7, 4000) 
+                setTimeout(myTimeout6, 2000)
+                setTimeout(myTimeout7, 4000)
                 setTimeout(myTimeout8, 6000+(Math.random()*1000)) }
         else{
             document.getElementById("output6").innerHTML='<div class="output"><div class="output_area"><div class="prompt"></div><div class="output_subarea output_stream output_stdout output_text"><pre>Please execute previous Shells</pre></div></div></div>';
         }
 }
 function myTimeout6() {
-    document.getElementById("output6").innerHTML = '<div class="output"><div class="output_area"><div class="prompt"></div><div class="output_subarea output_stream output_stdout output_text"><pre>Submit Compute Units to Unit Manager ...</pre></div></div></div>';
+    document.getElementById("output6").innerHTML = '<div class="output"><div class="output_area"><div class="prompt"></div><div class="output_subarea output_stream output_stdout output_text"><pre>Submit Tasks to Task Manager ...</pre></div></div></div>';
 }
 function myTimeout7() {
-    document.getElementById("output6").innerHTML = '<div class="output"><div class="output_area"><div class="prompt"></div><div class="output_subarea output_stream output_stdout output_text"><pre>Submit Compute Units to Unit Manager ...<br>Waiting for CUs to complete ...</pre></div></div></div>';
+    document.getElementById("output6").innerHTML = '<div class="output"><div class="output_area"><div class="prompt"></div><div class="output_subarea output_stream output_stdout output_text"><pre>Submit Tasks to Task Manager ...<br>Waiting for Tasks to complete ...</pre></div></div></div>';
 }
 function myTimeout8() {
-    document.getElementById("output6").innerHTML = '<div class="output"><div class="output_area"><div class="prompt"></div><div class="output_subarea output_stream output_stdout output_text"><pre>Submit Compute Units to Unit Manager ...<br>Waiting for CUs to complete ...<br>All CUs completed successfully!</pre></div></div></div>';
+    document.getElementById("output6").innerHTML = '<div class="output"><div class="output_area"><div class="prompt"></div><div class="output_subarea output_stream output_stdout output_text"><pre>Submit Tasks to Task Manager ...<br>Waiting for Tasks to complete ...<br>All Tasks completed successfully!</pre></div></div></div>';
     Executed = 5;
 }
 
@@ -151,18 +151,18 @@
         document.getElementById("output7").innerHTML = '';
         if (Executed > 4){
                 setTimeout(myTimeout9,(Math.random()*1000))
-		setTimeout(myTimeout12,1000+(Math.random()*1000))}   
+		setTimeout(myTimeout12,1000+(Math.random()*1000))}
         else{
             document.getElementById("output7").innerHTML='<div class="output"><div class="output_area"><div class="prompt"></div><div class="output_subarea output_stream output_stdout output_text"><pre>Please execute previous Shells</pre></div></div></div>';
-        } 
+        }
 }
 function myTimeout9() {
-    document.getElementById("output7").innerHTML = '<div class="output"><div class="output_area"><div class="prompt"></div><div class="output_subarea output_stream output_stdout output_text"><pre>I am CU number 1</pre></div></div></div>';
+    document.getElementById("output7").innerHTML = '<div class="output"><div class="output_area"><div class="prompt"></div><div class="output_subarea output_stream output_stdout output_text"><pre>I am Task number 1</pre></div></div></div>';
     Executed = 6;
 }
 
 function myTimeout12() {
-    document.getElementById("output7").innerHTML = '<div class="output"><div class="output_area"><div class="prompt"></div><div class="output_subarea output_stream output_stdout output_text"><pre>I am CU number 1<br>I am CU number 2</pre></div></div></div>';
+    document.getElementById("output7").innerHTML = '<div class="output"><div class="output_area"><div class="prompt"></div><div class="output_subarea output_stream output_stdout output_text"><pre>I am Task number 1<br>I am Task number 2</pre></div></div></div>';
     Executed = 6;
 }
 
@@ -205,7 +205,7 @@ <h2 id="1-RADICAL-Pilot-Setup">1 RADICAL-Pilot Setup<a class="anchor-link" href=
 <div class=" highlight hl-ipython2"><pre>
 <span class="kn">import</span> <span class="nn">os</span><span class="o">,</span> <span class="nn">sys</span>
 <span class="kn">import</span> <span class="nn">radical.pilot</span> <span class="kn">as</span> <span class="nn">rp</span>
-<span class="o"></span>print rp.version
+<span class="o"></span>print(rp.version)
 </pre></div>
 
 </div>
@@ -235,8 +235,8 @@ <h3 id="2.1-Create-a-new-Session-and-Pilot-Manager.">2.1 Create a new Session an
         <div class="input_area">
 <div class=" highlight hl-ipython2"><pre><span class="n">session</span> <span class="o">=</span> <span class="n">rp</span><span class="o">.</span><span class="n">Session</span><span class="p">()</span>
 <span class="n">pmgr</span> <span class="o">=</span> <span class="n">rp</span><span class="o">.</span><span class="n">PilotManager</span><span class="p">(</span><span class="n">session</span><span class="o">=</span><span class="n">session</span><span class="p">)</span>
-<span class="n">umgr</span> <span class="o">=</span> <span class="n">rp</span><span class="o">.</span><span class="n">UnitManager</span> <span class="p">(</span><span class="n">session</span><span class="o">=</span><span class="n">session</span><span class="p">,</span><span class="n">scheduler</span><span class="o">=</span><span class="n">rp</span><span class="o">.</span><span class="n">SCHED_ROUND_ROBIN</span><span class="p">)</span>
-<span class="k">print</span> <span class="s2">&quot;Session id: </span><span class="si">%s \n \</span><br><span class="s2"> Pilot Manager: </span><span class="si">%s \n \</span><br><span class="s2"> Unit Manager: </span><span class="si">%s</span><span class="s2">&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="n">session</span><span class="o">.</span><span class="n">uid</span><span class="p">,</span> <span class="n">pmgr</span><span class="o">.</span><span class="n">uid</span><span class="p">,</span> <span class="n">umgr</span><span class="o">.</span><span class="n">uid</span><span class="p">)</span>
+<span class="n">tmgr</span> <span class="o">=</span> <span class="n">rp</span><span class="o">.</span><span class="n">TaskManager</span> <span class="p">(</span><span class="n">session</span><span class="o">=</span><span class="n">session</span><span class="p">,</span><span class="n">scheduler</span><span class="o">=</span><span class="n">rp</span><span class="o">.</span><span class="n">SCHED_ROUND_ROBIN</span><span class="p">)</span>
+<span class="k">print</span> <span class="s2">(&quot;Session id: </span><span class="si">%s \n \</span><br><span class="s2"> Pilot Manager: </span><span class="si">%s \n \</span><br><span class="s2"> Task Manager: </span><span class="si">%s</span><span class="s2">&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="n">session</span><span class="o">.</span><span class="n">uid</span><span class="p">,</span> <span class="n">pmgr</span><span class="o">.</span><span class="n">uid</span><span class="p">,</span> <span class="n">tmgr</span><span class="o">.</span><span class="n">uid</span><span class="p">))</span>
 </pre></div>
 
 </div>
@@ -253,7 +253,7 @@ <h3 id="2.1-Create-a-new-Session-and-Pilot-Manager.">2.1 Create a new Session an
 </div>
 <div class="inner_cell">
 <div class="text_cell_render border-box-sizing rendered_html">
-<h3 id="2.2-Submit-Pilot-and-add-to-Unit-Manager">2.2 Submit Pilot and add to Unit Manager<a class="anchor-link" href="#2.2-Submit-Pilot-and-add-to-Unit-Manager"></a></h3><p>Create a description of the Pilot, which specifies its target resource, size and runtime.</p>
+<h3 id="2.2-Submit-Pilot-and-add-to-Task-Manager">2.2 Submit Pilot and add to Task Manager<a class="anchor-link" href="#2.2-Submit-Pilot-and-add-to-Task-Manager"></a></h3><p>Create a description of the Pilot, which specifies its target resource, size and runtime.</p>
 </div>
 </div>
 </div>
@@ -261,12 +261,12 @@ <h3 id="2.2-Submit-Pilot-and-add-to-Unit-Manager">2.2 Submit Pilot and add to Un
 <div class="input">
 <div class="inner_cell">
         <div class="input_area">
-<div class=" highlight hl-ipython2"><pre><span class="n">pdesc</span> <span class="o">=</span> <span class="n">rp</span><span class="o">.</span><span class="n">ComputePilotDescription</span><span class="p">()</span>
+<div class=" highlight hl-ipython2"><pre><span class="n">pdesc</span> <span class="o">=</span> <span class="n">rp</span><span class="o">.</span><span class="n">PilotDescription</span><span class="p">()</span>
 <span class="n">pdesc</span><span class="o">.</span><span class="n">resource</span> <span class="o">=</span> <span class="s2">&quot;local.localhost&quot;</span>
 <span class="n">pdesc</span><span class="o">.</span><span class="n">runtime</span>  <span class="o">=</span> <span class="mi">10</span> <span class="c1"># minutes</span>
 <span class="n">pdesc</span><span class="o">.</span><span class="n">cores</span>    <span class="o">=</span> <span class="mi">2</span>
 <span class="n">pilot</span> <span class="o">=</span> <span class="n">pmgr</span><span class="o">.</span><span class="n">submit_pilots</span><span class="p">(</span><span class="n">pdesc</span><span class="p">)</span>
-<span class="n">umgr</span><span class="o">.</span><span class="n">add_pilots</span><span class="p">(</span><span class="n">pilot</span><span class="p">)</span>
+<span class="n">tmgr</span><span class="o">.</span><span class="n">add_pilots</span><span class="p">(</span><span class="n">pilot</span><span class="p">)</span>
 </pre></div>
 
 </div>
@@ -279,7 +279,7 @@ <h3 id="2.2-Submit-Pilot-and-add-to-Unit-Manager">2.2 Submit Pilot and add to Un
 </div>
 <div class="inner_cell">
 <div class="text_cell_render border-box-sizing rendered_html">
-<p>The <code>umgr.add_pilot(pilot)</code> binds a Pilot to a Unit Manager. This informs the Unit Manager that the resources of the Pilot can be used for exeuction of Units. Multiple Pilots can be bound to a Unit Manager, and later be removed via <code>umgr.remove_pilot()</code>. The Unit Manager will schedule incoming Compute Units across all available Pilots.</p>
+<p>The <code>tmgr.add_pilot(pilot)</code> binds a Pilot to a Task Manager. This informs the Task Manager that the resources of the Pilot can be used for exeuction of Tasks. Multiple Pilots can be bound to a Task Manager, and later be removed via <code>tmgr.remove_pilot()</code>. The Task Manager will schedule incoming Tasks across all available Pilots.</p>
 
 </div>
 </div>
@@ -288,10 +288,10 @@ <h3 id="2.2-Submit-Pilot-and-add-to-Unit-Manager">2.2 Submit Pilot and add to Un
 <div class="input">
 <div class="inner_cell">
         <div class="input_area">
-<div class=" highlight hl-ipython2"><pre><span class="n">print "uid: ",</span> <span class="n">pilot</span><span class="o">.</span><span class="n">uid</span>
-<span class="n">print "resource: ",</span> <span class="n">pilot</span><span class="o">.</span><span class="n">resource</span>
-<span class="n">print "sandbox: ",</span> <span class="n">pilot</span><span class="o">.</span><span class="n">sandbox</span>
-<span class="n">print "state: ",</span> <span class="n">pilot</span><span class="o">.</span><span class="n">state</span>
+<div class=" highlight hl-ipython2"><pre><span class="n">print("uid: ",</span> <span class="n">pilot</span><span class="o">.</span><span class="n">uid)</span>
+<span class="n">print("resource: ",</span> <span class="n">pilot</span><span class="o">.</span><span class="n">resource)</span>
+<span class="n">print("sandbox: ",</span> <span class="n">pilot</span><span class="o">.</span><span class="n">sandbox)</span>
+<span class="n">print("state: ",</span> <span class="n">pilot</span><span class="o">.</span><span class="n">state)</span>
 </pre></div>
 </div>
 </div>
@@ -313,7 +313,7 @@ <h3 id="2.2-Submit-Pilot-and-add-to-Unit-Manager">2.2 Submit Pilot and add to Un
 </div>
 <div class="inner_cell">
 <div class="text_cell_render border-box-sizing rendered_html">
-<h3 id="2.3-Submit-Compute-Units">2.3 Submit Compute Units<a class="anchor-link" href="#2.3-Submit-Compute-Units"></a></h3><p>Create a description of the Compute Unit, which specifies the details of the task to be executed.</p>
+<h3 id="2.3-Submit-Tasks">2.3 Submit Tasks<a class="anchor-link" href="#2.3-Submit-Tasks"></a></h3><p>Create a description of the Task, which specifies the details of the task to be executed.</p>
 
 </div>
 </div>
@@ -322,16 +322,16 @@ <h3 id="2.3-Submit-Compute-Units">2.3 Submit Compute Units<a class="anchor-link"
 <div class="input">
 <div class="inner_cell">
         <div class="input_area">
-<div class=" highlight hl-ipython2"><pre><span class="n">cudesc1</span> <span class="o">=</span> <span class="n">rp</span><span class="o">.</span><span class="n">ComputeUnitDescription</span><span class="p">()</span>
-<span class="n">cudesc1</span><span class="o">.</span><span class="n">environment</span> <span class="o">=</span> <span class="p">{</span><span class="s1">&#39;CU_NO&#39;</span><span class="p">:</span> <span class="mi">1</span><span class="p">}</span>
-<span class="n">cudesc1</span><span class="o">.</span><span class="n">executable</span>  <span class="o">=</span> <span class="s2">&quot;/bin/echo&quot;</span>
-<span class="n">cudesc1</span><span class="o">.</span><span class="n">arguments</span>   <span class="o">=</span> <span class="p">[</span><span class="s1">&#39;I am CU number $CU_NO&#39;</span><span class="p">]</span>
-<span class="n">cudesc1</span><span class="o">.</span><span class="n">cores</span>       <span class="o">=</span> <span class="mi">1</span><br>
-<span class="n">cudesc2</span> <span class="o">=</span> <span class="n">rp</span><span class="o">.</span><span class="n">ComputeUnitDescription</span><span class="p">()</span>
-<span class="n">cudesc2</span><span class="o">.</span><span class="n">environment</span> <span class="o">=</span> <span class="p">{</span><span class="s1">&#39;CU_NO&#39;</span><span class="p">:</span> <span class="mi">2</span><span class="p">}</span>
-<span class="n">cudesc2</span><span class="o">.</span><span class="n">executable</span>  <span class="o">=</span> <span class="s2">&quot;/bin/echo&quot;</span>
-<span class="n">cudesc2</span><span class="o">.</span><span class="n">arguments</span>   <span class="o">=</span> <span class="p">[</span><span class="s1">&#39;I am CU number $CU_NO&#39;</span><span class="p">]</span>
-<span class="n">cudesc2</span><span class="o">.</span><span class="n">cores</span>       <span class="o">=</span> <span class="mi">1</span>
+<div class=" highlight hl-ipython2"><pre><span class="n">td_1</span> <span class="o">=</span> <span class="n">rp</span><span class="o">.</span><span class="n">TaskDescription</span><span class="p">()</span>
+<span class="n">td_1</span><span class="o">.</span><span class="n">environment</span> <span class="o">=</span> <span class="p">{</span><span class="s1">&#39;TASK_NO&#39;</span><span class="p">:</span> <span class="mi">1</span><span class="p">}</span>
+<span class="n">td_1</span><span class="o">.</span><span class="n">executable</span>  <span class="o">=</span> <span class="s2">&quot;/bin/echo&quot;</span>
+<span class="n">td_1</span><span class="o">.</span><span class="n">arguments</span>   <span class="o">=</span> <span class="p">[</span><span class="s1">&#39;I am Task number $TASK_NO&#39;</span><span class="p">]</span>
+<span class="n">td_1</span><span class="o">.</span><span class="n">cores</span>       <span class="o">=</span> <span class="mi">1</span><br>
+<span class="n">td_2</span> <span class="o">=</span> <span class="n">rp</span><span class="o">.</span><span class="n">TaskDescription</span><span class="p">()</span>
+<span class="n">td_2</span><span class="o">.</span><span class="n">environment</span> <span class="o">=</span> <span class="p">{</span><span class="s1">&#39;TASK_NO&#39;</span><span class="p">:</span> <span class="mi">2</span><span class="p">}</span>
+<span class="n">td_2</span><span class="o">.</span><span class="n">executable</span>  <span class="o">=</span> <span class="s2">&quot;/bin/echo&quot;</span>
+<span class="n">td_2</span><span class="o">.</span><span class="n">arguments</span>   <span class="o">=</span> <span class="p">[</span><span class="s1">&#39;I am Task number $TASK_NO&#39;</span><span class="p">]</span>
+<span class="n">td_2</span><span class="o">.</span><span class="n">cores</span>       <span class="o">=</span> <span class="mi">1</span>
 </pre></div>
 
 </div>
@@ -344,7 +344,7 @@ <h3 id="2.3-Submit-Compute-Units">2.3 Submit Compute Units<a class="anchor-link"
 </div>
 <div class="inner_cell">
 <div class="text_cell_render border-box-sizing rendered_html">
-<p>Submit the previously created Compute Unit descriptions to the Unit Manager. This will trigger the selected scheduler (in this case the Round-Robin scheduler) to start assigning Compute Units to the Pilots.</p>
+<p>Submit the previously created Task descriptions to the Task Manager. This will trigger the selected scheduler (in this case the Round-Robin scheduler) to start assigning Tasks to the Pilots.</p>
 
 </div>
 </div>
@@ -353,11 +353,11 @@ <h3 id="2.3-Submit-Compute-Units">2.3 Submit Compute Units<a class="anchor-link"
 <div class="input">
 <div class="inner_cell">
         <div class="input_area">
-<div class=" highlight hl-ipython2"><pre><span class="k">print</span> <span class="s2">&quot;Submit Compute Units to Unit Manager ...&quot;</span>
-<span class="n">cu_set</span> <span class="o">=</span> <span class="n">umgr</span><span class="o">.</span><span class="n">submit_units</span><span class="p">([</span><span class="n">cudesc1, cudesc2</span><span class="p">])</span>
-<span class="k">print</span> <span class="s2">&quot;Waiting for CUs to complete ...&quot;</span>
-<span class="n">umgr</span><span class="o">.</span><span class="n">wait_units</span><span class="p">()</span>
-<span class="k">print</span> <span class="s2">&quot;All CUs completed successfully!&quot;</span>
+<div class=" highlight hl-ipython2"><pre><span class="k">print</span> <span class="s2">(&quot;Submit Tasks to Task Manager ...&quot;)</span>
+<span class="n">tasks</span> <span class="o">=</span> <span class="n">tmgr</span><span class="o">.</span><span class="n">submit_tasks</span><span class="p">([</span><span class="n">td_1, td_2</span><span class="p">])</span>
+<span class="k">print</span> <span class="s2">(&quot;Waiting for Tasks to complete ...&quot;)</span>
+<span class="n">tmgr</span><span class="o">.</span><span class="n">wait_tasks</span><span class="p">()</span>
+<span class="k">print</span> <span class="s2">(&quot;All Tasks completed successfully!&quot;)</span>
 </pre></div>
 
 </div>
@@ -377,7 +377,7 @@ <h3 id="2.3-Submit-Compute-Units">2.3 Submit Compute Units<a class="anchor-link"
 </div>
 <div class="inner_cell">
 <div class="text_cell_render border-box-sizing rendered_html">
-<p>Inspect the output of the CUs</p>
+<p>Inspect the output of the Tasks</p>
 
 </div>
 </div>
@@ -386,8 +386,8 @@ <h3 id="2.3-Submit-Compute-Units">2.3 Submit Compute Units<a class="anchor-link"
 <div class="input">
 <div class="inner_cell">
         <div class="input_area">
-<div class=" highlight hl-ipython2"><pre><span class="k">print</span> <span class="n">cu_set[0]</span><span class="o">.</span><span class="n">stdout</span>
-<span class="k">print</span> <span class="n">cu_set[1]</span><span class="o">.</span><span class="n">stdout</span>
+<div class=" highlight hl-ipython2"><pre><span class="k">print</span> <span class="n">(tasks[0]</span><span class="o">.</span><span class="n">stdout)</span>
+<span class="k">print</span> <span class="n">(tasks[1]</span><span class="o">.</span><span class="n">stdout)</span>
 </pre></div>
 
 </div>
@@ -434,7 +434,7 @@ <h3 id="2.6-Close-and-Delete-Session">2.6 Close Session<a class="anchor-link" hr
 </div>
     <div id="footer">
       <div class="container">
-        <p align="center">Copyright &copy; 2016 <a href="http://radical.rutgers.edu">RADICAL Research</a> at 
+        <p align="center">Copyright &copy; 2016 <a href="http://radical.rutgers.edu">RADICAL Research</a> at
           <a href="http://www.rutgers.edu">
           Rutgers University </a></p>
       </div>