diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index e25838fca06ad523d94b10a108e7e89c73223904..4bdf52fc66f5a50caf8b560dc3a351163c97031b 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2529,7 +2529,7 @@ static void apply_dependent_coupling(AACContext *ac,
                 const float gain = cce->coup.gain[index][idx];
                 for (group = 0; group < ics->group_len[g]; group++) {
                     for (k = offsets[i]; k < offsets[i + 1]; k++) {
-                        // XXX dsputil-ize
+                        // FIXME: SIMDify
                         dest[group * 128 + k] += gain * src[group * 128 + k];
                     }
                 }
diff --git a/libavcodec/ac3dsp.c b/libavcodec/ac3dsp.c
index e792bcfce5ff7aa09aa7824f29b7240ff4cc95fa..25bd6e3577010c0574aff4787ba59b8aaa7f9049 100644
--- a/libavcodec/ac3dsp.c
+++ b/libavcodec/ac3dsp.c
@@ -1,5 +1,5 @@
 /*
- * AC-3 DSP utils
+ * AC-3 DSP functions
  * Copyright (c) 2011 Justin Ruggles
  *
  * This file is part of Libav.
diff --git a/libavcodec/ac3dsp.h b/libavcodec/ac3dsp.h
index e350c8824d6204d9131afd4ee6453fc3bed81116..6ca0c5b8e87d62809ffd627d231292a02e77ed2f 100644
--- a/libavcodec/ac3dsp.h
+++ b/libavcodec/ac3dsp.h
@@ -1,5 +1,5 @@
 /*
- * AC-3 DSP utils
+ * AC-3 DSP functions
  * Copyright (c) 2011 Justin Ruggles
  *
  * This file is part of Libav.
diff --git a/libavcodec/arm/hpeldsp_arm.S b/libavcodec/arm/hpeldsp_arm.S
index 5bacd8e3597555f76cb2cd3bf36194407db2f2dd..0f8092e15e5eb3939772f90a09249363b580f193 100644
--- a/libavcodec/arm/hpeldsp_arm.S
+++ b/libavcodec/arm/hpeldsp_arm.S
@@ -1,5 +1,5 @@
 @
-@ ARMv4 optimized DSP utils
+@ ARMv4-optimized halfpel functions
 @ Copyright (c) 2004 AGAWA Koji <i (AT) atty (DOT) jp>
 @
 @ This file is part of Libav.
diff --git a/libavcodec/arm/hpeldsp_init_arm.c b/libavcodec/arm/hpeldsp_init_arm.c
index 8176afeb3b5a256d079f3bea3d3cd12761b13f46..c675166f68dace8038eb894d5463caad05f05ebb 100644
--- a/libavcodec/arm/hpeldsp_init_arm.c
+++ b/libavcodec/arm/hpeldsp_init_arm.c
@@ -1,5 +1,5 @@
 /*
- * ARM optimized DSP utils
+ * ARM-optimized halfpel functions
  * Copyright (c) 2001 Lionel Ulmer
  *
  * This file is part of Libav.
diff --git a/libavcodec/arm/videodsp_armv5te.S b/libavcodec/arm/videodsp_armv5te.S
index 055736d7ba260f82e1b89cb36d14496c52c42766..bbd0a61da68ad055cddfacf3d4cd07cb466f97f1 100644
--- a/libavcodec/arm/videodsp_armv5te.S
+++ b/libavcodec/arm/videodsp_armv5te.S
@@ -1,5 +1,5 @@
 @
-@ ARMv5te optimized DSP utils
+@ ARMv5te-optimized core video DSP functions
 @ Copyright (c) 2004 AGAWA Koji <i (AT) atty (DOT) jp>
 @
 @ This file is part of Libav.
diff --git a/libavcodec/bfin/hpeldsp_bfin.c b/libavcodec/bfin/hpeldsp_bfin.c
index cecb1db51e3a98fc37607f8f8b1e8a4c4521af98..4fc66ed1b86a2d5788e07d59672c4655378ee933 100644
--- a/libavcodec/bfin/hpeldsp_bfin.c
+++ b/libavcodec/bfin/hpeldsp_bfin.c
@@ -1,5 +1,5 @@
 /*
- * BlackFin DSPUTILS
+ * BlackFin halfpel functions
  *
  * Copyright (C) 2007 Marc Hoffman <marc.hoffman@analog.com>
  * Copyright (c) 2006 Michael Benjamin <michael.benjamin@analog.com>
diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c
index 42def5ee88ba57ced9e2e6c3b93bb4961e221f62..756dcadef7c322ad25aa76947ec7acced40a754a 100644
--- a/libavcodec/mpegvideo_motion.c
+++ b/libavcodec/mpegvideo_motion.c
@@ -404,7 +404,7 @@ static void mpeg_motion_field(MpegEncContext *s, uint8_t *dest_y,
                              motion_x, motion_y, h, 0, mb_y);
 }
 
-// FIXME move to dsputil, avg variant, 16x16 version
+// FIXME: SIMDify, avg variant, 16x16 version
 static inline void put_obmc(uint8_t *dst, uint8_t *src[5], int stride)
 {
     int x;
diff --git a/libavcodec/x86/ac3dsp.asm b/libavcodec/x86/ac3dsp.asm
index b43231855c1885cbc5b244c5bc0400ec8dde3204..d0ab3e73596a7120e4ac0e1b8222da913c85e44e 100644
--- a/libavcodec/x86/ac3dsp.asm
+++ b/libavcodec/x86/ac3dsp.asm
@@ -1,5 +1,5 @@
 ;*****************************************************************************
-;* x86-optimized AC-3 DSP utils
+;* x86-optimized AC-3 DSP functions
 ;* Copyright (c) 2011 Justin Ruggles
 ;*
 ;* This file is part of Libav.
diff --git a/libavcodec/x86/ac3dsp_init.c b/libavcodec/x86/ac3dsp_init.c
index f3a921384ed1e3c5abab2c8afddd3008789f3760..a82c249400c26ef5467c4a8662a3fa1473c3ea96 100644
--- a/libavcodec/x86/ac3dsp_init.c
+++ b/libavcodec/x86/ac3dsp_init.c
@@ -1,5 +1,5 @@
 /*
- * x86-optimized AC-3 DSP utils
+ * x86-optimized AC-3 DSP functions
  * Copyright (c) 2011 Justin Ruggles
  *
  * This file is part of Libav.
diff --git a/libavcodec/x86/deinterlace.asm b/libavcodec/x86/deinterlace.asm
index b2828f3f1786a0d34b43404e35bb6050f328848b..70d000e0dbfbb98b3b2c88940f623320ee3288d1 100644
--- a/libavcodec/x86/deinterlace.asm
+++ b/libavcodec/x86/deinterlace.asm
@@ -1,5 +1,5 @@
 ;******************************************************************************
-;* MMX optimized deinterlacing functions
+;* SIMD-optimized deinterlacing functions
 ;* Copyright (c) 2010 Vitor Sessak
 ;* Copyright (c) 2002 Michael Niedermayer
 ;*
diff --git a/libavcodec/x86/fdct.c b/libavcodec/x86/fdct.c
index 6d595aa76f43a8f6bb6de78d9323479ead099d79..6c95439e100247603dbf76fdb74896e5bb05761e 100644
--- a/libavcodec/x86/fdct.c
+++ b/libavcodec/x86/fdct.c
@@ -1,5 +1,5 @@
 /*
- * MMX optimized forward DCT
+ * SIMD-optimized forward DCT
  * The gcc porting is Copyright (c) 2001 Fabrice Bellard.
  * cleanup/optimizations are Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
  * SSE2 optimization is Copyright (c) 2004 Denes Balatoni.
diff --git a/libavcodec/x86/fpel.asm b/libavcodec/x86/fpel.asm
index 43b039d0e0acb023cc6c40e86fe74f1745627684..b248764b5852039212af4754ff285c2a0e634c99 100644
--- a/libavcodec/x86/fpel.asm
+++ b/libavcodec/x86/fpel.asm
@@ -1,5 +1,5 @@
 ;******************************************************************************
-;* MMX optimized DSP utils
+;* SIMD-optimized fullpel functions
 ;* Copyright (c) 2008 Loren Merritt
 ;* Copyright (c) 2003-2013 Michael Niedermayer
 ;* Copyright (c) 2013 Daniel Kang
diff --git a/libavcodec/x86/hpeldsp.asm b/libavcodec/x86/hpeldsp.asm
index ff6e57a5d152af01f27c7da41e2d4ecc62687c44..cef91bd718eacadb0354b48be75d8e9355c8ffc1 100644
--- a/libavcodec/x86/hpeldsp.asm
+++ b/libavcodec/x86/hpeldsp.asm
@@ -1,5 +1,5 @@
 ;******************************************************************************
-;* MMX optimized hpel functions
+;* SIMD-optimized halfpel functions
 ;*
 ;* This file is part of Libav.
 ;*
diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c
index 3a197e17270616f9496787660fa292df56eff2e8..83d53dee5f5208423110eb192cde1db5d9e6b8d0 100644
--- a/libavcodec/x86/hpeldsp_init.c
+++ b/libavcodec/x86/hpeldsp_init.c
@@ -1,5 +1,5 @@
 /*
- * MMX optimized DSP utils
+ * SIMD-optimized halfpel functions
  * Copyright (c) 2000, 2001 Fabrice Bellard
  * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
  *
diff --git a/libavcodec/x86/hpeldsp_rnd_template.c b/libavcodec/x86/hpeldsp_rnd_template.c
index 516a03aec289fbd2ba4cf8d10ec9119275c0f4fb..b514a8fd4e2e8b3aaea697bee07e8d6e95039f62 100644
--- a/libavcodec/x86/hpeldsp_rnd_template.c
+++ b/libavcodec/x86/hpeldsp_rnd_template.c
@@ -1,5 +1,5 @@
 /*
- * DSP utils mmx functions are compiled twice for rnd/no_rnd
+ * SIMD-optimized halfpel functions are compiled twice for rnd/no_rnd
  * Copyright (c) 2000, 2001 Fabrice Bellard
  * Copyright (c) 2003-2004 Michael Niedermayer <michaelni@gmx.at>
  *
diff --git a/libavcodec/x86/lpc.c b/libavcodec/x86/lpc.c
index 12245c4298c41b2fc0ddcfb639289c48ce6f28c2..ea5d2eab5674cc215018bf4a4e2a65cce9718094 100644
--- a/libavcodec/x86/lpc.c
+++ b/libavcodec/x86/lpc.c
@@ -1,5 +1,5 @@
 /*
- * MMX optimized LPC DSP utils
+ * SIMD-optimized LPC functions
  * Copyright (c) 2007 Loren Merritt
  *
  * This file is part of Libav.
diff --git a/libavcodec/x86/mpegaudiodsp.c b/libavcodec/x86/mpegaudiodsp.c
index f45cb7e4a4a9ea20fbd854699c379cca6362224e..533b4a7c3fb67a60887f59a3cfcb54d4aa4a398d 100644
--- a/libavcodec/x86/mpegaudiodsp.c
+++ b/libavcodec/x86/mpegaudiodsp.c
@@ -1,5 +1,5 @@
 /*
- * MMX optimized MP3 decoding functions
+ * SIMD-optimized MP3 decoding functions
  * Copyright (c) 2010 Vitor Sessak
  *
  * This file is part of Libav.
diff --git a/libavcodec/x86/qpel.asm b/libavcodec/x86/qpel.asm
index c90b3932af52c710f83b4d692f0f9932086c63a5..9054f091eff68d5adc92783c978ef93189a5a18b 100644
--- a/libavcodec/x86/qpel.asm
+++ b/libavcodec/x86/qpel.asm
@@ -1,5 +1,5 @@
 ;******************************************************************************
-;* MMX optimized DSP utils
+;* SIMD-optimized quarterpel functions
 ;* Copyright (c) 2008 Loren Merritt
 ;* Copyright (c) 2003-2013 Michael Niedermayer
 ;* Copyright (c) 2013 Daniel Kang
diff --git a/libavcodec/x86/rnd_template.c b/libavcodec/x86/rnd_template.c
index e9a5a457993ceb00216beeb7d029399996d95cb0..144f111368b786d3fdfabb238b98407ff6e8a52c 100644
--- a/libavcodec/x86/rnd_template.c
+++ b/libavcodec/x86/rnd_template.c
@@ -1,5 +1,5 @@
 /*
- * DSP utils mmx functions are compiled twice for rnd/no_rnd
+ * SIMD-optimized halfpel functions are compiled twice for rnd/no_rnd
  * Copyright (c) 2000, 2001 Fabrice Bellard
  * Copyright (c) 2003-2004 Michael Niedermayer <michaelni@gmx.at>
  *
diff --git a/libavutil/arm/float_dsp_init_arm.c b/libavutil/arm/float_dsp_init_arm.c
index 39a5e9590f8135ba1989dcecbf3568527ca3fd59..ff0105c5c97396bab51a0b0973fd86ef6ee0c855 100644
--- a/libavutil/arm/float_dsp_init_arm.c
+++ b/libavutil/arm/float_dsp_init_arm.c
@@ -1,6 +1,4 @@
 /*
- * ARM optimized DSP utils
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or