Index: uspace/lib/c/arch/abs32le/src/tls.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/tls.c	(revision 0e63d34c5ceb98339adc1c1befc96f4b8afe9b1f)
+++ uspace/lib/c/arch/abs32le/src/tls.c	(revision e4a14979ffc3c37b48afa97e8633a1ada35d2418)
@@ -34,10 +34,10 @@
 #include <unistd.h>
 
-tcb_t * __alloc_tls(void **data, size_t size)
+tcb_t * tls_alloc_arch(void **data, size_t size)
 {
 	return tls_alloc_variant_2(data, size);
 }
 
-void __free_tls_arch(tcb_t *tcb, size_t size)
+void tls_free_arch(tcb_t *tcb, size_t size)
 {
 	tls_free_variant_2(tcb, size);
Index: uspace/lib/c/arch/amd64/src/tls.c
===================================================================
--- uspace/lib/c/arch/amd64/src/tls.c	(revision 0e63d34c5ceb98339adc1c1befc96f4b8afe9b1f)
+++ uspace/lib/c/arch/amd64/src/tls.c	(revision e4a14979ffc3c37b48afa97e8633a1ada35d2418)
@@ -38,10 +38,10 @@
 #include <sys/types.h>
 
-tcb_t * __alloc_tls(void **data, size_t size)
+tcb_t *tls_alloc_arch(void **data, size_t size)
 {
 	return tls_alloc_variant_2(data, size);
 }
 
-void __free_tls_arch(tcb_t *tcb, size_t size)
+void tls_free_arch(tcb_t *tcb, size_t size)
 {
 	tls_free_variant_2(tcb, size);
Index: uspace/lib/c/arch/arm32/src/tls.c
===================================================================
--- uspace/lib/c/arch/arm32/src/tls.c	(revision 0e63d34c5ceb98339adc1c1befc96f4b8afe9b1f)
+++ uspace/lib/c/arch/arm32/src/tls.c	(revision e4a14979ffc3c37b48afa97e8633a1ada35d2418)
@@ -38,10 +38,10 @@
 #include <sys/types.h>
 
-tcb_t * __alloc_tls(void **data, size_t size)
+tcb_t *tls_alloc_arch(void **data, size_t size)
 {
 	return tls_alloc_variant_1(data, size);
 }
 
-void __free_tls_arch(tcb_t *tcb, size_t size)
+void tls_free_arch(tcb_t *tcb, size_t size)
 {
 	tls_free_variant_1(tcb, size);
Index: uspace/lib/c/arch/ia32/src/tls.c
===================================================================
--- uspace/lib/c/arch/ia32/src/tls.c	(revision 0e63d34c5ceb98339adc1c1befc96f4b8afe9b1f)
+++ uspace/lib/c/arch/ia32/src/tls.c	(revision e4a14979ffc3c37b48afa97e8633a1ada35d2418)
@@ -39,10 +39,10 @@
 #include <align.h>
 
-tcb_t * __alloc_tls(void **data, size_t size)
+tcb_t *tls_alloc_arch(void **data, size_t size)
 {
 	return tls_alloc_variant_2(data, size);
 }
 
-void __free_tls_arch(tcb_t *tcb, size_t size)
+void tls_free_arch(tcb_t *tcb, size_t size)
 {
 	tls_free_variant_2(tcb, size);
Index: uspace/lib/c/arch/ia64/src/tls.c
===================================================================
--- uspace/lib/c/arch/ia64/src/tls.c	(revision 0e63d34c5ceb98339adc1c1befc96f4b8afe9b1f)
+++ uspace/lib/c/arch/ia64/src/tls.c	(revision e4a14979ffc3c37b48afa97e8633a1ada35d2418)
@@ -38,10 +38,10 @@
 #include <malloc.h>
 
-tcb_t * __alloc_tls(void **data, size_t size)
+tcb_t *tls_alloc_arch(void **data, size_t size)
 {
 	return tls_alloc_variant_1(data, size);
 }
 
-void __free_tls_arch(tcb_t *tcb, size_t size)
+void tls_free_arch(tcb_t *tcb, size_t size)
 {
 	tls_free_variant_1(tcb, size);
Index: uspace/lib/c/arch/mips32/src/tls.c
===================================================================
--- uspace/lib/c/arch/mips32/src/tls.c	(revision 0e63d34c5ceb98339adc1c1befc96f4b8afe9b1f)
+++ uspace/lib/c/arch/mips32/src/tls.c	(revision e4a14979ffc3c37b48afa97e8633a1ada35d2418)
@@ -37,10 +37,10 @@
 #include <sys/types.h>
 
-tcb_t * __alloc_tls(void **data, size_t size)
+tcb_t * tls_alloc_arch(void **data, size_t size)
 {
 	return tls_alloc_variant_1(data, size);
 }
 
-void __free_tls_arch(tcb_t *tcb, size_t size)
+void tls_free_arch(tcb_t *tcb, size_t size)
 {
 	tls_free_variant_1(tcb, size);
Index: uspace/lib/c/arch/mips64/src/tls.c
===================================================================
--- uspace/lib/c/arch/mips64/src/tls.c	(revision 0e63d34c5ceb98339adc1c1befc96f4b8afe9b1f)
+++ uspace/lib/c/arch/mips64/src/tls.c	(revision e4a14979ffc3c37b48afa97e8633a1ada35d2418)
@@ -37,10 +37,10 @@
 #include <sys/types.h>
 
-tcb_t * __alloc_tls(void **data, size_t size)
+tcb_t *tls_alloc_arch(void **data, size_t size)
 {
 	return tls_alloc_variant_1(data, size);
 }
 
-void __free_tls_arch(tcb_t *tcb, size_t size)
+void tls_free_arch(tcb_t *tcb, size_t size)
 {
 	tls_free_variant_1(tcb, size);
Index: uspace/lib/c/arch/ppc32/src/tls.c
===================================================================
--- uspace/lib/c/arch/ppc32/src/tls.c	(revision 0e63d34c5ceb98339adc1c1befc96f4b8afe9b1f)
+++ uspace/lib/c/arch/ppc32/src/tls.c	(revision e4a14979ffc3c37b48afa97e8633a1ada35d2418)
@@ -36,10 +36,10 @@
 #include <sys/types.h>
 
-tcb_t * __alloc_tls(void **data, size_t size)
+tcb_t *tls_alloc_arch(void **data, size_t size)
 {
 	return tls_alloc_variant_1(data, size);
 }
 
-void __free_tls_arch(tcb_t *tcb, size_t size)
+void tls_free_arch(tcb_t *tcb, size_t size)
 {
 	tls_free_variant_1(tcb, size);
Index: uspace/lib/c/arch/sparc64/src/tls.c
===================================================================
--- uspace/lib/c/arch/sparc64/src/tls.c	(revision 0e63d34c5ceb98339adc1c1befc96f4b8afe9b1f)
+++ uspace/lib/c/arch/sparc64/src/tls.c	(revision e4a14979ffc3c37b48afa97e8633a1ada35d2418)
@@ -38,10 +38,10 @@
 #include <sys/types.h>
 
-tcb_t * __alloc_tls(void **data, size_t size)
+tcb_t *tls_alloc_arch(void **data, size_t size)
 {
 	return tls_alloc_variant_2(data, size);
 }
 
-void __free_tls_arch(tcb_t *tcb, size_t size)
+void tls_free_arch(tcb_t *tcb, size_t size)
 {
 	tls_free_variant_2(tcb, size);
Index: uspace/lib/c/generic/fibril.c
===================================================================
--- uspace/lib/c/generic/fibril.c	(revision 0e63d34c5ceb98339adc1c1befc96f4b8afe9b1f)
+++ uspace/lib/c/generic/fibril.c	(revision e4a14979ffc3c37b48afa97e8633a1ada35d2418)
@@ -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 0e63d34c5ceb98339adc1c1befc96f4b8afe9b1f)
+++ uspace/lib/c/generic/tls.c	(revision e4a14979ffc3c37b48afa97e8633a1ada35d2418)
@@ -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);
 }
 
Index: uspace/lib/c/include/tls.h
===================================================================
--- uspace/lib/c/include/tls.h	(revision 0e63d34c5ceb98339adc1c1befc96f4b8afe9b1f)
+++ uspace/lib/c/include/tls.h	(revision e4a14979ffc3c37b48afa97e8633a1ada35d2418)
@@ -48,8 +48,8 @@
 extern char _tbss_end;
 
-extern tcb_t *__make_tls(void);
-extern tcb_t *__alloc_tls(void **, size_t);
-extern void __free_tls(tcb_t *);
-extern void __free_tls_arch(tcb_t *, size_t);
+extern tcb_t *tls_make(void);
+extern tcb_t *tls_alloc_arch(void **, size_t);
+extern void tls_free(tcb_t *);
+extern void tls_free_arch(tcb_t *, size_t);
 
 #ifdef CONFIG_TLS_VARIANT_1