diff --git a/conts/libl4/include/l4lib/tcb.h b/conts/libl4/include/l4lib/tcb.h
index da332e0..947317a 100644
--- a/conts/libl4/include/l4lib/tcb.h
+++ b/conts/libl4/include/l4lib/tcb.h
@@ -36,7 +36,7 @@ struct global_list {
 };
 
 struct tcb *find_task(int tid);
-struct tcb *tcb_alloc_init(struct tcb *parent, unsigned int flags);
+struct tcb *l4_tcb_alloc_init(struct tcb *parent, unsigned int flags);
 void global_add_task(struct tcb *task);
 void global_remove_task(struct tcb *task);
 
diff --git a/conts/libl4/src/tcb.c b/conts/libl4/src/tcb.c
index ea2b2f7..052740c 100644
--- a/conts/libl4/src/tcb.c
+++ b/conts/libl4/src/tcb.c
@@ -41,7 +41,7 @@ struct tcb *find_task(int tid)
 	return 0;
 }
 
-struct tcb *tcb_alloc_init(struct tcb *parent, unsigned int flags)
+struct tcb *l4_tcb_alloc_init(struct tcb *parent, unsigned int flags)
 {
 	struct tcb *task;
 
diff --git a/conts/libl4/src/thread.c b/conts/libl4/src/thread.c
index 796d187..db2f294 100644
--- a/conts/libl4/src/thread.c
+++ b/conts/libl4/src/thread.c
@@ -50,7 +50,7 @@ int l4_thread_create(struct task_ids *ids, unsigned int flags,
 	}
 
 	/* Allocate tcb for the child. */
-	if (!(child = tcb_alloc_init(parent, flags))) {
+	if (!(child = l4_tcb_alloc_init(parent, flags))) {
 		// FIXME: What happens to utcb_head
 		printf("libl4thread: No heap space left.\n");
 		err = -ENOMEM;
diff --git a/conts/libl4/src/utcb.c b/conts/libl4/src/utcb.c
index cb62635..caca0d6 100644
--- a/conts/libl4/src/utcb.c
+++ b/conts/libl4/src/utcb.c
@@ -77,7 +77,7 @@ static int set_utcb_addr(void)
 	int err;
 
 	/* Create a task. */
-	if (IS_ERR(task = tcb_alloc_init(0, 0)))
+	if (IS_ERR(task = l4_tcb_alloc_init(0, 0)))
 		return -ENOMEM;
 
 	/* Add child to the global task list. */