--- a/dom/events/EventDispatcher.cpp
+++ b/dom/events/EventDispatcher.cpp
@@ -724,17 +724,17 @@ EventDispatcher::CreateEvent(EventTarget
       return NS_NewDOMUIEvent(aDOMEvent, aOwner, aPresContext,
                               aEvent->AsTextEvent());
     case eClipboardEventClass:
       return NS_NewDOMClipboardEvent(aDOMEvent, aOwner, aPresContext,
                                      aEvent->AsClipboardEvent());
     case eSVGZoomEventClass:
       return NS_NewDOMSVGZoomEvent(aDOMEvent, aOwner, aPresContext,
                                    aEvent->AsSVGZoomEvent());
-    case NS_SMIL_TIME_EVENT:
+    case eSMILTimeEventClass:
       return NS_NewDOMTimeEvent(aDOMEvent, aOwner, aPresContext,
                                 aEvent->AsSMILTimeEvent());
     case NS_COMMAND_EVENT:
       return NS_NewDOMCommandEvent(aDOMEvent, aOwner, aPresContext,
                                    aEvent->AsCommandEvent());
     case eSimpleGestureEventClass:
       return NS_NewDOMSimpleGestureEvent(aDOMEvent, aOwner, aPresContext,
                                          aEvent->AsSimpleGestureEvent());

--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -756,39 +756,39 @@ NON_IDL_EVENT(zoom,
 NON_IDL_EVENT(begin,
               NS_SMIL_BEGIN,
               EventNameType_SMIL,
               NS_EVENT)
 #endif
 NON_IDL_EVENT(beginEvent,
               NS_SMIL_BEGIN,
               EventNameType_None,
-              NS_SMIL_TIME_EVENT)
+              eSMILTimeEventClass)
 // Only map the ID to the real event name when ID_TO_EVENT is defined.
 #ifndef ID_TO_EVENT
 NON_IDL_EVENT(end,
               NS_SMIL_END,
               EventNameType_SMIL,
               NS_EVENT)
 #endif
 NON_IDL_EVENT(endEvent,
               NS_SMIL_END,
               EventNameType_None,
-              NS_SMIL_TIME_EVENT)
+              eSMILTimeEventClass)
 // Only map the ID to the real event name when ID_TO_EVENT is defined.
 #ifndef ID_TO_EVENT
 NON_IDL_EVENT(repeat,
               NS_SMIL_REPEAT,
               EventNameType_SMIL,
               NS_EVENT)
 #endif
 NON_IDL_EVENT(repeatEvent,
               NS_SMIL_REPEAT,
               EventNameType_None,
-              NS_SMIL_TIME_EVENT)
+              eSMILTimeEventClass)
 
 NON_IDL_EVENT(MozAfterPaint,
               NS_AFTERPAINT,
               EventNameType_None,
               NS_EVENT)
 
 NON_IDL_EVENT(MozScrolledAreaChanged,
               NS_SCROLLEDAREACHANGED,

--- a/widget/BasicEvents.h
+++ b/widget/BasicEvents.h
@@ -55,17 +55,17 @@ enum EventClassID MOZ_ENUM_TYPE(EventCla
   eScrollPortEventClass,             // InternalScrollPortEvent
   eScrollAreaEventClass,             // InternalScrollAreaEvent
   eFormEventClass,                   // InternalFormEvent
   eFocusEventClass,                  // InternalFocusEvent
   eClipboardEventClass,              // InternalClipboardEvent
   eTransitionEventClass,             // InternalTransitionEvent
   eAnimationEventClass,              // InternalAnimationEvent
   eSVGZoomEventClass,                // InternalSVGZoomEvent
-  NS_SMIL_TIME_EVENT,                // InternalSMILTimeEvent
+  eSMILTimeEventClass,               // InternalSMILTimeEvent
 
   // MiscEvents.h
   NS_COMMAND_EVENT,                  // WidgetCommandEvent
   NS_CONTENT_COMMAND_EVENT,          // WidgetContentCommandEvent
   NS_PLUGIN_EVENT,                   // WidgetPluginEvent
 
   // InternalMutationEvent.h (dom/events)
   NS_MUTATION_EVENT                  // InternalMutationEvent

--- a/widget/ContentEvents.h
+++ b/widget/ContentEvents.h
@@ -356,26 +356,26 @@ public:
 class InternalSMILTimeEvent : public InternalUIEvent
 {
 public:
   virtual InternalSMILTimeEvent* AsSMILTimeEvent() MOZ_OVERRIDE
   {
     return this;
   }
 
-  InternalSMILTimeEvent(bool aIsTrusted, uint32_t aMessage) :
-    InternalUIEvent(aIsTrusted, aMessage, NS_SMIL_TIME_EVENT)
+  InternalSMILTimeEvent(bool aIsTrusted, uint32_t aMessage)
+    : InternalUIEvent(aIsTrusted, aMessage, eSMILTimeEventClass)
   {
     mFlags.mBubbles = false;
     mFlags.mCancelable = false;
   }
 
   virtual WidgetEvent* Duplicate() const MOZ_OVERRIDE
   {
-    MOZ_ASSERT(mClass == NS_SMIL_TIME_EVENT,
+    MOZ_ASSERT(mClass == eSMILTimeEventClass,
                "Duplicate() must be overridden by sub class");
     InternalSMILTimeEvent* result = new InternalSMILTimeEvent(false, message);
     result->AssignSMILTimeEventData(*this, true);
     result->mFlags = mFlags;
     return result;
   }
 
   void AssignSMILTimeEventData(const InternalSMILTimeEvent& aEvent,