diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
index fc35f5b28271721d85a300afa644eef408047b47..7d0ed9ce4c84fc92f3d7b7b424a1764212d46471 100644
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/replication/basebackup.c
@@ -834,7 +834,7 @@ sendDir(char *path, int basepathlen, bool sizeonly, List *tablespaces)
 
 		/* skip auto conf temporary file */
 		if (strncmp(de->d_name,
-					PG_AUTOCONF_FILENAME ".temp",
+					PG_AUTOCONF_FILENAME ".tmp",
 					sizeof(PG_AUTOCONF_FILENAME) + 4) == 0)
 			continue;
 
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 35dca18bfc09d52d5289d18aa15fcfaa8dedbaa5..59f395474a63e73205f0521e93edf9597972f394 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -6670,7 +6670,7 @@ AlterSystemSetConfigFile(AlterSystemStmt * altersysstmt)
 	canonicalize_path(AutoConfFileName);
 	snprintf(AutoConfTmpFileName, sizeof(AutoConfTmpFileName), "%s.%s",
 			 AutoConfFileName,
-			 "temp");
+			 "tmp");
 
 	/*
 	 * One backend is allowed to operate on file PG_AUTOCONF_FILENAME, to