diff --git a/layout/generic/nsPluginFrame.cpp b/layout/generic/nsPluginFrame.cpp
index ad659c892e1a..bd76e698c014 100644
--- a/layout/generic/nsPluginFrame.cpp
+++ b/layout/generic/nsPluginFrame.cpp
@@ -1767,7 +1767,7 @@ nsPluginFrame::HandleEvent(nsPresContext* aPresContext,
     if (fm && elem)
       return fm->SetFocus(elem, 0);
   }
-  else if (anEvent->mMessage == NS_PLUGIN_FOCUS) {
+  else if (anEvent->mMessage == ePluginFocus) {
     nsIFocusManager* fm = nsFocusManager::GetFocusManager();
     if (fm)
       return fm->FocusPlugin(GetContent());
diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h
index 354e0a4924e2..4f9e092ba569 100644
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -32,11 +32,11 @@ NS_EVENT_MESSAGE(eResize,               eWindowEventFirst + 60)
 NS_EVENT_MESSAGE(eScroll,               eWindowEventFirst + 61)
 
 // A plugin was clicked or otherwise focused. ePluginActivate should be
-// used when the window is not active. NS_PLUGIN_FOCUS should be used when
+// used when the window is not active. ePluginFocus should be used when
 // the window is active. In the latter case, the dispatcher of the event
 // is expected to ensure that the plugin's widget is focused beforehand.
 NS_EVENT_MESSAGE(ePluginActivate,       eWindowEventFirst + 62)
-NS_EVENT_MESSAGE(NS_PLUGIN_FOCUS,       eWindowEventFirst + 63)
+NS_EVENT_MESSAGE(ePluginFocus,          eWindowEventFirst + 63)
 
 NS_EVENT_MESSAGE(NS_OFFLINE,            eWindowEventFirst + 64)
 NS_EVENT_MESSAGE(NS_ONLINE,             eWindowEventFirst + 65)
diff --git a/widget/WidgetEventImpl.cpp b/widget/WidgetEventImpl.cpp
index ce7c7e6ead1d..3bc59a080b1c 100644
--- a/widget/WidgetEventImpl.cpp
+++ b/widget/WidgetEventImpl.cpp
@@ -152,7 +152,7 @@ bool
 WidgetEvent::HasPluginActivationEventMessage() const
 {
   return mMessage == ePluginActivate ||
-         mMessage == NS_PLUGIN_FOCUS;
+         mMessage == ePluginFocus;
 }
 
 /******************************************************************************