diff --git a/tasks/libl4/include/l4lib/arch-arm/utcb.h b/tasks/libl4/include/l4lib/arch-arm/utcb.h
index 4065c95..5aac223 100644
--- a/tasks/libl4/include/l4lib/arch-arm/utcb.h
+++ b/tasks/libl4/include/l4lib/arch-arm/utcb.h
@@ -27,21 +27,20 @@ struct utcb {
 	unsigned long usr_handle;
 };
 
-/* FIXME: LICENSE/LICENCE */
-static inline struct utcb *__L4_ARM_Utcb()
+static inline struct utcb *l4_get_utcb()
 {
-	return (struct utcb *)(*(struct utcb **)USER_UTCB_REF);
+	return *(struct utcb **)USER_UTCB_REF;
 }
 
 /* Functions to read/write utcb registers */
 static inline unsigned int read_mr(int offset)
 {
-	return __L4_ARM_Utcb()->mr[offset];
+	return l4_get_utcb()->mr[offset];
 }
 
 static inline void write_mr(unsigned int offset, unsigned int val)
 {
-	__L4_ARM_Utcb()->mr[offset] = val;
+	l4_get_utcb()->mr[offset] = val;
 }
 #endif /* !__ASSEMBLY__ */
 
diff --git a/tasks/mm0/src/init.c b/tasks/mm0/src/init.c
index 3656b52..9ff7cb9 100644
--- a/tasks/mm0/src/init.c
+++ b/tasks/mm0/src/init.c
@@ -19,7 +19,7 @@ void init_utcb(void)
 	void *utcb_page = alloc_page(1); /* Allocate a utcb page */
 
 	l4_getid(&ids);
-	l4_map(utcb_page, __L4_ARM_Utcb(), 1, MAP_USR_RW_FLAGS, ids.tid);
+	l4_map(utcb_page, l4_get_utcb(), 1, MAP_USR_RW_FLAGS, ids.tid);
 }
 
 void init_mm(struct initdata *initdata)
diff --git a/tasks/mm0/src/task.c b/tasks/mm0/src/task.c
index 356f7ed..097bb01 100644
--- a/tasks/mm0/src/task.c
+++ b/tasks/mm0/src/task.c
@@ -146,7 +146,7 @@ int start_boot_tasks(struct initdata *initdata, struct tcb_head *tcbs)
 		}
 
 		/* mmap each task's utcb as single page anonymous memory. */
-		if ((err = do_mmap(0, 0, task, (unsigned long)__L4_ARM_Utcb(),
+		if ((err = do_mmap(0, 0, task, (unsigned long)l4_get_utcb(),
 				   VM_READ | VM_WRITE | VMA_ANON, 1) < 0)) {
 			printf("do_mmap: Mapping utcb failed with %d.\n", err);
 			goto error;