diff --git a/test/src/common/harnessPostgres.h b/test/src/common/harnessPostgres.h
index d53de9d39..5d8d87b6b 100644
--- a/test/src/common/harnessPostgres.h
+++ b/test/src/common/harnessPostgres.h
@@ -50,7 +50,7 @@ Put a control file to storage
         storageParam, PG_PATH_GLOBAL "/" PG_FILE_PGCONTROL,                                                                        \
         hrnPgControlToBuffer(0, (PgControl){.version = versionParam, __VA_ARGS__}))
 
-#define HRN_PG_CONTROL_OVERRIDE_PUT(storageParam, versionParam, controlVersionParam, ...)                                          \
+#define HRN_PG_CONTROL_OVERRIDE_VERSION_PUT(storageParam, versionParam, controlVersionParam, ...)                                  \
     HRN_STORAGE_PUT(                                                                                                               \
         storageParam, PG_PATH_GLOBAL "/" PG_FILE_PGCONTROL,                                                                        \
         hrnPgControlToBuffer(controlVersionParam, (PgControl){.version = versionParam, __VA_ARGS__}))
diff --git a/test/src/module/command/archiveGetTest.c b/test/src/module/command/archiveGetTest.c
index 3527cfd3c..0f4df4c29 100644
--- a/test/src/module/command/archiveGetTest.c
+++ b/test/src/module/command/archiveGetTest.c
@@ -833,7 +833,7 @@ testRun(void)
         TEST_TITLE("get WAL segment with a modified control/catalog version");
 
         // Modify control/catalog version and use the --pg-version option
-        HRN_PG_CONTROL_OVERRIDE_PUT(storagePgWrite(), PG_VERSION_10, 1501, .catalogVersion = 202211111);
+        HRN_PG_CONTROL_OVERRIDE_VERSION_PUT(storagePgWrite(), PG_VERSION_10, 1501, .catalogVersion = 202211111);
 
         TEST_ERROR(
             cmdArchiveGet(), VersionNotSupportedError,
diff --git a/test/src/module/command/archivePushTest.c b/test/src/module/command/archivePushTest.c
index ae37dfde8..320f795fe 100644
--- a/test/src/module/command/archivePushTest.c
+++ b/test/src/module/command/archivePushTest.c
@@ -469,7 +469,7 @@ testRun(void)
             "unexpected WAL magic 999\n"
             "HINT: is this version of PostgreSQL supported?");
 
-        HRN_PG_CONTROL_OVERRIDE_PUT(storagePgWrite(), PG_VERSION_11, 1501, .catalogVersion = 202211111);
+        HRN_PG_CONTROL_OVERRIDE_VERSION_PUT(storagePgWrite(), PG_VERSION_11, 1501, .catalogVersion = 202211111);
 
         TEST_ERROR(
             cmdArchivePush(), VersionNotSupportedError,
diff --git a/test/src/module/command/backupTest.c b/test/src/module/command/backupTest.c
index 347257c1b..52cb31dbf 100644
--- a/test/src/module/command/backupTest.c
+++ b/test/src/module/command/backupTest.c
@@ -3584,7 +3584,7 @@ testRun(void)
             HRN_CFG_LOAD(cfgCmdBackup, argList);
 
             // Create pg_control with unexpected catalog and control version
-            HRN_PG_CONTROL_OVERRIDE_PUT(
+            HRN_PG_CONTROL_OVERRIDE_VERSION_PUT(
                 storagePgWrite(), PG_VERSION_11, 1501, .catalogVersion = 202211110, .pageChecksum = true,
                 .walSegmentSize = 1024 * 1024);
 
diff --git a/test/src/module/command/stanzaTest.c b/test/src/module/command/stanzaTest.c
index fa73e4f07..ae5a3e30a 100644
--- a/test/src/module/command/stanzaTest.c
+++ b/test/src/module/command/stanzaTest.c
@@ -523,7 +523,7 @@ testRun(void)
         hrnCfgArgRawZ(argList, cfgOptPgVersionForce, "15");
         HRN_CFG_LOAD(cfgCmdStanzaCreate, argList);
 
-        HRN_PG_CONTROL_OVERRIDE_PUT(storagePgWrite(), PG_VERSION_15, 1501, .catalogVersion = 202211111);
+        HRN_PG_CONTROL_OVERRIDE_VERSION_PUT(storagePgWrite(), PG_VERSION_15, 1501, .catalogVersion = 202211111);
 
         TEST_RESULT_VOID(cmdStanzaCreate(), "stanza create - forcing another PG version");
         TEST_RESULT_LOG("P00   INFO: stanza-create for stanza 'db' on repo1");
@@ -927,7 +927,7 @@ testRun(void)
         hrnCfgArgRawZ(argList, cfgOptPgVersionForce, "15");
         HRN_CFG_LOAD(cfgCmdStanzaUpgrade, argList);
 
-        HRN_PG_CONTROL_OVERRIDE_PUT(storagePgWrite(), PG_VERSION_15, 1501, .catalogVersion = 202211111);
+        HRN_PG_CONTROL_OVERRIDE_VERSION_PUT(storagePgWrite(), PG_VERSION_15, 1501, .catalogVersion = 202211111);
 
         HRN_INFO_PUT(
             storageRepoIdxWrite(0), INFO_BACKUP_PATH_FILE,
diff --git a/test/src/module/postgres/interfaceTest.c b/test/src/module/postgres/interfaceTest.c
index e6b568273..e821cc997 100644
--- a/test/src/module/postgres/interfaceTest.c
+++ b/test/src/module/postgres/interfaceTest.c
@@ -67,7 +67,7 @@ testRun(void)
         // -------------------------------------------------------------------------------------------------------------------------
         TEST_TITLE("unknown control version");
 
-        HRN_PG_CONTROL_OVERRIDE_PUT(storageTest, PG_VERSION_15, 1501, .catalogVersion = 202211111);
+        HRN_PG_CONTROL_OVERRIDE_VERSION_PUT(storageTest, PG_VERSION_15, 1501, .catalogVersion = 202211111);
 
         TEST_ERROR(
             pgControlFromFile(storageTest, NULL), VersionNotSupportedError,
@@ -114,7 +114,7 @@ testRun(void)
         // -------------------------------------------------------------------------------------------------------------------------
         TEST_TITLE("force control version");
 
-        HRN_PG_CONTROL_OVERRIDE_PUT(
+        HRN_PG_CONTROL_OVERRIDE_VERSION_PUT(
             storageTest, PG_VERSION_15, 1501, .systemId = 0xEFEFEFEFEF, .catalogVersion = 202211111,
             .checkpoint = 0xAABBAABBEEFFEEFF, .timeline = 88);