diff --git a/documentation/tutorials.rst b/documentation/tutorials.rst
index 03fce0c3..54a390ff 100644
--- a/documentation/tutorials.rst
+++ b/documentation/tutorials.rst
@@ -114,8 +114,8 @@ or in your local ``<repository root>/turorials``.
    :widths: 50 50
 
    * - | **Tutorial 0**
-       | This tutorial demonstrates the manipulation of Osd 'Compute' 'Contexts' and
-         'Controllers'.  `[code] <osd_tutorial_0.html>`__
+       | This tutorial demonstrates the manipulation of Osd Evaluator and BufferDescriptor.
+         `[code] <osd_tutorial_0.html>`__
        |
      - |
 
diff --git a/tutorials/osd/tutorial_0/osd_tutorial_0.cpp b/tutorials/osd/tutorial_0/osd_tutorial_0.cpp
index 31ae47f6..f2ed1893 100644
--- a/tutorials/osd/tutorial_0/osd_tutorial_0.cpp
+++ b/tutorials/osd/tutorial_0/osd_tutorial_0.cpp
@@ -26,8 +26,8 @@
 //------------------------------------------------------------------------------
 // Tutorial description:
 //
-// This tutorial demonstrates the manipulation of Osd 'Compute' 'Contexts' and
-// 'Controllers'.
+// This tutorial demonstrates the manipulation of Osd Evaluator and
+// BufferDescriptor.
 //
 
 #include <opensubdiv/far/topologyDescriptor.h>
@@ -76,7 +76,7 @@ int main(int, char **) {
     // Setup phase
     //
     Far::StencilTable const * stencilTable = NULL;
-    { // Setup Context
+    { // Setup Far::StencilTable
         Far::TopologyRefiner const * refiner = createTopologyRefiner(maxlevel);
 
         // Setup a factory to create FarStencilTable (for more details see