diff --git a/lib_com/ivas_filters_fx.c b/lib_com/ivas_filters_fx.c
index c7435ab40bec0d4ea304702d67974f543f3aa6a4..f9e35c65a2ecea4fd18583cf091f4ba29bc586c8 100644
--- a/lib_com/ivas_filters_fx.c
+++ b/lib_com/ivas_filters_fx.c
@@ -67,7 +67,7 @@ void ivas_filters_init_fx(
             filter_state->den_fx[IVAS_FILTER_STAGE_0][i] = filt_coeff_fx[i + IVAS_BIQUAD_FILT_LEN];
             move32();
             move32();
-#ifdef OPT_2239_IVAS_FILTER_PROCESS
+#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS
             filter_state->num_shr[IVAS_FILTER_STAGE_0][i] = Q30 - Q31;
             filter_state->den_shr[IVAS_FILTER_STAGE_0][i] = Q30 - Q31;
             move16();
@@ -80,7 +80,7 @@ void ivas_filters_init_fx(
 #endif
         }
 
-#ifdef OPT_2239_IVAS_FILTER_PROCESS
+#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS
         filter_state->state_fx[IVAS_FILTER_STAGE_0][0] = 0;
         filter_state->state_fx[IVAS_FILTER_STAGE_0][1] = 0;
         filter_state->state_fx[IVAS_FILTER_STAGE_0][2] = 0;
@@ -117,7 +117,7 @@ void ivas_filters_init_fx(
             move32();
             move32();
             move32();
-#ifdef OPT_2239_IVAS_FILTER_PROCESS
+#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS
             filter_state->num_shr[IVAS_FILTER_STAGE_0][i] = sub( sub( 31, filt_coeff_e[i + 0 * IVAS_BIQUAD_FILT_LEN] ), Q31 );
             filter_state->den_shr[IVAS_FILTER_STAGE_0][i] = sub( sub( 31, filt_coeff_e[i + 1 * IVAS_BIQUAD_FILT_LEN] ), Q31 );
             filter_state->num_shr[IVAS_FILTER_STAGE_1][i] = sub( sub( 31, filt_coeff_e[i + 2 * IVAS_BIQUAD_FILT_LEN] ), Q31 );
@@ -138,7 +138,7 @@ void ivas_filters_init_fx(
 #endif
         }
 
-#ifdef OPT_2239_IVAS_FILTER_PROCESS
+#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS
         filter_state->state_fx[IVAS_FILTER_STAGE_0][0] = 0;
         filter_state->state_fx[IVAS_FILTER_STAGE_0][1] = 0;
         filter_state->state_fx[IVAS_FILTER_STAGE_0][2] = 0;
@@ -182,7 +182,7 @@ void ivas_filters_init_fx(
     return;
 }
 
-#ifdef OPT_2239_IVAS_FILTER_PROCESS
+#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS
 static Word64 ivas_iir_2_filter_fx( ivas_filters_process_state_t *filter_state, const Word16 stage, const Word64 in );
 
 /*-----------------------------------------------------------------------------------------*
diff --git a/lib_com/ivas_prot_fx.h b/lib_com/ivas_prot_fx.h
index 7cee85a2cdabd2b9e525042a840c95f5949fe719..156088e7f9fefbfb11107cbae46f0cf59744c58b 100644
--- a/lib_com/ivas_prot_fx.h
+++ b/lib_com/ivas_prot_fx.h
@@ -3803,7 +3803,7 @@ void ivas_lfe_enc_fx(
     BSTR_ENC_HANDLE hBstr                                       /* i/o: bitstream handle                                */
 );
 
-#ifdef OPT_2239_IVAS_FILTER_PROCESS
+#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS
 void ivas_filter_process_fx32(
     ivas_filters_process_state_t *filter_state,                 /* i/o: filter state handle                             */
     Word32 *pIn_Out_fx,                                         /* i  : signal subject to filtering                     */
diff --git a/lib_com/ivas_stat_com.h b/lib_com/ivas_stat_com.h
index fbc32c34b3a9edbea74dc88388e76f2b80a7f6b1..4b232ecc941c8323e6ef06578826f09fd5477c6b 100644
--- a/lib_com/ivas_stat_com.h
+++ b/lib_com/ivas_stat_com.h
@@ -655,7 +655,7 @@ typedef struct ivas_filters_process_state_t
     Word16 filt_len;
     Word32 num_fx[IVAS_FILTER_MAX_STAGES][IVAS_BIQUAD_FILT_LEN];
     Word32 den_fx[IVAS_FILTER_MAX_STAGES][IVAS_BIQUAD_FILT_LEN];
-#ifdef OPT_2239_IVAS_FILTER_PROCESS
+#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS
     Word64 state_fx[IVAS_FILTER_MAX_STAGES][IVAS_BIQUAD_FILT_LEN];
     Word16 num_shr[IVAS_FILTER_MAX_STAGES][IVAS_BIQUAD_FILT_LEN];
     Word16 den_shr[IVAS_FILTER_MAX_STAGES][IVAS_BIQUAD_FILT_LEN];
diff --git a/lib_com/ivas_transient_det_fx.c b/lib_com/ivas_transient_det_fx.c
index a313e5a733c5f307c65ac63ec7288613d27610b0..9faba6131209544a1465175f89017dd7e3d4f8b4 100644
--- a/lib_com/ivas_transient_det_fx.c
+++ b/lib_com/ivas_transient_det_fx.c
@@ -44,7 +44,7 @@
  *------------------------------------------------------------------------------------------*/
 
 #define IVAS_TDET_PARM_ENV_EPS ( 1e-5f )
-#ifdef OPT_2239_IVAS_FILTER_PROCESS
+#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS
 #define IVAS_TDET_PARM_ENV_EPS_fx ( ( (Word64) 21474 ) << 12 ) // Q11+32
 #else
 #define IVAS_TDET_PARM_ENV_EPS_fx 21474 // Q31
@@ -396,7 +396,7 @@ void ivas_td_decorr_get_ducking_gains_fx(
     Word32 duck_mult_fac = hTranDet->duck_mult_fac; /*Q29*/
     move32();
 
-#ifdef OPT_2239_IVAS_FILTER_PROCESS
+#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS
     Word64 e_fast_fx[L_FRAME48k], e_slow_fx[L_FRAME48k];
     Word32 fast_fx, slow_fx;
     Word16 fast_e, slow_e;
diff --git a/lib_com/options.h b/lib_com/options.h
index 2320675a9f2ad56cb1461035dbcd18c15b5f9fee..73fa992a6bf988453824f445e15afc91487cecea 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -115,7 +115,7 @@
 #define OPT_2181_MATRIX_TRANSP_1_MUL        /* Dolby: Issue 2181, optimize matrixTransp1Mul_fx. */
 #define OPT_2182_MATRIX_SCALE_OPS           /* Dolby: Issue 2181, move matrix scale operations outside mul operations. */
 #define OPT_2185_MATRIX_OUT_SCALING         /* Dolby: Issue 2185, optimize matrix-mul output-format. */
-#define OPT_2239_IVAS_FILTER_PROCESS        /* Dolby: Issue 2239, optimize ivas_filter_process_fx. */
+#define NONBE_OPT_2239_IVAS_FILTER_PROCESS  /* Dolby: Issue 2239, optimize ivas_filter_process_fx. */
 #define NONBE_OPT_2193_EIG2X2               /* Dolby: Issue 2193, optimize eig2x2_fx. */
 #define BE_FIX_2240_COMPUTE_COV_MTC_FX_FAST /* FhG: Speeds up covariance calculation e.g. 60 WMOPS for encoding -mc 7_1_4 24400 48 */
 
diff --git a/lib_dec/ivas_lfe_dec_fx.c b/lib_dec/ivas_lfe_dec_fx.c
index 753dd20593c8db48d19aa6e604483d460a0747ae..2fa66e34cdbd205522e94a756139a74f3bef19f7 100644
--- a/lib_dec/ivas_lfe_dec_fx.c
+++ b/lib_dec/ivas_lfe_dec_fx.c
@@ -407,7 +407,7 @@ void ivas_lfe_dec_fx(
     IF( hLFE->filter_state.order > 0 )
     {
         /* Low Pass Filter */
-#ifdef OPT_2239_IVAS_FILTER_PROCESS
+#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS
         ivas_filter_process_fx32( &hLFE->filter_state, output_lfe_ch, output_frame );
 #else
         ivas_filter_process_fx( &hLFE->filter_state, output_lfe_ch, output_frame, q_out );
diff --git a/lib_enc/ivas_lfe_enc_fx.c b/lib_enc/ivas_lfe_enc_fx.c
index 15f1fd3ccc0b241fed441b3d7ce0f0f6ced1d245..9d05dbfc4bf3f69c90d3d7ad741df7cbd8a15e68 100644
--- a/lib_enc/ivas_lfe_enc_fx.c
+++ b/lib_enc/ivas_lfe_enc_fx.c
@@ -684,7 +684,7 @@ void ivas_lfe_lpf_enc_apply_fx(
     const Word16 input_frame               /* i  : input frame length per channel   */
 )
 {
-#ifdef OPT_2239_IVAS_FILTER_PROCESS
+#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS
     ivas_filter_process_fx32( hLfeLpf, data_lfe_ch, input_frame );
 #else
     ivas_filter_process_fx( hLfeLpf, data_lfe_ch, input_frame, (Word16) Q11 );