diff --git a/src/backend/distributed/commands/transmit.c b/src/backend/distributed/commands/transmit.c
index ea9e951b3..bfa434b31 100644
--- a/src/backend/distributed/commands/transmit.c
+++ b/src/backend/distributed/commands/transmit.c
@@ -411,7 +411,7 @@ VerifyTransmitStmt(CopyStmt *copyStatement)
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 (errmsg("path must be in the pgsql_job_cache directory"))));
+				 (errmsg("path must be in the " PG_JOB_CACHE_DIR " directory"))));
 	}
 
 	if (copyStatement->filename != NULL)
diff --git a/src/backend/distributed/shared_library_init.c b/src/backend/distributed/shared_library_init.c
index 3b2084218..abdf0a01e 100644
--- a/src/backend/distributed/shared_library_init.c
+++ b/src/backend/distributed/shared_library_init.c
@@ -343,7 +343,7 @@ CreateRequiredDirectories(void)
 	const char *subdirs[] = {
 		"pg_foreign_file",
 		"pg_foreign_file/cached",
-		"base/pgsql_job_cache"
+		"base/" PG_JOB_CACHE_DIR
 	};
 
 	for (dirNo = 0; dirNo < lengthof(subdirs); dirNo++)