diff --git a/pkg/arch/PKGBUILD b/pkg/arch/PKGBUILD
index 519d541..054ae34 100644
--- a/pkg/arch/PKGBUILD
+++ b/pkg/arch/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 encoder
+# optional: raspberrypi-firmware for OMX encoder
 # optional: wiringpi for GPIO support
 makedepends=(gcc make)
 source=(${pkgname}::"git+https://github.com/pi-kvm/ustreamer#commit=v${pkgver}")
diff --git a/src/encoder.c b/src/encoder.c
index 76b0f32..9847fb9 100644
--- a/src/encoder.c
+++ b/src/encoder.c
@@ -108,13 +108,13 @@ void encoder_prepare(struct encoder_t *encoder, struct device_t *dev) {
 	bool cpu_forced = false;
 
 	if ((dev->run->format == V4L2_PIX_FMT_MJPEG || dev->run->format == V4L2_PIX_FMT_JPEG) && type != ENCODER_TYPE_HW) {
-		LOG_INFO("Switching to HW JPEG encoder because the input format is (M)JPEG");
+		LOG_INFO("Switching to HW encoder because the input format is (M)JPEG");
 		type = ENCODER_TYPE_HW;
 	}
 
 	if (type == ENCODER_TYPE_HW) {
 		if (dev->run->format != V4L2_PIX_FMT_MJPEG && dev->run->format != V4L2_PIX_FMT_JPEG) {
-			LOG_INFO("Switching to CPU JPEG encoder because the input format is not (M)JPEG");
+			LOG_INFO("Switching to CPU encoder because the input format is not (M)JPEG");
 			goto use_cpu;
 		}
 
@@ -131,16 +131,16 @@ void encoder_prepare(struct encoder_t *encoder, struct device_t *dev) {
 				encoder->glitched_resolutions[index][0] == dev->run->width
 				&& encoder->glitched_resolutions[index][1] == dev->run->height
 			) {
-				LOG_INFO("Switching to CPU JPEG encoder the resolution %ux%u marked as glitchy for OMX",
+				LOG_INFO("Switching to CPU encoder the resolution %ux%u marked as glitchy for OMX",
 					dev->run->width, dev->run->height);
 				goto use_cpu;
 			}
 		}
 
-		LOG_DEBUG("Preparing OMX JPEG encoder ...");
+		LOG_DEBUG("Preparing OMX encoder ...");
 
 		if (dev->run->n_workers > OMX_MAX_ENCODERS) {
-			LOG_INFO("OMX JPEG encoder sets limit for worker threads: %u", OMX_MAX_ENCODERS);
+			LOG_INFO("OMX encoder sets limit for worker threads: %u", OMX_MAX_ENCODERS);
 			dev->run->n_workers = OMX_MAX_ENCODERS;
 		}
 
@@ -151,14 +151,14 @@ void encoder_prepare(struct encoder_t *encoder, struct device_t *dev) {
 		// Начинаем с нуля и доинициализируем на следующих заходах при необходимости
 		for (; encoder->run->n_omxs < dev->run->n_workers; ++encoder->run->n_omxs) {
 			if ((encoder->run->omxs[encoder->run->n_omxs] = omx_encoder_init()) == NULL) {
-				LOG_ERROR("Can't initialize OMX JPEG encoder, falling back to CPU");
+				LOG_ERROR("Can't initialize OMX encoder, falling back to CPU");
 				goto force_cpu;
 			}
 		}
 
 		for (unsigned index = 0; index < encoder->run->n_omxs; ++index) {
 			if (omx_encoder_prepare(encoder->run->omxs[index], dev, quality) < 0) {
-				LOG_ERROR("Can't prepare OMX JPEG encoder, falling back to CPU");
+				LOG_ERROR("Can't prepare OMX encoder, falling back to CPU");
 				goto force_cpu;
 			}
 		}
diff --git a/src/encoders/cpu/encoder.c b/src/encoders/cpu/encoder.c
index ce71ffd..8987210 100644
--- a/src/encoders/cpu/encoder.c
+++ b/src/encoders/cpu/encoder.c
@@ -100,7 +100,7 @@ void cpu_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 CPU JPEG encoder");
+		default: assert(0 && "Unsupported input format for CPU encoder");
 	}
 
 #	undef WRITE_SCANLINES
diff --git a/src/encoders/hw/encoder.c b/src/encoders/hw/encoder.c
index dc4fbee..445c047 100644
--- a/src/encoders/hw/encoder.c
+++ b/src/encoders/hw/encoder.c
@@ -51,12 +51,12 @@ int hw_encoder_prepare(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 encoder params and set quality (unsupported)");
+		LOG_ERROR("Can't query HW 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 encoder quality (unsopported)");
+		LOG_ERROR("Can't set HW encoder quality (unsupported)");
 		return -1;
 	}
 	return 0;
@@ -64,7 +64,7 @@ int hw_encoder_prepare(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 encoder");
+		assert(0 && "Unsupported input format for HW encoder");
 	}
 
 #	define PICTURE(_next)	dev->run->pictures[index]._next
diff --git a/src/encoders/omx/encoder.c b/src/encoders/omx/encoder.c
index c10ebdf..9afa342 100644
--- a/src/encoders/omx/encoder.c
+++ b/src/encoders/omx/encoder.c
@@ -99,7 +99,7 @@ struct omx_encoder_t *omx_encoder_init(void) {
 	}
 	_i_omx += 1;
 
-	LOG_INFO("Initializing OMX JPEG encoder ...");
+	LOG_INFO("Initializing OMX encoder ...");
 
 	if (vcos_semaphore_create(&omx->handler_lock, "handler_lock", 0) != VCOS_SUCCESS) {
 		LOG_ERROR("Can't create VCOS semaphore");
@@ -125,7 +125,7 @@ struct omx_encoder_t *omx_encoder_init(void) {
 void omx_encoder_destroy(struct omx_encoder_t *omx) {
 	OMX_ERRORTYPE error;
 
-	LOG_INFO("Destroying OMX JPEG encoder ...");
+	LOG_INFO("Destroying OMX encoder ...");
 
 	component_set_state(&omx->encoder, OMX_StateIdle);
 	_omx_encoder_clear_ports(omx);
@@ -329,7 +329,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 encoder");
+		default: assert(0 && "Unsupported input format for OMX encoder");
 	}
 
 #	undef MAP_FORMAT