diff --git a/atom/browser/api/event.cc b/atom/browser/api/event.cc
index 1ee0d57e36..673576c6d6 100644
--- a/atom/browser/api/event.cc
+++ b/atom/browser/api/event.cc
@@ -6,7 +6,7 @@
 
 #include "atom/common/api/api_messages.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
-#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "native_mate/object_template_builder.h"
 
@@ -60,8 +60,10 @@ bool Event::SendReply(const base::string16& json) {
   if (message_ == nullptr || sender_ == nullptr)
     return false;
 
-  AtomFrameHostMsg_Message_Sync::WriteReplyParams(message_, json);
-  bool success = sender_->Send(message_);
+  AtomViewHostMsg_Message_Sync::WriteReplyParams(message_, json);
+  auto host = sender_->GetRenderViewHost();
+  if (!host) return false;
+  bool success = host->Send(message_);
   message_ = nullptr;
   sender_ = nullptr;
   return success;
diff --git a/atom/common/api/remote_callback_freer.cc b/atom/common/api/remote_callback_freer.cc
index c15d5389a2..d91891e55f 100644
--- a/atom/common/api/remote_callback_freer.cc
+++ b/atom/common/api/remote_callback_freer.cc
@@ -7,7 +7,7 @@
 #include "atom/common/api/api_messages.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 
 namespace atom {
@@ -37,10 +37,10 @@ void RemoteCallbackFreer::RunDestructor() {
       base::ASCIIToUTF16("ELECTRON_RENDERER_RELEASE_CALLBACK");
   base::ListValue args;
   args.AppendInteger(object_id_);
-  auto frame_host = web_contents()->GetMainFrame();
-  if (frame_host) {
-    frame_host->Send(new AtomFrameMsg_Message(frame_host->GetRoutingID(), false,
-                                              channel, args));
+  auto host = web_contents()->GetRenderViewHost();
+  if (host) {
+    host->Send(new AtomViewMsg_Message(
+        host->GetRoutingID(), false, channel, args));
   }
 
   Observe(nullptr);