diff --git a/fcore/cursor-dfa/vi-WORD-dfa.sml b/fcore/cursor-dfa/vi-caps-word-dfa.sml
similarity index 99%
rename from fcore/cursor-dfa/vi-WORD-dfa.sml
rename to fcore/cursor-dfa/vi-caps-word-dfa.sml
index aa57c8c..50820bb 100644
--- a/fcore/cursor-dfa/vi-WORD-dfa.sml
+++ b/fcore/cursor-dfa/vi-caps-word-dfa.sml
@@ -1,4 +1,4 @@
-structure ViWORDDfa =
+structure ViCapsWordDfa =
 struct
   val startState: Word8.word = 0w0
   val startNonBlankState: Word8.word = 0w1
diff --git a/fcore/cursor.sml b/fcore/cursor.sml
index 09dbf38..c201c52 100644
--- a/fcore/cursor.sml
+++ b/fcore/cursor.sml
@@ -600,29 +600,29 @@ struct
   val nextWord = ViWordDfa.startOfNextWord
 
   (* equivalent of vi's 'W' command *)
-  val nextWORD = ViWORDDfa.startOfNextWORD
+  val nextWORD = ViCapsWordDfa.startOfNextWORD
 
   (* equivalent of vi's 'b' command *)
   val prevWord = ViWordDfa.startOfCurrentWord
   val prevWordStrict = ViWordDfa.startOfCurrentWordStrict
 
   (* equivalent of vi's 'B' command *)
-  val prevWORD = ViWORDDfa.startOfCurrentWORD
-  val prevWORDStrict = ViWORDDfa.startOfCurrentWORDStrict
+  val prevWORD = ViCapsWordDfa.startOfCurrentWORD
+  val prevWORDStrict = ViCapsWordDfa.startOfCurrentWORDStrict
 
   (* equivalent of vi's 'ge' command *)
   val endOfPrevWord = ViWordDfa.endOfPrevWord
 
   (* equivalent of vi's 'gE' command *)
-  val endOfPrevWORD = ViWORDDfa.endOfPrevWORD
+  val endOfPrevWORD = ViCapsWordDfa.endOfPrevWORD
 
   (* equivalent of vi's `e` command *)
   val endOfWord = ViWordDfa.endOfCurrentWord
   val endOfWordForDelete = ViWordDfa.endOfCurrentWordForDelete
 
   (* equivalent of vi's `E` command *)
-  val endOfWORD = ViWORDDfa.endOfCurrentWORD
-  val endOfWORDForDelete = ViWORDDfa.endOfCurrentWORDForDelete
+  val endOfWORD = ViCapsWordDfa.endOfCurrentWORD
+  val endOfWORDForDelete = ViCapsWordDfa.endOfCurrentWORDForDelete
 
   (* Prerequisite: 
    * LineGap has been moved to start of line (provided with vi0). *)
diff --git a/shf-tests.mlb b/shf-tests.mlb
index 50cd0ad..270b73a 100644
--- a/shf-tests.mlb
+++ b/shf-tests.mlb
@@ -33,8 +33,8 @@ in
   fcore/pipe-cursor.sml
   fcore/text-builder.sml
   fcore/cursor-dfa/make-dfa-loop.sml
-  fcore/cursor-dfa/vi-WORD-dfa.sml
   fcore/cursor-dfa/vi-word-dfa.sml
+  fcore/cursor-dfa/vi-caps-word-dfa.sml
   fcore/cursor-dfa/vi-dlr-dfa.sml
 end
 fcore/cursor.sml
diff --git a/shf.mlb b/shf.mlb
index 712dcee..7c5e51a 100644
--- a/shf.mlb
+++ b/shf.mlb
@@ -33,8 +33,8 @@ in
   fcore/pipe-cursor.sml
   fcore/text-builder.sml
   fcore/cursor-dfa/make-dfa-loop.sml
-  fcore/cursor-dfa/vi-WORD-dfa.sml
   fcore/cursor-dfa/vi-word-dfa.sml
+  fcore/cursor-dfa/vi-caps-word-dfa.sml
   fcore/cursor-dfa/vi-dlr-dfa.sml
 end
 fcore/cursor.sml