Index: uspace/srv/fs/fat/fat_dentry.c
===================================================================
--- uspace/srv/fs/fat/fat_dentry.c	(revision 92fd52d7f8133beb8043e6bcd17498477fe735ea)
+++ uspace/srv/fs/fat/fat_dentry.c	(revision 095003a87225b672e2979a6de2d669667aa1d735)
@@ -67,5 +67,5 @@
 	if (!(rc = stricmp(name, component)))
 		return rc;
-	if (!strchr(name, '.')) {
+	if (!str_chr(name, '.')) {
 		/*
 		 * There is no '.' in the name, so we know that there is enough
Index: uspace/srv/loader/main.c
===================================================================
--- uspace/srv/loader/main.c	(revision 92fd52d7f8133beb8043e6bcd17498477fe735ea)
+++ uspace/srv/loader/main.c	(revision 095003a87225b672e2979a6de2d669667aa1d735)
@@ -276,5 +276,5 @@
 	
 	/* Set the task name. */
-	cp = strrchr(pathname, '/');
+	cp = str_rchr(pathname, '/');
 	cp = (cp == NULL) ? pathname : (cp + 1);
 	task_set_name(cp);