Index: kernel/generic/include/str.h
===================================================================
--- kernel/generic/include/str.h	(revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b)
+++ kernel/generic/include/str.h	(revision b3db669a7999a4c7352c724f8986ac18c85ea5d6)
@@ -97,5 +97,5 @@
 extern bool wstr_remove(wchar_t *str, size_t pos);
 
-extern int str_uint64(const char *, char **, unsigned int, bool, uint64_t *);
+extern int str_uint64_t(const char *, char **, unsigned int, bool, uint64_t *);
 
 extern void order_suffix(const uint64_t, uint64_t *, char *);
Index: kernel/generic/src/console/cmd.c
===================================================================
--- kernel/generic/src/console/cmd.c	(revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b)
+++ kernel/generic/src/console/cmd.c	(revision b3db669a7999a4c7352c724f8986ac18c85ea5d6)
@@ -906,5 +906,5 @@
 		   ((char *) argv->buffer)[0] <= '9') {
 		uint64_t value;
-		rc = str_uint64((char *) argv->buffer, NULL, 0, true, &value);
+		rc = str_uint64_t((char *) argv->buffer, NULL, 0, true, &value);
 		if (rc == EOK)
 			addr = (uintptr_t) value;
Index: kernel/generic/src/console/kconsole.c
===================================================================
--- kernel/generic/src/console/kconsole.c	(revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b)
+++ kernel/generic/src/console/kconsole.c	(revision b3db669a7999a4c7352c724f8986ac18c85ea5d6)
@@ -472,5 +472,5 @@
 		/* It's a number - convert it */
 		uint64_t value;
-		int rc = str_uint64(text, NULL, 0, true, &value);
+		int rc = str_uint64_t(text, NULL, 0, true, &value);
 		switch (rc) {
 		case EINVAL:
Index: kernel/generic/src/lib/str.c
===================================================================
--- kernel/generic/src/lib/str.c	(revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b)
+++ kernel/generic/src/lib/str.c	(revision b3db669a7999a4c7352c724f8986ac18c85ea5d6)
@@ -893,5 +893,5 @@
  *
  */
-int str_uint64(const char *nptr, char **endptr, unsigned int base,
+int str_uint64_t(const char *nptr, char **endptr, unsigned int base,
     bool strict, uint64_t *result)
 {
Index: kernel/generic/src/sysinfo/stats.c
===================================================================
--- kernel/generic/src/sysinfo/stats.c	(revision 2e533d6f9fc70bcde4836ba05d892f0033109f3b)
+++ kernel/generic/src/sysinfo/stats.c	(revision b3db669a7999a4c7352c724f8986ac18c85ea5d6)
@@ -474,5 +474,5 @@
 	/* Parse the task ID */
 	task_id_t task_id;
-	if (str_uint64(name, NULL, 0, true, &task_id) != EOK)
+	if (str_uint64_t(name, NULL, 0, true, &task_id) != EOK)
 		return ret;
 	
@@ -545,5 +545,5 @@
 	/* Parse the thread ID */
 	thread_id_t thread_id;
-	if (str_uint64(name, NULL, 0, true, &thread_id) != EOK)
+	if (str_uint64_t(name, NULL, 0, true, &thread_id) != EOK)
 		return ret;
 	
@@ -662,5 +662,5 @@
 	/* Parse the exception number */
 	uint64_t excn;
-	if (str_uint64(name, NULL, 0, true, &excn) != EOK)
+	if (str_uint64_t(name, NULL, 0, true, &excn) != EOK)
 		return ret;