diff --git a/opal/util/trace.c b/opal/util/trace.c
index 3dfac570f8..97c779b8a8 100644
--- a/opal/util/trace.c
+++ b/opal/util/trace.c
@@ -24,7 +24,7 @@ int opal_trace_handle;
 
 void opal_trace_init(void)
 {
-#if ENABLE_TRACE
+#if OPAL_ENABLE_TRACE
      opal_output_stream_t tracer;
 
    /* get a file setup for opal_output to use for the trace */
@@ -37,7 +37,7 @@ void opal_trace_init(void)
 
 void opal_trace_finalize(void)
 {
-#if ENABLE_TRACE
+#if OPAL_ENABLE_TRACE
     opal_output_close(opal_trace_handle);
 #endif
 }
diff --git a/opal/util/trace.h b/opal/util/trace.h
index bb30dc36c9..b9b35c2d6b 100644
--- a/opal/util/trace.h
+++ b/opal/util/trace.h
@@ -20,11 +20,11 @@
 
 #include "ompi_config.h"
 
-#ifndef ENABLE_TRACE
-#define ENABLE_TRACE 0
+#ifndef OPAL_ENABLE_TRACE
+#define OPAL_ENABLE_TRACE 0
 #endif
 
-#if ENABLE_TRACE
+#if OPAL_ENABLE_TRACE
 
 #include "opal/util/output.h"