diff --git a/examples/mayaViewer/hbrUtil.cpp b/examples/mayaViewer/hbrUtil.cpp
index 16e1c299..918646ac 100644
--- a/examples/mayaViewer/hbrUtil.cpp
+++ b/examples/mayaViewer/hbrUtil.cpp
@@ -74,9 +74,9 @@ OpenSubdiv::OsdHbrMesh * ConvertToHBR(int nVertices,
                                       std::vector<float> const & edgeCreases2,
                                       int interpBoundary, bool loop)
 {
-    static HbrBilinearSubdivision<OpenSubdiv::OsdVertex> _bilinear;
-    static HbrLoopSubdivision<OpenSubdiv::OsdVertex> _loop;
-    static HbrCatmarkSubdivision<OpenSubdiv::OsdVertex> _catmark;
+    static OpenSubdiv::HbrBilinearSubdivision<OpenSubdiv::OsdVertex> _bilinear;
+    static OpenSubdiv::HbrLoopSubdivision<OpenSubdiv::OsdVertex> _loop;
+    static OpenSubdiv::HbrCatmarkSubdivision<OpenSubdiv::OsdVertex> _catmark;
     
     OpenSubdiv::OsdHbrMesh *hbrMesh;
     if (loop)
diff --git a/opensubdiv/hbr/allocator.h b/opensubdiv/hbr/allocator.h
index 5d13f8db..1e35f6d1 100644
--- a/opensubdiv/hbr/allocator.h
+++ b/opensubdiv/hbr/allocator.h
@@ -57,6 +57,11 @@
 #ifndef HBRALLOCATOR_H
 #define HBRALLOCATOR_H
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 typedef void (*HbrMemStatFunction)(unsigned long bytes);
 
 /**
@@ -191,4 +196,9 @@ HbrAllocator<T>::Deallocate(T * obj) {
     m_freecount++;
 }
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRALLOCATOR_H */
diff --git a/opensubdiv/hbr/bilinear.h b/opensubdiv/hbr/bilinear.h
index b04554d4..03f24933 100644
--- a/opensubdiv/hbr/bilinear.h
+++ b/opensubdiv/hbr/bilinear.h
@@ -60,6 +60,11 @@
 /*#define HBR_DEBUG */
 #include "../hbr/subdivision.h"
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T>
 class HbrBilinearSubdivision : public HbrSubdivision<T> {
 public:
@@ -917,4 +922,9 @@ HbrBilinearSubdivision<T>::Subdivide(HbrMesh<T>* mesh, HbrVertex<T>* vertex) {
     return v;    
 }
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRBILINEAR_H */
diff --git a/opensubdiv/hbr/catmark.h b/opensubdiv/hbr/catmark.h
index 4e94a0ee..9644309a 100644
--- a/opensubdiv/hbr/catmark.h
+++ b/opensubdiv/hbr/catmark.h
@@ -60,6 +60,11 @@
 /*#define HBR_DEBUG */
 #include "../hbr/subdivision.h"
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T>
 class HbrCatmarkSubdivision : public HbrSubdivision<T> {
 public:
@@ -1138,4 +1143,9 @@ HbrCatmarkSubdivision<T>::Subdivide(HbrMesh<T>* mesh, HbrVertex<T>* vertex) {
     return v;    
 }
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRCATMARK_H */
diff --git a/opensubdiv/hbr/cornerEdit.h b/opensubdiv/hbr/cornerEdit.h
index 867c7e89..840afde6 100644
--- a/opensubdiv/hbr/cornerEdit.h
+++ b/opensubdiv/hbr/cornerEdit.h
@@ -57,6 +57,11 @@
 #ifndef HBRCORNEREDIT_H
 #define HBRCORNEREDIT_H
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T> class HbrCornerEdit;
 
 template <class T>
@@ -117,4 +122,9 @@ private:
 };
 
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRCORNEREDIT_H */
diff --git a/opensubdiv/hbr/creaseEdit.h b/opensubdiv/hbr/creaseEdit.h
index 26407030..a15722cd 100644
--- a/opensubdiv/hbr/creaseEdit.h
+++ b/opensubdiv/hbr/creaseEdit.h
@@ -57,6 +57,11 @@
 #ifndef HBRCREASEEDIT_H
 #define HBRCREASEEDIT_H
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T> class HbrCreaseEdit;
 
 template <class T>
@@ -119,4 +124,9 @@ private:
 };
 
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRCREASEEDIT_H */
diff --git a/opensubdiv/hbr/face.h b/opensubdiv/hbr/face.h
index 9abbd139..4eabc8d8 100644
--- a/opensubdiv/hbr/face.h
+++ b/opensubdiv/hbr/face.h
@@ -71,6 +71,11 @@
 #include "libgprims/stitchInternal.h"
 #endif
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T> class HbrVertex;
 template <class T> class HbrHalfedge;
 template <class T> class HbrFace;
@@ -349,8 +354,16 @@ private:
     unsigned short destroyed:1;
 };
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #include "../hbr/mesh.h"
 
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T>
 HbrFace<T>::HbrFace()
     : mesh(0), id(-1), uindex(-1), ptexindex(-1), nvertices(0), extraedges(0), parent(0), children(0), vchild(0), fvarbits(0),
