diff --git a/encoder/ENC_SINCOS.c b/encoder/ENC_SINCOS.c
index ecb4a887..e8afb8d8 100644
--- a/encoder/ENC_SINCOS.c
+++ b/encoder/ENC_SINCOS.c
@@ -8,7 +8,7 @@
 #include "utils.h"
 #include <math.h>
 
-ENC_SINCOS_config_t enc_sincos_config_now = { 0 };
+ENCSINCOS_config_t enc_sincos_config_now = { 0 };
 
 static float sin_gain = 0.0;
 static float sin_offset = 0.0;
@@ -30,7 +30,7 @@ void ENC_SINCOS_deinit(void) {
 	enc_sincos_config_now.is_init = 0;
 }
 
-encoders_ret_t ENC_SINCOS_init(ENC_SINCOS_config_t *enc_sincos_config) {
+encoders_ret_t ENC_SINCOS_init(ENCSINCOS_config_t *enc_sincos_config) {
 	//ADC inputs are already initialized in hw_init_gpio()
 	sin_gain = enc_sincos_config->s_gain;
 	sin_offset = enc_sincos_config->s_offset;
diff --git a/encoder/ENC_SINCOS.h b/encoder/ENC_SINCOS.h
index c0181965..6efc5864 100644
--- a/encoder/ENC_SINCOS.h
+++ b/encoder/ENC_SINCOS.h
@@ -6,7 +6,7 @@
 #include "encoder/encoder_datatype.h"
 
 void ENC_SINCOS_deinit(void);
-encoders_ret_t ENC_SINCOS_init(ENC_SINCOS_config_t *enc_sincos_config);
+encoders_ret_t ENC_SINCOS_init(ENCSINCOS_config_t *enc_sincos_config);
 
 float ENC_SINCOS_read_deg(void);
 
diff --git a/encoder/encoder_datatype.h b/encoder/encoder_datatype.h
index b0cab881..d717a076 100644
--- a/encoder/encoder_datatype.h
+++ b/encoder/encoder_datatype.h
@@ -78,7 +78,7 @@ typedef struct {
 	float c_gain;
 	float c_offset;
 	float filter_constant;
-} ENC_SINCOS_config_t;
+} ENCSINCOS_config_t;
 
 typedef struct {
 	bool is_init;
diff --git a/encoder/encoders.c b/encoder/encoders.c
index 6f8e6cfb..824456a5 100644
--- a/encoder/encoders.c
+++ b/encoder/encoders.c
@@ -84,7 +84,7 @@ encoders_ret_t encoders_init(encoders_config_t *encoder_config) {
 		index_found = true;
 		return ENCODERS_OK;
 	} else if (encoder_type_now == ENCODERS_TYPE_SINCOS) {
-		ENC_SINCOS_config_t enc_sincos_config;
+		ENCSINCOS_config_t enc_sincos_config;
 		encoders_ret_t encoder_ret;
 
 		enc_sincos_config.is_init = 0;