diff --git a/fcore/cursor-dfa/vi-l-dfa.sml b/fcore/cursor-dfa/vi-hl-dfa.sml
similarity index 97%
rename from fcore/cursor-dfa/vi-l-dfa.sml
rename to fcore/cursor-dfa/vi-hl-dfa.sml
index 0bb86e0..0dd131c 100644
--- a/fcore/cursor-dfa/vi-l-dfa.sml
+++ b/fcore/cursor-dfa/vi-hl-dfa.sml
@@ -1,4 +1,4 @@
-structure ViLDfa =
+structure ViHlDfa =
 struct
   val startState: Word8.word = 0w0
   val notNewlineState: Word8.word = 0w1
@@ -82,7 +82,7 @@ struct
                str :: tl =>
                  loop
                    (String.size str - 1, absIdx, str, tl, currentState, counter)
-             | [] => absIdx
+             | [] => 0
            else
              let
                val chr = String.sub (str, idx)
@@ -108,6 +108,6 @@ struct
          val fStart = loop
        end)
 
-  val next = ViL.next
-  val prev = ViH.prev
+  val l = ViL.next
+  val h = ViH.prev
 end
diff --git a/fcore/cursor.sml b/fcore/cursor.sml
index fd5ec19..4162301 100644
--- a/fcore/cursor.sml
+++ b/fcore/cursor.sml
@@ -56,8 +56,8 @@ struct
   val viDlr = ViDlrDfa.next
   val viDlrForDelete = ViDlrDfa.nextForDelete
 
-  val viL = ViLDfa.next
-  val viH = ViLDfa.prev
+  val viL = ViHlDfa.l
+  val viH = ViHlDfa.h
 
   fun helpGetCursorColumn (distanceFromLine, strList, lineList) =
     case (strList, lineList) of
diff --git a/shf-tests.mlb b/shf-tests.mlb
index aa2e5a7..7e1e817 100644
--- a/shf-tests.mlb
+++ b/shf-tests.mlb
@@ -34,7 +34,7 @@ in
   fcore/cursor-dfa/vi-word-dfa.sml
   fcore/cursor-dfa/vi-caps-word-dfa.sml
   fcore/cursor-dfa/vi-dlr-dfa.sml
-  fcore/cursor-dfa/vi-l-dfa.sml
+  fcore/cursor-dfa/vi-hl-dfa.sml
   fcore/rect.sml
   fcore/pipe-cursor.sml
 end
diff --git a/shf.mlb b/shf.mlb
index 763be7e..88f8575 100644
--- a/shf.mlb
+++ b/shf.mlb
@@ -34,7 +34,7 @@ in
   fcore/cursor-dfa/vi-word-dfa.sml
   fcore/cursor-dfa/vi-caps-word-dfa.sml
   fcore/cursor-dfa/vi-dlr-dfa.sml
-  fcore/cursor-dfa/vi-l-dfa.sml
+  fcore/cursor-dfa/vi-hl-dfa.sml
   fcore/rect.sml
   fcore/pipe-cursor.sml
 end