diff --git a/src/ustreamer/encoder.c b/src/ustreamer/encoder.c
index 9004d83..54483af 100644
--- a/src/ustreamer/encoder.c
+++ b/src/ustreamer/encoder.c
@@ -207,7 +207,7 @@ void encoder_get_runtime_params(encoder_s *encoder, encoder_type_e *type, unsign
 
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic push
-int encoder_compress_buffer(encoder_s *encoder, unsigned worker_number, frame_s *raw, frame_s *frame) {
+int encoder_compress(encoder_s *encoder, unsigned worker_number, frame_s *raw, frame_s *frame) {
 #pragma GCC diagnostic pop
 
 	assert(ER(type) != ENCODER_TYPE_UNKNOWN);
@@ -218,15 +218,15 @@ int encoder_compress_buffer(encoder_s *encoder, unsigned worker_number, frame_s
 
 	if (ER(type) == ENCODER_TYPE_CPU) {
 		LOG_VERBOSE("Compressing buffer using CPU");
-		cpu_encoder_compress_buffer(raw, frame, ER(quality));
+		cpu_encoder_compress(raw, frame, ER(quality));
 	} else if (ER(type) == ENCODER_TYPE_HW) {
 		LOG_VERBOSE("Compressing buffer using HW (just copying)");
-		hw_encoder_compress_buffer(raw, frame);
+		hw_encoder_compress(raw, frame);
 	}
 #	ifdef WITH_OMX
 	else if (ER(type) == ENCODER_TYPE_OMX) {
 		LOG_VERBOSE("Compressing buffer using OMX");
-		if (omx_encoder_compress_buffer(ER(omxs[worker_number]), raw, frame) < 0) {
+		if (omx_encoder_compress(ER(omxs[worker_number]), raw, frame) < 0) {
 			goto error;
 		}
 	}
diff --git a/src/ustreamer/encoder.h b/src/ustreamer/encoder.h
index c5e974d..292c513 100644
--- a/src/ustreamer/encoder.h
+++ b/src/ustreamer/encoder.h
@@ -111,4 +111,4 @@ const char *encoder_type_to_string(encoder_type_e type);
 void encoder_prepare(encoder_s *encoder, device_s *dev);
 void encoder_get_runtime_params(encoder_s *encoder, encoder_type_e *type, unsigned *quality);
 
-int encoder_compress_buffer(encoder_s *encoder, unsigned worker_number, frame_s *raw, frame_s *frame);
+int encoder_compress(encoder_s *encoder, unsigned worker_number, frame_s *raw, frame_s *frame);
diff --git a/src/ustreamer/encoders/cpu/encoder.c b/src/ustreamer/encoders/cpu/encoder.c
index 8e9c168..9b94dc7 100644
--- a/src/ustreamer/encoders/cpu/encoder.c
+++ b/src/ustreamer/encoders/cpu/encoder.c
@@ -58,7 +58,7 @@ static boolean _jpeg_empty_output_buffer(j_compress_ptr jpeg);
 static void _jpeg_term_destination(j_compress_ptr jpeg);
 
 
-void cpu_encoder_compress_buffer(frame_s *raw, frame_s *frame, unsigned quality) {
+void cpu_encoder_compress(frame_s *raw, frame_s *frame, unsigned quality) {
 	// This function based on compress_image_to_jpeg() from mjpg-streamer
 
 	struct jpeg_compress_struct jpeg;
diff --git a/src/ustreamer/encoders/cpu/encoder.h b/src/ustreamer/encoders/cpu/encoder.h
index c28a3dc..2823df3 100644
--- a/src/ustreamer/encoders/cpu/encoder.h
+++ b/src/ustreamer/encoders/cpu/encoder.h
@@ -35,4 +35,4 @@
 #include "../../../common/frame.h"
 
 
-void cpu_encoder_compress_buffer(frame_s *raw, frame_s *frame, unsigned quality);
+void cpu_encoder_compress(frame_s *raw, frame_s *frame, unsigned quality);
diff --git a/src/ustreamer/encoders/hw/encoder.c b/src/ustreamer/encoders/hw/encoder.c
index ec13319..66399b8 100644
--- a/src/ustreamer/encoders/hw/encoder.c
+++ b/src/ustreamer/encoders/hw/encoder.c
@@ -49,7 +49,7 @@ int hw_encoder_prepare(device_s *dev, unsigned quality) {
 	return 0;
 }
 
-void hw_encoder_compress_buffer(frame_s *raw, frame_s *frame) {
+void hw_encoder_compress(frame_s *raw, frame_s *frame) {
 	if (raw->format != V4L2_PIX_FMT_MJPEG && raw->format != V4L2_PIX_FMT_JPEG) {
 		assert(0 && "Unsupported input format for HW encoder");
 	}
diff --git a/src/ustreamer/encoders/hw/encoder.h b/src/ustreamer/encoders/hw/encoder.h
index 7303a8e..62220ca 100644
--- a/src/ustreamer/encoders/hw/encoder.h
+++ b/src/ustreamer/encoders/hw/encoder.h
@@ -39,4 +39,4 @@
 
 
 int hw_encoder_prepare(device_s *dev, unsigned quality);
-void hw_encoder_compress_buffer(frame_s *raw, frame_s *frame);
+void hw_encoder_compress(frame_s *raw, frame_s *frame);
diff --git a/src/ustreamer/encoders/omx/encoder.c b/src/ustreamer/encoders/omx/encoder.c
index 7e5e769..5410fe4 100644
--- a/src/ustreamer/encoders/omx/encoder.c
+++ b/src/ustreamer/encoders/omx/encoder.c
@@ -154,7 +154,7 @@ int omx_encoder_prepare(omx_encoder_s *omx, device_s *dev, unsigned quality) {
 	return 0;
 }
 
-int omx_encoder_compress_buffer(omx_encoder_s *omx, frame_s *raw, frame_s *frame) {
+int omx_encoder_compress(omx_encoder_s *omx, frame_s *raw, frame_s *frame) {
 #	define IN(_next)	omx->input_buffer->_next
 #	define OUT(_next)	omx->output_buffer->_next
 
diff --git a/src/ustreamer/encoders/omx/encoder.h b/src/ustreamer/encoders/omx/encoder.h
index 8177517..8c44ae2 100644
--- a/src/ustreamer/encoders/omx/encoder.h
+++ b/src/ustreamer/encoders/omx/encoder.h
@@ -71,4 +71,4 @@ omx_encoder_s *omx_encoder_init(void);
 void omx_encoder_destroy(omx_encoder_s *omx);
 
 int omx_encoder_prepare(omx_encoder_s *omx, device_s *dev, unsigned quality);
-int omx_encoder_compress_buffer(omx_encoder_s *omx, frame_s *raw, frame_s *frame);
+int omx_encoder_compress(omx_encoder_s *omx, frame_s *raw, frame_s *frame);
diff --git a/src/ustreamer/stream.c b/src/ustreamer/stream.c
index 8c1c2e6..45b2719 100644
--- a/src/ustreamer/stream.c
+++ b/src/ustreamer/stream.c
@@ -471,7 +471,7 @@ static void *_worker_thread(void *v_worker) {
 
 			LOG_DEBUG("Worker %u compressing JPEG from buffer %u ...", wr->number, wr->buf_index);
 
-			wr->job_failed = (bool)encoder_compress_buffer(
+			wr->job_failed = (bool)encoder_compress(
 				wr->stream->encoder,
 				wr->number,
 				&wr->stream->dev->run->hw_buffers[wr->buf_index].raw,