diff --git a/apps/decoder.c b/apps/decoder.c
index f6b55ba00f5851cf9aa35d911047ba98f45b2059..b7459c9692fac948322f08c7410aa158239287e1 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -131,7 +131,7 @@ typedef struct
     char *outputMdFilename;
     IVAS_DEC_COMPLEXITY_LEVEL complexityLevel;
     bool tsmEnabled;
-    IVAS_RENDER_FRAMESIZE renderFramesize;
+    IVAS_RENDER_NUM_SUBFR render_num_subframes;
     bool applyPiData;
     char *piOutputFilename;
     bool rtpOutSR;
@@ -217,7 +217,7 @@ int main(
     Vector3PairFileReader *referenceVectorReader = NULL;
     RenderConfigReader *renderConfigReader = NULL;
     int16_t *pcmBuf = NULL;
-    IVAS_RENDER_FRAMESIZE asked_frame_size;
+    IVAS_RENDER_NUM_SUBFR asked_num_subframes;
     IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;
     ObjectEditFileReader *objectEditFileReader = NULL;
     IVAS_ROOM_ACOUSTICS_CONFIG_DATA **pAE = NULL;
@@ -446,11 +446,11 @@ int main(
      * Configure the decoder
      *------------------------------------------------------------------------------------------*/
 
-    asked_frame_size = arg.renderFramesize;
+    asked_num_subframes = arg.render_num_subframes;
     uint16_t aeID = arg.aeSequence.count > 0 ? arg.aeSequence.pID[0] : IVAS_DEFAULT_AEID;
     arg.enableHeadRotation = arg.enableHeadRotation || arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM;
 
-    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled,
+    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.render_num_subframes, arg.customLsOutputEnabled, arg.hrtfReaderEnabled,
                                        arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.roomSize, arg.non_diegetic_pan_enabled,
                                        arg.non_diegetic_pan_gain, arg.dpidEnabled, aeID, arg.objEditEnabled, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )
     {
@@ -458,13 +458,13 @@ int main(
         goto cleanup;
     }
 
-    if ( ( error = IVAS_DEC_GetRenderFramesize( hIvasDec, &arg.renderFramesize ) ) != IVAS_ERR_OK )
+    if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &arg.render_num_subframes ) ) != IVAS_ERR_OK )
     {
         fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
         goto cleanup;
     }
 
-    if ( arg.renderFramesize != asked_frame_size )
+    if ( arg.render_num_subframes != asked_num_subframes )
     {
         fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for decoding to EXT!\n" );
     }
@@ -473,7 +473,6 @@ int main(
      * Configure Split rendering
      *------------------------------------------------------------------------------------------*/
 
-    asked_frame_size = arg.renderFramesize;
     if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
     {
         if ( ( error = IVAS_DEC_EnableSplitRendering( hIvasDec ) ) != IVAS_ERR_OK )
@@ -482,7 +481,7 @@ int main(
             goto cleanup;
         }
 
-        if ( ( error = IVAS_DEC_GetRenderFramesize( hIvasDec, &arg.renderFramesize ) ) != IVAS_ERR_OK )
+        if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &arg.render_num_subframes ) ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
             goto cleanup;
@@ -666,31 +665,33 @@ int main(
             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] );
             goto cleanup;
         }
+
         if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt ) ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "Failed to get Distance Attenuation \n\n" );
             goto cleanup;
         }