@@ -771,4 +784,9 @@ public:
     virtual ~HbrFaceOperator() {}
 };
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRFACE_H */
diff --git a/opensubdiv/hbr/faceEdit.h b/opensubdiv/hbr/faceEdit.h
index 12c04e0c..d44cfd6f 100644
--- a/opensubdiv/hbr/faceEdit.h
+++ b/opensubdiv/hbr/faceEdit.h
@@ -59,6 +59,11 @@
 
 #include "../hbr/hierarchicalEdit.h"
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T> class HbrFaceEdit;
 
 template <class T>
@@ -141,4 +146,9 @@ private:
 };
 
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRFACEEDIT_H */
diff --git a/opensubdiv/hbr/fvarData.h b/opensubdiv/hbr/fvarData.h
index 80a34a0c..93cd794c 100644
--- a/opensubdiv/hbr/fvarData.h
+++ b/opensubdiv/hbr/fvarData.h
@@ -60,6 +60,11 @@
 #include <string.h>
 #include <cmath>
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T> class HbrFVarEdit;
 template <class T> class HbrFace;
 
@@ -179,8 +184,16 @@ private:
     float* const data;
 };
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #include "../hbr/fvarEdit.h"
 
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T>
 void
 HbrFVarData<T>::ApplyFVarEdit(const HbrFVarEdit<T>& edit) {
@@ -202,4 +215,9 @@ HbrFVarData<T>::ApplyFVarEdit(const HbrFVarEdit<T>& edit) {
     }
 
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRFVARDATA_H */
diff --git a/opensubdiv/hbr/fvarEdit.h b/opensubdiv/hbr/fvarEdit.h
index f681f2fa..c119d441 100644
--- a/opensubdiv/hbr/fvarEdit.h
+++ b/opensubdiv/hbr/fvarEdit.h
@@ -60,6 +60,11 @@
 #include "../hbr/hierarchicalEdit.h"
 #include "../hbr/vertexEdit.h"
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T> class HbrFVarEdit;
 
 template <class T>
@@ -140,4 +145,9 @@ private:
 };
 
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRFVAREDIT_H */
diff --git a/opensubdiv/hbr/halfedge.h b/opensubdiv/hbr/halfedge.h
index 63f6d7d7..1ee4470e 100644
--- a/opensubdiv/hbr/halfedge.h
+++ b/opensubdiv/hbr/halfedge.h
@@ -67,6 +67,11 @@
 #include "libgprims/stitchInternal.h"
 #endif
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T> class HbrFace;
 template <class T> class HbrHalfedge;
 template <class T> class HbrVertex;
@@ -642,4 +647,9 @@ public:
     virtual ~HbrHalfedgeOperator() {}
 };
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRHALFEDGE_H */
diff --git a/opensubdiv/hbr/hierarchicalEdit.h b/opensubdiv/hbr/hierarchicalEdit.h
index 4ab3eb68..2c6709fa 100644
--- a/opensubdiv/hbr/hierarchicalEdit.h
+++ b/opensubdiv/hbr/hierarchicalEdit.h
@@ -57,6 +57,11 @@
 #ifndef HBRHIERARCHICALEDIT_H
 #define HBRHIERARCHICALEDIT_H
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T> class HbrHierarchicalEdit;
 template <class T> class HbrFace;
 template <class T> class HbrVertex;
