diff --git a/examples/bare-metal/explorer_board/src/audio_pipeline/audio_pipeline.c b/examples/bare-metal/explorer_board/src/audio_pipeline/audio_pipeline.c
index fc7c62802..693723f97 100644
--- a/examples/bare-metal/explorer_board/src/audio_pipeline/audio_pipeline.c
+++ b/examples/bare-metal/explorer_board/src/audio_pipeline/audio_pipeline.c
@@ -10,7 +10,7 @@
 /* SDK headers */
 #include "xcore_utils.h"
 #include "mic_array.h"
-#include "bfp_math.h"
+#include "xmath/xmath.h"
 
 /* App headers */
 #include "app_conf.h"
@@ -69,7 +69,7 @@ void ap_stage_b(chanend_t c_input, chanend_t c_output, chanend_t c_from_gpio) {
                 // update the gain
                 float power = (float)gain_db / 20.0;
                 float gain_fl = powf(10.0, power);
-                float_s32_t gain = float_to_float_s32(gain_fl);
+                float_s32_t gain = f32_to_float_s32(gain_fl);
                 // scale both channels 
                 bfp_s32_scale(&ch0, &ch0, gain);
                 bfp_s32_scale(&ch1, &ch1, gain);
diff --git a/examples/freertos/explorer_board/src/example_pipeline/example_pipeline.c b/examples/freertos/explorer_board/src/example_pipeline/example_pipeline.c
index 5bc4b9ba0..17e2540e6 100644
--- a/examples/freertos/explorer_board/src/example_pipeline/example_pipeline.c
+++ b/examples/freertos/explorer_board/src/example_pipeline/example_pipeline.c
@@ -103,7 +103,7 @@ void stage0(int32_t * audio_frame)
     // convert dB to amplitude
     float power = (float)xStage0_Gain / 20.0;
     float gain_fl = powf(10.0, power);
-    float_s32_t gain = float_to_float_s32(gain_fl);
+    float_s32_t gain = f32_to_float_s32(gain_fl);
     // scale both channels
     bfp_s32_scale(&ch0, &ch0, gain);
     bfp_s32_scale(&ch1, &ch1, gain);
diff --git a/examples/freertos/explorer_board/src/example_pipeline/example_pipeline.h b/examples/freertos/explorer_board/src/example_pipeline/example_pipeline.h
index e8a51e6e1..3e54bbf10 100644
--- a/examples/freertos/explorer_board/src/example_pipeline/example_pipeline.h
+++ b/examples/freertos/explorer_board/src/example_pipeline/example_pipeline.h
@@ -6,7 +6,7 @@
 
 #include "rtos_mic_array.h"
 #include "rtos_i2s.h"
-#include "bfp_math.h"
+#include "xmath/xmath.h"
 
 enum {
     GET_GAIN_VAL = 1,
diff --git a/modules/core b/modules/core
index 1983b1173..61ef20e2b 160000
--- a/modules/core
+++ b/modules/core
@@ -1 +1 @@
-Subproject commit 1983b1173333d6bde099e09a21bc3f83ef70e5c6
+Subproject commit 61ef20e2b5b79898a9d1d095cc9f77b2906c9a06
diff --git a/modules/io b/modules/io
index de4cfb21f..bb2411a20 160000
--- a/modules/io
+++ b/modules/io
@@ -1 +1 @@
-Subproject commit de4cfb21fdb2ef6658cf7816c1ea78c4eab738e8
+Subproject commit bb2411a201e29488300aa8707314e0cf3d8178ba
diff --git a/modules/voice b/modules/voice
index 549e7058e..918decac3 160000
--- a/modules/voice
+++ b/modules/voice
@@ -1 +1 @@
-Subproject commit 549e7058e5dd8cd45fc088b6a10c0d75ccfe19e6
+Subproject commit 918decac3604d2faa78c6907ecb9654b669c9588