diff --git a/src/backend/optimizer/path/joinutils.c b/src/backend/optimizer/path/joinutils.c
index ed2df051eb..4f4fb7051b 100644
--- a/src/backend/optimizer/path/joinutils.c
+++ b/src/backend/optimizer/path/joinutils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/joinutils.c,v 1.21 1999/02/15 02:04:57 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/joinutils.c,v 1.22 1999/02/15 05:56:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -270,7 +270,7 @@ extract_path_keys(List *joinkeys,
 		 * find the right Var in the target list for this key
 		 */
 		var = (Var *) extract_join_subkey(jkey, which_subkey);
-		key = (Var *) matching_tlvar(var, tlist);
+		key = (Var *) matching_tlist_var(var, tlist);
 
 		/*
 		 * Include it in the pathkeys list if we haven't already done so
@@ -369,7 +369,7 @@ new_join_pathkey(List *subkeys,
 			break;				/* XXX something is wrong */
 		matched_subkeys = new_matching_subkeys(subkey, considered_subkeys,
 								 join_rel_tlist, joinclauses);
-		tlist_key = matching_tlvar(subkey, join_rel_tlist);
+		tlist_key = matching_tlist_var(subkey, join_rel_tlist);
 		newly_considered_subkeys = NIL;
 
 		if (tlist_key)
@@ -418,7 +418,7 @@ new_matching_subkeys(Var *subkey,
 	foreach(i, joinclauses)
 	{
 		joinclause = lfirst(i);
-		tlist_other_var = matching_tlvar(
+		tlist_other_var = matching_tlist_var(
 									other_join_clause_var(subkey, joinclause),
 									join_rel_tlist);
 
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index 29013f59ff..21f68a7a26 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.26 1999/02/13 23:16:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.27 1999/02/15 05:56:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,7 +61,7 @@ tlistentry_member(Var *var, List *targetlist)
 }
 
 /*
- * matching_tlvar
+ * matching_tlist_var
  *
  * RETURNS:  var node in a target list which is var_equal to 'var',
  *			 if one exists.
@@ -69,7 +69,7 @@ tlistentry_member(Var *var, List *targetlist)
  *
  */
 Expr *
-matching_tlvar(Var *var, List *targetlist)
+matching_tlist_var(Var *var, List *targetlist)
 {
 	TargetEntry *tlentry;
 
@@ -97,7 +97,7 @@ add_var_to_tlist(RelOptInfo *rel, Var *var)
 {
 	Expr	   *oldvar = (Expr *) NULL;
 
-	oldvar = matching_tlvar(var, rel->targetlist);
+	oldvar = matching_tlist_var(var, rel->targetlist);
 
 	/*
 	 * If 'var' is not already in 'rel's target list, add a new node.
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index cfed55bbb9..9066478183 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tlist.h,v 1.15 1999/02/13 23:21:53 momjian Exp $
+ * $Id: tlist.h,v 1.16 1999/02/15 05:56:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,7 @@
 #include "nodes/relation.h"
 
 extern TargetEntry *tlistentry_member(Var *var, List *targetlist);
-extern Expr *matching_tlvar(Var *var, List *targetlist);
+extern Expr *matching_tlist_var(Var *var, List *targetlist);
 extern void add_var_to_tlist(RelOptInfo *rel, Var *var);
 extern TargetEntry *create_tl_element(Var *var, int resdomno);
 extern List *get_actual_tlist(List *tlist);