@@ -150,9 +155,17 @@ public:
     }
 };
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #include "../hbr/face.h"
 #include <string.h>
 
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T>
 bool
 HbrHierarchicalEdit<T>::IsRelevantToFace(HbrFace<T>* face) const {
@@ -182,4 +195,9 @@ HbrHierarchicalEdit<T>::IsRelevantToFace(HbrFace<T>* face) const {
     return true;
 }
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRHIERARCHICALEDIT_H */
diff --git a/opensubdiv/hbr/holeEdit.h b/opensubdiv/hbr/holeEdit.h
index 0bdfd377..9712c9f6 100644
--- a/opensubdiv/hbr/holeEdit.h
+++ b/opensubdiv/hbr/holeEdit.h
@@ -57,6 +57,11 @@
 #ifndef HBRHOLEEDIT_H
 #define HBRHOLEEDIT_H
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T> class HbrHoleEdit;
 
 template <class T>
@@ -93,4 +98,9 @@ public:
 };
 
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRHOLEEDIT_H */
diff --git a/opensubdiv/hbr/loop.h b/opensubdiv/hbr/loop.h
index 849ef504..10588a56 100644
--- a/opensubdiv/hbr/loop.h
+++ b/opensubdiv/hbr/loop.h
@@ -63,6 +63,11 @@
 
 #include "../hbr/subdivision.h"
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 /* #define HBR_DEBUG */
 
 template <class T>
@@ -994,4 +999,9 @@ HbrLoopSubdivision<T>::refineFaceAtMiddle(HbrMesh<T>* mesh, HbrFace<T>* face) {
     }
 }
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRLOOP_H */
diff --git a/opensubdiv/hbr/mesh.h b/opensubdiv/hbr/mesh.h
index 11302b2f..8a2db9fe 100644
--- a/opensubdiv/hbr/mesh.h
+++ b/opensubdiv/hbr/mesh.h
@@ -79,6 +79,11 @@
 #include "../hbr/creaseEdit.h"
 #include "../hbr/allocator.h"
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T> class HbrSubdivision;
 
 template <class T> class HbrMesh {
@@ -394,10 +399,18 @@ private:
     
 };
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #include <algorithm>
 #include "../hbr/mesh.h"
 #include "../hbr/halfedge.h"
 
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T>
 HbrMesh<T>::HbrMesh(HbrSubdivision<T>* s, int _fvarcount, const int *_fvarindices, const int *_fvarwidths, int _totalfvarwidth
 #ifdef HBRSTITCH
@@ -1077,4 +1090,9 @@ HbrMesh<T>::FreeTransientData() {
     }
 }
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRMESH_H */
diff --git a/opensubdiv/hbr/subdivision.h b/opensubdiv/hbr/subdivision.h
index 723162d6..eaddec17 100644
--- a/opensubdiv/hbr/subdivision.h
+++ b/opensubdiv/hbr/subdivision.h
@@ -57,6 +57,11 @@
 #ifndef HBRSUBDIVISION_H
 #define HBRSUBDIVISION_H
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T> class HbrFace;
 template <class T> class HbrVertex;
 template <class T> class HbrHalfedge;
@@ -291,4 +296,10 @@ HbrSubdivision<T>::AddCreaseEdgesWithWeight(HbrMesh<T>* mesh, HbrVertex<T>* vert
     CreaseSubdivisionHalfedgeOperator op(vertex, data, mesh->HasVertexEdits(), next, weight);
     vertex->ApplyOperatorSurroundingEdges(op);
 }
+
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRSUBDIVISION_H */
diff --git a/opensubdiv/hbr/vertex.h b/opensubdiv/hbr/vertex.h
index 01b7e024..7949248c 100644
--- a/opensubdiv/hbr/vertex.h
+++ b/opensubdiv/hbr/vertex.h
@@ -64,6 +64,10 @@
 #include "../hbr/fvarData.h"
 #include "../hbr/face.h"
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
 
 template <class T> class HbrHalfedge;
 template <class T> class HbrHalfedgeCompare;
@@ -1496,5 +1500,10 @@ public:
     virtual ~HbrVertexOperator() {}
 };
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRVERTEX_H */
 
