diff --git a/genomix/genomix-data/src/main/java/edu/uci/ics/genomix/type/NodeWritable.java b/genomix/genomix-data/src/main/java/edu/uci/ics/genomix/type/NodeWritable.java
index 65931a2..844e2e8 100644
--- a/genomix/genomix-data/src/main/java/edu/uci/ics/genomix/type/NodeWritable.java
+++ b/genomix/genomix-data/src/main/java/edu/uci/ics/genomix/type/NodeWritable.java
@@ -81,7 +81,7 @@
         return kmer.getKmerLength();
     }
 
-    public void mergeForwadNext(NodeWritable nextNode, int initialKmerSize) {
+    public void mergeForwardNext(NodeWritable nextNode, int initialKmerSize) {
         this.forwardForwardList.set(nextNode.forwardForwardList);
         this.forwardReverseList.set(nextNode.forwardReverseList);
         kmer.mergeNextKmer(initialKmerSize, nextNode.getKmer());
diff --git a/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/hadoop/velvetgraphbuilding/DeepGraphBuildingReducer.java b/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/hadoop/velvetgraphbuilding/DeepGraphBuildingReducer.java
index 470b7fa..d28db37 100644
--- a/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/hadoop/velvetgraphbuilding/DeepGraphBuildingReducer.java
+++ b/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/hadoop/velvetgraphbuilding/DeepGraphBuildingReducer.java
@@ -65,7 +65,7 @@
                 nextNode.set(nextNextNode);
                 continue;
             }
-            curNode.mergeForwadNext(nextNode, KMER_SIZE);
+            curNode.mergeForwardNext(nextNode, KMER_SIZE);
             nextNode.set(nextNextNode);
         }
         output.collect(curNode, nullWritable);
diff --git a/genomix/genomix-hyracks/src/main/java/edu/uci/ics/genomix/hyracks/dataflow/MapReadToNodeOperator.java b/genomix/genomix-hyracks/src/main/java/edu/uci/ics/genomix/hyracks/dataflow/MapReadToNodeOperator.java
index 6c26feb..7394b71 100644
--- a/genomix/genomix-hyracks/src/main/java/edu/uci/ics/genomix/hyracks/dataflow/MapReadToNodeOperator.java
+++ b/genomix/genomix-hyracks/src/main/java/edu/uci/ics/genomix/hyracks/dataflow/MapReadToNodeOperator.java
@@ -135,7 +135,7 @@
                     nextNodeEntry.set(nextNextNodeEntry);
                     continue;
                 }
-                curNodeEntry.mergeForwadNext(nextNodeEntry, kmerSize);
+                curNodeEntry.mergeForwardNext(nextNodeEntry, kmerSize);
                 nextNodeEntry.set(nextNextNodeEntry);
             }
             outputNode(curNodeEntry);
