diff -r 0977046c60d2 -r 65a0521e744e test/heap_test.cc
--- a/test/heap_test.cc	Sat Sep 26 07:21:54 2009 +0200
+++ b/test/heap_test.cc	Tue Sep 29 13:32:01 2009 +0200
@@ -30,12 +30,12 @@
 #include <lemon/maps.h>
 
 #include <lemon/bin_heap.h>
-#include <lemon/fourary_heap.h>
-#include <lemon/kary_heap.h>
+#include <lemon/quad_heap.h>
+#include <lemon/dheap.h>
 #include <lemon/fib_heap.h>
 #include <lemon/pairing_heap.h>
 #include <lemon/radix_heap.h>
-#include <lemon/binom_heap.h>
+#include <lemon/binomial_heap.h>
 #include <lemon/bucket_heap.h>
 
 #include "test_tools.h"
@@ -185,26 +185,26 @@
     dijkstraHeapTest<NodeHeap>(digraph, length, source);
   }
 
-  // FouraryHeap
+  // QuadHeap
   {
-    typedef FouraryHeap<Prio, ItemIntMap> IntHeap;
+    typedef QuadHeap<Prio, ItemIntMap> IntHeap;
     checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
     heapSortTest<IntHeap>();
     heapIncreaseTest<IntHeap>();
 
-    typedef FouraryHeap<Prio, IntNodeMap > NodeHeap;
+    typedef QuadHeap<Prio, IntNodeMap > NodeHeap;
     checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
     dijkstraHeapTest<NodeHeap>(digraph, length, source);
   }
 
-  // KaryHeap
+  // DHeap
   {
-    typedef KaryHeap<Prio, ItemIntMap> IntHeap;
+    typedef DHeap<Prio, ItemIntMap> IntHeap;
     checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
     heapSortTest<IntHeap>();
     heapIncreaseTest<IntHeap>();
 
-    typedef KaryHeap<Prio, IntNodeMap > NodeHeap;
+    typedef DHeap<Prio, IntNodeMap > NodeHeap;
     checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
     dijkstraHeapTest<NodeHeap>(digraph, length, source);
   }
@@ -245,14 +245,14 @@
     dijkstraHeapTest<NodeHeap>(digraph, length, source);
   }
 
-  // BinomHeap
+  // BinomialHeap
   {
-    typedef BinomHeap<Prio, ItemIntMap> IntHeap;
+    typedef BinomialHeap<Prio, ItemIntMap> IntHeap;
     checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
     heapSortTest<IntHeap>();
     heapIncreaseTest<IntHeap>();
 
-    typedef BinomHeap<Prio, IntNodeMap > NodeHeap;
+    typedef BinomialHeap<Prio, IntNodeMap > NodeHeap;
     checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
     dijkstraHeapTest<NodeHeap>(digraph, length, source);
   }