diff --git a/opensubdiv/hbr/vertexEdit.h b/opensubdiv/hbr/vertexEdit.h
index 9cff6394..b7d15a72 100644
--- a/opensubdiv/hbr/vertexEdit.h
+++ b/opensubdiv/hbr/vertexEdit.h
@@ -60,6 +60,11 @@
 #include <algorithm>
 #include "../hbr/hierarchicalEdit.h"
 
+#include "../version.h"
+
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+
 template <class T> class HbrVertexEdit;
 
 template <class T>
@@ -260,4 +265,9 @@ private:
 };
 
 
+} // end namespace OPENSUBDIV_VERSION
+using namespace OPENSUBDIV_VERSION;
+
+} // end namespace OpenSubdiv
+
 #endif /* HBRVERTEXEDIT_H */
diff --git a/regression/common/shape_utils.h b/regression/common/shape_utils.h
index bee925ee..3d1d792c 100644
--- a/regression/common/shape_utils.h
+++ b/regression/common/shape_utils.h
@@ -108,7 +108,7 @@ struct shape {
     std::vector<float>  verts;
     std::vector<float>  uvs;
     std::vector<int>    nvertsPerFace;  
-    std::vector<int>    faceverts;	      
+    std::vector<int>    faceverts;              
     std::vector<int>    faceuvs;
     std::vector<tag *>  tags;
 }; 
@@ -137,28 +137,28 @@ shape::tag * shape::tag::parseTag(char const * line) {
 
     std::vector<int> intargs;
     for (int i=0; i<nints; ++i) {
-	int val;
-	while (*cp == ' ') cp++;
-	if (sscanf(cp, "%d", &val)!=1) return t;
-	intargs.push_back(val);
+        int val;
+        while (*cp == ' ') cp++;
+        if (sscanf(cp, "%d", &val)!=1) return t;
+        intargs.push_back(val);
         while (*cp && *cp != ' ') cp++;                    
     }
 
     std::vector<float> floatargs;
     for (int i=0; i<nfloats; ++i) {
-	float val;
-	while (*cp == ' ') cp++;
-	if (sscanf(cp, "%f", &val)!=1) return t;
-	floatargs.push_back(val);
+        float val;
+        while (*cp == ' ') cp++;
+        if (sscanf(cp, "%f", &val)!=1) return t;
+        floatargs.push_back(val);
         while (*cp && *cp != ' ') cp++;                    
     }
 
     std::vector<std::string> stringargs;
     for (int i=0; i<nstrings; ++i) {
-	char * val;
-	while (*cp == ' ') cp++;
-	if (sscanf(cp, "%s", &val)!=1) return t;
-	stringargs.push_back(val);
+        char * val;
+        while (*cp == ' ') cp++;
+        if (sscanf(cp, "%s", &val)!=1) return t;
+        stringargs.push_back(val);
         while (*cp && *cp != ' ') cp++;                    
     }
 
@@ -219,8 +219,8 @@ shape * shape::parseShape(char const * shapestr, int axis ) {
             case 't' : if(line[1] == ' ') {
                            shape::tag * t = tag::parseTag( line );
                            if (t)
-			       s->tags.push_back(t);
-	               } break;
+                               s->tags.push_back(t);
+                       } break;
         }
     }
     return s;
