diff --git a/src/renderers/dom/client/ReactBrowserEventEmitter.js b/src/renderers/dom/client/ReactBrowserEventEmitter.js
index abb9f4a6b8..07878746ce 100644
--- a/src/renderers/dom/client/ReactBrowserEventEmitter.js
+++ b/src/renderers/dom/client/ReactBrowserEventEmitter.js
@@ -107,6 +107,7 @@ var topEventMapping = {
   topDrop: 'drop',
   topDurationChange: 'durationchange',
   topEmptied: 'emptied',
+  topEncrypted: 'encrypted',
   topEnded: 'ended',
   topError: 'error',
   topFocus: 'focus',
@@ -122,7 +123,6 @@ var topEventMapping = {
   topMouseOut: 'mouseout',
   topMouseOver: 'mouseover',
   topMouseUp: 'mouseup',
-  topOnEncrypted: 'onencrypted',
   topPause: 'pause',
   topPaste: 'paste',
   topPlay: 'play',
diff --git a/src/renderers/dom/client/eventPlugins/SimpleEventPlugin.js b/src/renderers/dom/client/eventPlugins/SimpleEventPlugin.js
index f294c9621c..cc4ddde826 100644
--- a/src/renderers/dom/client/eventPlugins/SimpleEventPlugin.js
+++ b/src/renderers/dom/client/eventPlugins/SimpleEventPlugin.js
@@ -149,6 +149,12 @@ var eventTypes = {
       captured: keyOf({onEmptiedCapture: true}),
     },
   },
+  encrypted: {
+    phasedRegistrationNames: {
+      bubbled: keyOf({onEncrypted: true}),
+      captured: keyOf({onEncryptedCapture: true}),
+    },
+  },
   ended: {
     phasedRegistrationNames: {
       bubbled: keyOf({onEnded: true}),
@@ -247,12 +253,6 @@ var eventTypes = {
       captured: keyOf({onMouseUpCapture: true}),
     },
   },
-  onEncrypted: {
-    phasedRegistrationNames: {
-      bubbled: keyOf({onEncrypted: true}),
-      captured: keyOf({onEncryptedCapture: true}),
-    },
-  },
   paste: {
     phasedRegistrationNames: {
       bubbled: keyOf({onPaste: true}),
@@ -401,6 +401,7 @@ var topLevelEventsToDispatchConfig = {
   topDrop:            eventTypes.drop,
   topDurationChange:  eventTypes.durationChange,
   topEmptied:         eventTypes.emptied,
+  topEncrypted:       eventTypes.encrypted,
   topEnded:           eventTypes.ended,
   topError:           eventTypes.error,
   topFocus:           eventTypes.focus,
@@ -417,7 +418,6 @@ var topLevelEventsToDispatchConfig = {
   topMouseOut:        eventTypes.mouseOut,
   topMouseOver:       eventTypes.mouseOver,
   topMouseUp:         eventTypes.mouseUp,
-  topOnEncrypted:     eventTypes.onEncrypted,
   topPause:           eventTypes.pause,
   topPaste:           eventTypes.paste,
   topPlay:            eventTypes.play,
@@ -501,6 +501,7 @@ var SimpleEventPlugin = {
       case topLevelTypes.topCanPlayThrough:
       case topLevelTypes.topDurationChange:
       case topLevelTypes.topEmptied:
+      case topLevelTypes.topEncrypted:
       case topLevelTypes.topEnded:
       case topLevelTypes.topError:
       case topLevelTypes.topInput:
@@ -508,7 +509,6 @@ var SimpleEventPlugin = {
       case topLevelTypes.topLoadedData:
       case topLevelTypes.topLoadedMetadata:
       case topLevelTypes.topLoadStart:
-      case topLevelTypes.topOnEncrypted:
       case topLevelTypes.topPause:
       case topLevelTypes.topPlay:
       case topLevelTypes.topPlaying:
diff --git a/src/renderers/dom/shared/ReactDOMComponent.js b/src/renderers/dom/shared/ReactDOMComponent.js
index f9e5601ca2..b150acab00 100644
--- a/src/renderers/dom/shared/ReactDOMComponent.js
+++ b/src/renderers/dom/shared/ReactDOMComponent.js
@@ -309,12 +309,12 @@ var mediaEvents = {
   topCanPlayThrough: 'canplaythrough',
   topDurationChange: 'durationchange',
   topEmptied: 'emptied',
+  topEncrypted: 'encrypted',
   topEnded: 'ended',
   topError: 'error',
   topLoadedData: 'loadeddata',
   topLoadedMetadata: 'loadedmetadata',
   topLoadStart: 'loadstart',
-  topOnEncrypted: 'onencrypted',
   topPause: 'pause',
   topPlay: 'play',
   topPlaying: 'playing',
diff --git a/src/renderers/shared/event/EventConstants.js b/src/renderers/shared/event/EventConstants.js
index 5e8ccbc43d..99ec1fd319 100644
--- a/src/renderers/shared/event/EventConstants.js
+++ b/src/renderers/shared/event/EventConstants.js
@@ -42,6 +42,7 @@ var topLevelTypes = keyMirror({
   topDrop: null,
   topDurationChange: null,
   topEmptied: null,
+  topEncrypted: null,
   topEnded: null,
   topError: null,
   topFocus: null,
@@ -58,7 +59,6 @@ var topLevelTypes = keyMirror({
   topMouseOut: null,
   topMouseOver: null,
   topMouseUp: null,
-  topOnEncrypted: null,
   topPaste: null,
   topPause: null,
   topPlay: null,