+
         if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
         {
-            if ( asked_frame_size != IVAS_RENDER_FRAMESIZE_20MS &&
+            if ( asked_num_subframes != IVAS_RENDER_NUM_SUBFR_20MS &&
                  ( renderConfig.split_rend_config.poseCorrectionMode == ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE ||
                    renderConfig.split_rend_config.dof == 0 ) )
             {
-                arg.renderFramesize = asked_frame_size;
+                arg.render_num_subframes = asked_num_subframes;
             }
             else
             {
-                arg.renderFramesize = IVAS_RENDER_FRAMESIZE_20MS;
+                arg.render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
             }
 
-            if ( ( error = IVAS_DEC_SetRenderFramesize( hIvasDec, arg.renderFramesize ) ) != IVAS_ERR_OK )
+            if ( ( error = IVAS_DEC_SetRenderNumSubfr( hIvasDec, arg.render_num_subframes ) ) != IVAS_ERR_OK )
             {
                 fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
                 goto cleanup;
             }
 
-            if ( arg.renderFramesize != asked_frame_size )
+            if ( arg.render_num_subframes != asked_num_subframes )
             {
                 fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for non-0dof split rendering!\n" );
             }
@@ -715,7 +716,7 @@ int main(
 
         /* ISAR frame size is set from command line, not renderer config file.
          * This will be ignored if output format is not split rendering. */
-        renderConfig.split_rend_config.isar_frame_size_ms = (int16_t) arg.renderFramesize /* given in number of 5ms subframes */ * 5;
+        renderConfig.split_rend_config.isar_frame_size_ms = (int16_t) arg.render_num_subframes /* given in number of 5ms subframes */ * 5;
 
         if ( ( error = IVAS_DEC_FeedRenderConfig( hIvasDec, renderConfig ) ) != IVAS_ERR_OK )
         {
@@ -1049,7 +1050,7 @@ static bool parseCmdlIVAS_dec(
     arg->non_diegetic_pan_enabled = false;
     arg->non_diegetic_pan_gain = 0.f;
     arg->tsmEnabled = false;
-    arg->renderFramesize = IVAS_RENDER_FRAMESIZE_20MS;
+    arg->render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
 #ifdef DEBUGGING
 #ifdef VARIABLE_SPEED_DECODING
     arg->tsmScale = 100;
@@ -1281,13 +1282,13 @@ static bool parseCmdlIVAS_dec(
                 switch ( (int16_t) tmp )
                 {
                     case 5:
-                        arg->renderFramesize = IVAS_RENDER_FRAMESIZE_5MS;
+                        arg->render_num_subframes = IVAS_RENDER_NUM_SUBFR_5MS;
                         break;
                     case 10:
-                        arg->renderFramesize = IVAS_RENDER_FRAMESIZE_10MS;
+                        arg->render_num_subframes = IVAS_RENDER_NUM_SUBFR_10MS;
                         break;
                     case 20:
-                        arg->renderFramesize = IVAS_RENDER_FRAMESIZE_20MS;
+                        arg->render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
                         break;
                     default:
                         fprintf( stderr, "Error: Invalid render frame size %d \n\n", tmp );
@@ -2414,12 +2415,22 @@ static ivas_error decodeG192(
             }
         }
 
+#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC
+        IVAS_RENDER_NUM_SUBFR num_subframes;
+        if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &num_subframes ) ) != IVAS_ERR_OK )
+        {
+            fprintf( stderr, "\nIVAS_DEC_GetRenderNumSubfr failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
+            goto cleanup;
+        }
+
+#else
         int16_t num_subframes;
         if ( ( error = IVAS_DEC_GetNumOrientationSubframes( hIvasDec, &num_subframes ) ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "\nIVAS_DEC_GetNumOrientationSubframes failed: \n" );
             goto cleanup;
         }
+#endif
 
         /* Head-tracking input simulation */
         if ( arg.enableHeadRotation )
@@ -2428,7 +2439,11 @@ static ivas_error decodeG192(
 
             if ( headRotReader == NULL )
             {
+#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC
+                for ( i = 0; i < (int16_t) num_subframes; i++ )
+#else
                 for ( i = 0; i < num_subframes; i++ )
+#endif
                 {
                     Quaternions[i].w = -3.0f;
                     Quaternions[i].x = 0.0f;
@@ -2441,7 +2456,11 @@ static ivas_error decodeG192(
             }
             else
             {
+#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC
+                for ( i = 0; i < (int16_t) num_subframes; i++ )
+#else
                 for ( i = 0; i < num_subframes; i++ )
+#endif
                 {
                     if ( ( error = HeadRotationFileReading( headRotReader, &Quaternions[i], &Pos[i] ) ) != IVAS_ERR_OK )
                     {
@@ -2451,7 +2470,11 @@ static ivas_error decodeG192(
                 }
             }
 
+#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC
+            for ( i = 0; i < (int16_t) num_subframes; i++ )
+#else
             for ( i = 0; i < num_subframes; i++ )
+#endif
             {
                 if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[i], Pos[i], i, DEFAULT_AXIS ) ) != IVAS_ERR_OK )
                 {
@@ -2469,7 +2492,11 @@ static ivas_error decodeG192(
             int8_t enableRotationInterpolation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];
             int16_t numFramesToTargetOrientation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];
 
+#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC
+            for ( i = 0; i < (int16_t) num_subframes; i++ )
+#else
             for ( i = 0; i < num_subframes; i++ )
+#endif
             {
                 if ( ( error = ExternalOrientationFileReading( externalOrientationFileReader, &Quaternions[i], &enableHeadRotation[i], &enableExternalOrientation[i], &enableRotationInterpolation[i], &numFramesToTargetOrientation[i] ) ) != IVAS_ERR_OK )
                 {
@@ -2477,7 +2504,12 @@ static ivas_error decodeG192(
                     goto cleanup;
                 }
             }
+
+#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC
+            for ( i = 0; i < (int16_t) num_subframes; i++ )
+#else
             for ( i = 0; i < num_subframes; i++ )
+#endif
             {
                 if ( ( error = IVAS_DEC_FeedExternalOrientationData( hIvasDec, Quaternions[i], enableHeadRotation[i], enableExternalOrientation[i], enableRotationInterpolation[i], numFramesToTargetOrientation[i], i ) ) != IVAS_ERR_OK )
                 {
@@ -3376,12 +3408,22 @@ static ivas_error decodeVoIP(
             }
         }
 
+#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC
+        IVAS_RENDER_NUM_SUBFR num_subframes;
+        if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &num_subframes ) ) != IVAS_ERR_OK )
+        {
+            fprintf( stderr, "\nIVAS_DEC_GetRenderNumSubfr failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
+            goto cleanup;
+        }
+
+#else
         int16_t num_subframes;
         if ( ( error = IVAS_DEC_GetNumOrientationSubframes( hIvasDec, &num_subframes ) ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "\nIVAS_DEC_GetNumOrientationSubframes failed: \n" );
             goto cleanup;
         }
+#endif
 
         /* Head-tracking input simulation */
         if ( arg.enableHeadRotation )
@@ -3390,7 +3432,11 @@ static ivas_error decodeVoIP(
 
             if ( headRotReader == NULL )
             {
+#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC
+                for ( i = 0; i < (int16_t) num_subframes; i++ )
+#else
                 for ( i = 0; i < num_subframes; i++ )
+#endif
                 {
                     Quaternions[i].w = -3.0f;
                     Quaternions[i].x = 0.0f;
@@ -3403,7 +3449,11 @@ static ivas_error decodeVoIP(
             }
             else
             {
+#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC
+                for ( i = 0; i < (int16_t) num_subframes; i++ )
+#else
                 for ( i = 0; i < num_subframes; i++ )
+#endif
                 {
                     if ( ( error = HeadRotationFileReading( headRotReader, &Quaternions[i], &Pos[i] ) ) != IVAS_ERR_OK )
                     {
@@ -3414,7 +3464,11 @@ static ivas_error decodeVoIP(
                 }
             }
 
+#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC
+            for ( i = 0; i < (int16_t) num_subframes; i++ )
+#else
             for ( i = 0; i < num_subframes; i++ )
+#endif
             {
                 if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[i], Pos[i], i, DEFAULT_AXIS ) ) != IVAS_ERR_OK )
                 {
@@ -3432,7 +3486,11 @@ static ivas_error decodeVoIP(
             int8_t enableRotationInterpolation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];
             int16_t numFramesToTargetOrientation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];
 
+#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC
+            for ( i = 0; i < (int16_t) num_subframes; i++ )
+#else
             for ( i = 0; i < num_subframes; i++ )
+#endif
             {
 
                 if ( ( error = ExternalOrientationFileReading( externalOrientationFileReader, &Quaternions[i], &enableHeadRotation[i], &enableExternalOrientation[i], &enableRotationInterpolation[i], &numFramesToTargetOrientation[i] ) ) != IVAS_ERR_OK )
@@ -3442,7 +3500,12 @@ static ivas_error decodeVoIP(
                     goto cleanup;
                 }
             }
+
+#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC
+            for ( i = 0; i < (int16_t) num_subframes; i++ )
+#else
             for ( i = 0; i < num_subframes; i++ )
+#endif
             {
                 if ( ( error = IVAS_DEC_FeedExternalOrientationData( hIvasDec, Quaternions[i], enableHeadRotation[i], enableExternalOrientation[i], enableRotationInterpolation[i], numFramesToTargetOrientation[i], i ) ) != IVAS_ERR_OK )
                 {
@@ -4329,7 +4392,7 @@ static ivas_error restartDecoder(
 
     IVAS_AUDIO_CONFIG outputConfig = ( decMode == IVAS_DEC_MODE_IVAS ) ? arg->outputConfig : IVAS_AUDIO_CONFIG_MONO;
 
-    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg->output_Fs, outputConfig, arg->renderFramesize, arg->customLsOutputEnabled, arg->hrtfReaderEnabled,
+    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg->output_Fs, outputConfig, arg->render_num_subframes, arg->customLsOutputEnabled, arg->hrtfReaderEnabled,
                                        arg->enableHeadRotation, arg->enableExternalOrientation, arg->orientation_tracking, arg->renderConfigEnabled, arg->roomSize, arg->non_diegetic_pan_enabled,
                                        arg->non_diegetic_pan_gain, arg->dpidEnabled, aeID, arg->objEditEnabled, arg->delayCompensationEnabled ) ) != IVAS_ERR_OK )
     {
@@ -4337,7 +4400,7 @@ static ivas_error restartDecoder(
         goto cleanup;
     }
 
-    if ( ( error = IVAS_DEC_GetRenderFramesize( hIvasDec, &arg->renderFramesize ) ) != IVAS_ERR_OK )
+    if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &arg->render_num_subframes ) ) != IVAS_ERR_OK )
     {
         fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
         goto cleanup;
@@ -4362,7 +4425,7 @@ static ivas_error restartDecoder(
      * This will be ignored if output format is not split rendering. */
     if ( renderConfig != NULL )
     {
-        renderConfig->split_rend_config.isar_frame_size_ms = (int16_t) arg->renderFramesize /* given in number of 5ms subframes */ * 5;
+        renderConfig->split_rend_config.isar_frame_size_ms = (int16_t) arg->render_num_subframes /* given in number of 5ms subframes */ * 5;
     }
 
     if ( arg->renderConfigEnabled && renderConfig != NULL )
diff --git a/apps/isar_post_rend.c b/apps/isar_post_rend.c
index 47ffdfb70118bba7683dc6fa563bb30ed4afbb65..12f24405935c635e029c1054f7fedf200a3f8388 100644
--- a/apps/isar_post_rend.c
+++ b/apps/isar_post_rend.c
@@ -113,7 +113,7 @@ typedef struct
     bool delayCompensationEnabled;
     bool quietModeEnabled;
     bool sceneDescriptionInput;
-    IVAS_RENDER_FRAMESIZE render_framesize;
+    IVAS_RENDER_NUM_SUBFR render_num_subframes;
 } CmdlnArgs;
 
 typedef enum
@@ -340,26 +340,28 @@ static bool parseInConfig(
 
 static bool parseRenderFramesize(
     char *value,
-    IVAS_RENDER_FRAMESIZE *render_framesize )
+    IVAS_RENDER_NUM_SUBFR *render_num_subframes )
 {
     int32_t tmp;
 
-    *render_framesize = IVAS_RENDER_FRAMESIZE_UNKNOWN;
+    *render_num_subframes = IVAS_RENDER_NUM_SUBFR_UNKNOWN;
+
     if ( !is_digits_only( value ) )
     {
         return false;
     }
+
     tmp = (int32_t) strtol( value, NULL, 0 );
     switch ( (int16_t) tmp )
     {
         case 5:
-            *render_framesize = IVAS_RENDER_FRAMESIZE_5MS;
+            *render_num_subframes = IVAS_RENDER_NUM_SUBFR_5MS;
             break;
         case 10:
-            *render_framesize = IVAS_RENDER_FRAMESIZE_10MS;
+            *render_num_subframes = IVAS_RENDER_NUM_SUBFR_10MS;
             break;
         case 20:
-            *render_framesize = IVAS_RENDER_FRAMESIZE_20MS;
+            *render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
             break;
         default:
             return false;
@@ -474,7 +476,7 @@ static CmdlnArgs defaultArgs(
     args.quietModeEnabled = false;
     args.sceneDescriptionInput = false;
 
-    args.render_framesize = IVAS_RENDER_FRAMESIZE_20MS;
+    args.render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
 
     return args;
 }
@@ -557,7 +559,7 @@ static void parseOption(
             break;
         case CmdLnOptionId_framing:
             assert( numOptionValues == 1 );
-            if ( !parseRenderFramesize( optionValues[0], &args->render_framesize ) )
+            if ( !parseRenderFramesize( optionValues[0], &args->render_num_subframes ) )
             {
                 fprintf( stderr, "Unknown or invalid option for frame size: %s\n", optionValues[0] );
                 exit( -1 );
@@ -950,7 +952,7 @@ int main(
         }
         audioReader = NULL;
         /* Force owerwrite of command line provided rendersize to align with codec frame size */
-        args.render_framesize = bitsBuffer.config.isar_frame_size_ms / 5;
+        args.render_num_subframes = bitsBuffer.config.isar_frame_size_ms / 5;
     }
     /*if split renderer is running in post renderer mode*/
     else if ( ( args.inConfig.numBinBuses > 0 ) && ( args.inConfig.binBuses[0].audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) )
@@ -1022,9 +1024,9 @@ int main(
      * Open ISAR handle
      *------------------------------------------------------------------------------------------*/
 
-    const int16_t frameSize_smpls = (int16_t) ( ( args.render_framesize ) * args.sampleRate * 5 / ( 1000 ) );
+    const int16_t frameSize_smpls = (int16_t) ( ( args.render_num_subframes ) * args.sampleRate * 5 / ( 1000 ) );
     args.outConfig.audioConfig = IVAS_AUDIO_CONFIG_BINAURAL;
-    if ( ( error = ISAR_POST_REND_open( &hIsarPostRend, args.sampleRate, args.outConfig.audioConfig, true, 0, 0.0, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
+    if ( ( error = ISAR_POST_REND_open( &hIsarPostRend, args.sampleRate, args.outConfig.audioConfig, true, 0, 0.0, (int16_t) args.render_num_subframes ) ) != IVAS_ERR_OK )
     {
         fprintf( stderr, "\nError opening renderer handle: %s\n", ivas_error_to_string( error ) );
         goto cleanup;
@@ -1237,7 +1239,7 @@ int main(
         convertInputBuffer( inpInt16Buffer, numSamplesRead, inBuffer.config.numSamplesPerChannel, num_in_channels, inFloatBuffer );
 
         int16_t num_subframes, sf_idx;
-        num_subframes = (int16_t) args.render_framesize;
+        num_subframes = (int16_t) args.render_num_subframes;
 
         /* Read from head rotation trajectory file if specified */
         if ( headRotReader != NULL )
diff --git a/apps/renderer.c b/apps/renderer.c
index 491433d645a25ba2da700da30c92c9187391f336..15efd0408d24a5bb9b1e0c062d6e7782fda80ee8 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -191,7 +191,7 @@ typedef struct
     bool lfeCustomRoutingEnabled;
     char inLfePanningMatrixFile[RENDERER_MAX_CLI_ARG_LENGTH];
     int16_t syncMdDelay;
-    IVAS_RENDER_FRAMESIZE render_framesize;
+    IVAS_RENDER_NUM_SUBFR render_num_subframes;
     uint16_t directivityPatternId[RENDERER_MAX_ISM_INPUTS];
     AcousticEnvironmentSequence aeSequence;
     IVAS_ROOM_SIZE_T reverbRoomSize;
@@ -917,9 +917,9 @@ int main(
         goto cleanup;
     }
 
-    const int16_t frameSize_smpls = (int16_t) ( ( args.render_framesize ) * args.sampleRate * 5 / ( 1000 ) );
+    const int16_t frameSize_smpls = (int16_t) ( ( args.render_num_subframes ) * args.sampleRate * BINAURAL_RENDERING_FRAME_SIZE_MS / ( 1000 ) );
 
-    if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ), args.nonDiegeticPan, args.nonDiegeticPanGain, args.Opt_Headrotation, args.Opt_ExternalOrientation, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
+    if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ), args.nonDiegeticPan, args.nonDiegeticPanGain, args.Opt_Headrotation, args.Opt_ExternalOrientation, (int16_t) args.render_num_subframes ) ) != IVAS_ERR_OK )
     {
         fprintf( stderr, "\nError opening renderer handle: %s\n", ivas_error_to_string( error ) );
         goto cleanup;
@@ -1145,7 +1145,7 @@ int main(
 
         /* ISAR frame size is set from command line, not renderer config file.
          * This will be ignored if output format is not split rendering. */
-        renderConfig.split_rend_config.isar_frame_size_ms = (int16_t) args.render_framesize /* given in number of 5ms subframes */ * 5;
+        renderConfig.split_rend_config.isar_frame_size_ms = (int16_t) args.render_num_subframes * 5;
 
         if ( ( error = IVAS_REND_FeedRenderConfig( hIvasRend, renderConfig ) ) != IVAS_ERR_OK )
         {
@@ -1535,7 +1535,7 @@ int main(
     {
         int16_t num_in_channels;
         num_in_channels = inBuffer.config.numChannels;
-        const bool isCurrentFrameMultipleOf20ms = frame % ( 4 / args.render_framesize ) == 0;
+        const bool isCurrentFrameMultipleOf20ms = frame % ( 4 / args.render_num_subframes ) == 0;
 
         if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && renderConfigReader != NULL &&
              args.aeSequence.count > 0 && args.aeSequence.pValidity[args.aeSequence.selected] != 0 )
@@ -1593,7 +1593,7 @@ int main(
         }
 
         int16_t num_subframes, sf_idx;
-        num_subframes = (int16_t) args.render_framesize;
+        num_subframes = (int16_t) args.render_num_subframes;
 
         if ( isCurrentFrameMultipleOf20ms && !flushRendererLastFrame )
         {
@@ -2313,26 +2313,27 @@ static bool parseDiegeticPan(
 
 static bool parseRenderFramesize(
     char *value,
-    IVAS_RENDER_FRAMESIZE *render_framesize )
+    IVAS_RENDER_NUM_SUBFR *render_num_subframes )
 {
     int32_t tmp;
 
-    *render_framesize = IVAS_RENDER_FRAMESIZE_UNKNOWN;
+    *render_num_subframes = IVAS_RENDER_NUM_SUBFR_UNKNOWN;
     if ( !is_digits_only( value ) )
     {
         return false;
     }
+
     tmp = (int32_t) strtol( value, NULL, 0 );
     switch ( (int16_t) tmp )
     {
         case 5:
-            *render_framesize = IVAS_RENDER_FRAMESIZE_5MS;
+            *render_num_subframes = IVAS_RENDER_NUM_SUBFR_5MS;
             break;
         case 10:
-            *render_framesize = IVAS_RENDER_FRAMESIZE_10MS;
+            *render_num_subframes = IVAS_RENDER_NUM_SUBFR_10MS;
             break;
         case 20:
-            *render_framesize = IVAS_RENDER_FRAMESIZE_20MS;
+            *render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
             break;
         default:
             return false;
@@ -2702,7 +2703,7 @@ static CmdlnArgs defaultArgs(
 
     args.lfeCustomRoutingEnabled = false;
     clearString( args.inLfePanningMatrixFile );
-    args.render_framesize = IVAS_RENDER_FRAMESIZE_20MS;
+    args.render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
     args.syncMdDelay = 0;
 
     for ( i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
@@ -2872,7 +2873,7 @@ static void parseOption(
             break;
         case CmdLnOptionId_framing:
             assert( numOptionValues == 1 );
-            if ( !parseRenderFramesize( optionValues[0], &args->render_framesize ) )
+            if ( !parseRenderFramesize( optionValues[0], &args->render_num_subframes ) )
             {
                 fprintf( stderr, "Unknown or invalid option for frame size: %s\n", optionValues[0] );
                 exit( -1 );
diff --git a/lib_com/common_api_types.h b/lib_com/common_api_types.h
index ad74f9136cad5e6544a2cdf92084b31297cd02d9..e98408b2b717d452381e7e9e32289a178f3290e6 100644
--- a/lib_com/common_api_types.h
+++ b/lib_com/common_api_types.h
@@ -167,12 +167,12 @@ typedef enum
 
 typedef enum
 {
-    IVAS_RENDER_FRAMESIZE_UNKNOWN = 0,
-    IVAS_RENDER_FRAMESIZE_5MS = 1,
-    IVAS_RENDER_FRAMESIZE_10MS = 2,
-    IVAS_RENDER_FRAMESIZE_20MS = 4
+    IVAS_RENDER_NUM_SUBFR_UNKNOWN = 0,
+    IVAS_RENDER_NUM_SUBFR_5MS = 1,
+    IVAS_RENDER_NUM_SUBFR_10MS = 2,
+    IVAS_RENDER_NUM_SUBFR_20MS = 4
 
-} IVAS_RENDER_FRAMESIZE;
+} IVAS_RENDER_NUM_SUBFR;
 
 typedef enum
 {
diff --git a/lib_com/options.h b/lib_com/options.h
index 11f9b1f26ebdea14a0c6f62e9f9c7e2f110b1c31..72c3d3883f3bf4452f67bfb3707f746e48465d06 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -162,6 +162,7 @@
 /*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */
 #define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */
 #define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */
+#define FIX_945_REMOVE_DUPLICATED_API_FUNC              /* VA: issue 945: remove duplicated API function for getting number of rendering subframes */
 
 
 /* #################### End BE switches ################################## */
diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
index a3d954ef2f3d770751f34017e087449b914f5d1f..89274b08edf55b20d327b0433ee2b98e31be6b82 100644
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -1306,7 +1306,7 @@ ivas_error ivas_init_decoder_front(
 
     if ( st_ivas->hDecoderConfig->Opt_ExternalOrientation )
     {
-        if ( ( error = ivas_external_orientation_open( &( st_ivas->hExtOrientationData ), st_ivas->hDecoderConfig->render_framesize ) ) != IVAS_ERR_OK )
+        if ( ( error = ivas_external_orientation_open( &( st_ivas->hExtOrientationData ), st_ivas->hDecoderConfig->render_num_subframes ) ) != IVAS_ERR_OK )
         {
             return error;
         }
@@ -1318,7 +1318,7 @@ ivas_error ivas_init_decoder_front(
 
     if ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation )
     {
-        if ( ( error = ivas_combined_orientation_open( &( st_ivas->hCombinedOrientationData ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hDecoderConfig->render_framesize ) ) != IVAS_ERR_OK )
+        if ( ( error = ivas_combined_orientation_open( &( st_ivas->hCombinedOrientationData ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hDecoderConfig->render_num_subframes ) ) != IVAS_ERR_OK )
         {
             return error;
         }
diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h
index 3ce93da9de0415ba6743ffca7b4a8b44a71f2335..b87b30127b4f923c12a601b99cae7a64827fd16a 100644
--- a/lib_dec/ivas_stat_dec.h
+++ b/lib_dec/ivas_stat_dec.h
@@ -1008,8 +1008,8 @@ typedef struct decoder_config_structure
     int16_t Opt_aeid_on;                         /* indicates whether Acoustic environment option is used */
     int16_t Opt_ObjEdit_on;                      /* indicates whether object editing option is used */
     int16_t Opt_tsm;                             /* indicates whether time scaling modification is activated */
-    IVAS_RENDER_FRAMESIZE render_framesize;
-    int16_t Opt_delay_comp; /* flag indicating delay compensation active */
+    IVAS_RENDER_NUM_SUBFR render_num_subframes;  /* renderer number of subframes */
+    int16_t Opt_delay_comp;                      /* flag indicating delay compensation active */
 
 } DECODER_CONFIG, *DECODER_CONFIG_HANDLE;
 
diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c
index 102c73becc1115acb22c2158fed651ed52999443..7a3f457b215ea436cc305c76a38988de1511530c 100644
--- a/lib_dec/lib_dec.c
+++ b/lib_dec/lib_dec.c
@@ -125,7 +125,7 @@ static ivas_error ivas_dec_reconfig_split_rend( Decoder_Struct *st_ivas );
 static ivas_error ivas_dec_init_split_rend( Decoder_Struct *st_ivas );
 static ivas_error ivas_create_handle_isar( ISAR_DEC_SPLIT_REND_WRAPPER_HANDLE *hSplitBinRend_out );
 static void ivas_destroy_handle_isar( ISAR_DEC_SPLIT_REND_WRAPPER_HANDLE *hSplitBinRend_out );
-static int16_t get_render_frame_size_ms( IVAS_RENDER_FRAMESIZE render_framesize );
+static int16_t get_render_frame_size_ms( IVAS_RENDER_NUM_SUBFR render_num_subfr );
 static int16_t get_render_frame_size_samples( const DECODER_CONFIG_HANDLE hDecoderConfig );
 static int16_t ivas_dec_split_rend_cldfb_in( const RENDERER_TYPE renderer_type );
 static void update_voip_rendered20ms( IVAS_DEC_HANDLE hIvasDec, const int16_t nSamplesRendered );
@@ -438,7 +438,7 @@ ivas_error IVAS_DEC_Configure(
     IVAS_DEC_HANDLE hIvasDec,                          /* i/o: IVAS decoder handle                        */
     const uint32_t sampleRate,                         /* i  : output sampling frequency                  */
     const AUDIO_CONFIG outputConfig,                   /* i  : output configuration                       */
-    const IVAS_RENDER_FRAMESIZE renderFramesize,       /* i  : rendering frame size                       */
+    const IVAS_RENDER_NUM_SUBFR render_num_subframes,  /* i  : rendering number of subframes              */
     const bool customLsOutputEnabled,                  /* i  : enable custom loudspeaker setup handle     */
     const bool hrtfReaderEnabled,                      /* i  : enable HRTF binary file input              */
     const bool enableHeadRotation,                     /* i  : enable head rotation for binaural output   */
@@ -519,17 +519,18 @@ ivas_error IVAS_DEC_Configure(
     hDecoderConfig->Opt_aeid_on = acousticEnvironmentId != 65535 ? TRUE : FALSE;
     hDecoderConfig->Opt_ObjEdit_on = (int16_t) objEditEnabled;
 
-    if ( renderFramesize == IVAS_RENDER_FRAMESIZE_UNKNOWN )
+    if ( render_num_subframes == IVAS_RENDER_NUM_SUBFR_UNKNOWN )
     {
         return IVAS_ERR_WRONG_PARAMS;
     }
+
     if ( outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL )
     {
-        hDecoderConfig->render_framesize = IVAS_RENDER_FRAMESIZE_20MS;
+        hDecoderConfig->render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
     }
     else
     {
-        hDecoderConfig->render_framesize = renderFramesize;
+        hDecoderConfig->render_num_subframes = render_num_subframes;
     }
 
     /* Set decoder parameters to initial values */
@@ -578,7 +579,7 @@ ivas_error IVAS_DEC_EnableSplitRendering(
     hDecoderConfig = hIvasDec->st_ivas->hDecoderConfig;
 
     hDecoderConfig->Opt_Headrotation = 1;
-    hDecoderConfig->render_framesize = IVAS_RENDER_FRAMESIZE_20MS;
+    hDecoderConfig->render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
 
     return IVAS_ERR_OK;
 }
@@ -590,22 +591,23 @@ ivas_error IVAS_DEC_EnableSplitRendering(
  * Get render framesize in ms
  *---------------------------------------------------------------------*/
 
+/*! r: render framesize in ms  */
 static int16_t get_render_frame_size_ms(
-    const IVAS_RENDER_FRAMESIZE render_framesize )
+    const IVAS_RENDER_NUM_SUBFR render_num_subframes )
 {
-    return (int16_t) ( render_framesize * ( 1000 / ( FRAMES_PER_SEC * IVAS_MAX_PARAM_SPATIAL_SUBFRAMES ) ) );
+    return (int16_t) ( render_num_subframes * ( 1000 / ( FRAMES_PER_SEC * IVAS_MAX_PARAM_SPATIAL_SUBFRAMES ) ) );
 }
 
 
 /*---------------------------------------------------------------------*
- * IVAS_DEC_SetRenderFramesize( )
+ * IVAS_DEC_SetRenderNumSubfr( )
  *
  * Set render framesize
  *---------------------------------------------------------------------*/
 
-ivas_error IVAS_DEC_SetRenderFramesize(
-    IVAS_DEC_HANDLE hIvasDec,                    /* i/o: IVAS decoder handle   */
-    const IVAS_RENDER_FRAMESIZE render_framesize /* i  : render framesize      */
+ivas_error IVAS_DEC_SetRenderNumSubfr(
+    IVAS_DEC_HANDLE hIvasDec,                        /* i/o: IVAS decoder handle            */
+    const IVAS_RENDER_NUM_SUBFR render_num_subframes /* i  : renderer number of subframes   */
 )
 {
     if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hDecoderConfig == NULL )
@@ -613,16 +615,16 @@ ivas_error IVAS_DEC_SetRenderFramesize(
         return IVAS_ERR_UNEXPECTED_NULL_POINTER;
     }
 
-    hIvasDec->st_ivas->hDecoderConfig->render_framesize = render_framesize;
+    hIvasDec->st_ivas->hDecoderConfig->render_num_subframes = render_num_subframes;
 
     if ( hIvasDec->st_ivas->hExtOrientationData != NULL )
     {
-        hIvasDec->st_ivas->hExtOrientationData->num_subframes = (int16_t) render_framesize;
+        hIvasDec->st_ivas->hExtOrientationData->num_subframes = (int16_t) render_num_subframes;
     }
 
     if ( hIvasDec->st_ivas->hCombinedOrientationData != NULL )
     {
-        hIvasDec->st_ivas->hCombinedOrientationData->num_subframes = (int16_t) render_framesize;
+        hIvasDec->st_ivas->hCombinedOrientationData->num_subframes = (int16_t) render_num_subframes;
     }
 
     return IVAS_ERR_OK;
@@ -630,22 +632,22 @@ ivas_error IVAS_DEC_SetRenderFramesize(
 
 
 /*---------------------------------------------------------------------*
- * IVAS_DEC_GetGetRenderFramesize( )
+ * IVAS_DEC_GetRenderNumSubfr( )
  *
- * Get render framesize
+ * Get number of rendering subframes
  *---------------------------------------------------------------------*/
 
-ivas_error IVAS_DEC_GetRenderFramesize(
-    IVAS_DEC_HANDLE hIvasDec,               /* i/o: IVAS decoder handle   */
-    IVAS_RENDER_FRAMESIZE *render_framesize /* o  : render framesize      */
+ivas_error IVAS_DEC_GetRenderNumSubfr(
+    IVAS_DEC_HANDLE hIvasDec,                   /* i/o: IVAS decoder handle             */
+    IVAS_RENDER_NUM_SUBFR *render_num_subframes /* o  : rendering number of subframes   */
 )
 {
-    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || render_framesize == NULL )
+    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || render_num_subframes == NULL )
     {
         return IVAS_ERR_UNEXPECTED_NULL_POINTER;
     }
 
-    *render_framesize = hIvasDec->st_ivas->hDecoderConfig->render_framesize;
+    *render_num_subframes = hIvasDec->st_ivas->hDecoderConfig->render_num_subframes;
 
     return IVAS_ERR_OK;
 }
@@ -661,7 +663,7 @@ static int16_t get_render_frame_size_samples(
     const DECODER_CONFIG_HANDLE hDecoderConfig /* i  : configuration structure */
 )
 {
-    return (int16_t) ( hDecoderConfig->output_Fs * hDecoderConfig->render_framesize / ( FRAMES_PER_SEC * IVAS_MAX_PARAM_SPATIAL_SUBFRAMES ) );
+    return (int16_t) ( hDecoderConfig->output_Fs * hDecoderConfig->render_num_subframes / ( FRAMES_PER_SEC * IVAS_MAX_PARAM_SPATIAL_SUBFRAMES ) );
 }
 
 
@@ -688,29 +690,29 @@ ivas_error IVAS_DEC_GetRenderFramesizeSamples(
 
 
 /*---------------------------------------------------------------------*
- * IVAS_DEC_GetGetRenderFramesizeMs( )
+ * IVAS_DEC_GetRenderFramesizeMs( )
  *
  * Get render framesize in milliseconds
  *---------------------------------------------------------------------*/
 
 ivas_error IVAS_DEC_GetRenderFramesizeMs(
-    IVAS_DEC_HANDLE hIvasDec,  /* i/o: IVAS decoder handle          */
-    uint32_t *render_framesize /* o  : render framesize in samples  */
+    IVAS_DEC_HANDLE hIvasDec,     /* i/o: IVAS decoder handle          */
+    uint32_t *render_framesize_ms /* o  : render framesize in ms       */
 )
 {
-    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || render_framesize == NULL )
+    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || render_framesize_ms == NULL )
     {
         return IVAS_ERR_UNEXPECTED_NULL_POINTER;
     }
 
-    *render_framesize = get_render_frame_size_ms( hIvasDec->st_ivas->hDecoderConfig->render_framesize );
+    *render_framesize_ms = get_render_frame_size_ms( hIvasDec->st_ivas->hDecoderConfig->render_num_subframes );
 
     return IVAS_ERR_OK;
 }
 
 
 /*---------------------------------------------------------------------*
- * IVAS_DEC_GetGetReferencesUpdateFrequency( )
+ * IVAS_DEC_GetReferencesUpdateFrequency( )
  *
  * Get update frequency of the reference vector/orientation
  *---------------------------------------------------------------------*/
@@ -725,11 +727,12 @@ ivas_error IVAS_DEC_GetReferencesUpdateFrequency(
         return IVAS_ERR_UNEXPECTED_NULL_POINTER;
     }
 
-    *update_frequency = (int16_t) ( IVAS_MAX_PARAM_SPATIAL_SUBFRAMES / hIvasDec->st_ivas->hDecoderConfig->render_framesize );
+    *update_frequency = (int16_t) ( IVAS_MAX_PARAM_SPATIAL_SUBFRAMES / hIvasDec->st_ivas->hDecoderConfig->render_num_subframes );
 
     return IVAS_ERR_OK;
 }
 
+#ifndef FIX_945_REMOVE_DUPLICATED_API_FUNC
 /*---------------------------------------------------------------------*
  * IVAS_DEC_GetGetNumOrientationSubframes( )
  *
@@ -746,11 +749,11 @@ ivas_error IVAS_DEC_GetNumOrientationSubframes(
         return IVAS_ERR_UNEXPECTED_NULL_POINTER;
     }
 
-    *num_subframes = (int16_t) hIvasDec->st_ivas->hDecoderConfig->render_framesize;
+    *num_subframes = (int16_t) hIvasDec->st_ivas->hDecoderConfig->render_num_subframes;
 
     return IVAS_ERR_OK;
 }
-
+#endif
 
 /*---------------------------------------------------------------------*
  * IVAS_DEC_EnableVoIP( )
@@ -1936,12 +1939,12 @@ static int16_t isar_get_frame_size(
 
     output_Fs = st_ivas->hDecoderConfig->output_Fs;
 
-    if ( st_ivas->hDecoderConfig->render_framesize != IVAS_RENDER_FRAMESIZE_20MS &&
+    if ( st_ivas->hDecoderConfig->render_num_subframes != IVAS_RENDER_NUM_SUBFR_20MS &&
          ( st_ivas->hRenderConfig->split_rend_config.poseCorrectionMode == ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE ||
            st_ivas->hRenderConfig->split_rend_config.dof == 0 ) )
     {
         nSamplesPerChannel = (int16_t) ( output_Fs / FRAMES_PER_SEC / MAX_PARAM_SPATIAL_SUBFRAMES );
-        nSamplesPerChannel *= (int16_t) st_ivas->hDecoderConfig->render_framesize;
+        nSamplesPerChannel *= (int16_t) st_ivas->hDecoderConfig->render_num_subframes;
     }
     else
     {
@@ -2172,7 +2175,7 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream(
     /* convert to int16 with limiting for BINAURAL_SPLIT_PCM */
     if ( pcm_out_flag )
     {
-        if ( st_ivas->hDecoderConfig->render_framesize == IVAS_RENDER_FRAMESIZE_5MS )
+        if ( st_ivas->hDecoderConfig->render_num_subframes == IVAS_RENDER_NUM_SUBFR_5MS )
         {
 #ifndef DISABLE_LIMITER
             ivas_limiter_dec( st_ivas->hLimiter, p_head_pose_buf, st_ivas->hDecoderConfig->nchan_out, numSamplesPerChannelToOutput, st_ivas->BER_detect );
@@ -4107,7 +4110,7 @@ static ivas_error ivas_dec_voip_get_samples_common(
         /* Synthesise PCM output if split PCM */
         if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
         {
-            if ( st_ivas->hDecoderConfig->render_framesize == IVAS_RENDER_FRAMESIZE_5MS )
+            if ( st_ivas->hDecoderConfig->render_num_subframes == IVAS_RENDER_NUM_SUBFR_5MS )
             {
 #ifndef DISABLE_LIMITER
                 ivas_limiter_dec( st_ivas->hLimiter, p_head_pose_buf, st_ivas->hDecoderConfig->nchan_out, *nSamplesRendered, st_ivas->BER_detect );
@@ -4605,7 +4608,7 @@ static ivas_error printConfigInfo_dec(
 
         if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
         {
-            fprintf( stdout, "Render framesize:       %dms\n", get_render_frame_size_ms( st_ivas->hDecoderConfig->render_framesize ) );
+            fprintf( stdout, "Render frame size:      %d ms\n", get_render_frame_size_ms( st_ivas->hDecoderConfig->render_num_subframes ) );
         }
         if ( st_ivas->hDecoderConfig->Opt_HRTF_binary )
         {
@@ -5604,7 +5607,7 @@ static ivas_error ivas_dec_init_split_rend(
         mixed_td_cldfb_flag = 1;
     }
 
-    error = ISAR_PRE_REND_open( &st_ivas->hSplitBinRend->splitrend, &st_ivas->hRenderConfig->split_rend_config, st_ivas->hDecoderConfig->output_Fs, cldfb_in_flag, pcm_out_flag, (int16_t) st_ivas->hDecoderConfig->render_framesize, mixed_td_cldfb_flag );
+    error = ISAR_PRE_REND_open( &st_ivas->hSplitBinRend->splitrend, &st_ivas->hRenderConfig->split_rend_config, st_ivas->hDecoderConfig->output_Fs, cldfb_in_flag, pcm_out_flag, (int16_t) st_ivas->hDecoderConfig->render_num_subframes, mixed_td_cldfb_flag );
 
     return error;
 }
@@ -5668,7 +5671,7 @@ static ivas_error feedSinglePIorientation(
 
     if ( !st_ivas->hExtOrientationData )
     {
-        if ( ( error = ivas_external_orientation_open( &( st_ivas->hExtOrientationData ), st_ivas->hDecoderConfig->render_framesize ) ) != IVAS_ERR_OK )
+        if ( ( error = ivas_external_orientation_open( &( st_ivas->hExtOrientationData ), st_ivas->hDecoderConfig->render_num_subframes ) ) != IVAS_ERR_OK )
         {
             return error;
         }
@@ -5676,7 +5679,7 @@ static ivas_error feedSinglePIorientation(
 
     if ( !st_ivas->hCombinedOrientationData )
     {
-        if ( ( error = ivas_combined_orientation_open( &( st_ivas->hCombinedOrientationData ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hDecoderConfig->render_framesize ) ) != IVAS_ERR_OK )
+        if ( ( error = ivas_combined_orientation_open( &( st_ivas->hCombinedOrientationData ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hDecoderConfig->render_num_subframes ) ) != IVAS_ERR_OK )
         {
             return error;
         }
diff --git a/lib_dec/lib_dec.h b/lib_dec/lib_dec.h
index e9c866e3b63aebdd1ad883c57a786453349ccaaa..ad646b680a75a898a3191c4e5a42d1ef1296b4d4 100644
--- a/lib_dec/lib_dec.h
+++ b/lib_dec/lib_dec.h
@@ -112,7 +112,7 @@ ivas_error IVAS_DEC_Configure(
     IVAS_DEC_HANDLE hIvasDec,                   /* i/o: IVAS decoder handle                                                     */
     const uint32_t sampleRate,                  /* i  : output sampling frequency                                               */
     const IVAS_AUDIO_CONFIG outputConfig,       /* i  : audio configuration                                                     */
-    const IVAS_RENDER_FRAMESIZE renderFramesize,/* i  : rendering frame size                                                    */
+    const IVAS_RENDER_NUM_SUBFR render_n_subfr, /* i  : rendering number of subframes                                           */
     const bool customLsOutputEnabled,           /* i  : enable custom loudspeaker setup handle                                  */
     const bool hrtfReaderEnabled,               /* i  : enable HRTF binary file input                                           */
     const bool enableHeadRotation,              /* i  : enable head rotation for binaural output                                */
@@ -355,14 +355,14 @@ ivas_error IVAS_DEC_EnableSplitRendering(
     IVAS_DEC_HANDLE hIvasDec                    /* i/o: IVAS decoder handle                                                     */
 );
 
-ivas_error IVAS_DEC_SetRenderFramesize(
+ivas_error IVAS_DEC_SetRenderNumSubfr(
     IVAS_DEC_HANDLE hIvasDec,                   /* i/o: IVAS decoder handle                                                     */
-    const IVAS_RENDER_FRAMESIZE render_framesize /* i  : render framesize                                                       */
+    const IVAS_RENDER_NUM_SUBFR render_num_subframes    /* i  : rendering number of subframes                                   */
 );
 
-ivas_error IVAS_DEC_GetRenderFramesize(
+ivas_error IVAS_DEC_GetRenderNumSubfr(
     IVAS_DEC_HANDLE hIvasDec,                   /* i/o: IVAS decoder handle                                                     */
-    IVAS_RENDER_FRAMESIZE *render_framesize     /* o  : render framesize                                                        */
+    IVAS_RENDER_NUM_SUBFR *render_num_subframes /* o  : rendering number of subframes                                           */
 );
 
 ivas_error IVAS_DEC_GetRenderFramesizeSamples(
@@ -375,14 +375,16 @@ ivas_error IVAS_DEC_GetReferencesUpdateFrequency(
     int16_t *update_frequency                   /* o  : update frequency                                                        */
 );
 
+#ifndef FIX_945_REMOVE_DUPLICATED_API_FUNC
 ivas_error IVAS_DEC_GetNumOrientationSubframes(
     IVAS_DEC_HANDLE hIvasDec,                   /* i/o: IVAS decoder handle                                                     */
     int16_t *num_subframes                      /* o  : render framesize                                                        */
 );
 
+#endif
 ivas_error IVAS_DEC_GetRenderFramesizeMs(
     IVAS_DEC_HANDLE hIvasDec,                   /* i/o: IVAS decoder handle                                                     */
-    uint32_t *render_framesize                  /* o  : render framesize in samples                                             */
+    uint32_t *render_framesize_ms               /* o  : render framesize in ms                                                  */
 );
 
 #ifdef DEBUGGING
diff --git a/lib_isar/isar_prot.h b/lib_isar/isar_prot.h
index dd224e741b6226d385eea6aff14f976684f6df51..ff38559eaf9a56200dd9351eaa5ea136dc453fec 100644
--- a/lib_isar/isar_prot.h
+++ b/lib_isar/isar_prot.h
@@ -58,7 +58,7 @@ ivas_error split_renderer_open_lc3plus(
     SPLIT_REND_WRAPPER *hSplitRendWrapper,                      /* i/o: Split renderer pre-renderer handle      */
     const ISAR_SPLIT_REND_CONFIG_DATA *pSplitRendConfig,        /* i  : Split renderer pre-renderer config      */
     const int32_t output_Fs,                                    /* i  : output sampling rate                    */
-    const IVAS_RENDER_FRAMESIZE ivas_frame_size                 /* i  : IVAS frame size                         */
+    const IVAS_RENDER_NUM_SUBFR render_num_subframes            /* i  : rendering number of subframes           */
 );
 
 void isar_splitBinPreRendClose(
@@ -353,7 +353,7 @@ int32_t isar_get_split_rend_md_target_brate(
 );
 
 ivas_error isar_framesize_to_ms(
-    const IVAS_RENDER_FRAMESIZE frame_size,                     /* i  : frame size enum                         */
+    const IVAS_RENDER_NUM_SUBFR render_num_subframes,           /* i  : rendering number of subframes           */
     int16_t *ms                                                 /* o  : frame size in ms                        */
 );
 
diff --git a/lib_isar/isar_splitRendererPre.c b/lib_isar/isar_splitRendererPre.c
index cd5a75cefbaf6bac8788a74a7c35b6c2a655192d..5dfce772e2b18a72371c373ae8ac2bbeddafc34c 100644
--- a/lib_isar/isar_splitRendererPre.c
+++ b/lib_isar/isar_splitRendererPre.c
@@ -1735,7 +1735,7 @@ ivas_error split_renderer_open_lc3plus(
     SPLIT_REND_WRAPPER *hSplitRendWrapper,               /* i/o: Split renderer pre-renderer handle      */
     const ISAR_SPLIT_REND_CONFIG_DATA *pSplitRendConfig, /* i  : Split renderer pre-renderer config      */
     const int32_t output_Fs,                             /* i  : output sampling rate                    */
-    const IVAS_RENDER_FRAMESIZE isar_frame_size          /* i  : IVAS frame size                         */
+    const IVAS_RENDER_NUM_SUBFR render_num_subframes     /* i  : rendering number of subframes           */
 )
 {
     ivas_error error;
@@ -1743,7 +1743,7 @@ ivas_error split_renderer_open_lc3plus(
     LC3PLUS_CONFIG config;
     int16_t isar_frame_size_ms;
 
-    if ( ( error = isar_framesize_to_ms( isar_frame_size, &isar_frame_size_ms ) ) != IVAS_ERR_OK )
+    if ( ( error = isar_framesize_to_ms( render_num_subframes, &isar_frame_size_ms ) ) != IVAS_ERR_OK )
     {
         return error;
     }
diff --git a/lib_isar/isar_splitRenderer_utils.c b/lib_isar/isar_splitRenderer_utils.c
index d9b3d361a1354de0ea2f8451c29003695d37b0d0..0d85ade6d703b8d8e9f19119551924ad781c52c8 100644
--- a/lib_isar/isar_splitRenderer_utils.c
+++ b/lib_isar/isar_splitRenderer_utils.c
@@ -1039,19 +1039,19 @@ void isar_init_multi_bin_pose_data(
  *------------------------------------------------------------------------*/
 
 ivas_error isar_framesize_to_ms(
-    const IVAS_RENDER_FRAMESIZE frame_size, /* i  : frame size enum         */
-    int16_t *ms                             /* o  : frame size in ms        */
+    const IVAS_RENDER_NUM_SUBFR render_num_subframes, /* i  : rendering number of subframes  */
+    int16_t *ms                                       /* o  : frame size in ms               */
 )
 {
-    switch ( frame_size )
+    switch ( render_num_subframes )
     {
-        case IVAS_RENDER_FRAMESIZE_5MS:
+        case IVAS_RENDER_NUM_SUBFR_5MS:
             *ms = 5;
             break;
-        case IVAS_RENDER_FRAMESIZE_10MS:
+        case IVAS_RENDER_NUM_SUBFR_10MS:
             *ms = 10;
             break;
-        case IVAS_RENDER_FRAMESIZE_20MS:
+        case IVAS_RENDER_NUM_SUBFR_20MS:
             *ms = 20;
             break;
         default:
diff --git a/lib_isar/lib_isar_pre_rend.c b/lib_isar/lib_isar_pre_rend.c
index c552cefca3c0c7f85201a26cce3816934a7ab21b..de5a224dcdc94783a0a1b624553ad031ba5a4691 100644
--- a/lib_isar/lib_isar_pre_rend.c
+++ b/lib_isar/lib_isar_pre_rend.c
@@ -53,20 +53,20 @@
  *------------------------------------------------------------------------*/
 
 ivas_error ISAR_PRE_REND_open(
-    SPLIT_REND_WRAPPER *hSplitBinRend,             /* i/o: Split renderer pre-renderer handle           */
-    ISAR_SPLIT_REND_CONFIG_DATA *pSplitRendConfig, /* i/o: Split renderer pre-renderer config           */
-    const int32_t output_Fs,                       /* i  : output sampling rate                         */
-    const int16_t cldfb_in_flag,                   /* i  : Flag to indicate CLDFB or time doamin input  */
-    const int16_t pcm_out_flag,                    /* i  : Flag to indicate PCM output                  */
-    const IVAS_RENDER_FRAMESIZE ivas_frame_size,   /* i  : IVAS frame size                              */
-    const int16_t mixed_td_cldfb_flag              /* i  : Flag to indicate combined TD and CLDFB input */
+    SPLIT_REND_WRAPPER *hSplitBinRend,                /* i/o: Split renderer pre-renderer handle           */
+    ISAR_SPLIT_REND_CONFIG_DATA *pSplitRendConfig,    /* i/o: Split renderer pre-renderer config           */
+    const int32_t output_Fs,                          /* i  : output sampling rate                         */
+    const int16_t cldfb_in_flag,                      /* i  : Flag to indicate CLDFB or time doamin input  */
+    const int16_t pcm_out_flag,                       /* i  : Flag to indicate PCM output                  */
+    const IVAS_RENDER_NUM_SUBFR render_num_subframes, /* i  : rendering number of subframes                */
+    const int16_t mixed_td_cldfb_flag                 /* i  : Flag to indicate combined TD and CLDFB input */
 )
 {
     ivas_error error, ch, num_ch;
     uint8_t isCldfbNeeded = 0;
     int16_t cldfb_in_flag_local = cldfb_in_flag;
 
-    if ( ( error = isar_split_rend_choose_default_codec( &( pSplitRendConfig->codec ), &pSplitRendConfig->isar_frame_size_ms, &pSplitRendConfig->codec_frame_size_ms, cldfb_in_flag_local, pcm_out_flag, (int16_t) ivas_frame_size ) ) != IVAS_ERR_OK )
+    if ( ( error = isar_split_rend_choose_default_codec( &( pSplitRendConfig->codec ), &pSplitRendConfig->isar_frame_size_ms, &pSplitRendConfig->codec_frame_size_ms, cldfb_in_flag_local, pcm_out_flag, (int16_t) render_num_subframes ) ) != IVAS_ERR_OK )
     {
         return error;
     }
@@ -146,7 +146,7 @@ ivas_error ISAR_PRE_REND_open(
     {
         if ( pSplitRendConfig->codec == ISAR_SPLIT_REND_CODEC_LC3PLUS )
         {
-            if ( ( error = split_renderer_open_lc3plus( hSplitBinRend, pSplitRendConfig, output_Fs, ivas_frame_size ) ) != IVAS_ERR_OK )
+            if ( ( error = split_renderer_open_lc3plus( hSplitBinRend, pSplitRendConfig, output_Fs, render_num_subframes ) ) != IVAS_ERR_OK )
             {
                 return error;
             }
diff --git a/lib_isar/lib_isar_pre_rend.h b/lib_isar/lib_isar_pre_rend.h
index f0ffbf430e85bddd0d616f144fc0088280073694..03d6c5ae2911ad51a894f5e4d90c542d5c1d4d1a 100644
--- a/lib_isar/lib_isar_pre_rend.h
+++ b/lib_isar/lib_isar_pre_rend.h
@@ -48,7 +48,7 @@ ivas_error ISAR_PRE_REND_open(
     const int32_t output_Fs,                                            /* i  : output sampling rate                            */
     const int16_t cldfb_in_flag,                                        /* i  : Flag to indicate CLDFB or time doamin input     */
     const int16_t pcm_out_flag,                                         /* i  : Flag to indicate PCM output                     */
-    const IVAS_RENDER_FRAMESIZE ivas_frame_size,                        /* i  : IVAS frame size                                 */
+    const IVAS_RENDER_NUM_SUBFR render_num_subframes,                   /* i  : rendering number of subframes                   */
     const int16_t mixed_td_cldfb_flag                                   /* i  : Flag to indicate combined TD and CLDFB input    */
 );