diff --git a/libavutil/arm/float_dsp_arm.h b/libavutil/arm/float_dsp_arm.h
index 976e5a0a2467f8cb72ab7b38c25f601fb71291f4..81fad3ef2f7bfe071246576201d42265222a1fa6 100644
--- a/libavutil/arm/float_dsp_arm.h
+++ b/libavutil/arm/float_dsp_arm.h
@@ -23,7 +23,7 @@
 
 #include "libavutil/float_dsp.h"
 
-void ff_dsputil_init_vfp (AVFloatDSPContext *fdsp);
-void ff_dsputil_init_neon(AVFloatDSPContext *fdsp);
+void ff_float_dsp_init_vfp (AVFloatDSPContext *fdsp);
+void ff_float_dsp_init_neon(AVFloatDSPContext *fdsp);
 
 #endif /* AVUTIL_ARM_FLOAT_DSP_ARM_H */
diff --git a/libavutil/arm/float_dsp_init_arm.c b/libavutil/arm/float_dsp_init_arm.c
index 0fee8611c43f65c7221745ed96fb76d0b9553a80..a352becd0cd3be490499e0efb8e9e224a9ac5353 100644
--- a/libavutil/arm/float_dsp_init_arm.c
+++ b/libavutil/arm/float_dsp_init_arm.c
@@ -27,7 +27,7 @@ void ff_float_dsp_init_arm(AVFloatDSPContext *fdsp)
     int cpu_flags = av_get_cpu_flags();
 
     if (have_vfp(cpu_flags))
-        ff_dsputil_init_vfp(fdsp);
+        ff_float_dsp_init_vfp(fdsp);
     if (have_neon(cpu_flags))
-        ff_dsputil_init_neon(fdsp);
+        ff_float_dsp_init_neon(fdsp);
 }
diff --git a/libavutil/arm/float_dsp_init_neon.c b/libavutil/arm/float_dsp_init_neon.c
index 1e732db9df42ec6e07b7609109626d4c6621f573..fa6d0d7d15885a21f3bd02ead1b6cdfff3f29efb 100644
--- a/libavutil/arm/float_dsp_init_neon.c
+++ b/libavutil/arm/float_dsp_init_neon.c
@@ -26,7 +26,7 @@
 
 void ff_vector_fmul_neon(float *dst, const float *src0, const float *src1, int len);
 
-void ff_dsputil_init_neon(AVFloatDSPContext *fdsp)
+void ff_float_dsp_init_neon(AVFloatDSPContext *fdsp)
 {
-    c->vector_fmul = ff_vector_fmul_neon;
+    fdsp->vector_fmul = ff_vector_fmul_neon;
 }
diff --git a/libavutil/arm/float_dsp_init_vfp.c b/libavutil/arm/float_dsp_init_vfp.c
index d58dbded3ab58003b881f6cb15cbb85e5d2ca0cf..30a9ce4ed7bf51a870bbe24443184822b76857e1 100644
--- a/libavutil/arm/float_dsp_init_vfp.c
+++ b/libavutil/arm/float_dsp_init_vfp.c
@@ -25,10 +25,10 @@
 void ff_vector_fmul_vfp(float *dst, const float *src0, const float *src1,
                         int len);
 
-void ff_dsputil_init_vfp(DSPContext* c, AVCodecContext *avctx)
+void ff_float_dsp_init_vfp(AVFloatDSPContext *fdsp)
 {
     int cpu_flags = av_get_cpu_flags();
 
     if (!have_vfpv3(cpu_flags))
-        c->vector_fmul = ff_vector_fmul_vfp;
+        fdsp->vector_fmul = ff_vector_fmul_vfp;
 }