diff -r c8fa41fcc4a7 -r 699c7eac2c6d test/bpgraph_test.cc
--- a/test/bpgraph_test.cc	Thu Dec 01 09:05:47 2011 +0100
+++ b/test/bpgraph_test.cc	Wed Jan 11 22:21:07 2012 +0100
@@ -101,8 +101,8 @@
   checkEdgeIds(G);
 
   checkGraphNodeMap(G);
-  checkGraphRedMap(G);
-  checkGraphBlueMap(G);
+  checkGraphRedNodeMap(G);
+  checkGraphBlueNodeMap(G);
   checkGraphArcMap(G);
   checkGraphEdgeMap(G);
 }
@@ -260,8 +260,8 @@
   checkEdgeIds(G);
 
   checkGraphNodeMap(G);
-  checkGraphRedMap(G);
-  checkGraphBlueMap(G);
+  checkGraphRedNodeMap(G);
+  checkGraphBlueNodeMap(G);
   checkGraphArcMap(G);
   checkGraphEdgeMap(G);
 
@@ -369,13 +369,13 @@
   checkGraphEdgeList(G, redNum * blueNum);
   checkGraphArcList(G, 2 * redNum * blueNum);
 
-  for (RedIt n(G); n != INVALID; ++n) {
+  for (RedNodeIt n(G); n != INVALID; ++n) {
     checkGraphOutArcList(G, n, blueNum);
     checkGraphInArcList(G, n, blueNum);
     checkGraphIncEdgeList(G, n, blueNum);
   }
 
-  for (BlueIt n(G); n != INVALID; ++n) {
+  for (BlueNodeIt n(G); n != INVALID; ++n) {
     checkGraphOutArcList(G, n, redNum);
     checkGraphInArcList(G, n, redNum);
     checkGraphIncEdgeList(G, n, redNum);
@@ -393,8 +393,8 @@
   checkEdgeIds(G);
 
   checkGraphNodeMap(G);
-  checkGraphRedMap(G);
-  checkGraphBlueMap(G);
+  checkGraphRedNodeMap(G);
+  checkGraphBlueNodeMap(G);
   checkGraphArcMap(G);
   checkGraphEdgeMap(G);