Index: openmp/trunk/runtime/src/include/50/ompt.h.var
===================================================================
--- openmp/trunk/runtime/src/include/50/ompt.h.var
+++ openmp/trunk/runtime/src/include/50/ompt.h.var
@@ -96,7 +96,7 @@
 
 
 #define FOREACH_KMP_MUTEX_IMPL(macro)                                                \
-    macro (ompt_mutex_impl_unknown, 0)     /* unknown implementation */              \
+    macro (ompt_mutex_impl_none, 0)        /* unknown implementation */              \
     macro (kmp_mutex_impl_spin, 1)         /* based on spin */                       \
     macro (kmp_mutex_impl_queuing, 2)      /* based on some fair policy */           \
     macro (kmp_mutex_impl_speculative, 3)  /* based on HW-supported speculation */
Index: openmp/trunk/runtime/src/kmp_csupport.cpp
===================================================================
--- openmp/trunk/runtime/src/kmp_csupport.cpp
+++ openmp/trunk/runtime/src/kmp_csupport.cpp
@@ -1292,7 +1292,7 @@
       return kmp_mutex_impl_speculative;
 #endif
     default:
-      return ompt_mutex_impl_unknown;
+      return ompt_mutex_impl_none;
     }
     ilock = KMP_LOOKUP_I_LOCK(user_lock);
   }
@@ -1316,7 +1316,7 @@
   case locktag_nested_drdpa:
     return kmp_mutex_impl_queuing;
   default:
-    return ompt_mutex_impl_unknown;
+    return ompt_mutex_impl_none;
   }
 }
 #else
@@ -1339,7 +1339,7 @@
     return kmp_mutex_impl_speculative;
 #endif
   default:
-    return ompt_mutex_impl_unknown;
+    return ompt_mutex_impl_none;
   }
 }
 #endif // KMP_USE_DYNAMIC_LOCK
Index: openmp/trunk/runtime/test/ompt/misc/api_calls_from_other_thread.cpp
===================================================================
--- openmp/trunk/runtime/test/ompt/misc/api_calls_from_other_thread.cpp
+++ openmp/trunk/runtime/test/ompt/misc/api_calls_from_other_thread.cpp
@@ -36,7 +36,7 @@
   printf("%" PRIu64 ": ompt_enumerate_states()=%d\n", tvalue,
          ompt_enumerate_states(state, &state, &state_name));
 
-  int impl = ompt_mutex_impl_unknown;
+  int impl = ompt_mutex_impl_none;
   const char *impl_name;
   printf("%" PRIu64 ": ompt_enumerate_mutex_impls()=%d\n", tvalue,
          ompt_enumerate_mutex_impls(impl, &impl, &impl_name));
Index: openmp/trunk/runtime/test/ompt/misc/api_calls_misc.c
===================================================================
--- openmp/trunk/runtime/test/ompt/misc/api_calls_misc.c
+++ openmp/trunk/runtime/test/ompt/misc/api_calls_misc.c
@@ -35,7 +35,7 @@
     }
 
     // ompt_enumerate_mutex_impls()
-    int impl = ompt_mutex_impl_unknown;
+    int impl = ompt_mutex_impl_none;
     const char *impl_name;
     steps = 0;
     while (ompt_enumerate_mutex_impls(impl, &impl, &impl_name) &&