diff --git a/share/functions/fish_default_mode_prompt.fish b/share/functions/fish_default_mode_prompt.fish
index 638c07f9e..27a9c9f62 100644
--- a/share/functions/fish_default_mode_prompt.fish
+++ b/share/functions/fish_default_mode_prompt.fish
@@ -9,7 +9,7 @@ function fish_default_mode_prompt --description "Display the default mode for th
             case insert
                 set_color --bold --background green white
                 echo '[I]'
-            case replace-one
+            case replace_one
                 set_color --bold --background green white
                 echo '[R]'
             case visual
diff --git a/share/functions/fish_vi_key_bindings.fish b/share/functions/fish_vi_key_bindings.fish
index 3aadff7d9..05ed9dedc 100644
--- a/share/functions/fish_vi_key_bindings.fish
+++ b/share/functions/fish_vi_key_bindings.fish
@@ -207,11 +207,11 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
     bind '"*P' backward-char "commandline -i ( xsel -p; echo )[1]"
 
     #
-    # Lowercase r, enters replace-one mode
+    # Lowercase r, enters replace_one mode
     #
-    bind -m replace-one r force-repaint
-    bind -M replace-one -m default '' delete-char self-insert backward-char force-repaint
-    bind -M replace-one -m default \e cancel force-repaint
+    bind -m replace_one r force-repaint
+    bind -M replace_one -m default '' delete-char self-insert backward-char force-repaint
+    bind -M replace_one -m default \e cancel force-repaint
 
     #
     # visual mode
diff --git a/tests/bind.expect b/tests/bind.expect
index 260f206e6..71b91cd3d 100644
--- a/tests/bind.expect
+++ b/tests/bind.expect
@@ -157,7 +157,7 @@ expect_prompt -re {\r\nTENT\r\n} {
 
 # Now test that exactly the expected bind modes are defined
 send "bind --list-modes\r"
-expect_prompt -re {\r\ndefault\r\ninsert\r\npaste\r\nreplace-one\r\nvisual\r\n} {
+expect_prompt -re {\r\ndefault\r\ninsert\r\npaste\r\nreplaceone\r\nvisual\r\n} {
     puts "vi bind modes"
 } unmatched {
     puts stderr "Unexpected vi bind modes"