diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 07bf272a201..62fee5a7ddd 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1309,7 +1309,7 @@ testdb=>
         </term>
         <listitem>
         <para>
-        Lists procedures associated with operator families
+        Lists functions associated with operator families
         (<xref linkend="catalog-pg-amproc"/>).
         If <replaceable class="parameter">access-method-pattern</replaceable>
         is specified, only members of operator families associated with access
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index a5160f91de6..560eacc7f0c 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -747,7 +747,7 @@ exec_command_d(PsqlScanState scan_state, bool active_branch, const char *cmd)
 							success = listOpFamilyOperators(pattern, pattern2, show_verbose);
 							break;
 						case 'p':
-							success = listOpFamilyProcedures(pattern, pattern2);
+							success = listOpFamilyFunctions(pattern, pattern2);
 							break;
 						default:
 							status = PSQL_CMD_UNKNOWN;
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index c7639f62062..cd39b913cda 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -6310,14 +6310,14 @@ listOpFamilyOperators(const char *access_method_pattern,
 
 /*
  * \dAp
- * Lists procedures of operator families
+ * Lists support functions of operator families
  *
  * Takes an optional regexps to filter by index access method and operator
  * family.
  */
 bool
-listOpFamilyProcedures(const char *access_method_pattern,
-					   const char *family_pattern)
+listOpFamilyFunctions(const char *access_method_pattern,
+					  const char *family_pattern)
 {
 	PQExpBufferData buf;
 	PGresult   *res;
@@ -6344,7 +6344,7 @@ listOpFamilyProcedures(const char *access_method_pattern,
 					  gettext_noop("Left arg type"),
 					  gettext_noop("Right arg type"),
 					  gettext_noop("Number"),
-					  gettext_noop("Proc name"));
+					  gettext_noop("Function"));
 
 	appendPQExpBuffer(&buf,
 					  "FROM pg_catalog.pg_amproc ap\n"
@@ -6371,7 +6371,7 @@ listOpFamilyProcedures(const char *access_method_pattern,
 		return false;
 
 	myopt.nullPrint = NULL;
-	myopt.title = _("List of procedures of operator families");
+	myopt.title = _("List of support functions of operator families");
 	myopt.translate_header = true;
 	myopt.translate_columns = translate_columns;
 	myopt.n_translate_columns = lengthof(translate_columns);
diff --git a/src/bin/psql/describe.h b/src/bin/psql/describe.h
index 35c50e3bcd6..4297f7fdfdf 100644
--- a/src/bin/psql/describe.h
+++ b/src/bin/psql/describe.h
@@ -129,8 +129,8 @@ extern bool listOpFamilyOperators(const char *accessMethod_pattern,
 								  const char *family_pattern, bool verbose);
 
 /* \dAp */
-extern bool listOpFamilyProcedures(const char *access_method_pattern,
-								   const char *family_pattern);
+extern bool listOpFamilyFunctions(const char *access_method_pattern,
+								  const char *family_pattern);
 
 
 #endif							/* DESCRIBE_H */
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index e7509480429..00992f96a0a 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -231,7 +231,7 @@ slashUsage(unsigned short int pager)
 	fprintf(output, _("  \\dAc[+] [AMPTRN [TYPEPTRN]] list operator classes\n"));
 	fprintf(output, _("  \\dAf[+] [AMPTRN [TYPEPTRN]] list operator families\n"));
 	fprintf(output, _("  \\dAo[+] [AMPTRN [OPFPTRN]] list operators of operator families\n"));
-	fprintf(output, _("  \\dAp    [AMPTRN [OPFPTRN]] list procedures of operator families\n"));
+	fprintf(output, _("  \\dAp    [AMPTRN [OPFPTRN]] list support functions of operator families\n"));
 	fprintf(output, _("  \\db[+]  [PATTERN]      list tablespaces\n"));
 	fprintf(output, _("  \\dc[S+] [PATTERN]      list conversions\n"));
 	fprintf(output, _("  \\dC[+]  [PATTERN]      list casts\n"));
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
index ca6b1531cdf..7d2d6328fc8 100644
--- a/src/test/regress/expected/psql.out
+++ b/src/test/regress/expected/psql.out
@@ -4988,8 +4988,8 @@ List of access methods
 (3 rows)
 
 \dAp btree float_ops
-                           List of procedures of operator families
-  AM   | Operator family |  Left arg type   |  Right arg type  | Number |      Proc name      
+                        List of support functions of operator families
+  AM   | Operator family |  Left arg type   |  Right arg type  | Number |      Function       
 -------+-----------------+------------------+------------------+--------+---------------------
  btree | float_ops       | double precision | double precision |      1 | btfloat8cmp
  btree | float_ops       | double precision | double precision |      2 | btfloat8sortsupport
@@ -5002,8 +5002,8 @@ List of access methods
 (8 rows)
 
 \dAp * pg_catalog.uuid_ops
-                        List of procedures of operator families
-  AM   | Operator family | Left arg type | Right arg type | Number |     Proc name      
+                     List of support functions of operator families
+  AM   | Operator family | Left arg type | Right arg type | Number |      Function      
 -------+-----------------+---------------+----------------+--------+--------------------
  btree | uuid_ops        | uuid          | uuid           |      1 | uuid_cmp
  btree | uuid_ops        | uuid          | uuid           |      2 | uuid_sortsupport