diff --git a/src/audio/playback/jack.c b/src/audio/playback/jack.c
index c5f14d966..22a9cbd60 100644
--- a/src/audio/playback/jack.c
+++ b/src/audio/playback/jack.c
@@ -3,7 +3,7 @@
  * @author Martin Pulec     <pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2012-2024 CESNET z.s.p.o.
+ * Copyright (c) 2012-2025 CESNET
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -299,7 +299,10 @@ static bool audio_play_jack_reconfigure(void *state, struct audio_desc desc)
         }
 
         if(desc.ch_count > s->jack_ports_count) {
-                log_msg(LOG_LEVEL_WARNING, MOD_NAME "Warning: received %d audio channels, JACK can process only %d.", desc.ch_count, s->jack_ports_count);
+                MSG(WARNING,
+                    "Warning: received %d audio channels, JACK "
+                    "can process only %d.\n",
+                    desc.ch_count, s->jack_ports_count);
         }
 
         if (s->buffer_fns) {
diff --git a/src/control_socket.cpp b/src/control_socket.cpp
index c8abcf91e..831a5d9c3 100644
--- a/src/control_socket.cpp
+++ b/src/control_socket.cpp
@@ -3,7 +3,7 @@
  * @author Martin Pulec     <pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2013-2023 CESNET, z. s. p. o.
+ * Copyright (c) 2013-2025 CESNET
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,6 +57,7 @@
 #include "utils/thread.h"
 
 #define MAX_CLIENTS 16
+#define MOD_NAME "[control_socket] "
 
 #ifdef _WIN32
 typedef const char *sso_val_type;
@@ -986,7 +987,7 @@ static void control_report_stats_event(struct control_state *s, const std::strin
         if (s->stat_event_queue.size() < MAX_STAT_EVENT_QUEUE) {
                 s->stat_event_queue.push(report_line);
         } else {
-                log_msg(LOG_LEVEL_WARNING, "Cannot write stats/event - queue full!!!");
+                MSG(WARNING, "Cannot write stats/event - queue full!!!\n");
         }
         lk.unlock();
         s->stat_event_cv.notify_one();
diff --git a/src/video_capture/bitflow.cpp b/src/video_capture/bitflow.cpp
index 12c1a6ee4..f15a6486d 100644
--- a/src/video_capture/bitflow.cpp
+++ b/src/video_capture/bitflow.cpp
@@ -3,7 +3,7 @@
  * @author Martin Pulec <pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2017-2023 CESNET z.s.p.o.
+ * Copyright (c) 2017-2025 CESNET
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,7 @@
 #include "video.h"
 #include "video_capture.h"
 
+#define MOD_NAME "[bitflow] "
 
 struct vidcap_state_bitflow {
         tCIp        sCIp;                    /* device open token */
@@ -176,7 +177,7 @@ static int vidcap_bitflow_init(struct vidcap_params *params, void **state)
         s->desc = {hROIsize, vROIsize, RGB, get_fps(s), PROGRESSIVE, 1};
 
         if (s->desc.fps == 0) {
-                log_msg(LOG_LEVEL_ERROR, "Unable to get FPS!");
+                MSG(ERROR, "Unable to get FPS!\n");
                 goto error;
         }
 
diff --git a/src/video_capture/ximea.c b/src/video_capture/ximea.c
index 05fbba9cb..378bca076 100644
--- a/src/video_capture/ximea.c
+++ b/src/video_capture/ximea.c
@@ -288,7 +288,7 @@ static struct video_frame *vidcap_ximea_grab(void *state, struct audio_frame **a
         *audio = NULL;
         XI_RETURN ret = s->funcs.xiGetImage(s->xiH, timeout_ms, &img);
         if (ret != XI_OK) {
-                log_msg(LOG_LEVEL_ERROR, MOD_NAME "Cannot capture frame: %d", (int) ret);
+                MSG(ERROR, "Cannot capture frame: %d\n", (int) ret);
                 return NULL;
         }
 
diff --git a/src/video_decompress/gpujpeg_to_dxt.cpp b/src/video_decompress/gpujpeg_to_dxt.cpp
index f965a24c8..b0eaa54cf 100644
--- a/src/video_decompress/gpujpeg_to_dxt.cpp
+++ b/src/video_decompress/gpujpeg_to_dxt.cpp
@@ -3,7 +3,7 @@
  * @author Martin Pulec  <pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2012-2023, CESNET z. s. p. o.
+ * Copyright (c) 2012-2025, CESNET
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -163,7 +163,7 @@ static void *worker_thread(void *arg)
                                                 output_frame->data_len,
                                                 CUDA_WRAPPER_MEMCPY_DEVICE_TO_HOST) !=
                                         CUDA_WRAPPER_SUCCESS) {
-                                log_msg(LOG_LEVEL_ERROR, MOD_NAME "unable to copy from device.");
+                                MSG(ERROR, "unable to copy from device.\n");
                         }
                         s->m_out.push(output_frame);