diff --git a/plugins/sip/calls-sip-call.c b/plugins/sip/calls-sip-call.c
index e86c9bd..0d15941 100644
--- a/plugins/sip/calls-sip-call.c
+++ b/plugins/sip/calls-sip-call.c
@@ -106,7 +106,7 @@ calls_sip_call_answer (CallsCall *call)
   }
 
   /* TODO get free port by creating GSocket and passing that to the pipeline */
-  calls_sip_call_setup_local_media (self, local_port, local_port + 1);
+  calls_sip_call_setup_local_media_connection (self, local_port, local_port + 1);
 
   local_sdp = calls_sip_media_manager_static_capabilities (self->manager,
                                                            local_port,
@@ -258,9 +258,9 @@ calls_sip_call_init (CallsSipCall *self)
 
 
 void
-calls_sip_call_setup_local_media (CallsSipCall *self,
-                                  guint         port_rtp,
-                                  guint         port_rtcp)
+calls_sip_call_setup_local_media_connection (CallsSipCall *self,
+                                             guint         port_rtp,
+                                             guint         port_rtcp)
 {
   g_return_if_fail (CALLS_IS_SIP_CALL (self));
   g_return_if_fail (CALLS_IS_SIP_MEDIA_PIPELINE (self->pipeline));
@@ -274,10 +274,10 @@ calls_sip_call_setup_local_media (CallsSipCall *self,
 
 
 void
-calls_sip_call_setup_remote_media (CallsSipCall *self,
-                                   const char   *remote,
-                                   guint         port_rtp,
-                                   guint         port_rtcp)
+calls_sip_call_setup_remote_media_connection (CallsSipCall *self,
+                                              const char   *remote,
+                                              guint         port_rtp,
+                                              guint         port_rtcp)
 {
   g_return_if_fail (CALLS_IS_SIP_CALL (self));
   g_return_if_fail (CALLS_IS_SIP_MEDIA_PIPELINE (self->pipeline));
diff --git a/plugins/sip/calls-sip-call.h b/plugins/sip/calls-sip-call.h
index 1b0bc2a..c7a4348 100644
--- a/plugins/sip/calls-sip-call.h
+++ b/plugins/sip/calls-sip-call.h
@@ -35,19 +35,19 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (CallsSipCall, calls_sip_call, CALLS, SIP_CALL, CallsCall)
 
-CallsSipCall          *calls_sip_call_new                    (const gchar  *number,
-                                                              gboolean      inbound,
-                                                              nua_handle_t *handle);
-void                   calls_sip_call_setup_remote_media     (CallsSipCall *self,
-                                                              const char   *remote,
-                                                              guint         port_rtp,
-                                                              guint         port_rtcp);
-void                   calls_sip_call_setup_local_media      (CallsSipCall *self,
-                                                              guint         port_rtp,
-                                                              guint         port_rtcp);
-void                   calls_sip_call_activate_media         (CallsSipCall *self,
-                                                              gboolean      enabled);
-void                   calls_sip_call_set_state              (CallsSipCall  *self,
-                                                              CallsCallState state);
+CallsSipCall          *calls_sip_call_new                               (const gchar  *number,
+                                                                         gboolean      inbound,
+                                                                         nua_handle_t *handle);
+void                   calls_sip_call_setup_remote_media_connection     (CallsSipCall *self,
+                                                                         const char   *remote,
+                                                                         guint         port_rtp,
+                                                                         guint         port_rtcp);
+void                   calls_sip_call_setup_local_media_connection      (CallsSipCall *self,
+                                                                         guint         port_rtp,
+                                                                         guint         port_rtcp);
+void                   calls_sip_call_activate_media                    (CallsSipCall *self,
+                                                                         gboolean      enabled);
+void                   calls_sip_call_set_state                         (CallsSipCall  *self,
+                                                                         CallsCallState state);
 
 G_END_DECLS
diff --git a/plugins/sip/calls-sip-origin.c b/plugins/sip/calls-sip-origin.c
index 4946381..addb89e 100644
--- a/plugins/sip/calls-sip-origin.c
+++ b/plugins/sip/calls-sip-origin.c
@@ -247,10 +247,10 @@ sip_i_state (int              status,
    * also: rtcp port = rtp port + 1
    */
   if (r_sdp) {
-    calls_sip_call_setup_remote_media (call,
-                                       r_sdp->sdp_connection->c_address,
-                                       r_sdp->sdp_media->m_port,
-                                       r_sdp->sdp_media->m_port + 1);
+    calls_sip_call_setup_remote_media_connection (call,
+                                                  r_sdp->sdp_connection->c_address,
+                                                  r_sdp->sdp_media->m_port,
+                                                  r_sdp->sdp_media->m_port + 1);
   }
 
   /* TODO use CallCallStates with g_object_set (notify!) */
@@ -726,7 +726,7 @@ add_call (CallsSipOrigin *self,
                             self);
 
   if (!inbound) {
-    calls_sip_call_setup_local_media (sip_call, local_port, local_port + 1);
+    calls_sip_call_setup_local_media_connection (sip_call, local_port, local_port + 1);
 
     local_sdp = calls_sip_media_manager_static_capabilities (self->media_manager,
                                                              local_port,