diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index 9526f2eb2c..97a3bd51e5 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -610,7 +610,7 @@ find_in_dynamic_libpath(const char *basename)
 		char	   *mangled;
 		char	   *full;
 
-		piece = first_path_separator(p);
+		piece = first_path_var_separator(p);
 		if (piece == p)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_NAME),
diff --git a/src/include/port.h b/src/include/port.h
index 2c58b55492..4f0c0c1b08 100644
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -36,7 +36,7 @@ extern bool pg_set_block(pgsocket sock);
 
 extern char *first_dir_separator(const char *filename);
 extern char *last_dir_separator(const char *filename);
-extern char *first_path_separator(const char *pathlist);
+extern char *first_path_var_separator(const char *pathlist);
 extern void join_path_components(char *ret_path,
 					 const char *head, const char *tail);
 extern void canonicalize_path(char *path);
diff --git a/src/port/exec.c b/src/port/exec.c
index 2405140128..6027917b57 100644
--- a/src/port/exec.c
+++ b/src/port/exec.c
@@ -168,7 +168,7 @@ find_my_exec(const char *argv0, char *retpath)
 			else
 				startp = endp + 1;
 
-			endp = first_path_separator(startp);
+			endp = first_path_var_separator(startp);
 			if (!endp)
 				endp = startp + strlen(startp); /* point to end */
 
diff --git a/src/port/path.c b/src/port/path.c
index 08397d5b99..ccf801ead6 100644
--- a/src/port/path.c
+++ b/src/port/path.c
@@ -98,13 +98,13 @@ first_dir_separator(const char *filename)
 }
 
 /*
- *	first_path_separator
+ *	first_path_var_separator
  *
  * Find the location of the first path separator (i.e. ':' on
  * Unix, ';' on Windows), return NULL if not found.
  */
 char *
-first_path_separator(const char *pathlist)
+first_path_var_separator(const char *pathlist)
 {
 	const char *p;