Index: uspace/lib/c/generic/stdio/scanf.c
===================================================================
--- uspace/lib/c/generic/stdio/scanf.c	(revision f47a905f54a600cbf89372fdb1682e03070399c3)
+++ uspace/lib/c/generic/stdio/scanf.c	(revision 5a6c28d195eff93f3ee378bd1f116b66a4c0fd9c)
@@ -624,5 +624,5 @@
 	v = 0;
 	do {
-		digit = digit_value(c); // XXX
+		digit = digit_value(c);
 		if (digit >= base)
 			break;
@@ -1266,5 +1266,5 @@
 }
 
-int xxvfscanf(FILE *f, const char *fmt, va_list ap)
+int vfscanf(FILE *f, const char *fmt, va_list ap)
 {
 	const char *cp;
@@ -1323,5 +1323,5 @@
 }
 
-int xxfscanf(FILE *f, const char *fmt, ...)
+int fscanf(FILE *f, const char *fmt, ...)
 {
 	va_list args;
@@ -1329,5 +1329,5 @@
 
 	va_start(args, fmt);
-	rc = xxvfscanf(f, fmt, args);
+	rc = vfscanf(f, fmt, args);
 	va_end(args);
 
@@ -1335,10 +1335,10 @@
 }
 
-int xxvscanf(const char *fmt, va_list ap)
-{
-	return xxvfscanf(stdin, fmt, ap);
-}
-
-int xxscanf(const char *fmt, ...)
+int vscanf(const char *fmt, va_list ap)
+{
+	return vfscanf(stdin, fmt, ap);
+}
+
+int scanf(const char *fmt, ...)
 {
 	va_list args;
@@ -1346,5 +1346,5 @@
 
 	va_start(args, fmt);
-	rc = xxvscanf(fmt, args);
+	rc = vscanf(fmt, args);
 	va_end(args);
 
Index: uspace/lib/c/generic/stdio/sscanf.c
===================================================================
--- uspace/lib/c/generic/stdio/sscanf.c	(revision f47a905f54a600cbf89372fdb1682e03070399c3)
+++ uspace/lib/c/generic/stdio/sscanf.c	(revision 5a6c28d195eff93f3ee378bd1f116b66a4c0fd9c)
@@ -40,13 +40,13 @@
 #include "../private/sstream.h"
 
-int xxvsscanf(const char *s, const char *fmt, va_list ap)
+int vsscanf(const char *s, const char *fmt, va_list ap)
 {
 	FILE f;
 
 	__sstream_init(s, &f);
-	return xxvfscanf(&f, fmt, ap);
+	return vfscanf(&f, fmt, ap);
 }
 
-int xxsscanf(const char *s, const char *fmt, ...)
+int sscanf(const char *s, const char *fmt, ...)
 {
 	va_list args;
@@ -54,5 +54,5 @@
 
 	va_start(args, fmt);
-	rc = xxvsscanf(s, fmt, args);
+	rc = vsscanf(s, fmt, args);
 	va_end(args);