Index: uspace/lib/c/generic/fibril.c
===================================================================
--- uspace/lib/c/generic/fibril.c	(revision 0fa34dda5c55295515ecd984f5b5364c4e1d0206)
+++ uspace/lib/c/generic/fibril.c	(revision d8d7a0d35bbd752aa55636ffce58de262efc3f60)
@@ -95,5 +95,5 @@
 fibril_t *fibril_setup(void)
 {
-	tcb_t *tcb = __make_tls();
+	tcb_t *tcb = tls_make();
 	if (!tcb)
 		return NULL;
@@ -101,5 +101,5 @@
 	fibril_t *fibril = malloc(sizeof(fibril_t));
 	if (!fibril) {
-		__free_tls(tcb);
+		tls_free(tcb);
 		return NULL;
 	}
@@ -122,5 +122,5 @@
 void fibril_teardown(fibril_t *fibril)
 {
-	__free_tls(fibril->tcb);
+	tls_free(fibril->tcb);
 	free(fibril);
 }
Index: uspace/lib/c/generic/tls.c
===================================================================
--- uspace/lib/c/generic/tls.c	(revision 0fa34dda5c55295515ecd984f5b5364c4e1d0206)
+++ uspace/lib/c/generic/tls.c	(revision d8d7a0d35bbd752aa55636ffce58de262efc3f60)
@@ -51,5 +51,5 @@
  * @return Pointer to TCB.
  */
-tcb_t *__make_tls(void)
+tcb_t *tls_make(void)
 {
 	void *data;
@@ -57,5 +57,5 @@
 	size_t tls_size = &_tbss_end - &_tdata_start;
 	
-	tcb = __alloc_tls(&data, tls_size);
+	tcb = tls_alloc_arch(&data, tls_size);
 	if (!tcb)
 		return NULL;
@@ -74,8 +74,8 @@
 }
 
-void __free_tls(tcb_t *tcb)
+void tls_free(tcb_t *tcb)
 {
 	size_t tls_size = &_tbss_end - &_tdata_start;
-	__free_tls_arch(tcb, tls_size);
+	tls_free_arch(tcb, tls_size);
 }