Index: uspace/lib/c/arch/abs32le/src/tls.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/tls.c	(revision 33d394a27216fe15b4a8a82851762290d107cc84)
+++ uspace/lib/c/arch/abs32le/src/tls.c	(revision 31399f351e50cccf9ca8013eff7464706542f56d)
@@ -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 33d394a27216fe15b4a8a82851762290d107cc84)
+++ uspace/lib/c/arch/amd64/src/tls.c	(revision 31399f351e50cccf9ca8013eff7464706542f56d)
@@ -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 33d394a27216fe15b4a8a82851762290d107cc84)
+++ uspace/lib/c/arch/arm32/src/tls.c	(revision 31399f351e50cccf9ca8013eff7464706542f56d)
@@ -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 33d394a27216fe15b4a8a82851762290d107cc84)
+++ uspace/lib/c/arch/ia32/src/tls.c	(revision 31399f351e50cccf9ca8013eff7464706542f56d)
@@ -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 33d394a27216fe15b4a8a82851762290d107cc84)
+++ uspace/lib/c/arch/ia64/src/tls.c	(revision 31399f351e50cccf9ca8013eff7464706542f56d)
@@ -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 33d394a27216fe15b4a8a82851762290d107cc84)
+++ uspace/lib/c/arch/mips32/src/tls.c	(revision 31399f351e50cccf9ca8013eff7464706542f56d)
@@ -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 33d394a27216fe15b4a8a82851762290d107cc84)
+++ uspace/lib/c/arch/mips64/src/tls.c	(revision 31399f351e50cccf9ca8013eff7464706542f56d)
@@ -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 33d394a27216fe15b4a8a82851762290d107cc84)
+++ uspace/lib/c/arch/ppc32/src/tls.c	(revision 31399f351e50cccf9ca8013eff7464706542f56d)
@@ -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 33d394a27216fe15b4a8a82851762290d107cc84)
+++ uspace/lib/c/arch/sparc64/src/tls.c	(revision 31399f351e50cccf9ca8013eff7464706542f56d)
@@ -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);