diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h
index 2f533f96ef01..4f634367304b 100644
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -680,7 +680,7 @@ NON_IDL_EVENT(compositionstart,
               EventNameType_XUL,
               eCompositionEventClass)
 NON_IDL_EVENT(compositionupdate,
-              NS_COMPOSITION_UPDATE,
+              eCompositionUpdate,
               EventNameType_XUL,
               eCompositionEventClass)
 NON_IDL_EVENT(compositionend,
diff --git a/dom/events/IMEStateManager.cpp b/dom/events/IMEStateManager.cpp
index 31134f998bd0..51842e702e6a 100644
--- a/dom/events/IMEStateManager.cpp
+++ b/dom/events/IMEStateManager.cpp
@@ -141,8 +141,8 @@ GetEventMessageName(EventMessage aMessage)
       return "eCompositionStart";
     case eCompositionEnd:
       return "eCompositionEnd";
-    case NS_COMPOSITION_UPDATE:
-      return "NS_COMPOSITION_UPDATE";
+    case eCompositionUpdate:
+      return "eCompositionUpdate";
     case NS_COMPOSITION_CHANGE:
       return "NS_COMPOSITION_CHANGE";
     case eCompositionCommitAsIs:
@@ -1147,7 +1147,7 @@ IMEStateManager::DispatchCompositionEvent(
     return;
   }
 
-  MOZ_ASSERT(aCompositionEvent->mMessage != NS_COMPOSITION_UPDATE,
+  MOZ_ASSERT(aCompositionEvent->mMessage != eCompositionUpdate,
              "compositionupdate event shouldn't be dispatched manually");
 
   EnsureTextCompositionArray();
diff --git a/dom/events/TextComposition.cpp b/dom/events/TextComposition.cpp
index 5d611bf39808..764aa9a101e3 100644
--- a/dom/events/TextComposition.cpp
+++ b/dom/events/TextComposition.cpp
@@ -93,7 +93,7 @@ TextComposition::MaybeDispatchCompositionUpdate(
   if (mLastData == aCompositionEvent->mData) {
     return true;
   }
-  CloneAndDispatchAs(aCompositionEvent, NS_COMPOSITION_UPDATE);
+  CloneAndDispatchAs(aCompositionEvent, eCompositionUpdate);
   return IsValidStateForComposition(aCompositionEvent->widget);
 }
 
@@ -120,7 +120,7 @@ TextComposition::CloneAndDispatchAs(
 
   nsEventStatus dummyStatus = nsEventStatus_eConsumeNoDefault;
   nsEventStatus* status = aStatus ? aStatus : &dummyStatus;
-  if (aMessage == NS_COMPOSITION_UPDATE) {
+  if (aMessage == eCompositionUpdate) {
     mLastData = compositionEvent.mData;
   }
   EventDispatcher::Dispatch(mNode, mPresContext,
diff --git a/editor/libeditor/nsEditor.cpp b/editor/libeditor/nsEditor.cpp
index e414af986580..301b55a8e6dd 100644
--- a/editor/libeditor/nsEditor.cpp
+++ b/editor/libeditor/nsEditor.cpp
@@ -5161,7 +5161,7 @@ nsEditor::IsAcceptableInputEvent(nsIDOMEvent* aEvent)
       return false;
     case eCompositionStart:
     case eCompositionEnd:
-    case NS_COMPOSITION_UPDATE:
+    case eCompositionUpdate:
     case NS_COMPOSITION_CHANGE:
     case eCompositionCommitAsIs:
       // Don't allow composition events whose internal event are not
diff --git a/widget/ContentCache.cpp b/widget/ContentCache.cpp
index e44657ba5367..3e8d7b5ef1e3 100644
--- a/widget/ContentCache.cpp
+++ b/widget/ContentCache.cpp
@@ -31,8 +31,8 @@ GetEventMessageName(EventMessage aMessage)
       return "eCompositionStart";
     case eCompositionEnd:
       return "eCompositionEnd";
-    case NS_COMPOSITION_UPDATE:
-      return "NS_COMPOSITION_UPDATE";
+    case eCompositionUpdate:
+      return "eCompositionUpdate";
     case NS_COMPOSITION_CHANGE:
       return "NS_COMPOSITION_CHANGE";
     case eCompositionCommitAsIs:
diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h
index 7d91e3efc02e..f38f98d02e33 100644
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -151,11 +151,11 @@ NS_EVENT_MESSAGE(eCompositionStart,      eCompositionEventFirst)
 // This event should NOT be dispatched from widget if NS_COMPOSITION_COMMIT
 // is available.
 NS_EVENT_MESSAGE(eCompositionEnd,        eCompositionEventFirst + 1)
-// NS_COMPOSITION_UPDATE is the message for DOM compositionupdate event.
+// eCompositionUpdate is the message for DOM compositionupdate event.
 // This event should NOT be dispatched from widget since it will be dispatched
 // by mozilla::TextComposition automatically if NS_COMPOSITION_CHANGE event
 // will change composition string.
-NS_EVENT_MESSAGE(NS_COMPOSITION_UPDATE,  eCompositionEventFirst + 2)
+NS_EVENT_MESSAGE(eCompositionUpdate,     eCompositionEventFirst + 2)
 // NS_COMPOSITION_CHANGE is the message for representing a change of
 // composition string.  This should be dispatched from widget even if
 // composition string isn't changed but the ranges are changed.  This causes
diff --git a/widget/WidgetEventImpl.cpp b/widget/WidgetEventImpl.cpp
index 2c09069a89cb..273a3a1463dc 100644
--- a/widget/WidgetEventImpl.cpp
+++ b/widget/WidgetEventImpl.cpp
@@ -138,7 +138,7 @@ WidgetEvent::HasIMEEventMessage() const
   switch (mMessage) {
     case eCompositionStart:
     case eCompositionEnd:
-    case NS_COMPOSITION_UPDATE:
+    case eCompositionUpdate:
     case NS_COMPOSITION_CHANGE:
     case eCompositionCommitAsIs:
     case NS_COMPOSITION_COMMIT: