diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index ac3ec4abf616..26fd3eee418e 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -23,10 +23,10 @@ WebContents::WebContents(content::WebContents* web_contents)
 WebContents::~WebContents() {
 }
 
-void WebContents::RenderViewDeleted(content::RenderViewHost*) {
+void WebContents::RenderViewDeleted(content::RenderViewHost* render_view_host) {
   base::ListValue args;
-  args.AppendInteger(GetProcessID());
-  args.AppendInteger(GetRoutingID());
+  args.AppendInteger(render_view_host->GetProcess()->GetID());
+  args.AppendInteger(render_view_host->GetRoutingID());
   Emit("render-view-deleted", args);
 }
 
diff --git a/atom/browser/lib/objects-registry.coffee b/atom/browser/lib/objects-registry.coffee
index 1bae8f6e4e50..f6c4a50d338e 100644
--- a/atom/browser/lib/objects-registry.coffee
+++ b/atom/browser/lib/objects-registry.coffee
@@ -78,7 +78,7 @@ class ObjectsRegistry extends EventEmitter
 
   # Clear all references to objects from renderer view.
   clear: (processId, routingId) ->
-    @emit "release-renderer-view-#{processId}-#{routingId}"
+    @emit "clear-#{processId}-#{routingId}"
     ObjectsStore.releaseForRenderView processId, routingId
 
 module.exports = new ObjectsRegistry
diff --git a/atom/browser/lib/rpc-server.coffee b/atom/browser/lib/rpc-server.coffee
index e10f875328e3..05ac5ec1a19a 100644
--- a/atom/browser/lib/rpc-server.coffee
+++ b/atom/browser/lib/rpc-server.coffee
@@ -53,7 +53,7 @@ unwrapArgs = (processId, routingId, args) ->
         -> returnValue
       when 'function'
         rendererReleased = false
-        objectsRegistry.once "release-renderer-view-#{processId}-#{routingId}", ->
+        objectsRegistry.once "clear-#{processId}-#{routingId}", ->
           rendererReleased = true
 
         ret = ->