diff --git a/fcore/cursor.sml b/fcore/cursor.sml
index 091eaff..2757166 100644
--- a/fcore/cursor.sml
+++ b/fcore/cursor.sml
@@ -351,7 +351,7 @@ struct
            helpToNextChr (strPos + 1, str, absIdx + 1, stl, ~1, findChr, count)
        end)
 
-  val toNextChrNew = ToNextChr.foldNext
+  val toNextChr = ToNextChr.foldNext
 
   structure ToPrevChr =
     MakeIfCharFolderPrev
diff --git a/fcore/normal-mode/make-normal-delete.sml b/fcore/normal-mode/make-normal-delete.sml
index 43142f7..512ede8 100644
--- a/fcore/normal-mode/make-normal-delete.sml
+++ b/fcore/normal-mode/make-normal-delete.sml
@@ -149,8 +149,7 @@ struct
         else
           let
             val newCursorIdx =
-              Cursor.toNextChrNew
-                (buffer, cursorIdx, {findChr = #"\n", count = 1})
+              Cursor.toNextChr (buffer, cursorIdx, {findChr = #"\n", count = 1})
           in
             if newCursorIdx >= #textLength buffer - 2 then
               finishAfterDeletingBuffer (app, cursorIdx, buffer, time, [])
@@ -181,8 +180,7 @@ struct
         let
           val buffer = LineGap.goToIdx (cursorIdx, buffer)
           val newCursorIdx =
-            Cursor.toNextChrNew
-              (buffer, cursorIdx, {findChr = #"\n", count = 1})
+            Cursor.toNextChr (buffer, cursorIdx, {findChr = #"\n", count = 1})
           val buffer = LineGap.goToIdx (newCursorIdx, buffer)
         in
           if
@@ -721,7 +719,7 @@ struct
       val {buffer, cursorIdx, ...} = app
       val buffer = LineGap.goToIdx (cursorIdx, buffer)
       val newCursorIdx =
-        Cursor.toNextChrNew (buffer, cursorIdx, {findChr = chr, count = count})
+        Cursor.toNextChr (buffer, cursorIdx, {findChr = chr, count = count})
     in
       if newCursorIdx = ~1 then
         NormalFinish.clearMode app
@@ -749,7 +747,7 @@ struct
       val {buffer, cursorIdx, ...} = app
       val buffer = LineGap.goToIdx (cursorIdx, buffer)
       val newCursorIdx =
-        Cursor.toNextChrNew (buffer, cursorIdx, {findChr = chr, count = count})
+        Cursor.toNextChr (buffer, cursorIdx, {findChr = chr, count = count})
     in
       if newCursorIdx = ~1 then
         NormalFinish.clearMode app
@@ -980,7 +978,7 @@ struct
       val start = Int.max (cursorIdx - 1, 0)
       val buffer = LineGap.goToIdx (start, buffer)
 
-      val high = Cursor.toNextChrNew (buffer, start, {findChr = chr, count = 1})
+      val high = Cursor.toNextChr (buffer, start, {findChr = chr, count = 1})
       val buffer = LineGap.goToIdx (high, buffer)
       val origLow = Cursor.matchPair (buffer, high)
     in
@@ -1024,7 +1022,7 @@ struct
       val start = Int.max (cursorIdx - 1, 0)
       val buffer = LineGap.goToIdx (start, buffer)
 
-      val high = Cursor.toNextChrNew (buffer, start, {findChr = chr, count = 1})
+      val high = Cursor.toNextChr (buffer, start, {findChr = chr, count = 1})
       val buffer = LineGap.goToIdx (high, buffer)
       val low = Cursor.matchPair (buffer, high)
     in
diff --git a/fcore/normal-mode/normal-move.sml b/fcore/normal-mode/normal-move.sml
index 2c064e0..d2285c4 100644
--- a/fcore/normal-mode/normal-move.sml
+++ b/fcore/normal-mode/normal-move.sml
@@ -522,7 +522,7 @@ struct
       val {cursorIdx, buffer, searchList, bufferModifyTime, ...} = app
       val buffer = LineGap.goToIdx (cursorIdx, buffer)
       val newCursorIdx =
-        Cursor.toNextChrNew (buffer, cursorIdx, {findChr = chr, count = count})
+        Cursor.toNextChr (buffer, cursorIdx, {findChr = chr, count = count})
     in
       if newCursorIdx = ~1 then
         NormalFinish.clearMode app
@@ -536,7 +536,7 @@ struct
       val {cursorIdx, buffer, searchList, bufferModifyTime, ...} = app
       val buffer = LineGap.goToIdx (cursorIdx, buffer)
       val newCursorIdx =
-        Cursor.toNextChrNew (buffer, cursorIdx, {findChr = chr, count = count})
+        Cursor.toNextChr (buffer, cursorIdx, {findChr = chr, count = count})
     in
       if newCursorIdx = ~1 then
         NormalFinish.clearMode app
diff --git a/fcore/normal-mode/normal-yank.sml b/fcore/normal-mode/normal-yank.sml
index 9adfe50..5c91077 100644
--- a/fcore/normal-mode/normal-yank.sml
+++ b/fcore/normal-mode/normal-yank.sml
@@ -235,7 +235,7 @@ struct
       val {buffer, cursorIdx, ...} = app
       val buffer = LineGap.goToIdx (cursorIdx, buffer)
       val newCursorIdx =
-        Cursor.toNextChrNew (buffer, cursorIdx, {findChr = chr, count = count})
+        Cursor.toNextChr (buffer, cursorIdx, {findChr = chr, count = count})
     in
       if newCursorIdx = ~1 then
         NormalFinish.clearMode app
@@ -350,7 +350,7 @@ struct
       val start = Int.max (cursorIdx - 1, 0)
       val buffer = LineGap.goToIdx (start, buffer)
 
-      val high = Cursor.toNextChrNew (buffer, start, {findChr = chr, count = 1})
+      val high = Cursor.toNextChr (buffer, start, {findChr = chr, count = 1})
       val buffer = LineGap.goToIdx (high, buffer)
       val low = Cursor.matchPair (buffer, high) + 1
     in
@@ -382,7 +382,7 @@ struct
       val start = Int.max (cursorIdx - 1, 0)
       val buffer = LineGap.goToIdx (start, buffer)
 
-      val high = Cursor.toNextChrNew (buffer, start, {findChr = chr, count = 1})
+      val high = Cursor.toNextChr (buffer, start, {findChr = chr, count = 1})
       val buffer = LineGap.goToIdx (high, buffer)
       val low = Cursor.matchPair (buffer, high)
       val high = high + 1