diff --git a/PKGBUILD b/PKGBUILD
index 66ad322..110e86a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ url="https://github.com/pi-kvm/ustreamer"
 license=(GPL)
 arch=(i686 x86_64 armv6h armv7h)
 depends=(libjpeg libevent libutil-linux)
-# optional: raspberrypi-firmware for OMX JPEG compressor
+# optional: raspberrypi-firmware for OMX JPEG encoder
 makedepends=(gcc make)
 source=("$url/archive/v$pkgver.tar.gz")
 md5sums=(SKIP)
diff --git a/src/encoder.c b/src/encoder.c
index 0ba0f7c..284cbe0 100644
--- a/src/encoder.c
+++ b/src/encoder.c
@@ -80,7 +80,7 @@ void encoder_prepare(struct encoder_t *encoder, struct device_t *dev) {
 
 #	ifdef OMX_ENCODER
 	if (encoder->run->type == ENCODER_TYPE_OMX) {
-		LOG_DEBUG("Preparing OMX encoder ...");
+		LOG_DEBUG("Preparing OMX JPEG encoder ...");
 
 		if (dev->n_workers > OMX_MAX_ENCODERS) {
 			LOG_INFO(
@@ -152,7 +152,7 @@ void encoder_prepare_live(struct encoder_t *encoder, struct device_t *dev) {
 		(dev->run->format == V4L2_PIX_FMT_MJPEG || dev->run->format == V4L2_PIX_FMT_JPEG)
 		&& encoder->run->type != ENCODER_TYPE_HW
 	) {
-		LOG_INFO("Switching to HW encoder because the input format is (M)JPEG");
+		LOG_INFO("Switching to HW JPEG encoder because the input format is (M)JPEG");
 		A_PTHREAD_M_LOCK(&encoder->run->mutex);
 		encoder->run->type = ENCODER_TYPE_HW;
 		A_PTHREAD_M_UNLOCK(&encoder->run->mutex);
@@ -160,21 +160,21 @@ void encoder_prepare_live(struct encoder_t *encoder, struct device_t *dev) {
 
 	if (encoder->run->type == ENCODER_TYPE_HW) {
 		if (dev->run->format != V4L2_PIX_FMT_MJPEG && dev->run->format != V4L2_PIX_FMT_JPEG) {
-			LOG_INFO("Switching to CPU encoder because the input format is not (M)JPEG");
+			LOG_INFO("Switching to CPU JPEG encoder because the input format is not (M)JPEG");
 			goto use_fallback;
 		}
 		if (hw_encoder_prepare_live(dev, encoder->quality) < 0) {
 			A_PTHREAD_M_LOCK(&encoder->run->mutex);
 			encoder->run->quality = 0;
 			A_PTHREAD_M_UNLOCK(&encoder->run->mutex);
-			LOG_INFO("Using JPEG quality: HW default");
+			LOG_INFO("Using JPEG quality: HW-default");
 		}
 	}
 #	ifdef OMX_ENCODER
 	else if (encoder->run->type == ENCODER_TYPE_OMX) {
 		for (unsigned index = 0; index < encoder->run->n_omxs; ++index) {
 			if (omx_encoder_prepare_live(encoder->run->omxs[index], dev, encoder->quality) < 0) {
-				LOG_ERROR("Can't prepare OMX encoder, falling back to CPU");
+				LOG_ERROR("Can't prepare OMX JPEG encoder, falling back to CPU");
 				goto use_fallback;
 			}
 		}
diff --git a/src/hw/encoder.c b/src/hw/encoder.c
index 7d19fe1..f3032c9 100644
--- a/src/hw/encoder.c
+++ b/src/hw/encoder.c
@@ -37,12 +37,12 @@ int hw_encoder_prepare_live(struct device_t *dev, unsigned quality) {
 	MEMSET_ZERO(comp);
 
 	if (xioctl(dev->run->fd, VIDIOC_G_JPEGCOMP, &comp) < 0) {
-		LOG_ERROR("Can't query HW JPEG compressor params and set quality (unsupported)");
+		LOG_ERROR("Can't query HW JPEG encoder params and set quality (unsupported)");
 		return -1;
 	}
 	comp.quality = quality;
 	if (xioctl(dev->run->fd, VIDIOC_S_JPEGCOMP, &comp) < 0) {
-		LOG_ERROR("Can't set HW JPEG compressor quality (unsopported)");
+		LOG_ERROR("Can't set HW JPEG encoder quality (unsopported)");
 		return -1;
 	}
 	return 0;
@@ -50,7 +50,7 @@ int hw_encoder_prepare_live(struct device_t *dev, unsigned quality) {
 
 void hw_encoder_compress_buffer(struct device_t *dev, unsigned index) {
 	if (dev->run->format != V4L2_PIX_FMT_MJPEG && dev->run->format != V4L2_PIX_FMT_JPEG) {
-		assert(0 && "Unsupported input format for HW JPEG compressor");
+		assert(0 && "Unsupported input format for HW JPEG encoder");
 	}
 	assert(dev->run->pictures[index].allocated >= dev->run->hw_buffers[index].length);
 	memcpy(dev->run->pictures[index].data, dev->run->hw_buffers[index].start, dev->run->hw_buffers[index].length);
diff --git a/src/jpeg/encoder.c b/src/jpeg/encoder.c
index 7e8c296..030d490 100644
--- a/src/jpeg/encoder.c
+++ b/src/jpeg/encoder.c
@@ -101,7 +101,7 @@ void jpeg_encoder_compress_buffer(struct device_t *dev, unsigned index, unsigned
 		WRITE_SCANLINES(V4L2_PIX_FMT_UYVY, _jpeg_write_scanlines_uyvy);
 		WRITE_SCANLINES(V4L2_PIX_FMT_RGB565, _jpeg_write_scanlines_rgb565);
 		WRITE_SCANLINES(V4L2_PIX_FMT_RGB24, _jpeg_write_scanlines_rgb24);
-		default: assert(0 && "Unsupported input format for JPEG compressor");
+		default: assert(0 && "Unsupported input format for CPU JPEG encoder");
 	}
 
 #	undef WRITE_SCANLINES
diff --git a/src/omx/encoder.c b/src/omx/encoder.c
index 68c6b13..05a4856 100644
--- a/src/omx/encoder.c
+++ b/src/omx/encoder.c
@@ -323,7 +323,7 @@ static int _omx_setup_input(struct omx_encoder_t *omx, struct device_t *dev) {
 		// FIXME: RGB24 не работает нормально, нижняя половина экрана зеленая.
 		// FIXME: Китайский EasyCap тоже не работает, мусор на экране.
 		// Вероятно обе проблемы вызваны некорректной реализацией OMX на пае.
-		default: assert(0 && "Unsupported input format for OMX JPEG compressor");
+		default: assert(0 && "Unsupported input format for OMX JPEG encoder");
 	}
 
 #	undef MAP_FORMAT