diff --git a/src/classic/btstack_sbc.h b/src/classic/btstack_sbc.h
index 0260dfc4d..35ab5a5a9 100644
--- a/src/classic/btstack_sbc.h
+++ b/src/classic/btstack_sbc.h
@@ -48,7 +48,7 @@
 typedef enum{
     SBC_MODE_STANDARD,
     SBC_MODE_mSBC
-} sbc_mode_t;
+} btstack_sbc_mode_t;
 
 #if defined __cplusplus
 }
diff --git a/src/classic/btstack_sbc_decoder.h b/src/classic/btstack_sbc_decoder.h
index 7c9883996..97802129a 100644
--- a/src/classic/btstack_sbc_decoder.h
+++ b/src/classic/btstack_sbc_decoder.h
@@ -36,12 +36,12 @@
  */
 
 /*
- * sbc_decoder.h
+ * btstack_sbc_decoder.h
  *
  */
 
-#ifndef __SBC_DECODER_H
-#define __SBC_DECODER_H
+#ifndef __BTSTACK_SBC_DECODER_H
+#define __BTSTACK_SBC_DECODER_H
 
 #include <stdint.h>
 #include "btstack_sbc.h"
@@ -56,8 +56,8 @@ typedef struct {
     void (*handle_pcm_data)(int16_t * data, int num_samples, int num_channels, int sample_rate, void * context);
     // private
     void * decoder_state;
-    sbc_plc_state_t plc_state;
-    sbc_mode_t mode;
+    btstack_sbc_plc_state_t plc_state;
+    btstack_sbc_mode_t mode;
 
     // summary of processed good, bad and zero frames
     int good_frames_nr;
@@ -75,7 +75,7 @@ typedef struct {
  * @param context provided in callback
  */
 
-void btstack_sbc_decoder_init(btstack_sbc_decoder_state_t * state, sbc_mode_t mode, void (*callback)(int16_t * data, int num_samples, int num_channels, int sample_rate, void * context), void * context);
+void btstack_sbc_decoder_init(btstack_sbc_decoder_state_t * state, btstack_sbc_mode_t mode, void (*callback)(int16_t * data, int num_samples, int num_channels, int sample_rate, void * context), void * context);
 
 /**
  * @brief Process received SCO data
@@ -111,4 +111,4 @@ void btstack_sbc_decoder_test_simulate_corrupt_frames(int period);
 }
 #endif
 
-#endif // __SBC_DECODER_H
\ No newline at end of file
+#endif // __BTSTACK_SBC_DECODER_H
\ No newline at end of file
diff --git a/src/classic/btstack_sbc_decoder_bludroid.c b/src/classic/btstack_sbc_decoder_bludroid.c
index b37c0023d..59b9e434b 100644
--- a/src/classic/btstack_sbc_decoder_bludroid.c
+++ b/src/classic/btstack_sbc_decoder_bludroid.c
@@ -112,7 +112,7 @@ static int find_sequence_of_zeros(const OI_BYTE *frame_data, OI_UINT32 frame_byt
     return 0;
 }
 
-static int find_h2_syncword(const OI_BYTE *frame_data, OI_UINT32 frame_bytes, sbc_mode_t mode){
+static int find_h2_syncword(const OI_BYTE *frame_data, OI_UINT32 frame_bytes, btstack_sbc_mode_t mode){
     if (mode != SBC_MODE_mSBC) return -1;
     int syncword = mSBC_SYNCWORD;
     uint8_t h2_first_byte = 0;
@@ -159,7 +159,7 @@ void OI_AssertFail(char* file, int line, char* reason){
     printf("AssertFail file %s, line %d, reason %s\n", file, line, reason);
 }
 
-void btstack_sbc_decoder_init(btstack_sbc_decoder_state_t * state, sbc_mode_t mode, void (*callback)(int16_t * data, int num_samples, int num_channels, int sample_rate, void * context), void * context){
+void btstack_sbc_decoder_init(btstack_sbc_decoder_state_t * state, btstack_sbc_mode_t mode, void (*callback)(int16_t * data, int num_samples, int num_channels, int sample_rate, void * context), void * context){
     if (sbc_state_singelton && sbc_state_singelton != state ){
         log_error("SBC decoder: different sbc decoder state is allready registered");
     } 
@@ -194,7 +194,7 @@ void btstack_sbc_decoder_init(btstack_sbc_decoder_state_t * state, sbc_mode_t mo
     state->mode = mode;
     state->context = context;
     state->decoder_state = &bd_state;
-    sbc_plc_init(&state->plc_state);
+    btstack_sbc_plc_init(&state->plc_state);
 }
 
 static void append_received_sbc_data(bludroid_decoder_state_t * state, uint8_t * buffer, int size){
@@ -292,7 +292,7 @@ void btstack_sbc_decoder_process_data(btstack_sbc_decoder_state_t * state, int p
                     bd_decoder_state->sync_word_found = 0;
                 }
                 
-                sbc_plc_good_frame(&state->plc_state, bd_decoder_state->pcm_plc_data, bd_decoder_state->pcm_data);
+                btstack_sbc_plc_good_frame(&state->plc_state, bd_decoder_state->pcm_plc_data, bd_decoder_state->pcm_data);
                 state->handle_pcm_data(bd_decoder_state->pcm_data, 
                                     btstack_sbc_decoder_num_samples_per_frame(state), 
                                     btstack_sbc_decoder_num_channels(state), 
@@ -336,7 +336,7 @@ void btstack_sbc_decoder_process_data(btstack_sbc_decoder_state_t * state, int p
 #endif
                 if (!plc_enabled) break;
                 
-                frame_data = sbc_plc_zero_signal_frame();
+                frame_data = btstack_sbc_plc_zero_signal_frame();
                 OI_UINT32 bytes_in_frame_buffer = msbc_frame_size;
                 
                 status = OI_CODEC_SBC_DecodeFrame(&(bd_decoder_state->decoder_context), 
@@ -347,7 +347,7 @@ void btstack_sbc_decoder_process_data(btstack_sbc_decoder_state_t * state, int p
                 // printf("after bad frame, new status: %d, bytes in frame %d\n", status, bytes_in_frame_buffer);
 
                 if (status != 0) exit(10);
-                sbc_plc_bad_frame(&state->plc_state, bd_decoder_state->pcm_plc_data, bd_decoder_state->pcm_data);
+                btstack_sbc_plc_bad_frame(&state->plc_state, bd_decoder_state->pcm_plc_data, bd_decoder_state->pcm_data);
                 state->handle_pcm_data(bd_decoder_state->pcm_data, 
                                     btstack_sbc_decoder_num_samples_per_frame(state), 
                                     btstack_sbc_decoder_num_channels(state), 
diff --git a/src/classic/btstack_sbc_encoder.h b/src/classic/btstack_sbc_encoder.h
index e4ae83342..65b03e681 100644
--- a/src/classic/btstack_sbc_encoder.h
+++ b/src/classic/btstack_sbc_encoder.h
@@ -53,10 +53,10 @@ extern "C" {
 typedef struct {
     // private
     void * encoder_state;
-    sbc_mode_t mode;
+    btstack_sbc_mode_t mode;
 } btstack_sbc_encoder_state_t;
 
-void btstack_sbc_encoder_init(btstack_sbc_encoder_state_t * state, sbc_mode_t mode, 
+void btstack_sbc_encoder_init(btstack_sbc_encoder_state_t * state, btstack_sbc_mode_t mode, 
                         int blocks, int subbands, int allmethod, int sample_rate, int bitpool);
 
 void btstack_sbc_encoder_process_data(int16_t * input_buffer);
diff --git a/src/classic/btstack_sbc_encoder_bludroid.c b/src/classic/btstack_sbc_encoder_bludroid.c
index ce2a24a57..3d3efa233 100644
--- a/src/classic/btstack_sbc_encoder_bludroid.c
+++ b/src/classic/btstack_sbc_encoder_bludroid.c
@@ -110,7 +110,7 @@ uint16_t  btstack_sbc_encoder_sbc_buffer_length(void){
 }
 
 
-void btstack_sbc_encoder_init(btstack_sbc_encoder_state_t * state, sbc_mode_t mode, 
+void btstack_sbc_encoder_init(btstack_sbc_encoder_state_t * state, btstack_sbc_mode_t mode, 
                         int blocks, int subbands, int allmethod, int sample_rate, int bitpool){
 
     if (sbc_state_singelton && sbc_state_singelton != state ){
diff --git a/src/classic/btstack_sbc_plc.c b/src/classic/btstack_sbc_plc.c
index 3f5f8f622..0724965ab 100644
--- a/src/classic/btstack_sbc_plc.c
+++ b/src/classic/btstack_sbc_plc.c
@@ -36,7 +36,7 @@
  */
 
 /*
- * sbc_plc.c
+ * btstack_sbc_plc.c
  *
  */
 
@@ -67,11 +67,11 @@ static float CrossCorrelation(int16_t *x, int16_t *y);
 static int PatternMatch(int16_t *y);
 static float AmplitudeMatch(int16_t *y, int16_t bestmatch);
 
-uint8_t * sbc_plc_zero_signal_frame(void){
+uint8_t * btstack_sbc_plc_zero_signal_frame(void){
     return (uint8_t *)&indices0;
 }
 
-void sbc_plc_init(sbc_plc_state_t *plc_state){
+void btstack_sbc_plc_init(btstack_sbc_plc_state_t *plc_state){
     int i;
     plc_state->nbf=0;
     plc_state->bestlag=0;
@@ -81,7 +81,7 @@ void sbc_plc_init(sbc_plc_state_t *plc_state){
        
 }
 
-void sbc_plc_bad_frame(sbc_plc_state_t *plc_state, int16_t *ZIRbuf, int16_t *out){
+void btstack_sbc_plc_bad_frame(btstack_sbc_plc_state_t *plc_state, int16_t *ZIRbuf, int16_t *out){
     int   i;
     float val;
     float sf;
@@ -133,7 +133,7 @@ void sbc_plc_bad_frame(sbc_plc_state_t *plc_state, int16_t *ZIRbuf, int16_t *out
 
 }
 
-void sbc_plc_good_frame(sbc_plc_state_t *plc_state, int16_t *in, int16_t *out){
+void btstack_sbc_plc_good_frame(btstack_sbc_plc_state_t *plc_state, int16_t *in, int16_t *out){
     int i;
     i=0;
     if (plc_state->nbf>0){
diff --git a/src/classic/btstack_sbc_plc.h b/src/classic/btstack_sbc_plc.h
index 92968549a..3cd1b21cf 100644
--- a/src/classic/btstack_sbc_plc.h
+++ b/src/classic/btstack_sbc_plc.h
@@ -36,12 +36,12 @@
  */
 
 /*
- * sbc_plc.h
+ * btstack_sbc_plc.h
  *
  */
 
-#ifndef __SBC_PLC_H
-#define __SBC_PLC_H
+#ifndef __BTSTACK_SBC_PLC_H
+#define __BTSTACK_SBC_PLC_H
 
 #include <stdint.h>
 
@@ -61,15 +61,15 @@ typedef struct sbc_plc_state {
     int16_t hist[LHIST+FS+SBCRT+OLAL];
     int16_t bestlag;
     int     nbf;
-} sbc_plc_state_t;
+} btstack_sbc_plc_state_t;
+
+void btstack_sbc_plc_init(btstack_sbc_plc_state_t *plc_state);
+void btstack_sbc_plc_bad_frame(btstack_sbc_plc_state_t *plc_state, int16_t *ZIRbuf, int16_t *out); 
+void btstack_sbc_plc_good_frame(btstack_sbc_plc_state_t *plc_state, int16_t *in, int16_t *out);
+uint8_t * btstack_sbc_plc_zero_signal_frame(void);
 
 #if defined __cplusplus
 }
 #endif
 
-void sbc_plc_init(sbc_plc_state_t *plc_state);
-void sbc_plc_bad_frame(sbc_plc_state_t *plc_state, int16_t *ZIRbuf, int16_t *out); 
-void sbc_plc_good_frame(sbc_plc_state_t *plc_state, int16_t *in, int16_t *out);
-uint8_t * sbc_plc_zero_signal_frame(void);
-
-#endif // __SBC_PLC_H
\ No newline at end of file
+#endif // __BTSTACK_SBC_PLC_H
\ No newline at end of file
diff --git a/test/sbc/sbc_decoder_test.c b/test/sbc/sbc_decoder_test.c
index 1d964d3ce..31fd83f73 100644
--- a/test/sbc/sbc_decoder_test.c
+++ b/test/sbc/sbc_decoder_test.c
@@ -141,7 +141,7 @@ int main (int argc, const char * argv[]){
         return -1;
     }
     
-    sbc_mode_t mode = SBC_MODE_STANDARD;
+    btstack_sbc_mode_t mode = SBC_MODE_STANDARD;
     
     const char * filename = argv[1];