diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c
index f139eeff9f..d2615356ec 100644
--- a/src/backend/access/transam/xlogfuncs.c
+++ b/src/backend/access/transam/xlogfuncs.c
@@ -465,7 +465,8 @@ pg_walfile_name_offset(PG_FUNCTION_ARGS)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("recovery is in progress"),
-				 errhint("pg_walfile_name_offset() cannot be executed during recovery.")));
+				 errhint("%s cannot be executed during recovery.",
+						 "pg_walfile_name_offset()")));
 
 	/*
 	 * Construct a tuple descriptor for the result row.  This must match this
@@ -521,7 +522,8 @@ pg_walfile_name(PG_FUNCTION_ARGS)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("recovery is in progress"),
-				 errhint("pg_walfile_name() cannot be executed during recovery.")));
+				 errhint("%s cannot be executed during recovery.",
+						 "pg_walfile_name()")));
 
 	XLByteToPrevSeg(locationpoint, xlogsegno, wal_segment_size);
 	XLogFileName(xlogfilename, ThisTimeLineID, xlogsegno, wal_segment_size);
diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c
index 87e4dd8245..31dcfe7b11 100644
--- a/src/backend/commands/extension.c
+++ b/src/backend/commands/extension.c
@@ -2348,8 +2348,8 @@ pg_extension_config_dump(PG_FUNCTION_ARGS)
 	if (!creating_extension)
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("pg_extension_config_dump() can only be called "
-						"from an SQL script executed by CREATE EXTENSION")));
+				 errmsg("%s can only be called from an SQL script executed by CREATE EXTENSION",
+						"pg_extension_config_dump()")));
 
 	/*
 	 * Check that the table exists and is a member of the extension being