Index: uspace/lib/c/generic/time.c
===================================================================
--- uspace/lib/c/generic/time.c	(revision 077dad209163d377ede79b812138bac6e8d802ee)
+++ uspace/lib/c/generic/time.c	(revision 2e6293bcbe4e0a98e83e1721f52fb0b74611caed)
@@ -849,5 +849,5 @@
  * @return        EOK or a negative error code
  */
-int utctime2tm(const time_t time, struct tm *restrict result)
+int time_utc2tm(const time_t time, struct tm *restrict result)
 {
 	assert(result != NULL);
@@ -876,13 +876,13 @@
  * @return       EOK or a negative error code.
  */
-int utctime2str(const time_t time, char *restrict buf)
+int time_utc2str(const time_t time, char *restrict buf)
 {
 	struct tm t;
 	int r;
 
-	if ((r = utctime2tm(time, &t)) != EOK)
+	if ((r = time_utc2tm(time, &t)) != EOK)
 		return r;
 
-	tm2str(&t, buf);
+	time_tm2str(&t, buf);
 	return EOK;
 }
@@ -897,5 +897,5 @@
  *                bytes long.
  */
-void tm2str(const struct tm *restrict timeptr, char *restrict buf)
+void time_tm2str(const struct tm *restrict timeptr, char *restrict buf)
 {
 	assert(timeptr != NULL);
@@ -927,5 +927,5 @@
  * @return          EOK on success or a negative error code.
  */
-int localtime2tm(const time_t time, struct tm *restrict result)
+int time_local2tm(const time_t time, struct tm *restrict result)
 {
 	// TODO: deal with timezone
@@ -957,13 +957,13 @@
  * @return       EOK on success or a negative error code.
  */
-int localtime2str(const time_t time, char *buf)
+int time_local2str(const time_t time, char *buf)
 {
 	struct tm loctime;
 	int r;
 
-	if ((r = localtime2tm(time, &loctime)) != EOK)
+	if ((r = time_local2tm(time, &loctime)) != EOK)
 		return r;
 
-	tm2str(&loctime, buf);
+	time_tm2str(&loctime, buf);
 
 	return EOK;