@@ -228,16 +228,16 @@ shape * shape::parseShape(char const * shapestr, int axis ) {
 
 //------------------------------------------------------------------------------       
 template <class T> 
-void applyTags( HbrMesh<T> * mesh, shape const * sh ) {
+void applyTags( OpenSubdiv::HbrMesh<T> * mesh, shape const * sh ) {
 
     for (int i=0; i<(int)sh->tags.size(); ++i) {
         shape::tag * t = sh->tags[i];
 
         if (t->name=="crease") {
             for (int j=0; j<(int)t->intargs.size()-1; ++j) {
-                HbrVertex<T> * v = mesh->GetVertex( t->intargs[j] ),
-                             * w = mesh->GetVertex( t->intargs[j+1] );
-                HbrHalfedge<T> * e = 0;
+                OpenSubdiv::HbrVertex<T> * v = mesh->GetVertex( t->intargs[j] ),
+                                         * w = mesh->GetVertex( t->intargs[j+1] );
+                OpenSubdiv::HbrHalfedge<T> * e = 0;
                 if( v && w ) { 
                     if( !(e = v->GetEdge(w) ) )
                     e = w->GetEdge(v);
@@ -250,7 +250,7 @@ void applyTags( HbrMesh<T> * mesh, shape const * sh ) {
             }
         } else if (t->name=="corner") {
             for (int j=0; j<(int)t->intargs.size(); ++j) {
-                HbrVertex<T> * v = mesh->GetVertex( t->intargs[j] );
+                OpenSubdiv::HbrVertex<T> * v = mesh->GetVertex( t->intargs[j] );
                 if(v) {
                     int nfloat = (int) t->floatargs.size();
                     v->SetSharpness( std::max(0.0f, ((nfloat > 1) ? t->floatargs[j] : t->floatargs[0])) );
@@ -259,50 +259,52 @@ void applyTags( HbrMesh<T> * mesh, shape const * sh ) {
             }
         } else if (t->name=="hole") {
             for (int j=0; j<(int)t->intargs.size(); ++j) {
-                HbrFace<T> * f = mesh->GetFace( t->intargs[j] );
+                OpenSubdiv::HbrFace<T> * f = mesh->GetFace( t->intargs[j] );
                 if(f) {
                     f->SetHole();
                 } else
                    printf("cannot find face for hole tag (%d)\n", t->intargs[j] );
             }
         } else if (t->name=="interpolateboundary") {
-	    if ((int)t->intargs.size()!=1) {
+            if ((int)t->intargs.size()!=1) {
                 printf("expecting 1 integer for \"interpolateboundary\" tag n. %d\n", i);
                 continue;
             }
-	    switch( t->intargs[0] )
-	    { case 0 : mesh->SetInterpolateBoundaryMethod(HbrMesh<T>::k_InterpolateBoundaryNone); break;
-              case 1 : mesh->SetInterpolateBoundaryMethod(HbrMesh<T>::k_InterpolateBoundaryEdgeAndCorner); break;
-	      case 2 : mesh->SetInterpolateBoundaryMethod(HbrMesh<T>::k_InterpolateBoundaryEdgeOnly); break;
-	      default: printf("unknown interpolation boundary : %d\n", t->intargs[0] ); break;
-	    }
+            switch( t->intargs[0] ) { 
+                case 0 : mesh->SetInterpolateBoundaryMethod(OpenSubdiv::HbrMesh<T>::k_InterpolateBoundaryNone); break;
+                case 1 : mesh->SetInterpolateBoundaryMethod(OpenSubdiv::HbrMesh<T>::k_InterpolateBoundaryEdgeAndCorner); break;
+                case 2 : mesh->SetInterpolateBoundaryMethod(OpenSubdiv::HbrMesh<T>::k_InterpolateBoundaryEdgeOnly); break;
+                default: printf("unknown interpolation boundary : %d\n", t->intargs[0] ); break;
+            }
         } else if (t->name=="facevaryingpropagatecorners") {
-	    if ((int)t->intargs.size()==1)
-	        mesh->SetFVarPropagateCorners( t->intargs[0] != 0 );
-	    else
-	        printf( "expecting single int argument for \"facevaryingpropagatecorners\"\n" );
+            if ((int)t->intargs.size()==1)
+                mesh->SetFVarPropagateCorners( t->intargs[0] != 0 );
+            else
+                printf( "expecting single int argument for \"facevaryingpropagatecorners\"\n" );
         } else if (t->name=="creasemethod") {
         
-	    HbrCatmarkSubdivision<T> * scheme = 
-	        dynamic_cast<HbrCatmarkSubdivision<T> *>( mesh->GetSubdivision() );
-	
-	    if (not scheme) {
-	        printf("the \"creasemethod\" tag can only be applied to Catmark meshes\n");
-		continue;
-	    }
-	
-	    if ((int)t->stringargs.size()==0) {
-	        printf("the \"creasemethod\" tag expects a string argument\n");
-		continue;
-	    }
-	
+            OpenSubdiv::HbrCatmarkSubdivision<T> * scheme = 
+                dynamic_cast<OpenSubdiv::HbrCatmarkSubdivision<T> *>( mesh->GetSubdivision() );
+        
+            if (not scheme) {
+                printf("the \"creasemethod\" tag can only be applied to Catmark meshes\n");
+                continue;
+            }
+        
+            if ((int)t->stringargs.size()==0) {
+                printf("the \"creasemethod\" tag expects a string argument\n");
+                continue;
+            }
+        
             if( t->stringargs[0]=="normal" )
-                scheme->SetTriangleSubdivisionMethod(HbrCatmarkSubdivision<T>::k_Old);
+                scheme->SetTriangleSubdivisionMethod(
+                    OpenSubdiv::HbrCatmarkSubdivision<T>::k_Old);
             else if( t->stringargs[0]=="chaikin" )
-                scheme->SetTriangleSubdivisionMethod(HbrCatmarkSubdivision<T>::k_New);
-	    else
-	        printf("the \"creasemethod\" tag only accepts \"normal\" or \"chaikin\" as value (%s)\n", t->stringargs[0].c_str());
-	    
+                scheme->SetTriangleSubdivisionMethod(
+                    OpenSubdiv::HbrCatmarkSubdivision<T>::k_New);
+            else
+                printf("the \"creasemethod\" tag only accepts \"normal\" or \"chaikin\" as value (%s)\n", t->stringargs[0].c_str());
+            
         } else if (t->name=="vertexedit" or t->name=="edgeedit") {
             printf("hierarchical edits not supported (yet)\n");
         } else {
@@ -319,19 +321,19 @@ enum Scheme {
 };
 
 //------------------------------------------------------------------------------
-template <class T> HbrMesh<T> *
+template <class T> OpenSubdiv::HbrMesh<T> *
 createMesh( Scheme scheme=kCatmark) {
 
-  HbrMesh<T> * mesh = 0;
+  OpenSubdiv::HbrMesh<T> * mesh = 0;
   
-  static HbrBilinearSubdivision<T> _bilinear;
-  static HbrLoopSubdivision<T>     _loop;
-  static HbrCatmarkSubdivision<T>  _catmark;
+  static OpenSubdiv::HbrBilinearSubdivision<T> _bilinear;
+  static OpenSubdiv::HbrLoopSubdivision<T>     _loop;
+  static OpenSubdiv::HbrCatmarkSubdivision<T>  _catmark;
   
   switch (scheme) {
-    case kBilinear : mesh = new HbrMesh<T>( &_bilinear ); break;
-    case kLoop : mesh = new HbrMesh<T>(  &_loop ); break;
-    case kCatmark : mesh = new HbrMesh<T>(  &_catmark ); break;
+    case kBilinear : mesh = new OpenSubdiv::HbrMesh<T>( &_bilinear ); break;
+    case kLoop     : mesh = new OpenSubdiv::HbrMesh<T>( &_loop     ); break;
+    case kCatmark  : mesh = new OpenSubdiv::HbrMesh<T>( &_catmark  ); break;
   }
   
   return mesh;
@@ -339,7 +341,7 @@ createMesh( Scheme scheme=kCatmark) {
 
 //------------------------------------------------------------------------------
 template <class T> void
-createVertices( shape const * sh, HbrMesh<T> * mesh ) {
+createVertices( shape const * sh, OpenSubdiv::HbrMesh<T> * mesh ) {
   
   T v;
   for(int i=0;i<sh->getNverts(); i++ ) {
@@ -350,7 +352,7 @@ createVertices( shape const * sh, HbrMesh<T> * mesh ) {
 
 //------------------------------------------------------------------------------
 template <class T> void
-createVertices( shape const * sh, HbrMesh<T> * mesh, std::vector<float> & verts ) {
+createVertices( shape const * sh, OpenSubdiv::HbrMesh<T> * mesh, std::vector<float> & verts ) {
   
     int nverts = sh->getNverts();
     verts.resize(nverts*3);
@@ -367,7 +369,7 @@ createVertices( shape const * sh, HbrMesh<T> * mesh, std::vector<float> & verts
 
 //------------------------------------------------------------------------------
 template <class T> void
-createTopology( shape const * sh, HbrMesh<T> * mesh, Scheme scheme) {
+createTopology( shape const * sh, OpenSubdiv::HbrMesh<T> * mesh, Scheme scheme) {
 
       const int * fv=&(sh->faceverts[0]);
       for(int f=0, ptxidx=0;f<sh->getNfaces(); f++ ) {
@@ -380,9 +382,9 @@ createTopology( shape const * sh, HbrMesh<T> * mesh, Scheme scheme) {
           }
 
           for(int j=0;j<nv;j++) { 
-              HbrVertex<T> * origin      = mesh->GetVertex( fv[j] );                                                           
-              HbrVertex<T> * destination = mesh->GetVertex( fv[ (j+1)%nv] );
-              HbrHalfedge<T> * opposite  = destination->GetEdge(origin);
+              OpenSubdiv::HbrVertex<T> * origin      = mesh->GetVertex( fv[j] );                                                           
+              OpenSubdiv::HbrVertex<T> * destination = mesh->GetVertex( fv[ (j+1)%nv] );
+              OpenSubdiv::HbrHalfedge<T> * opposite  = destination->GetEdge(origin);
 
               if(origin==NULL || destination==NULL) { 
                   printf(" An edge was specified that connected a nonexistent vertex\n"); 
@@ -406,7 +408,7 @@ createTopology( shape const * sh, HbrMesh<T> * mesh, Scheme scheme) {
               }
           }
 
-          HbrFace<T> * face = mesh->NewFace(nv, (int *)fv, 0);
+          OpenSubdiv::HbrFace<T> * face = mesh->NewFace(nv, (int *)fv, 0);
 
           face->SetPtexIndex(ptxidx);
 
@@ -424,12 +426,12 @@ createTopology( shape const * sh, HbrMesh<T> * mesh, Scheme scheme) {
 }
 
 //------------------------------------------------------------------------------
-template <class T> HbrMesh<T> *
+template <class T> OpenSubdiv::HbrMesh<T> *
 simpleHbr( char const * shapestr, Scheme scheme=kCatmark) {
 
   shape * sh = shape::parseShape( shapestr );
 
-  HbrMesh<T> * mesh = createMesh<T>(scheme);
+  OpenSubdiv::HbrMesh<T> * mesh = createMesh<T>(scheme);
   
   createVertices<T>(sh, mesh);
   
@@ -441,12 +443,12 @@ simpleHbr( char const * shapestr, Scheme scheme=kCatmark) {
 }
 
 //------------------------------------------------------------------------------
-template <class T> HbrMesh<T> *
+template <class T> OpenSubdiv::HbrMesh<T> *
 simpleHbr( char const * shapestr, std::vector<float> & verts, Scheme scheme=kCatmark) {
 
   shape * sh = shape::parseShape( shapestr );
 
-  HbrMesh<T> * mesh = createMesh<T>(scheme);
+  OpenSubdiv::HbrMesh<T> * mesh = createMesh<T>(scheme);
   
   createVertices<T>(sh, mesh, verts);
   
diff --git a/regression/far_regression/main.cpp b/regression/far_regression/main.cpp
index 26027f06..01cf06c8 100644
--- a/regression/far_regression/main.cpp
+++ b/regression/far_regression/main.cpp
@@ -104,12 +104,12 @@ private:
 
 //------------------------------------------------------------------------------
 class xyzFV;
-typedef HbrMesh<xyzVV>           xyzmesh;
-typedef HbrFace<xyzVV>           xyzface;        
-typedef HbrVertex<xyzVV>         xyzvertex;      
-typedef HbrHalfedge<xyzVV>       xyzhalfedge;
-typedef HbrFaceOperator<xyzVV>   xyzFaceOperator;
-typedef HbrVertexOperator<xyzVV> xyzVertexOperator;
+typedef OpenSubdiv::HbrMesh<xyzVV>           xyzmesh;
+typedef OpenSubdiv::HbrFace<xyzVV>           xyzface;        
+typedef OpenSubdiv::HbrVertex<xyzVV>         xyzvertex;      
+typedef OpenSubdiv::HbrHalfedge<xyzVV>       xyzhalfedge;
+typedef OpenSubdiv::HbrFaceOperator<xyzVV>   xyzFaceOperator;
+typedef OpenSubdiv::HbrVertexOperator<xyzVV> xyzVertexOperator;
 
 typedef OpenSubdiv::FarMesh<xyzVV>              fMesh;
 typedef OpenSubdiv::FarMeshFactory<xyzVV>       fMeshFactory;