diff -r e997802b855c -r 87f7c54892df src/work/peter/hierarchygraph.h
--- a/src/work/peter/hierarchygraph.h	Sat Nov 13 12:53:28 2004 +0000
+++ b/src/work/peter/hierarchygraph.h	Sat Nov 13 17:07:10 2004 +0000
@@ -433,8 +433,8 @@
     template < class T > class NodeMap
     {
     public:
-      typedef T ValueType;
-      typedef Node KeyType;
+      typedef T Value;
+      typedef Node Key;
 
       NodeMap (const HierarchyGraph &)
       {
@@ -489,8 +489,8 @@
     template < class T > class EdgeMap
     {
     public:
-      typedef T ValueType;
-      typedef Edge KeyType;
+      typedef T Value;
+      typedef Edge Key;
 
       EdgeMap (const HierarchyGraph &)
       {