--- a/regexParser/transition.cc	Thu Dec 24 20:37:29 2015 +0900
+++ b/regexParser/transition.cc	Thu Dec 24 22:38:50 2015 +0900
@@ -1,13 +1,13 @@
 #include <stdlib.h>
 #include "transition.h"
 
-StatePtr searchState(StatePtr stateArray, StatePtr state) {
+node::StatePtr searchState(node::StatePtr stateArray, node::StatePtr state) {
     while(stateArray) {
         if (stateArray->bitState.bitContainer == state->bitState.bitContainer) {
             return stateArray;
         }
         if (stateArray->next == NULL) {
-            StatePtr s = createState(state->bitState);
+            node::StatePtr s = createState(state->bitState);
             stateArray = appendState(stateArray,s);
             return stateArray;
         }
@@ -16,17 +16,16 @@
     return stateArray;
 }
 
-StatePtr createState(BitVector bi) {
-    StatePtr state = NEW(State);
+node::StatePtr createState(BitVector bi) {
+    node::StatePtr state = NEW(node::State);
     state->bitState = bi;
-    state->transition = NEW(Transition);
-    state->nextNode = NEW(Node);
+    state->node = NEW(Node);
     return state;
 }
 
-StatePtr appendState(StatePtr x,StatePtr y) {
-    StatePtr x0 = createState(x->bitState);
-    StatePtr x1 = x0;
+node::StatePtr appendState(node::StatePtr x,node::StatePtr y) {
+    node::StatePtr x0 = createState(x->bitState);
+    node::StatePtr x1 = x0;
     for(;;) {
         if (x->next == NULL) {
             x1->next = y;