diff --git a/ChangeLog b/ChangeLog
index 554eb9d1bb2dadfd242c61ee6f1bc285285d15db..14c8f206834a6fb854dc646d9a1476c558e110e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ CVS code -
 - files.c:
   do_browser()
 	- Rename variable lineno to fileline to avoid confusion. (DLR)
+- utils.c:
+  regexec_safe()
+	- Rename to safe_regexec() for consistency. (DLR)
 
 GNU nano 1.3.6 - 2005.03.20
 - General:
diff --git a/src/nano.h b/src/nano.h
index f6ed43138c0677d671707e3874d61900e26bb4a6..071bf80e211edc8f5935f456a0f0dd63f217419a 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -48,7 +48,7 @@
 
 #ifdef BROKEN_REGEXEC
 #undef regexec
-#define regexec(preg, string, nmatch, pmatch, eflags) regexec_safe(preg, string, nmatch, pmatch, eflags)
+#define regexec(preg, string, nmatch, pmatch, eflags) safe_regexec(preg, string, nmatch, pmatch, eflags)
 #endif
 
 /* Set a default value for PATH_MAX, so we can use it in lines like
@@ -82,7 +82,7 @@
 #endif
 #define gettext_noop(string) (string)
 #define N_(string) gettext_noop(string)
-	/* Mark a string that will be sent to gettext later. */
+	/* Mark a string that will be sent to gettext() later. */
 
 #include <stddef.h>
 #include <sys/types.h>
diff --git a/src/proto.h b/src/proto.h
index e7bc1590acfe3849a811b46b6a089f8fcee5c6a6..03989ba7c42cbd5500d1fe7d5201f6c91e6bfdda 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -532,7 +532,7 @@ void free_history(historyheadtype *h);
 /* Public functions in utils.c. */
 #ifdef HAVE_REGEX_H
 #ifdef BROKEN_REGEXEC
-int regexec_safe(const regex_t *preg, const char *string, size_t nmatch,
+int safe_regexec(const regex_t *preg, const char *string, size_t nmatch,
 	regmatch_t pmatch[], int eflags);
 #endif
 int regexp_bol_or_eol(const regex_t *preg, const char *string);
diff --git a/src/utils.c b/src/utils.c
index cf0bed4ba9537a797c678edc36f775879ab72425..ce21eced7912642496df2ea9db2e5a29e7423b97 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -36,7 +36,7 @@
 
 #ifdef HAVE_REGEX_H
 #ifdef BROKEN_REGEXEC
-int regexec_safe(const regex_t *preg, const char *string, size_t nmatch,
+int safe_regexec(const regex_t *preg, const char *string, size_t nmatch,
 	regmatch_t pmatch[], int eflags)
 {
     if (string != NULL && *string != '\0')