diff --git a/compiler/optimizer/Inliner.cpp b/compiler/optimizer/Inliner.cpp
index e99d0b9b6a4..95c7d0ea7f3 100644
--- a/compiler/optimizer/Inliner.cpp
+++ b/compiler/optimizer/Inliner.cpp
@@ -18,7 +18,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  *******************************************************************************/
-#ifdef J9ZTPF
+#ifdef OMRZTPF
 #define __TPF_DO_NOT_MAP_ATOE_REMOVE
 #endif
 
diff --git a/include_core/omrgcconsts.h b/include_core/omrgcconsts.h
index 9d6cf38d715..7f0206b02f7 100644
--- a/include_core/omrgcconsts.h
+++ b/include_core/omrgcconsts.h
@@ -567,9 +567,9 @@ typedef enum {
 #define METRONOME_DEFAULT_TIME_WINDOW_MICRO 60000
 #endif /* OMR_GC_REALTIME */
 
-#if defined(J9ZTPF)
+#if defined(OMRZTPF)
 #define ZTPF_MEMORY_RESERVE_RATIO .8
-#endif /* defined(J9ZTPF) */
+#endif /* defined(OMRZTPF) */
 
 /**
  * Bit geometry within header flags byte.
diff --git a/omrmakefiles/rules.ztpf.mk b/omrmakefiles/rules.ztpf.mk
index 12cee66566d..6f180151be8 100644
--- a/omrmakefiles/rules.ztpf.mk
+++ b/omrmakefiles/rules.ztpf.mk
@@ -42,7 +42,7 @@ endif
 ### Global Flags
 ###
 
-GLOBAL_CPPFLAGS += -DLINUX -D_REENTRANT -DJ9ZTPF -DOMRZTPF -DOMRPORT_JSIG_SUPPORT -DIBMLOCKS
+GLOBAL_CPPFLAGS += -DLINUX -D_REENTRANT -DOMRZTPF -DOMRPORT_JSIG_SUPPORT -DIBMLOCKS
 GLOBAL_CPPFLAGS += -D_GNU_SOURCE -DIBM_ATOE -D_TPF_SOURCE -D_TPF_THREADS -DZTPF_POSIX_SOCKET
 
 ifeq (s390,$(OMR_HOST_ARCH))
diff --git a/port/unix/omrshsem_deprecated.c b/port/unix/omrshsem_deprecated.c
index d9aac391a7c..0e64fa369ab 100644
--- a/port/unix/omrshsem_deprecated.c
+++ b/port/unix/omrshsem_deprecated.c
@@ -1060,14 +1060,14 @@ omrshsem_openSemaphore(struct OMRPortLibrary *portLibrary, intptr_t fd, char *ba
 				goto failDontUnlink;
 			}
 		} else {
-#if defined(__GNUC__) || defined(AIXPPC) || defined(J9ZTPF)
+#if defined(__GNUC__) || defined(AIXPPC) || defined(OMRZTPF)
 #if defined(OSX)
 			/*Use _key for OSX*/
 			if (buf.sem_perm._key != controlinfo->ftok_key)
 #elif defined(AIXPPC)
 			/*Use .key for AIXPPC*/
 			if (buf.sem_perm.key != controlinfo->ftok_key)
-#elif defined(J9ZTPF)
+#elif defined(OMRZTPF)
 			/*Use .key for z/TPF */
 			if (buf.key != controlinfo->ftok_key)
 #elif defined(__GNUC__)
diff --git a/port/unix/omrsysinfo.c b/port/unix/omrsysinfo.c
index 5b0832320a4..61a0d633780 100644
--- a/port/unix/omrsysinfo.c
+++ b/port/unix/omrsysinfo.c
@@ -83,10 +83,10 @@
 #include "omrsimap.h"
 #endif /* defined(J9ZOS390) */
 
-#if defined(LINUXPPC) || (defined(S390) && defined(LINUX) && !defined(J9ZTPF)) || (defined(AARCH64) && defined(LINUX))
+#if defined(LINUXPPC) || (defined(S390) && defined(LINUX) && !defined(OMRZTPF)) || (defined(AARCH64) && defined(LINUX))
 #include "auxv.h"
 #include <strings.h>
-#endif /* defined(LINUXPPC) || (defined(S390) && defined(LINUX) && !defined(J9ZTPF)) || (defined(AARCH64) && defined(LINUX)) */
+#endif /* defined(LINUXPPC) || (defined(S390) && defined(LINUX) && !defined(OMRZTPF)) || (defined(AARCH64) && defined(LINUX)) */
 
 #if (defined(S390))
 #include "omrportpriv.h"
@@ -258,11 +258,11 @@ static intptr_t omrsysinfo_get_aix_ppc_description(struct OMRPortLibrary *portLi
 #endif  /* !defined(__power_tm) */
 #endif /* !defined(J9OS_I5_V7R2) && !defined(J9OS_I5_V6R1) */
 
-#if (defined(S390) || defined(J9ZOS390) || defined(J9ZTPF))
+#if (defined(S390) || defined(J9ZOS390) || defined(OMRZTPF))
 static BOOLEAN omrsysinfo_test_stfle(struct OMRPortLibrary *portLibrary, uint64_t stfleBit);
 static intptr_t omrsysinfo_get_s390_description(struct OMRPortLibrary *portLibrary, OMRProcessorDesc *desc);
 const char * omrsysinfo_get_s390_processor_feature_name(uint32_t feature);
-#endif /* defined(S390) || defined(J9ZOS390) || defined(J9ZTPF) */
+#endif /* defined(S390) || defined(J9ZOS390) || defined(OMRZTPF) */
 
 #if defined(RISCV)
 static intptr_t omrsysinfo_get_riscv_description(struct OMRPortLibrary *portLibrary, OMRProcessorDesc *desc);
@@ -839,9 +839,9 @@ omrsysinfo_get_processor_feature_name(struct OMRPortLibrary *portLibrary, uint32
 	Trc_PRT_sysinfo_get_processor_feature_name_Entered(feature);
 #if defined(J9X86) || defined(J9HAMMER)
 	rc = omrsysinfo_get_x86_processor_feature_name(feature);
-#elif defined(S390) || defined(J9ZOS390) || defined(J9ZTPF) /* defined(J9X86) || defined(J9HAMMER) */
+#elif defined(S390) || defined(J9ZOS390) || defined(OMRZTPF) /* defined(J9X86) || defined(J9HAMMER) */
 	rc = omrsysinfo_get_s390_processor_feature_name(feature);
-#elif defined(AIXPPC) || defined(LINUXPPC) /* defined(S390) || defined(J9ZOS390) || defined(J9ZTPF) */
+#elif defined(AIXPPC) || defined(LINUXPPC) /* defined(S390) || defined(J9ZOS390) || defined(OMRZTPF) */
 	rc = omrsysinfo_get_ppc_processor_feature_name(feature);
 #elif defined(AARCH64) /* defined(AIXPPC) || defined(LINUXPPC) */
 	rc = omrsysinfo_get_aarch64_processor_feature_name(feature);
@@ -1408,7 +1408,7 @@ omrsysinfo_get_s390_description(struct OMRPortLibrary *portLibrary, OMRProcessor
 	if (OMR_ARE_NO_BITS_SET(*(int*) 200, S390_STFLE_BIT)) {
 		return -1;
 	}
-#elif defined(J9ZTPF)  /* defined(J9ZOS390) */
+#elif defined(OMRZTPF)  /* defined(J9ZOS390) */
 	/*
 	 * z/TPF requires OS support for some of the Hardware Capabilities.
 	 * Setting the auxvFeatures capabilities flag directly to mimic the query_auxv call in Linux.
@@ -1417,7 +1417,7 @@ omrsysinfo_get_s390_description(struct OMRPortLibrary *portLibrary, OMRProcessor
 			OMR_HWCAP_S390_STFLE|OMR_HWCAP_S390_MSA|OMR_HWCAP_S390_DFP|
 			OMR_HWCAP_S390_LDISP|OMR_HWCAP_S390_EIMM|OMR_HWCAP_S390_ETF3EH;
 
-#elif defined(LINUX) /* defined(J9ZTPF) */
+#elif defined(LINUX) /* defined(OMRZTPF) */
 	/* Some s390 features require OS support on Linux, querying auxv for AT_HWCAP bit-mask of processor capabilities. */
 	unsigned long auxvFeatures = query_auxv(AT_HWCAP);
 #endif /* defined(LINUX) */
@@ -1610,9 +1610,9 @@ omrsysinfo_get_s390_description(struct OMRPortLibrary *portLibrary, OMRProcessor
 		if (omrsysinfo_get_s390_zos_supports_runtime_instrumentation_facility())
 #endif /* defined(J9ZOS390) */
 		{
-#if !defined(J9ZTPF)
+#if !defined(OMRZTPF)
 			omrsysinfo_set_feature(desc, OMR_FEATURE_S390_RI);
-#endif /* !defined(J9ZTPF) */
+#endif /* !defined(OMRZTPF) */
 		}
 	}
 
@@ -1723,9 +1723,9 @@ omrsysinfo_get_s390_description(struct OMRPortLibrary *portLibrary, OMRProcessor
 	if (omrsysinfo_test_stfle(portLibrary, OMR_FEATURE_S390_VECTOR_FACILITY_ENHANCEMENT_2)) {
 #if defined(J9ZOS390)
 		if (omrsysinfo_get_s390_zos_supports_vector_extension_facility())
-#elif defined(LINUX) && !defined(J9ZTPF) /* defined(J9ZOS390) */
+#elif defined(LINUX) && !defined(OMRZTPF) /* defined(J9ZOS390) */
 		if (OMR_ARE_ALL_BITS_SET(auxvFeatures, OMR_HWCAP_S390_VXRS))
-#endif /* defined(LINUX) && !defined(J9ZTPF) */
+#endif /* defined(LINUX) && !defined(OMRZTPF) */
 		{
 			omrsysinfo_set_feature(desc, OMR_FEATURE_S390_VECTOR_FACILITY_ENHANCEMENT_2);
 
@@ -1736,9 +1736,9 @@ omrsysinfo_get_s390_description(struct OMRPortLibrary *portLibrary, OMRProcessor
 	if (omrsysinfo_test_stfle(portLibrary, OMR_FEATURE_S390_VECTOR_PACKED_DECIMAL_ENHANCEMENT_FACILITY)) {
 #if defined(J9ZOS390)
 		if (omrsysinfo_get_s390_zos_supports_vector_extension_facility())
-#elif defined(LINUX) && !defined(J9ZTPF) /* defined(J9ZOS390) */
+#elif defined(LINUX) && !defined(OMRZTPF) /* defined(J9ZOS390) */
 		if (OMR_ARE_ALL_BITS_SET(auxvFeatures, OMR_HWCAP_S390_VXRS))
-#endif /* defined(LINUX) && !defined(J9ZTPF) */
+#endif /* defined(LINUX) && !defined(OMRZTPF) */
 		{
 			omrsysinfo_set_feature(desc, OMR_FEATURE_S390_VECTOR_PACKED_DECIMAL_ENHANCEMENT_FACILITY);
 
@@ -1751,9 +1751,9 @@ omrsysinfo_get_s390_description(struct OMRPortLibrary *portLibrary, OMRProcessor
 	if (omrsysinfo_test_stfle(portLibrary, OMR_FEATURE_S390_VECTOR_PACKED_DECIMAL_ENHANCEMENT_FACILITY_2)) {
 #if defined(J9ZOS390)
 		if (omrsysinfo_get_s390_zos_supports_vector_extension_facility())
-#elif defined(LINUX) && !defined(J9ZTPF) /* defined(J9ZOS390) */
+#elif defined(LINUX) && !defined(OMRZTPF) /* defined(J9ZOS390) */
 		if (OMR_ARE_ALL_BITS_SET(auxvFeatures, OMR_HWCAP_S390_VXRS))
-#endif /* defined(LINUX) && !defined(J9ZTPF) */
+#endif /* defined(LINUX) && !defined(OMRZTPF) */
 		{
 			omrsysinfo_set_feature(desc, OMR_FEATURE_S390_VECTOR_PACKED_DECIMAL_ENHANCEMENT_FACILITY_2);
 
diff --git a/port/ztpf/omrintrospect.c b/port/ztpf/omrintrospect.c
index c2be0aa6275..49271c2a717 100644
--- a/port/ztpf/omrintrospect.c
+++ b/port/ztpf/omrintrospect.c
@@ -885,7 +885,7 @@ resume_all_preempted(struct PlatformWalkData *data)
 
 
 int  __attribute__((optimize(0)))
-J9ZTPF_getcontext( void *region )
+OMRZTPF_getcontext( void *region )
 {
         register char *rgn asm("r2") = (char *)region;
         /*
@@ -997,7 +997,7 @@ setup_native_thread(J9ThreadWalkState *state, thread_context *sigContext, int he
 			memcpy(state->current_thread->context, ((OMRUnixSignalInfo*)sigContext)->platformSignalInfo.context, size);
 		} else if (state->current_thread->thread_id == omrthread_get_ras_tid()) {
 			/* return context for current thread */
-			J9ZTPF_getcontext((ucontext_t*)state->current_thread->context);
+			OMRZTPF_getcontext((ucontext_t*)state->current_thread->context);
 		} else {
 			memcpy(state->current_thread->context, (void*)data->thread->context, size);
 		}
diff --git a/port/ztpf/omrosdump.c b/port/ztpf/omrosdump.c
index 793a11124ff..1657b91786a 100644
--- a/port/ztpf/omrosdump.c
+++ b/port/ztpf/omrosdump.c
@@ -310,7 +310,7 @@ omrdump_startup(struct OMRPortLibrary *portLibrary)
 	 *  The #define following is that constant in EBCDIC.
 	 */
 #define OMRZTPF_BYTE_INTERP "\xC4\xF9\xE5\xD4"
-	/*              J9ZTPF_BYTE_INTERP "D9VM" */
+	/*              OMRZTPF_BYTE_INTERP "D9VM" */
 	/*
 	 *      z/TPF handles JVM-associated processes a little differently than all
 	 *      others. We need to mark the process block to inform the kernel that
diff --git a/port/ztpf/omrosdump_helpers.c b/port/ztpf/omrosdump_helpers.c
index d34a3fb5e3e..1e7b9c6e29e 100644
--- a/port/ztpf/omrosdump_helpers.c
+++ b/port/ztpf/omrosdump_helpers.c
@@ -330,7 +330,7 @@ splitPathName(char *finalname, char *pathname)
  * \param[in]        arg->portLibrary    Pointer to an initialized OMRPortLibrary
  *                                        block. If there isn't one at call time,
  *                                        leave this value NULL and set flag
- *                                        J9ZTPF_NO_PORT_LIBRARY
+ *                                        OMRZTPF_NO_PORT_LIBRARY
  * \param[in]        arg->dibPtr            Address of the DIB attached to the faulting
  *                                        UOW at post-interrupt time.
  *
diff --git a/thread/linux/omrthreadnuma.c b/thread/linux/omrthreadnuma.c
index 70168a18886..ebaef8e9639 100644
--- a/thread/linux/omrthreadnuma.c
+++ b/thread/linux/omrthreadnuma.c
@@ -43,7 +43,7 @@
 #include "omrcfg.h"
 #include "threaddef.h"
 
-#if defined(J9ZTPF)
+#if defined(OMRZTPF)
 #define CPU_SETSIZE 4
 #define CPU_ISSET(x,y) 0
 #define CPU_SET(x,y) {}
diff --git a/tools/tracegen/Port.cpp b/tools/tracegen/Port.cpp
index c88c9e31011..11966935200 100644
--- a/tools/tracegen/Port.cpp
+++ b/tools/tracegen/Port.cpp
@@ -680,7 +680,7 @@ Port::omrfile_stat(const char *path, unsigned int flags, struct J9FileStat *buf)
 	buf->ownerUid = statbuf.st_uid;
 	buf->ownerGid = statbuf.st_gid;
 
-#if (defined(LINUX) && !defined(J9ZTPF)) || defined(OSX)
+#if (defined(LINUX) && !defined(OMRZTPF)) || defined(OSX)
 	if (statfs(path, &statfsbuf)) {
 		return RC_FAILED;
 	}