diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 2993e59b63..3f9aa538c7 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -282,6 +282,10 @@ preprocess_patch() {
   LC_ALL=C sed -Ee 's/( [ab]\/src\/nvim)\/profiler\.c/\1\/profile.c/g' \
     "$file" > "$file".tmp && mv "$file".tmp "$file"
 
+  # Rename regexp_(bt|nfa).c to regexp.c
+  LC_ALL=C sed -Ee 's/( [ab]\/src\/nvim)\/regexp_(bt|nfa)\.c/\1\/regexp.c/g' \
+    "$file" > "$file".tmp && mv "$file".tmp "$file"
+
   # Rename scriptfile.c to runtime.c
   LC_ALL=C sed -Ee 's/( [ab]\/src\/nvim)\/scriptfile\.c/\1\/runtime.c/g' \
     "$file" > "$file".tmp && mv "$file".tmp "$file"
diff --git a/src/nvim/errors.h b/src/nvim/errors.h
index e0fc9ec0ca..83f8ec6e4f 100644
--- a/src/nvim/errors.h
+++ b/src/nvim/errors.h
@@ -27,7 +27,6 @@ EXTERN const char e_while[] INIT(= N_("E588: :endwhile without :while"));
 EXTERN const char e_for[] INIT(= N_("E588: :endfor without :for"));
 EXTERN const char e_exists[] INIT(= N_("E13: File exists (add ! to override)"));
 EXTERN const char e_failed[] INIT(= N_("E472: Command failed"));
-EXTERN const char e_internal[] INIT(= N_("E473: Internal error"));
 EXTERN const char e_intern2[] INIT(= N_("E685: Internal error: %s"));
 EXTERN const char e_interr[] INIT(= N_("Interrupted"));
 EXTERN const char e_invarg[] INIT(= N_("E474: Invalid argument"));
@@ -37,6 +36,7 @@ EXTERN const char e_invargNval[] INIT(= N_("E475: Invalid value for argument %s:
 EXTERN const char e_duparg2[] INIT(= N_("E983: Duplicate argument: %s"));
 EXTERN const char e_invexpr2[] INIT(= N_("E15: Invalid expression: \"%s\""));
 EXTERN const char e_invrange[] INIT(= N_("E16: Invalid range"));
+EXTERN const char e_internal_error_in_regexp[] INIT(= N_("E473: Internal error in regexp"));
 EXTERN const char e_invcmd[] INIT(= N_("E476: Invalid command"));
 EXTERN const char e_isadir2[] INIT(= N_("E17: \"%s\" is a directory"));
 EXTERN const char e_no_spell[] INIT(= N_("E756: Spell checking is not possible"));
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 0968cbdd4f..e8afffbe63 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -4370,7 +4370,8 @@ static uint8_t *regatom(int *flagp)
     if (one_exactly) {
       EMSG_ONE_RET_NULL;
     }
-    IEMSG_RET_NULL(_(e_internal));       // Supposed to be caught earlier.
+    // Supposed to be caught earlier.
+    IEMSG_RET_NULL(_(e_internal_error_in_regexp));
   // NOTREACHED
 
   case Magic('='):