diff --git a/resis/ResMain.c b/resis/ResMain.c
index 4dd8ce4f..1e40c73f 100644
--- a/resis/ResMain.c
+++ b/resis/ResMain.c
@@ -1479,7 +1479,7 @@ ResExtractNet(node, resisdata, cellname)
 
     ResFindNewContactTiles(ResContactList);
 
-    HashInit(&DevNodeTable, HT_DEFAULTSIZE, HT_CLIENTKEYS);
+    HashInit(&DevNodeTable, HT_DEFAULTSIZE, HT_WORDKEYS);
     ResPreProcessDevices(DevTiles, ResDevList, ResUse->cu_def, &DevNodeTable);
 
     /* do extraction */
diff --git a/resis/ResMakeRes.c b/resis/ResMakeRes.c
index 3264d867..7cd53121 100644
--- a/resis/ResMakeRes.c
+++ b/resis/ResMakeRes.c
@@ -172,7 +172,7 @@ ResCalcEastWest(tile, pendingList, doneList, resList)
      * a nested loop for each entry.
      */
     if (count >= 16)
-	HashInit(&BreakTable, HT_DEFAULTSIZE, HT_CLIENTKEYS);
+	HashInit(&BreakTable, HT_DEFAULTSIZE, HT_WORDKEYS);
 
     /*
      * Eliminate breakpoints with the same X coordinate and merge
@@ -374,7 +374,7 @@ ResCalcNorthSouth(tile, pendingList, doneList, resList)
      * a nested loop for each entry.
      */
     if (count >= 16)
-	HashInit(&BreakTable, HT_DEFAULTSIZE, HT_CLIENTKEYS);
+	HashInit(&BreakTable, HT_DEFAULTSIZE, HT_WORDKEYS);
 
     /* Simplified split tile handling */
     if (IsSplit(tile))
diff --git a/resis/ResMerge.c b/resis/ResMerge.c
index cc727179..e201a102 100644
--- a/resis/ResMerge.c
+++ b/resis/ResMerge.c
@@ -431,7 +431,7 @@ ResParallelCheck(resptr)
 	HashEntry	*he;
 
 	/* Hash the connections */
-	HashInit(&NodeResTable, HT_DEFAULTSIZE, HT_CLIENTKEYS);
+	HashInit(&NodeResTable, HT_DEFAULTSIZE, HT_WORDKEYS);
 	
 	for (rcell2 = resptr->rn_re; rcell2 != NULL; rcell2 = rcell2->re_nextEl)
 	{
@@ -549,7 +549,7 @@ ResTriangleCheck(resptr)
 	HashSearch	hs;
 
 	/* Hash the neighboring connections */
-	HashInit(&NodeResTable, HT_DEFAULTSIZE, HT_CLIENTKEYS);
+	HashInit(&NodeResTable, HT_DEFAULTSIZE, HT_WORDKEYS);
 
 	for (rcell2 = resptr->rn_re; rcell2 != NULL; rcell2 = rcell2->re_nextEl)
 	{