diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h
index 086da4b3112..3db4f279d50 100644
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -335,7 +335,7 @@ EVENT(pointerout,
       EventNameType_All,
       ePointerEventClass)
 EVENT(pointerenter,
-      NS_POINTER_ENTER,
+      ePointerEnter,
       EventNameType_All,
       ePointerEventClass)
 EVENT(pointerleave,
diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
index 428eaed39e0..9cf77877e55 100644
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -3872,8 +3872,7 @@ public:
 
   ~EnterLeaveDispatcher()
   {
-    if (mEventMessage == eMouseEnter ||
-        mEventMessage == NS_POINTER_ENTER) {
+    if (mEventMessage == eMouseEnter || mEventMessage == ePointerEnter) {
       for (int32_t i = mTargets.Count() - 1; i >= 0; --i) {
         mESM->DispatchMouseOrPointerEvent(mMouseEvent, mEventMessage,
                                           mTargets[i], mRelatedTarget);
@@ -4010,7 +4009,7 @@ EventStateManager::NotifyMouseOver(WidgetMouseEvent* aMouseEvent,
   Maybe<EnterLeaveDispatcher> enterDispatcher;
   if (dispatch) {
     enterDispatcher.emplace(this, aContent, lastOverElement, aMouseEvent,
-                            isPointer ? NS_POINTER_ENTER : eMouseEnter);
+                            isPointer ? ePointerEnter : eMouseEnter);
   }
 
   NotifyMouseOut(aMouseEvent, aContent);
diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h
index 2ca0ca48142..8c4256c1deb 100644
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -69,7 +69,7 @@ NS_EVENT_MESSAGE(NS_POINTER_UP,           ePointerEventFirst + 1)
 NS_EVENT_MESSAGE(NS_POINTER_DOWN,         ePointerEventFirst + 2)
 NS_EVENT_MESSAGE(NS_POINTER_OVER,         ePointerEventFirst + 22)
 NS_EVENT_MESSAGE(NS_POINTER_OUT,          ePointerEventFirst + 23)
-NS_EVENT_MESSAGE(NS_POINTER_ENTER,        ePointerEventFirst + 24)
+NS_EVENT_MESSAGE(ePointerEnter,         ePointerEventFirst + 24)
 NS_EVENT_MESSAGE(ePointerLeave,         ePointerEventFirst + 25)
 NS_EVENT_MESSAGE(ePointerCancel,        ePointerEventFirst + 26)
 NS_EVENT_MESSAGE(ePointerGotCapture,    ePointerEventFirst + 27)
diff --git a/widget/MouseEvents.h b/widget/MouseEvents.h
index 0186f1c6eaa..7d9ac0b3838 100644
--- a/widget/MouseEvents.h
+++ b/widget/MouseEvents.h
@@ -625,7 +625,7 @@ public:
   void UpdateFlags()
   {
     switch (mMessage) {
-      case NS_POINTER_ENTER:
+      case ePointerEnter:
       case ePointerLeave:
         mFlags.mBubbles = false;
         mFlags.mCancelable = false;