*** empty log message ***

16 files changed, 118 insertions, 118 deletions

diff --git a/src/bltChain.h b/src/bltChain.h
index 5afb08d..2f28fb5 100644
--- a/src/bltChain.h
+++ b/src/bltChain.h
@@ -34,10 +34,10 @@
 
 #include <tcl.h>
 
-#define Blt_Chain_GetLength(c)	(((c) == NULL) ? 0 : (c)->nLinks)
-#define Blt_Chain_FirstLink(c)	(((c) == NULL) ? NULL : (c)->head)
-#define Blt_Chain_LastLink(c)	(((c) == NULL) ? NULL : (c)->tail)
-#define Blt_Chain_PrevLink(l)	((l)->prev)
+#define Chain_GetLength(c)	(((c) == NULL) ? 0 : (c)->nLinks)
+#define Chain_FirstLink(c)	(((c) == NULL) ? NULL : (c)->head)
+#define Chain_LastLink(c)	(((c) == NULL) ? NULL : (c)->tail)
+#define Chain_PrevLink(l)	((l)->prev)
 #define Blt_Chain_NextLink(l) 	((l)->next)
 #define Blt_Chain_GetValue(l)  	((l)->clientData)
 #define Blt_Chain_FirstValue(c)	(((c)->head == NULL) ? NULL : (c)->head->clientData)
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index 29e99b8..eadb7f8 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -622,7 +622,7 @@ void Axis::draw(Drawable drawable)
     ts.xPad_ = 2;
     ts.yPad_ = 0;
 
-    for (Blt_ChainLink link=Blt_Chain_FirstLink(tickLabels_); link;
+    for (Blt_ChainLink link=Chain_FirstLink(tickLabels_); link;
 	 link = Blt_Chain_NextLink(link)) {	
       TickLabel* labelPtr = (TickLabel*)Blt_Chain_GetValue(link);
       ts.drawText(drawable, labelPtr->string, labelPtr->anchorPos.x, 
@@ -1028,7 +1028,7 @@ int Axis::isHorizontal()
 void Axis::freeTickLabels()
 {
   Blt_Chain chain = tickLabels_;
-  for (Blt_ChainLink link=Blt_Chain_FirstLink(chain); link;
+  for (Blt_ChainLink link=Chain_FirstLink(chain); link;
        link = Blt_Chain_NextLink(link)) {
     TickLabel* labelPtr = (TickLabel*)Blt_Chain_GetValue(link);
     delete labelPtr;
@@ -1597,7 +1597,7 @@ void Axis::makeSegments(AxisInfo *infoPtr)
       sp++;
     }
 
-    Blt_ChainLink link = Blt_Chain_FirstLink(tickLabels_);
+    Blt_ChainLink link = Chain_FirstLink(tickLabels_);
     double labelPos = (double)infoPtr->label;
 
     for (int ii=0; ii< nMajorTicks; ii++) {
@@ -1731,7 +1731,7 @@ void Axis::print(PSOutput* psPtr)
     ts.xPad_ = 2;
     ts.yPad_ = 0;
 
-    for (Blt_ChainLink link=Blt_Chain_FirstLink(tickLabels_); link; 
+    for (Blt_ChainLink link=Chain_FirstLink(tickLabels_); link; 
 	 link = Blt_Chain_NextLink(link)) {
       TickLabel *labelPtr = (TickLabel*)Blt_Chain_GetValue(link);
       ts.printText(psPtr, labelPtr->string, labelPtr->anchorPos.x, 
diff --git a/src/bltGrElem.C b/src/bltGrElem.C
index 0fae6f7..cee8a88 100644
--- a/src/bltGrElem.C
+++ b/src/bltGrElem.C
@@ -237,7 +237,7 @@ PenStyle** Element::StyleMap()
   int nPoints = NUMBEROFPOINTS(ops);
   int nWeights = MIN(ops->w ? ops->w->nValues() : 0, nPoints);
   double* w = ops->w ? ops->w->values_ : NULL;
-  Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette);
+  Blt_ChainLink link = Chain_FirstLink(ops->stylePalette);
   PenStyle* stylePtr = (PenStyle*)Blt_Chain_GetValue(link);
 
   // Create a style mapping array (data point index to style), 
@@ -247,8 +247,8 @@ PenStyle** Element::StyleMap()
     dataToStyle[ii] = stylePtr;
 
   for (int ii=0; ii<nWeights; ii++) {
-    for (link=Blt_Chain_LastLink(ops->stylePalette); link; 
-	 link=Blt_Chain_PrevLink(link)) {
+    for (link=Chain_LastLink(ops->stylePalette); link; 
+	 link=Chain_PrevLink(link)) {
       stylePtr = (PenStyle*)Blt_Chain_GetValue(link);
 
       if (stylePtr->weight.range > 0.0) {
@@ -268,7 +268,7 @@ PenStyle** Element::StyleMap()
 void Element::freeStylePalette(Blt_Chain stylePalette)
 {
   // Skip the first slot. It contains the built-in "normal" pen of the element
-  Blt_ChainLink link = Blt_Chain_FirstLink(stylePalette);
+  Blt_ChainLink link = Chain_FirstLink(stylePalette);
   if (link) {
     Blt_ChainLink next;
     for (link=Blt_Chain_NextLink(link); link; link=next) {
diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C
index b82bea2..9717b13 100644
--- a/src/bltGrElemBar.C
+++ b/src/bltGrElemBar.C
@@ -234,7 +234,7 @@ int BarElement::configure()
     return TCL_ERROR;
 
   // Point to the static normal pen if no external pens have been selected.
-  Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette);
+  Blt_ChainLink link = Chain_FirstLink(ops->stylePalette);
   if (!link) {
     link = Chain_AllocLink(sizeof(BarStyle));
     Chain_LinkAfter(ops->stylePalette, link, NULL);
@@ -446,7 +446,7 @@ void BarElement::map()
     size = bars->width;
 
   // Set the symbol size of all the pen styles
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette); link;
+  for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
        link = Blt_Chain_NextLink(link)) {
     BarStyle *stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
     BarPen* penPtr = stylePtr->penPtr;
@@ -669,7 +669,7 @@ void BarElement::draw(Drawable drawable)
     return;
 
   int count = 0;
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette); link;
+  for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
        link = Blt_Chain_NextLink(link)) {
 
     BarStyle* stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
@@ -753,7 +753,7 @@ void BarElement::print(PSOutput* psPtr)
   psPtr->format("\n%% Element \"%s\"\n\n", name_);
 
   int count = 0;
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette); link;
+  for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
        link = Blt_Chain_NextLink(link)) {
 
     BarStyle *stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
@@ -840,7 +840,7 @@ void BarElement::printSymbol(PSOutput* psPtr, double x, double y, int size)
 
 void BarElement::ResetStylePalette(Blt_Chain stylePalette)
 {
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(stylePalette); link; 
+  for (Blt_ChainLink link = Chain_FirstLink(stylePalette); link; 
        link = Blt_Chain_NextLink(link)) {
     BarStyle *stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
     stylePtr->xeb.length = 0;
@@ -881,8 +881,8 @@ void BarElement::mergePens(BarStyle** dataToStyle)
 {
   BarElementOptions* ops = (BarElementOptions*)ops_;
 
-  if (Blt_Chain_GetLength(ops->stylePalette) < 2) {
-    Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette);
+  if (Chain_GetLength(ops->stylePalette) < 2) {
+    Blt_ChainLink link = Chain_FirstLink(ops->stylePalette);
     BarStyle *stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
     stylePtr->nBars = nBars_;
     stylePtr->bars = bars_;
@@ -900,7 +900,7 @@ void BarElement::mergePens(BarStyle** dataToStyle)
     int* barToData = new int[nBars_];
     XRectangle* bp = bars;
     int* ip = barToData;
-    for (Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette); link; 
+    for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link; 
 	 link = Blt_Chain_NextLink(link)) {
       BarStyle *stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
       stylePtr->symbolSize = bp->width / 2;
@@ -925,7 +925,7 @@ void BarElement::mergePens(BarStyle** dataToStyle)
     Segment2d *sp = bars;
     int* map = new int[xeb_.length];
     int* ip = map;
-    for (Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette); 
+    for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); 
 	 link; link = Blt_Chain_NextLink(link)) {
       BarStyle *stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
       stylePtr->xeb.segments = sp;
@@ -949,7 +949,7 @@ void BarElement::mergePens(BarStyle** dataToStyle)
     Segment2d* sp = bars;
     int* map = new int[yeb_.length];
     int* ip = map;
-    for (Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette); link; 
+    for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link; 
 	 link = Blt_Chain_NextLink(link)) {
       BarStyle *stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
       stylePtr->yeb.segments = sp;
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C
index fa5bd7e..79e6d1a 100644
--- a/src/bltGrElemLine.C
+++ b/src/bltGrElemLine.C
@@ -288,7 +288,7 @@ int LineElement::configure()
 
   // Point to the static normal/active pens if no external pens have been
   // selected.
-  Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette);
+  Blt_ChainLink link = Chain_FirstLink(ops->stylePalette);
   if (!link) {
     link = Chain_AllocLink(sizeof(LineStyle));
     Chain_LinkAfter(ops->stylePalette, link, NULL);
@@ -361,7 +361,7 @@ void LineElement::map()
   delete [] mi.map;
 
   // Set the symbol size of all the pen styles
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette); link;
+  for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
        link = Blt_Chain_NextLink(link)) {
     LineStyle* stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
     LinePen* penPtr = (LinePen *)stylePtr->penPtr;
@@ -539,13 +539,13 @@ void LineElement::draw(Drawable drawable)
   }
 
   // traces
-  if ((Blt_Chain_GetLength(traces_) > 0) && (penOps->traceWidth > 0))
+  if ((Chain_GetLength(traces_) > 0) && (penOps->traceWidth > 0))
     drawTraces(drawable, penPtr);
 
   // Symbols, error bars, values
   if (ops->reqMaxSymbols > 0) {
     int total = 0;
-    for (Blt_ChainLink link=Blt_Chain_FirstLink(ops->stylePalette); link;
+    for (Blt_ChainLink link=Chain_FirstLink(ops->stylePalette); link;
 	 link=Blt_Chain_NextLink(link)) {
       LineStyle *stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
       total += stylePtr->symbolPts.length;
@@ -555,7 +555,7 @@ void LineElement::draw(Drawable drawable)
   }
 
   unsigned int count =0;
-  for (Blt_ChainLink link=Blt_Chain_FirstLink(ops->stylePalette); link;
+  for (Blt_ChainLink link=Chain_FirstLink(ops->stylePalette); link;
        link=Blt_Chain_NextLink(link)) {
     LineStyle* stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
     LinePen* penPtr = (LinePen *)stylePtr->penPtr;
@@ -609,7 +609,7 @@ void LineElement::drawActive(Drawable drawable)
 		 activePts_.map);
   }
   else if (nActiveIndices_ < 0) { 
-    if ((Blt_Chain_GetLength(traces_) > 0) && (penOps->traceWidth > 0))
+    if ((Chain_GetLength(traces_) > 0) && (penOps->traceWidth > 0))
       drawTraces(drawable, penPtr);
 
     if (penOps->symbol.type != SYMBOL_NONE)
@@ -668,13 +668,13 @@ void LineElement::print(PSOutput* psPtr)
   }
 
   // traces
-  if ((Blt_Chain_GetLength(traces_) > 0) && (penOps->traceWidth > 0))
+  if ((Chain_GetLength(traces_) > 0) && (penOps->traceWidth > 0))
     printTraces(psPtr, penPtr);
 
   // Symbols, error bars, values
   if (ops->reqMaxSymbols > 0) {
     int total = 0;
-    for (Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette); 
+    for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); 
 	 link; link = Blt_Chain_NextLink(link)) {
       LineStyle *stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
       total += stylePtr->symbolPts.length;
@@ -684,7 +684,7 @@ void LineElement::print(PSOutput* psPtr)
   }
 
   unsigned int count =0;
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette); link;
+  for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
        link = Blt_Chain_NextLink(link)) {
     LineStyle *stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
     LinePen* penPtr = (LinePen *)stylePtr->penPtr;
@@ -747,7 +747,7 @@ void LineElement::printActive(PSOutput* psPtr)
 		  activePts_.map);
   }
   else if (nActiveIndices_ < 0) {
-    if ((Blt_Chain_GetLength(traces_) > 0) && (penOps->traceWidth > 0))
+    if ((Chain_GetLength(traces_) > 0) && (penOps->traceWidth > 0))
       printTraces(psPtr, (LinePen*)penPtr);
 
     if (penOps->symbol.type != SYMBOL_NONE)
@@ -1357,8 +1357,8 @@ void LineElement::mergePens(LineStyle **styleMap)
 {
   LineElementOptions* ops = (LineElementOptions*)ops_;
 
-  if (Blt_Chain_GetLength(ops->stylePalette) < 2) {
-    Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette);
+  if (Chain_GetLength(ops->stylePalette) < 2) {
+    Blt_ChainLink link = Chain_FirstLink(ops->stylePalette);
     LineStyle *stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
     stylePtr->symbolPts.length = symbolPts_.length;
     stylePtr->symbolPts.points = symbolPts_.points;
@@ -1374,7 +1374,7 @@ void LineElement::mergePens(LineStyle **styleMap)
     int* map = new int[symbolPts_.length];
     Point2d *pp = points;
     int* ip = map;
-    for (Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette); 
+    for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); 
 	 link; link = Blt_Chain_NextLink(link)) {
       LineStyle *stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
       stylePtr->symbolPts.points = pp;
@@ -1398,7 +1398,7 @@ void LineElement::mergePens(LineStyle **styleMap)
     Segment2d *sp = segments;
     int* map = new int[xeb_.length];
     int* ip = map;
-    for (Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette); 
+    for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); 
 	 link; link = Blt_Chain_NextLink(link)) {
       LineStyle *stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
       stylePtr->xeb.segments = sp;
@@ -1422,7 +1422,7 @@ void LineElement::mergePens(LineStyle **styleMap)
     Segment2d* sp = segments;
     int* map = new int [yeb_.length];
     int* ip = map;
-    for (Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette); 
+    for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); 
 	 link; link = Blt_Chain_NextLink(link)) {
       LineStyle *stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
       stylePtr->yeb.segments = sp;
@@ -1540,7 +1540,7 @@ void LineElement::saveTrace(int start, int length, MapInfo* mapPtr)
 
 void LineElement::freeTraces()
 {
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(traces_); link;
+  for (Blt_ChainLink link = Chain_FirstLink(traces_); link;
        link = Blt_Chain_NextLink(link)) {
     bltTrace* tracePtr = (bltTrace*)Blt_Chain_GetValue(link);
     delete [] tracePtr->screenPts.map;
@@ -1684,7 +1684,7 @@ void LineElement::reset()
 
   freeTraces();
 
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(ops->stylePalette); link;
+  for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
        link = Blt_Chain_NextLink(link)) {
     LineStyle *stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
     stylePtr->symbolPts.length = 0;
@@ -1885,7 +1885,7 @@ int LineElement::closestTrace()
   iClose = -1;			/* Suppress compiler warning. */
   dMin = searchPtr->dist;
   closest.x = closest.y = 0;		/* Suppress compiler warning. */
-  for (link = Blt_Chain_FirstLink(traces_); link;
+  for (link = Chain_FirstLink(traces_); link;
        link = Blt_Chain_NextLink(link)) {
     Point2d *p, *pend;
 
@@ -2341,7 +2341,7 @@ void LineElement::drawSymbols(Drawable drawable, LinePen* penPtr, int size,
 
 void LineElement::drawTraces(Drawable drawable, LinePen* penPtr)
 {
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(traces_); link;
+  for (Blt_ChainLink link = Chain_FirstLink(traces_); link;
        link = Blt_Chain_NextLink(link)) {
     bltTrace* tracePtr = (bltTrace*)Blt_Chain_GetValue(link);
 
@@ -2495,7 +2495,7 @@ void LineElement::setLineAttributes(PSOutput* psPtr, LinePen* penPtr)
 void LineElement::printTraces(PSOutput* psPtr, LinePen* penPtr)
 {
   setLineAttributes(psPtr, penPtr);
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(traces_); link;
+  for (Blt_ChainLink link = Chain_FirstLink(traces_); link;
        link = Blt_Chain_NextLink(link)) {
     bltTrace *tracePtr = (bltTrace*)Blt_Chain_GetValue(link);
     if (tracePtr->screenPts.length > 0) {
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index 78d589c..535f252 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -251,8 +251,8 @@ static int ClosestOp(ClientData clientData, Tcl_Interp* interp,
     // searching the display list from back to front.  That way if
     // the points from two different elements overlay each other
     // exactly, the last one picked will be the topmost.  
-    for (Blt_ChainLink link=Blt_Chain_LastLink(graphPtr->elements_.displayList);
-	 link; link = Blt_Chain_PrevLink(link)) {
+    for (Blt_ChainLink link=Chain_LastLink(graphPtr->elements_.displayList);
+	 link; link = Chain_PrevLink(link)) {
       Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
       ElementOptions* eops = (ElementOptions*)elemPtr->ops();
       if (!eops->hide)
@@ -369,7 +369,7 @@ static int LowerOp(ClientData clientData, Tcl_Interp* interp,
 
   // Append the links to end of the display list
   Blt_ChainLink link, next;
-  for (link = Blt_Chain_FirstLink(chain); link != NULL; link = next) {
+  for (link = Chain_FirstLink(chain); link != NULL; link = next) {
     next = Blt_Chain_NextLink(link);
     Chain_UnlinkLink(chain, link); 
     Chain_LinkAfter(graphPtr->elements_.displayList, link, NULL); 
@@ -434,8 +434,8 @@ static int RaiseOp(ClientData clientData, Tcl_Interp* interp,
 
   // Prepend the links to beginning of the display list in reverse order
   Blt_ChainLink link, prev;
-  for (link = Blt_Chain_LastLink(chain); link != NULL; link = prev) {
-    prev = Blt_Chain_PrevLink(link);
+  for (link = Chain_LastLink(chain); link != NULL; link = prev) {
+    prev = Chain_PrevLink(link);
     Chain_UnlinkLink(chain, link); 
     Chain_LinkBefore(graphPtr->elements_.displayList, link, NULL); 
   }	
@@ -473,7 +473,7 @@ static int ShowOp(ClientData clientData, Tcl_Interp* interp,
   }
 
   // Clear the links from the currently displayed elements
-  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr->elements_.displayList);
+  for (Blt_ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList);
        link; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     elemPtr->link = NULL;
@@ -482,7 +482,7 @@ static int ShowOp(ClientData clientData, Tcl_Interp* interp,
   graphPtr->elements_.displayList = chain;
 
   // Set links on all the displayed elements
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(chain); link; 
+  for (Blt_ChainLink link = Chain_FirstLink(chain); link; 
        link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     elemPtr->link = link;
@@ -534,7 +534,7 @@ static Tcl_Obj *DisplayListObj(Graph* graphPtr)
 {
   Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
 
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->elements_.displayList); link != NULL; link = Blt_Chain_NextLink(link)) {
+  for (Blt_ChainLink link = Chain_FirstLink(graphPtr->elements_.displayList); link != NULL; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     Tcl_Obj *objPtr = Tcl_NewStringObj(elemPtr->name_, -1);
     Tcl_ListObjAppendElement(graphPtr->interp_, listObjPtr, objPtr);
diff --git a/src/bltGrElemOption.C b/src/bltGrElemOption.C
index cee332e..1dfc217 100644
--- a/src/bltGrElemOption.C
+++ b/src/bltGrElemOption.C
@@ -240,7 +240,7 @@ int StyleSetProc(ClientData clientData, Tcl_Interp* interp,
 
   // Reserve the first entry for the "normal" pen. We'll set the style later
   elemPtr->freeStylePalette(stylePalette);
-  Blt_ChainLink link = Blt_Chain_FirstLink(stylePalette);
+  Blt_ChainLink link = Chain_FirstLink(stylePalette);
   if (!link) {
     link = Chain_AllocLink(size);
     Chain_LinkAfter(stylePalette, link, NULL);
@@ -273,14 +273,14 @@ Tcl_Obj* StyleGetProc(ClientData clientData, Tk_Window tkwin,
 
   // count how many
   int cnt =0;
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(stylePalette); !link; 
+  for (Blt_ChainLink link = Chain_FirstLink(stylePalette); !link; 
        link = Blt_Chain_NextLink(link), cnt++) {}
   if (!cnt)
     return Tcl_NewListObj(0, (Tcl_Obj**)NULL);
 
   Tcl_Obj** ll = new Tcl_Obj*[3*cnt];
   int ii=0;
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(stylePalette); !link; 
+  for (Blt_ChainLink link = Chain_FirstLink(stylePalette); !link; 
        link = Blt_Chain_NextLink(link)) {
     PenStyle *stylePtr = (PenStyle*)Blt_Chain_GetValue(link);
     ll[ii++] = Tcl_NewStringObj(stylePtr->penPtr->name_, -1);
diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C
index d63676f..32f678c 100644
--- a/src/bltGrLegd.C
+++ b/src/bltGrLegd.C
@@ -266,7 +266,7 @@ void Legend::map(int plotWidth, int plotHeight)
   int maxWidth =0;
   int maxHeight =0;
   TextStyle ts(graphPtr_, &ops->style);
-  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr_->elements_.displayList); 
+  for (Blt_ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList); 
        link; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
@@ -374,7 +374,7 @@ void Legend::map(int plotWidth, int plotHeight)
   int row =0;
   int col =0;
   int count =0;
-  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr_->elements_.displayList); 
+  for (Blt_ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList); 
        link; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     count++;
@@ -454,7 +454,7 @@ void Legend::draw(Drawable drawable)
   int yStart = y;
   TextStyle ts(graphPtr_, &ops->style);
 
-  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr_->elements_.displayList);
+  for (Blt_ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList);
        link; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
@@ -574,7 +574,7 @@ void Legend::print(PSOutput* psPtr)
   double yStart = y;
   TextStyle ts(graphPtr_, &ops->style);
 
-  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr_->elements_.displayList); 
+  for (Blt_ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList); 
        link; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
@@ -791,7 +791,7 @@ int Legend::selectRange(Element *fromPtr, Element *toPtr)
   } 
   else {
     for (Blt_ChainLink link=fromPtr->link; link;
-	 link=Blt_Chain_PrevLink(link)) {
+	 link=Chain_PrevLink(link)) {
       Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
       selectEntry(elemPtr);
       if (link == toPtr->link)
@@ -909,7 +909,7 @@ Element* Legend::getPreviousRow(Element* focusPtr)
 {
   int col = focusPtr->col_;
   int row = focusPtr->row_ - 1;
-  for (Blt_ChainLink link=focusPtr->link; link; link=Blt_Chain_PrevLink(link)) {
+  for (Blt_ChainLink link=focusPtr->link; link; link=Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
 
@@ -926,7 +926,7 @@ Element* Legend::getPreviousColumn(Element* focusPtr)
 {
   int col = focusPtr->col_ - 1;
   int row = focusPtr->row_;
-  for (Blt_ChainLink link=focusPtr->link; link; link=Blt_Chain_PrevLink(link)) {
+  for (Blt_ChainLink link=focusPtr->link; link; link=Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
 
@@ -941,7 +941,7 @@ Element* Legend::getPreviousColumn(Element* focusPtr)
 
 Element* Legend::getFirstElement()
 {
-  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr_->elements_.displayList);
+  for (Blt_ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList);
        link; link=Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
@@ -953,8 +953,8 @@ Element* Legend::getFirstElement()
 
 Element* Legend::getLastElement()
 {
-  for (Blt_ChainLink link=Blt_Chain_LastLink(graphPtr_->elements_.displayList); 
-       link; link=Blt_Chain_PrevLink(link)) {
+  for (Blt_ChainLink link=Chain_LastLink(graphPtr_->elements_.displayList); 
+       link; link=Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
     if (elemOps->label)
@@ -987,7 +987,7 @@ ClientData Legend::pickEntry(int xx, int yy, ClassId* classIdPtr)
     // Legend entries are stored in bottom-to-top
     if (nn < nEntries_) {
       int count = 0;
-      for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr_->elements_.displayList); link; link = Blt_Chain_NextLink(link)) {
+      for (Blt_ChainLink link = Chain_FirstLink(graphPtr_->elements_.displayList); link; link = Blt_Chain_NextLink(link)) {
 	Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
 	ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
 	if (elemOps->label) {
@@ -1020,7 +1020,7 @@ static int SelectionProc(ClientData clientData, int offset, char *buffer,
   Tcl_DString dString;
   Tcl_DStringInit(&dString);
   if (legendPtr->flags & SELECT_SORTED) {
-    for (Blt_ChainLink link=Blt_Chain_FirstLink(legendPtr->selected_); 
+    for (Blt_ChainLink link=Chain_FirstLink(legendPtr->selected_); 
 	 link; link = Blt_Chain_NextLink(link)) {
       Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
       Tcl_DStringAppend(&dString, elemPtr->name_, -1);
@@ -1028,7 +1028,7 @@ static int SelectionProc(ClientData clientData, int offset, char *buffer,
     }
   }
   else {
-    for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr->elements_.displayList);
+    for (Blt_ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList);
 	 link; link = Blt_Chain_NextLink(link)) {
       Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
       if (legendPtr->entryIsSelected(elemPtr)) {
diff --git a/src/bltGrLegdOp.C b/src/bltGrLegdOp.C
index 5c1e0d5..d226fdf 100644
--- a/src/bltGrLegdOp.C
+++ b/src/bltGrLegdOp.C
@@ -138,7 +138,7 @@ static int ActivateOp(ClientData clientData, Tcl_Interp* interp,
   for (int ii=3; ii<objc; ii++) {
     
     const char* pattern = Tcl_GetString(objv[ii]);
-    for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr->elements_.displayList); link; link = Blt_Chain_NextLink(link)) {
+    for (Blt_ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList); link; link = Blt_Chain_NextLink(link)) {
       Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
       if (Tcl_StringMatch(elemPtr->name_, pattern)) {
 	if (active) {
@@ -164,7 +164,7 @@ static int ActivateOp(ClientData clientData, Tcl_Interp* interp,
 
   // List active elements in stacking order
   Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
-  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr->elements_.displayList); link; link = Blt_Chain_NextLink(link)) {
+  for (Blt_ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList); link; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     if (elemPtr->labelActive_) {
       Tcl_Obj *objPtr = Tcl_NewStringObj(elemPtr->name_, -1);
@@ -207,7 +207,7 @@ static int CurselectionOp(ClientData clientData, Tcl_Interp* interp,
   if (legendPtr->flags & SELECT_SORTED) {
     Blt_ChainLink link;
 
-    for (link = Blt_Chain_FirstLink(legendPtr->selected_); link != NULL;
+    for (link = Chain_FirstLink(legendPtr->selected_); link != NULL;
 	 link = Blt_Chain_NextLink(link)) {
       Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
       Tcl_Obj *objPtr = Tcl_NewStringObj(elemPtr->name_, -1);
@@ -216,7 +216,7 @@ static int CurselectionOp(ClientData clientData, Tcl_Interp* interp,
   }
   else {
     // List of selected entries is in stacking order
-    for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->elements_.displayList); link != NULL; link = Blt_Chain_NextLink(link)) {
+    for (Blt_ChainLink link = Chain_FirstLink(graphPtr->elements_.displayList); link != NULL; link = Blt_Chain_NextLink(link)) {
       Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
 
       if (legendPtr->entryIsSelected(elemPtr)) {
@@ -364,9 +364,9 @@ static int SelectionMarkOp(ClientData clientData, Tcl_Interp* interp,
   if (legendPtr->selMarkPtr_ != elemPtr) {
     // Deselect entry from the list all the way back to the anchor
     Blt_ChainLink link, next;
-    for (link = Blt_Chain_LastLink(legendPtr->selected_); link != NULL; 
+    for (link = Chain_LastLink(legendPtr->selected_); link != NULL; 
 	 link = next) {
-      next = Blt_Chain_PrevLink(link);
+      next = Chain_PrevLink(link);
       Element *selectPtr = (Element*)Blt_Chain_GetValue(link);
       if (selectPtr == legendPtr->selAnchorPtr_)
 	break;
@@ -394,7 +394,7 @@ static int SelectionPresentOp(ClientData clientData, Tcl_Interp* interp,
 {
   Graph* graphPtr = (Graph*)clientData;
   Legend* legendPtr = graphPtr->legend_;
-  int boo = (Blt_Chain_GetLength(legendPtr->selected_) > 0);
+  int boo = (Chain_GetLength(legendPtr->selected_) > 0);
   Tcl_SetBooleanObj(Tcl_GetObjResult(interp), boo);
   return TCL_OK;
 }
diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C
index 3b15fc1..6856115 100644
--- a/src/bltGrMarkerOp.C
+++ b/src/bltGrMarkerOp.C
@@ -321,7 +321,7 @@ static int FindOp(ClientData clientData, Tcl_Interp* interp,
   }
 
   int enclosed = (mode == FIND_ENCLOSED);
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers_.displayList);
+  for (Blt_ChainLink link = Chain_FirstLink(graphPtr->markers_.displayList);
        link; link = Blt_Chain_NextLink(link)) {
     Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
     MarkerOptions* ops = (MarkerOptions*)markerPtr->ops();
@@ -348,7 +348,7 @@ static int NamesOp(ClientData clientData, Tcl_Interp* interp,
   Graph* graphPtr = (Graph*)clientData;
   Tcl_Obj* listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
   if (objc == 3) {
-    for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr->markers_.displayList); 
+    for (Blt_ChainLink link=Chain_FirstLink(graphPtr->markers_.displayList); 
 	 link; link = Blt_Chain_NextLink(link)) {
       Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
       Tcl_ListObjAppendElement(interp, listObjPtr,
@@ -356,7 +356,7 @@ static int NamesOp(ClientData clientData, Tcl_Interp* interp,
     }
   } 
   else {
-    for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr->markers_.displayList); 
+    for (Blt_ChainLink link=Chain_FirstLink(graphPtr->markers_.displayList); 
 	 link; link = Blt_Chain_NextLink(link)) {
       Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
       for (int ii = 3; ii<objc; ii++) {
diff --git a/src/bltGrXAxisOp.C b/src/bltGrXAxisOp.C
index 2d67284..c5165b7 100644
--- a/src/bltGrXAxisOp.C
+++ b/src/bltGrXAxisOp.C
@@ -55,7 +55,7 @@ static Axis* GetAxisFromCmd(ClientData clientData, Tcl_Obj* obj)
   else
     return NULL;
 
-  Blt_ChainLink link = Blt_Chain_FirstLink(ops->margins[margin].axes);
+  Blt_ChainLink link = Chain_FirstLink(ops->margins[margin].axes);
   return (Axis*)Blt_Chain_GetValue(link);
 }
 
@@ -141,7 +141,7 @@ static int UseOp(ClientData clientData, Tcl_Interp* interp,
 
   if (objc == 3) {
     Tcl_Obj* listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
-    for (Blt_ChainLink link = Blt_Chain_FirstLink(chain); link;
+    for (Blt_ChainLink link = Chain_FirstLink(chain); link;
 	 link = Blt_Chain_NextLink(link)) {
       Axis* axisPtr = (Axis*)Blt_Chain_GetValue(link);
       Tcl_ListObjAppendElement(interp, listObjPtr,
@@ -156,7 +156,7 @@ static int UseOp(ClientData clientData, Tcl_Interp* interp,
   if (Tcl_ListObjGetElements(interp, objv[3], &axisObjc, &axisObjv) != TCL_OK)
     return TCL_ERROR;
 
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(chain); link; 
+  for (Blt_ChainLink link = Chain_FirstLink(chain); link; 
        link = Blt_Chain_NextLink(link)) {
     Axis* axisPtr;
 
diff --git a/src/bltGraph.C b/src/bltGraph.C
index 7840b77..b0cebf8 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -661,7 +661,7 @@ void Graph::destroyElements()
 
 void Graph::configureElements()
 {
-  for (Blt_ChainLink link=Blt_Chain_FirstLink(elements_.displayList); 
+  for (Blt_ChainLink link=Chain_FirstLink(elements_.displayList); 
        link; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     elemPtr->configure();
@@ -670,7 +670,7 @@ void Graph::configureElements()
 
 void Graph::mapElements()
 {
-  for (Blt_ChainLink link =Blt_Chain_FirstLink(elements_.displayList); 
+  for (Blt_ChainLink link =Chain_FirstLink(elements_.displayList); 
        link; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     elemPtr->map();
@@ -680,8 +680,8 @@ void Graph::mapElements()
 void Graph::drawElements(Drawable drawable)
 {
   // Draw with respect to the stacking order
-  for (Blt_ChainLink link=Blt_Chain_LastLink(elements_.displayList); 
-       link; link = Blt_Chain_PrevLink(link)) {
+  for (Blt_ChainLink link=Chain_LastLink(elements_.displayList); 
+       link; link = Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     elemPtr->draw(drawable);
   }
@@ -689,8 +689,8 @@ void Graph::drawElements(Drawable drawable)
 
 void Graph::drawActiveElements(Drawable drawable)
 {
-  for (Blt_ChainLink link=Blt_Chain_LastLink(elements_.displayList); 
-       link; link = Blt_Chain_PrevLink(link)) {
+  for (Blt_ChainLink link=Chain_LastLink(elements_.displayList); 
+       link; link = Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     elemPtr->drawActive(drawable);
   }
@@ -698,8 +698,8 @@ void Graph::drawActiveElements(Drawable drawable)
 
 void Graph::printElements(PSOutput* psPtr)
 {
-  for (Blt_ChainLink link=Blt_Chain_LastLink(elements_.displayList); 
-       link != NULL; link = Blt_Chain_PrevLink(link)) {
+  for (Blt_ChainLink link=Chain_LastLink(elements_.displayList); 
+       link != NULL; link = Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     elemPtr->print(psPtr);
   }
@@ -707,8 +707,8 @@ void Graph::printElements(PSOutput* psPtr)
 
 void Graph::printActiveElements(PSOutput* psPtr)
 {
-  for (Blt_ChainLink link=Blt_Chain_LastLink(elements_.displayList); 
-       link; link = Blt_Chain_PrevLink(link)) {
+  for (Blt_ChainLink link=Chain_LastLink(elements_.displayList); 
+       link; link = Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     elemPtr->printActive(psPtr);
   }
@@ -758,7 +758,7 @@ void Graph::destroyMarkers()
 
 void Graph::configureMarkers()
 {
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(markers_.displayList); 
+  for (Blt_ChainLink link = Chain_FirstLink(markers_.displayList); 
        link; link = Blt_Chain_NextLink(link)) {
     Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
     markerPtr->configure();
@@ -767,7 +767,7 @@ void Graph::configureMarkers()
 
 void Graph::mapMarkers()
 {
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(markers_.displayList); 
+  for (Blt_ChainLink link = Chain_FirstLink(markers_.displayList); 
        link; link = Blt_Chain_NextLink(link)) {
     Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
     MarkerOptions* mops = (MarkerOptions*)markerPtr->ops();
@@ -786,8 +786,8 @@ void Graph::mapMarkers()
 
 void Graph::drawMarkers(Drawable drawable, int under)
 {
-  for (Blt_ChainLink link = Blt_Chain_LastLink(markers_.displayList); 
-       link; link = Blt_Chain_PrevLink(link)) {
+  for (Blt_ChainLink link = Chain_LastLink(markers_.displayList); 
+       link; link = Chain_PrevLink(link)) {
     Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
     MarkerOptions* mops = (MarkerOptions*)markerPtr->ops();
 
@@ -803,8 +803,8 @@ void Graph::drawMarkers(Drawable drawable, int under)
 
 void Graph::printMarkers(PSOutput* psPtr, int under)
 {
-  for (Blt_ChainLink link = Blt_Chain_LastLink(markers_.displayList); 
-       link; link = Blt_Chain_PrevLink(link)) {
+  for (Blt_ChainLink link = Chain_LastLink(markers_.displayList); 
+       link; link = Chain_PrevLink(link)) {
     Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
     MarkerOptions* mops = (MarkerOptions*)markerPtr->ops();
     if (mops->drawUnder != under)
@@ -834,7 +834,7 @@ Marker* Graph::nearestMarker(int x, int y, int under)
   Point2d point;
   point.x = (double)x;
   point.y = (double)y;
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(markers_.displayList);
+  for (Blt_ChainLink link = Chain_FirstLink(markers_.displayList);
        link; link = Blt_Chain_NextLink(link)) {
     Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
     MarkerOptions* mops = (MarkerOptions*)markerPtr->ops();
@@ -974,7 +974,7 @@ void Graph::mapAxes()
     int offset =0;
 
     Blt_Chain chain = ops->margins[ii].axes;
-    for (Blt_ChainLink link=Blt_Chain_FirstLink(chain); link; 
+    for (Blt_ChainLink link=Chain_FirstLink(chain); link; 
 	 link = Blt_Chain_NextLink(link)) {
       Axis *axisPtr = (Axis*)Blt_Chain_GetValue(link);
       AxisOptions* aops = (AxisOptions*)axisPtr->ops();
@@ -1003,8 +1003,8 @@ void Graph::drawAxes(Drawable drawable)
   GraphOptions* ops = (GraphOptions*)ops_;
 
   for (int ii=0; ii<4; ii++) {
-    for (Blt_ChainLink link = Blt_Chain_LastLink(ops->margins[ii].axes); 
-	 link != NULL; link = Blt_Chain_PrevLink(link)) {
+    for (Blt_ChainLink link = Chain_LastLink(ops->margins[ii].axes); 
+	 link != NULL; link = Chain_PrevLink(link)) {
       Axis *axisPtr = (Axis*)Blt_Chain_GetValue(link);
       axisPtr->draw(drawable);
     }
@@ -1026,7 +1026,7 @@ void Graph::drawAxesGrids(Drawable drawable)
   GraphOptions* ops = (GraphOptions*)ops_;
 
   for (int ii=0; ii<4; ii++) {
-    for (Blt_ChainLink link = Blt_Chain_FirstLink(ops->margins[ii].axes);
+    for (Blt_ChainLink link = Chain_FirstLink(ops->margins[ii].axes);
 	 link; link = Blt_Chain_NextLink(link)) {
       Axis *axisPtr = (Axis*)Blt_Chain_GetValue(link);
       axisPtr->drawGrids(drawable);
@@ -1040,7 +1040,7 @@ void Graph::printAxes(PSOutput* psPtr)
 
   Margin *mp, *mend;
   for (mp = ops->margins, mend = mp + 4; mp < mend; mp++) {
-    for (Blt_ChainLink link=Blt_Chain_FirstLink(mp->axes); link; 
+    for (Blt_ChainLink link=Chain_FirstLink(mp->axes); link; 
 	 link = Blt_Chain_NextLink(link)) {
       Axis *axisPtr = (Axis*)Blt_Chain_GetValue(link);
       axisPtr->print(psPtr);
@@ -1053,7 +1053,7 @@ void Graph::printAxesGrids(PSOutput* psPtr)
   GraphOptions* ops = (GraphOptions*)ops_;
 
   for (int ii=0; ii<4; ii++) {
-    for (Blt_ChainLink link=Blt_Chain_FirstLink(ops->margins[ii].axes);
+    for (Blt_ChainLink link=Chain_FirstLink(ops->margins[ii].axes);
 	 link; link = Blt_Chain_NextLink(link)) {
       Axis *axisPtr = (Axis*)Blt_Chain_GetValue(link);
       axisPtr->printGrids(psPtr);
@@ -1162,7 +1162,7 @@ void Graph::resetAxes()
   // and largest data values mapped to each X and Y-axis.  This
   // will be the axis limits if the user doesn't override them 
   // with -min and -max options.
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(elements_.displayList);
+  for (Blt_ChainLink link = Chain_FirstLink(elements_.displayList);
        link; link = Blt_Chain_NextLink(link)) {
     Region2d exts;
 
@@ -1207,7 +1207,7 @@ Axis* Graph::nearestAxis(int x, int y)
       continue;
 
     if (ops->showTicks) {
-      for (Blt_ChainLink link=Blt_Chain_FirstLink(axisPtr->tickLabels_);
+      for (Blt_ChainLink link=Chain_FirstLink(axisPtr->tickLabels_);
 	   link; link = Blt_Chain_NextLink(link)) {	
 	TickLabel *labelPtr = (TickLabel*)Blt_Chain_GetValue(link);
 	double rw, rh;
@@ -1370,8 +1370,8 @@ ClientData Graph::pickEntry(int xx, int yy, ClassId* classIdPtr)
   searchPtr->y = yy;
   searchPtr->dist = (double)(searchPtr->halo + 1);
 	
-  for (Blt_ChainLink link=Blt_Chain_LastLink(elements_.displayList); link;
-       link = Blt_Chain_PrevLink(link)) {
+  for (Blt_ChainLink link=Chain_LastLink(elements_.displayList); link;
+       link = Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     ElementOptions* eops = (ElementOptions*)elemPtr->ops();
     if (eops->hide)
diff --git a/src/bltGraphBar.C b/src/bltGraphBar.C
index b3a263b..b4cbabc 100644
--- a/src/bltGraphBar.C
+++ b/src/bltGraphBar.C
@@ -325,7 +325,7 @@ void BarGraph::initBarSets()
   Tcl_InitHashTable(&setTable, sizeof(BarSetKey)/sizeof(int));
   int nSegs =0;
 
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(elements_.displayList);
+  for (Blt_ChainLink link = Chain_FirstLink(elements_.displayList);
        link; link = Blt_Chain_NextLink(link)) {
     BarElement* bePtr = (BarElement*)Blt_Chain_GetValue(link);
     BarElementOptions* ops = (BarElementOptions*)bePtr->ops();
@@ -462,7 +462,7 @@ void BarGraph::computeBarStacks()
   // Consider each bar x-y coordinate. Add the ordinates of duplicate
   // abscissas
 
-  for (link = Blt_Chain_FirstLink(elements_.displayList); 
+  for (link = Chain_FirstLink(elements_.displayList); 
        link; link = Blt_Chain_NextLink(link)) {
     BarElement* bePtr = (BarElement*)Blt_Chain_GetValue(link);
     BarElementOptions* ops = (BarElementOptions*)bePtr->ops();
diff --git a/src/bltGraphOp.C b/src/bltGraphOp.C
index 1ec3eae..2504368 100644
--- a/src/bltGraphOp.C
+++ b/src/bltGraphOp.C
@@ -302,7 +302,7 @@ static int TransformOp(ClientData clientData, Tcl_Interp* interp, int objc,
 }
 
 static const Ensemble graphEnsemble[] = {
-  {"axis",        0, axisEnsemble},
+  {"axis",        0, Blt::axisEnsemble},
   {"bar",         0, Blt::elementEnsemble},
   {"cget", 	  CgetOp, 0},
   {"configure",   ConfigureOp, 0},
@@ -328,7 +328,7 @@ static const Ensemble graphEnsemble[] = {
 
 static Axis* GetFirstAxis(Blt_Chain chain)
 {
-  Blt_ChainLink link = Blt_Chain_FirstLink(chain);
+  Blt_ChainLink link = Chain_FirstLink(chain);
   if (!link)
     return NULL;
 
diff --git a/src/bltGraphSup.C b/src/bltGraphSup.C
index e38c9bd..6c713cd 100644
--- a/src/bltGraphSup.C
+++ b/src/bltGraphSup.C
@@ -395,7 +395,7 @@ int Graph::getMarginGeometry(Margin *marginPtr)
   marginPtr->maxTickHeight =0;
 
   if (ops->stackAxes) {
-    for (Blt_ChainLink link = Blt_Chain_FirstLink(marginPtr->axes);
+    for (Blt_ChainLink link = Chain_FirstLink(marginPtr->axes);
 	 link != NULL; link = Blt_Chain_NextLink(link)) {
       Axis* axisPtr = (Axis*)Blt_Chain_GetValue(link);
       AxisOptions* ops = (AxisOptions*)axisPtr->ops();
@@ -420,7 +420,7 @@ int Graph::getMarginGeometry(Margin *marginPtr)
     }
   }
   else {
-    for (Blt_ChainLink link = Blt_Chain_FirstLink(marginPtr->axes);
+    for (Blt_ChainLink link = Chain_FirstLink(marginPtr->axes);
 	 link != NULL; link = Blt_Chain_NextLink(link)) {
       Axis* axisPtr = (Axis*)Blt_Chain_GetValue(link);
       AxisOptions* ops = (AxisOptions*)axisPtr->ops();
diff --git a/src/bltVector.C b/src/bltVector.C
index dcf9b78..1ba29b2 100644
--- a/src/bltVector.C
+++ b/src/bltVector.C
@@ -378,8 +378,8 @@ void Blt_Vec_NotifyClients(ClientData clientData)
   notify = (vPtr->notifyFlags & NOTIFY_DESTROYED)
     ? BLT_VECTOR_NOTIFY_DESTROY : BLT_VECTOR_NOTIFY_UPDATE;
   vPtr->notifyFlags &= ~(NOTIFY_UPDATED | NOTIFY_DESTROYED | NOTIFY_PENDING);
-  for (link = Blt_Chain_FirstLink(vPtr->chain); link != NULL; link = next) {
-    next = Blt_Chain_NextLink(link);
+  for (link = Chain_FirstLink(vPtr->chain); link != NULL; link = next) {
+    next = Chain_NextLink(link);
     VectorClient *clientPtr = (VectorClient*)Blt_Chain_GetValue(link);
     if ((clientPtr->proc != NULL) && (clientPtr->serverPtr != NULL)) {
       (*clientPtr->proc) (vPtr->interp, clientPtr->clientData, notify);
@@ -390,8 +390,8 @@ void Blt_Vec_NotifyClients(ClientData clientData)
   // should call Blt_FreeVectorId to release the client identifier), so mark
   // any remaining clients to indicate that vector's server has gone away.
   if (notify == BLT_VECTOR_NOTIFY_DESTROY) {
-    for (link = Blt_Chain_FirstLink(vPtr->chain); link != NULL;
-	 link = Blt_Chain_NextLink(link)) {
+    for (link = Chain_FirstLink(vPtr->chain); link != NULL;
+	 link = Chain_NextLink(link)) {
       VectorClient *clientPtr = (VectorClient*)Blt_Chain_GetValue(link);
       clientPtr->serverPtr = NULL;
     }
@@ -791,8 +791,8 @@ void Blt::Vec_Free(Vector* vPtr)
   vPtr->notifyFlags |= NOTIFY_DESTROYED;
   Blt_Vec_NotifyClients(vPtr);
 
-  for (link = Blt_Chain_FirstLink(vPtr->chain); link != NULL;
-       link = Blt_Chain_NextLink(link)) {
+  for (link = Chain_FirstLink(vPtr->chain); link != NULL;
+       link = Chain_NextLink(link)) {
     VectorClient *clientPtr = (VectorClient*)Blt_Chain_GetValue(link);
     free(clientPtr);
   }