diff --git a/daemon/call.c b/daemon/call.c
index 24d8a81bb..0e412090e 100644
--- a/daemon/call.c
+++ b/daemon/call.c
@@ -1734,7 +1734,7 @@ str *call_lookup_udp(char **out, struct callmaster *m) {
 	return call_update_lookup_udp(out, m, OP_ANSWER, RE_UDP_UL_TOTAG);
 }
 
-static str *call_request_lookup(char **out, struct callmaster *m, enum call_opmode opmode, const char *tagstr) {
+static str *call_request_lookup_tcp(char **out, struct callmaster *m, enum call_opmode opmode, const char *tagstr) {
 	struct call *c;
 	GQueue s = G_QUEUE_INIT;
 	int num;
@@ -1770,11 +1770,11 @@ out:
 	return ret;
 }
 
-str *call_request(char **out, struct callmaster *m) {
-	return call_request_lookup(out, m, OP_OFFER, "fromtag");
+str *call_request_tcp(char **out, struct callmaster *m) {
+	return call_request_lookup_tcp(out, m, OP_OFFER, "fromtag");
 }
-str *call_lookup(char **out, struct callmaster *m) {
-	return call_request_lookup(out, m, OP_ANSWER, "totag");
+str *call_lookup_tcp(char **out, struct callmaster *m) {
+	return call_request_lookup_tcp(out, m, OP_ANSWER, "totag");
 }
 
 static int call_delete_branch(struct callmaster *m, const str *callid, const str *branch, const str *fromtag, const str *totag) {
@@ -1954,7 +1954,7 @@ out:
 	return ret;
 }
 
-void call_delete(char **out, struct callmaster *m) {
+void call_delete_tcp(char **out, struct callmaster *m) {
 	str callid;
 
 	str_init(&callid, out[RE_TCP_D_CALLID]);
@@ -2020,7 +2020,7 @@ static void callmaster_get_all_calls_interator(void *key, void *val, void *ptr)
 	g_queue_push_tail(q, obj_get(val));
 }
 
-void calls_status(struct callmaster *m, struct control_stream *s) {
+void calls_status_tcp(struct callmaster *m, struct control_stream *s) {
 	struct stats st;
 	GQueue q = G_QUEUE_INIT;
 	struct call *c;
@@ -2130,7 +2130,7 @@ static void call_ng_process_flags(struct sdp_ng_flags *out, GQueue *streams, ben
 	}
 }
 
-static const char *call_offer_answer(bencode_item_t *input, struct callmaster *m, bencode_item_t *output, enum call_opmode opmode, const char *tagname) {
+static const char *call_offer_answer_ng(bencode_item_t *input, struct callmaster *m, bencode_item_t *output, enum call_opmode opmode, const char *tagname) {
 	str sdp, fromtag, viabranch, callid, *sdp_new;
 	char *errstr;
 	GQueue parsed = G_QUEUE_INIT;
@@ -2185,12 +2185,12 @@ out:
 	return errstr;
 }
 
-const char *call_offer(bencode_item_t *input, struct callmaster *m, bencode_item_t *output) {
-	return call_offer_answer(input, m, output, OP_OFFER, "from-tag");
+const char *call_offer_ng(bencode_item_t *input, struct callmaster *m, bencode_item_t *output) {
+	return call_offer_answer_ng(input, m, output, OP_OFFER, "from-tag");
 }
 
-const char *call_answer(bencode_item_t *input, struct callmaster *m, bencode_item_t *output) {
-	return call_offer_answer(input, m, output, OP_ANSWER, "to-tag");
+const char *call_answer_ng(bencode_item_t *input, struct callmaster *m, bencode_item_t *output) {
+	return call_offer_answer_ng(input, m, output, OP_ANSWER, "to-tag");
 }
 
 const char *call_delete_ng(bencode_item_t *input, struct callmaster *m, bencode_item_t *output) {
diff --git a/daemon/call.h b/daemon/call.h
index adc48a613..e06d95d0d 100644
--- a/daemon/call.h
+++ b/daemon/call.h
@@ -133,15 +133,20 @@ struct callmaster *callmaster_new(struct poller *);
 void callmaster_config(struct callmaster *m, struct callmaster_config *c);
 
 
-str *call_request(char **, struct callmaster *);
+str *call_request_tcp(char **, struct callmaster *);
+str *call_lookup_tcp(char **, struct callmaster *);
+void call_delete_tcp(char **, struct callmaster *);
+void calls_status_tcp(struct callmaster *, struct control_stream *);
+
 str *call_update_udp(char **, struct callmaster *);
-str *call_lookup(char **, struct callmaster *);
 str *call_lookup_udp(char **, struct callmaster *);
-void call_delete(char **, struct callmaster *);
 str *call_delete_udp(char **, struct callmaster *);
 str *call_query_udp(char **, struct callmaster *);
 
-void calls_status(struct callmaster *, struct control_stream *);
+const char *call_offer_ng(bencode_item_t *, struct callmaster *, bencode_item_t *);
+const char *call_answer_ng(bencode_item_t *, struct callmaster *, bencode_item_t *);
+const char *call_delete_ng(bencode_item_t *, struct callmaster *, bencode_item_t *);
+
 
 void calls_dump_redis(struct callmaster *);
 
@@ -186,10 +191,6 @@ static inline str *call_str_init_dup(struct call *c, char *s) {
 	return call_str_dup(c, &t);
 }
 
-const char *call_offer(bencode_item_t *, struct callmaster *, bencode_item_t *);
-const char *call_answer(bencode_item_t *, struct callmaster *, bencode_item_t *);
-const char *call_delete_ng(bencode_item_t *, struct callmaster *, bencode_item_t *);
-
 
 
 
diff --git a/daemon/control.c b/daemon/control.c
index f626e366b..fcf242adc 100644
--- a/daemon/control.c
+++ b/daemon/control.c
@@ -114,13 +114,13 @@ static int control_stream_parse(struct control_stream *s, char *line) {
 
 
 	if (!strcmp(out[RE_TCP_RL_CMD], "request"))
-		output = call_request(out, c->callmaster);
+		output = call_request_tcp(out, c->callmaster);
 	else if (!strcmp(out[RE_TCP_RL_CMD], "lookup"))
-		output = call_lookup(out, c->callmaster);
+		output = call_lookup_tcp(out, c->callmaster);
 	else if (!strcmp(out[RE_TCP_D_CMD], "delete"))
-		call_delete(out, c->callmaster);
+		call_delete_tcp(out, c->callmaster);
 	else if (!strcmp(out[RE_TCP_DIV_CMD], "status"))
-		calls_status(c->callmaster, s);
+		calls_status_tcp(c->callmaster, s);
 	else if (!strcmp(out[RE_TCP_DIV_CMD], "build") | !strcmp(out[RE_TCP_DIV_CMD], "version"))
 		control_stream_printf(s, "Version: %s\n", MEDIAPROXY_VERSION);
 	else if (!strcmp(out[RE_TCP_DIV_CMD], "controls"))
diff --git a/daemon/control_ng.c b/daemon/control_ng.c
index 74f53092c..c852f320d 100644
--- a/daemon/control_ng.c
+++ b/daemon/control_ng.c
@@ -57,9 +57,9 @@ static void control_ng_incoming(struct obj *obj, str *buf, struct sockaddr_in6 *
 	if (!str_cmp(&cmd, "ping"))
 		bencode_dictionary_add_string(resp, "result", "pong");
 	else if (!str_cmp(&cmd, "offer"))
-		errstr = call_offer(dict, c->callmaster, resp);
+		errstr = call_offer_ng(dict, c->callmaster, resp);
 	else if (!str_cmp(&cmd, "answer"))
-		errstr = call_answer(dict, c->callmaster, resp);
+		errstr = call_answer_ng(dict, c->callmaster, resp);
 	else if (!str_cmp(&cmd, "delete"))
 		errstr = call_delete_ng(dict, c->callmaster, resp);
 	else