--- a/js/jetpack/JetpackChild.cpp
+++ b/js/jetpack/JetpackChild.cpp
@@ -236,17 +236,17 @@ JetpackChild::SendMessage(JSContext* cx,
 JSBool
 JetpackChild::CallMessage(JSContext* cx, uintN argc, jsval* vp)
 {
   MessageResult smr;
   if (!MessageCommon(cx, argc, vp, &smr))
     return JS_FALSE;
 
   nsTArray<Variant> results;
-  if (!GetThis(cx)->SendCallMessage(smr.msgName, smr.data, &results)) {
+  if (!GetThis(cx)->CallCallMessage(smr.msgName, smr.data, &results)) {
     JS_ReportError(cx, "Failed to callMessage");
     return JS_FALSE;
   }
 
   nsAutoTArray<jsval, 4> jsvals;
   jsval* rvals = jsvals.AppendElements(results.Length());
   if (!rvals) {
     JS_ReportOutOfMemory(cx);

--- a/js/jetpack/JetpackParent.cpp
+++ b/js/jetpack/JetpackParent.cpp
@@ -161,19 +161,19 @@ JetpackParent::RecvSendMessage(const nsS
                                const nsTArray<Variant>& data)
 {
   AutoCXPusher cxp(mContext);
   JSAutoRequest request(mContext);
   return JetpackActorCommon::RecvMessage(mContext, messageName, data, NULL);
 }
 
 bool
-JetpackParent::RecvCallMessage(const nsString& messageName,
-                               const nsTArray<Variant>& data,
-                               nsTArray<Variant>* results)
+JetpackParent::AnswerCallMessage(const nsString& messageName,
+                                 const nsTArray<Variant>& data,
+                                 nsTArray<Variant>* results)
 {
   AutoCXPusher cxp(mContext);
   JSAutoRequest request(mContext);
   return JetpackActorCommon::RecvMessage(mContext, messageName, data, results);
 }
 
 NS_IMETHODIMP
 JetpackParent::CreateHandle(nsIVariant** aResult)

--- a/js/jetpack/JetpackParent.h
+++ b/js/jetpack/JetpackParent.h
@@ -63,19 +63,19 @@ public:
   NS_DECL_NSIJETPACK
 
   JetpackParent(JSContext* cx);
   ~JetpackParent();
 
 protected:
   NS_OVERRIDE virtual bool RecvSendMessage(const nsString& messageName,
                                            const nsTArray<Variant>& data);
-  NS_OVERRIDE virtual bool RecvCallMessage(const nsString& messageName,
-                                           const nsTArray<Variant>& data,
-                                           nsTArray<Variant>* results);
+  NS_OVERRIDE virtual bool AnswerCallMessage(const nsString& messageName,
+                                             const nsTArray<Variant>& data,
+                                             nsTArray<Variant>* results);
 
   NS_OVERRIDE virtual PHandleParent* AllocPHandle();
   NS_OVERRIDE virtual bool DeallocPHandle(PHandleParent* actor);
 
 private:
   JetpackProcessParent* mSubprocess;
   JSContext* mContext;
 

--- a/js/jetpack/PJetpack.ipdl
+++ b/js/jetpack/PJetpack.ipdl
@@ -64,28 +64,28 @@ union CompVariant {
   size_t; // reference
 };
   
 union Variant {
   PrimVariant;
   CompVariant;
 };
 
-sync protocol PJetpack
+rpc protocol PJetpack
 {
   manages PHandle;
 both:
   async SendMessage(nsString messageName,
                     Variant[] data);
   async PHandle();
 
 child:
   async EvalScript(nsString code);
 
 parent:
-  sync CallMessage(nsString messageName,
-                   Variant[] data)
+  rpc CallMessage(nsString messageName,
+                  Variant[] data)
     returns (Variant[] results);
 
 };
 
 } // namespace jetpack
 } // namespace mozilla