Index: uspace/app/tester/stdio/logger2.c
===================================================================
--- uspace/app/tester/stdio/logger2.c	(revision ebbc8a74be1f1519844fe377d2f6c61c93492ed1)
+++ uspace/app/tester/stdio/logger2.c	(revision d6ddeb7d7df07c3b7a80fe9eed08ad79ab2e62d3)
@@ -36,9 +36,9 @@
 const char *test_logger2(void)
 {
-	log_context_t ctx_alpha = log_context_create("alpha");
-	log_context_t ctx_bravo = log_context_create("bravo");
+	log_t log_alpha = log_create("alpha");
+	log_t log_bravo = log_create("bravo");
 
-	TPRINTF("Alpha context is %" PRIlogctx ".\n", ctx_alpha);
-	TPRINTF("Bravo context is %" PRIlogctx ".\n", ctx_bravo);
+	TPRINTF("Alpha context is %" PRIlogctx ".\n", log_alpha);
+	TPRINTF("Bravo context is %" PRIlogctx ".\n", log_bravo);
 
 	while (true) {
@@ -50,9 +50,9 @@
 			log_msg(level, "Printing level %d (%s).",
 			    (int) level, log_level_str(level));
-			log_ctx_msg(ctx_alpha, level,
-			    "Printing level %d (%s) in alpha context.",
+			log_log_msg(log_alpha, level,
+			    "Printing level %d (%s) into alpha log.",
 			    (int) level, log_level_str(level));
-			log_ctx_msg(ctx_bravo, level,
-			    "Printing level %d (%s) in bravo context.",
+			log_log_msg(log_bravo, level,
+			    "Printing level %d (%s) into bravo log.",
 			    (int) level, log_level_str(level));
 			async_usleep(1000 * 100);
Index: uspace/lib/c/generic/io/log.c
===================================================================
--- uspace/lib/c/generic/io/log.c	(revision ebbc8a74be1f1519844fe377d2f6c61c93492ed1)
+++ uspace/lib/c/generic/io/log.c	(revision d6ddeb7d7df07c3b7a80fe9eed08ad79ab2e62d3)
@@ -83,5 +83,5 @@
 }
 
-static int logger_message(async_sess_t *session, log_context_t ctx, log_level_t level, const char *message)
+static int logger_message(async_sess_t *session, log_t ctx, log_level_t level, const char *message)
 {
 	async_exch_t *exchange = async_exchange_begin(session);
@@ -176,9 +176,9 @@
  * This function always returns a valid context.
  */
-log_context_t log_context_create(const char *name)
+log_t log_create(const char *name)
 {
 	async_exch_t *exchange = async_exchange_begin(logger_session);
 	if (exchange == NULL)
-		return LOG_CONTEXT_DEFAULT;
+		return LOG_DEFAULT;
 
 	ipc_call_t answer;
@@ -191,5 +191,5 @@
 
 	if ((rc != EOK) || (reg_msg_rc != EOK))
-		return LOG_CONTEXT_DEFAULT;
+		return LOG_DEFAULT;
 
 	return IPC_GET_ARG1(answer);
@@ -203,10 +203,10 @@
  * @param fmt		Format string (no traling newline).
  */
-void log_ctx_msg(log_context_t ctx, log_level_t level, const char *fmt, ...)
+void log_log_msg(log_t ctx, log_level_t level, const char *fmt, ...)
 {
 	va_list args;
 
 	va_start(args, fmt);
-	log_ctx_msgv(ctx, level, fmt, args);
+	log_log_msgv(ctx, level, fmt, args);
 	va_end(args);
 }
@@ -219,5 +219,5 @@
  * @param fmt		Format string (no trailing newline)
  */
-void log_ctx_msgv(log_context_t ctx, log_level_t level, const char *fmt, va_list args)
+void log_log_msgv(log_t ctx, log_level_t level, const char *fmt, va_list args)
 {
 	assert(level < LVL_LIMIT);
Index: uspace/lib/c/include/io/log.h
===================================================================
--- uspace/lib/c/include/io/log.h	(revision ebbc8a74be1f1519844fe377d2f6c61c93492ed1)
+++ uspace/lib/c/include/io/log.h	(revision d6ddeb7d7df07c3b7a80fe9eed08ad79ab2e62d3)
@@ -51,7 +51,7 @@
 } log_level_t;
 
-typedef sysarg_t log_context_t;
+typedef sysarg_t log_t;
 #define PRIlogctx PRIxn
-#define LOG_CONTEXT_DEFAULT 0
+#define LOG_DEFAULT 0
 
 extern const char *log_level_str(log_level_t);
@@ -60,13 +60,13 @@
 extern int log_init(const char *, log_level_t);
 
-extern log_context_t log_context_create(const char *);
+extern log_t log_create(const char *);
 
 #define log_msg(level, format, ...) \
-	log_ctx_msg(LOG_CONTEXT_DEFAULT, (level), (format), ##__VA_ARGS__)
+	log_log_msg(LOG_DEFAULT, (level), (format), ##__VA_ARGS__)
 #define log_msgv(level, format, args) \
-	log_ctx_msgv(LOG_CONTEXT_DEFAULT, (level), (format), (args))
+	log_log_msgv(LOG_DEFAULT, (level), (format), (args))
 
-extern void log_ctx_msg(log_context_t, log_level_t, const char *, ...);
-extern void log_ctx_msgv(log_context_t, log_level_t, const char *, va_list);
+extern void log_log_msg(log_t, log_level_t, const char *, ...);
+extern void log_log_msgv(log_t, log_level_t, const char *, va_list);
 
 #endif