diff --git a/apps/decoder.c b/apps/decoder.c
index b00514bd6699eca17b5bf9485f5cd1bc9a26479b..e09e8fe20961059224892f034cea3d4db75c8e19 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -638,7 +638,7 @@ int main(
 
         if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, arg.directivityPatternId, renderConfig.directivity ) ) != IVAS_ERR_OK )
         {
-#ifdef FIX_730_DPID_NOT_SET_CORRECTLY
+#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY
             fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );
 #else
             fprintf( stderr, "Failed to get directivity for objects: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );
@@ -1031,7 +1031,7 @@ static bool parseCmdlIVAS_dec(
     arg->acousticEnvironmentId = 65535;
     for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )
     {
-#ifdef FIX_730_DPID_NOT_SET_CORRECTLY
+#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY
         arg->directivityPatternId[i] = 65535;
 #else
         arg->directivityPatternId[i] = 0;
diff --git a/apps/renderer.c b/apps/renderer.c
index f121eb241a1421cf7547f5edcae948174f85b680..fc93077a2f922cb45c0258a43fee8f106153929b 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -2640,7 +2640,7 @@ static CmdlnArgs defaultArgs(
 
     for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
     {
-#ifdef FIX_730_DPID_NOT_SET_CORRECTLY
+#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY
         args.directivityPatternId[i] = 65535;
 #else
         args.directivityPatternId[i] = 0;
diff --git a/lib_com/options.h b/lib_com/options.h
index c1dcf8ed15fc59e5b49aa4baf48eacd9df99291b..99ef133b39a7e5a4b58233eee8dd67d0538e295c 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -161,7 +161,6 @@
 
 
 #define FIX_708_DPID_COMMAND_LINE                       /* issue 708: sanity checks for '-dpid' command-line */
-#define FIX_730_DPID_NOT_SET_CORRECTLY                  /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */
 #define FIX_513_REND_MC_ALLOC                           /* FhG: issue 513, optimise external renderer allocation for multichannel */
 #define FIX_812_DOUBLE_PREC_MCT                         /* FhG: Issue 812: Avoid double precision in MCT */
 #define FIX_807_VARIABLE_SPEED_DECODING                 /* FhG: Issue 807: Resolve "Variable Speed Decoding broken" */
@@ -185,6 +184,7 @@
 #ifdef JBM_FOR_OSBA
 #define OSBA_ROOM_IR
 #endif
+#define NONBE_FIX_730_DPID_NOT_SET_CORRECTLY                  /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c
index 028ee3060b644086aae3ed4cae7fb71338751fa9..867282e6b2a23f251e00488fe4589fb73d8a6adc 100644
--- a/lib_util/render_config_reader.c
+++ b/lib_util/render_config_reader.c
@@ -2617,7 +2617,7 @@ ivas_error RenderConfigReader_read(
                     return IVAS_ERR_INVALID_RENDER_CONFIG;
                 }
                 idx = strtol( strtok( NULL, ":" ), NULL, 0 );
-#ifndef FIX_730_DPID_NOT_SET_CORRECTLY
+#ifndef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY
                 pRenderConfigReader->pDP->id = idx;
 #endif
 
@@ -2627,7 +2627,7 @@ ivas_error RenderConfigReader_read(
                 {
                     params_idx += (int32_t) ( strlen( item ) + strlen( pValue ) + 2 );
 #ifdef DEBUGGING
-#ifdef FIX_730_DPID_NOT_SET_CORRECTLY
+#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY
                     fprintf( stderr, "        PARAM: %s -> %s, DIRECTIVITYPATTERN -> %u\n", item, pValue, idx );
 #else
                     fprintf( stderr, "        PARAM: %s -> %s\n", item, pValue );
@@ -2638,7 +2638,7 @@ ivas_error RenderConfigReader_read(
                     {
                         return IVAS_ERR_FAILED_ALLOC;
                     }
-#ifdef FIX_730_DPID_NOT_SET_CORRECTLY
+#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY
                     pRenderConfigReader->pDP[accDPIdx].id = idx;
 #endif
                     if ( strcmp( item, "DIRECTIVITY" ) == 0 )
@@ -2841,7 +2841,7 @@ ivas_error RenderConfigReader_getDirectivity(
 )
 {
     uint16_t n, m;
-#ifdef FIX_730_DPID_NOT_SET_CORRECTLY
+#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY
     uint16_t last_specified_id;
 #endif
     bool idExists;
@@ -2862,7 +2862,7 @@ ivas_error RenderConfigReader_getDirectivity(
     }
     else
     {
-#ifdef FIX_730_DPID_NOT_SET_CORRECTLY
+#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY
         last_specified_id = id[0];
 
         /* set unpspecified Directivity Patterns ID to last specified ID */
@@ -2893,7 +2893,7 @@ ivas_error RenderConfigReader_getDirectivity(
                 if ( id[n] == pRenderConfigReader->pDP[m].id )
                 {
                     idExists = true;
-#ifdef FIX_730_DPID_NOT_SET_CORRECTLY
+#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY
                     mvr2r( pRenderConfigReader->pDP[m].pDirectivity, directivity + ( n * 3 ), 3 );
 #else
                     mvr2r( pRenderConfigReader->pDP[id[n]].pDirectivity, directivity + ( n * 3 ), 3 );