diff --git a/gst/audiofxbad/gstaudiochannelmix.c b/gst/audiofxbad/gstaudiochannelmix.c
index 84e1049f75..c65a5c47c8 100644
--- a/gst/audiofxbad/gstaudiochannelmix.c
+++ b/gst/audiofxbad/gstaudiochannelmix.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1335, USA.
  */
 /**
- * SECTION:element-gstaudiochannelmix
+ * SECTION:element-audiochannelmix
  * @title: gstaudiochannelmix
  *
  * The audiochannelmix element mixes channels in stereo audio based on
diff --git a/gst/camerabin2/gstviewfinderbin.c b/gst/camerabin2/gstviewfinderbin.c
index 4ff7335a4c..3a96e8956c 100644
--- a/gst/camerabin2/gstviewfinderbin.c
+++ b/gst/camerabin2/gstviewfinderbin.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 /**
- * SECTION:element-gstviewfinderbin
+ * SECTION:element-viewfinderbin
  * @title: gstviewfinderbin
  *
  * The gstviewfinderbin element is a displaying element for camerabin2.
diff --git a/gst/debugutils/gstchopmydata.c b/gst/debugutils/gstchopmydata.c
index bed08befb6..2d4c4b40a4 100644
--- a/gst/debugutils/gstchopmydata.c
+++ b/gst/debugutils/gstchopmydata.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 /**
- * SECTION:element-gstchopmydata
+ * SECTION:element-chopmydata
  * @title: gstchopmydata
  *
  * The chopmydata element takes an incoming stream and chops it up
diff --git a/gst/debugutils/gstclockselect.c b/gst/debugutils/gstclockselect.c
index 759c5a2869..a8f574b7ef 100644
--- a/gst/debugutils/gstclockselect.c
+++ b/gst/debugutils/gstclockselect.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1335, USA.
  */
 /**
- * SECTION:element-gstclockselect
+ * SECTION:element-clockselect
  *
  * The clockselect element is a pipeline that enables one to choose its
  * clock. By default, pipelines chose a clock depending on its elements,
diff --git a/gst/debugutils/gstwatchdog.c b/gst/debugutils/gstwatchdog.c
index cb1d90177e..a45039a9f0 100644
--- a/gst/debugutils/gstwatchdog.c
+++ b/gst/debugutils/gstwatchdog.c
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1335, USA.
  */
 /**
- * SECTION:element-gstwatchdog
+ * SECTION:element-watchdog
  * @title: watchdog
  *
  * The watchdog element watches buffers and events flowing through
diff --git a/gst/inter/gstinteraudiosink.c b/gst/inter/gstinteraudiosink.c
index 3c30631037..eaa5b2e658 100644
--- a/gst/inter/gstinteraudiosink.c
+++ b/gst/inter/gstinteraudiosink.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1335, USA.
  */
 /**
- * SECTION:element-gstinteraudiosink
+ * SECTION:element-interaudiosink
  * @title: gstinteraudiosink
  *
  * The interaudiosink element is an audio sink element.  It is used
diff --git a/gst/inter/gstinteraudiosrc.c b/gst/inter/gstinteraudiosrc.c
index 8a15f072f9..7fbb589ae3 100644
--- a/gst/inter/gstinteraudiosrc.c
+++ b/gst/inter/gstinteraudiosrc.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1335, USA.
  */
 /**
- * SECTION:element-gstinteraudiosrc
+ * SECTION:element-interaudiosrc
  * @title: gstinteraudiosrc
  *
  * The interaudiosrc element is an audio source element.  It is used
diff --git a/gst/inter/gstintersubsink.c b/gst/inter/gstintersubsink.c
index 62a627491e..882a1663be 100644
--- a/gst/inter/gstintersubsink.c
+++ b/gst/inter/gstintersubsink.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1335, USA.
  */
 /**
- * SECTION:element-gstintersubsink
+ * SECTION:element-intersubsink
  * @title: gstintersubsink
  *
  * The intersubsink element is a subtitle sink element.  It is used
diff --git a/gst/inter/gstintersubsrc.c b/gst/inter/gstintersubsrc.c
index 2ca1a523ad..dc42caedaf 100644
--- a/gst/inter/gstintersubsrc.c
+++ b/gst/inter/gstintersubsrc.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1335, USA.
  */
 /**
- * SECTION:element-gstintersubsrc
+ * SECTION:element-intersubsrc
  * @title: gstintersubsrc
  *
  * The intersubsrc element is a subtitle source element.  It is used
diff --git a/gst/inter/gstintervideosink.c b/gst/inter/gstintervideosink.c
index b73a554c28..12a971a5d7 100644
--- a/gst/inter/gstintervideosink.c
+++ b/gst/inter/gstintervideosink.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1335, USA.
  */
 /**
- * SECTION:element-gstintervideosink
+ * SECTION:element-intervideosink
  * @title: gstintervideosink
  *
  * The intervideosink element is a video sink element.  It is used
diff --git a/gst/inter/gstintervideosrc.c b/gst/inter/gstintervideosrc.c
index 1c20b42195..7858e6ede5 100644
--- a/gst/inter/gstintervideosrc.c
+++ b/gst/inter/gstintervideosrc.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1335, USA.
  */
 /**
- * SECTION:element-gstintervideosrc
+ * SECTION:element-intervideosrc
  * @title: gstintervideosrc
  *
  * The intervideosrc element is a video source element.  It is used
diff --git a/gst/ivtc/gstcombdetect.c b/gst/ivtc/gstcombdetect.c
index d55ab5b7c2..87b3f73bc2 100644
--- a/gst/ivtc/gstcombdetect.c
+++ b/gst/ivtc/gstcombdetect.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1335, USA.
  */
 /**
- * SECTION:element-gstcombdetect
+ * SECTION:element-combdetect
  * @title: gstcombdetect
  *
  * The combdetect element detects if combing artifacts are present in
diff --git a/gst/ivtc/gstivtc.c b/gst/ivtc/gstivtc.c
index 407fb2f302..2556eed116 100644
--- a/gst/ivtc/gstivtc.c
+++ b/gst/ivtc/gstivtc.c
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1335, USA.
  */
 /**
- * SECTION:element-gstivtc
+ * SECTION:element-ivtc
  * @title: gstivtc
  *
  * The ivtc element is an inverse telecine filter.  It takes interlaced
diff --git a/gst/jp2kdecimator/gstjp2kdecimator.c b/gst/jp2kdecimator/gstjp2kdecimator.c
index 35c506cc91..3688381b9f 100644
--- a/gst/jp2kdecimator/gstjp2kdecimator.c
+++ b/gst/jp2kdecimator/gstjp2kdecimator.c
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 /**
- * SECTION:element-gstjp2kdecimator
+ * SECTION:element-jp2kdecimator
  * @title: gstjp2kdecimator
  *
  * The jp2kdecimator element removes information from JPEG2000 images without reencoding.
diff --git a/gst/rtmp2/gstrtmp2sink.c b/gst/rtmp2/gstrtmp2sink.c
index 08937930b4..6a105ee9a2 100644
--- a/gst/rtmp2/gstrtmp2sink.c
+++ b/gst/rtmp2/gstrtmp2sink.c
@@ -19,7 +19,7 @@
  * Boston, MA 02110-1335, USA.
  */
 /**
- * SECTION:element-gstrtmp2sink
+ * SECTION:element-rtmp2sink
  *
  * The rtmp2sink element sends audio and video streams to an RTMP
  * server.
diff --git a/gst/rtmp2/gstrtmp2src.c b/gst/rtmp2/gstrtmp2src.c
index c3603aebbc..2b7a05f98a 100644
--- a/gst/rtmp2/gstrtmp2src.c
+++ b/gst/rtmp2/gstrtmp2src.c
@@ -19,7 +19,7 @@
  * Boston, MA 02110-1335, USA.
  */
 /**
- * SECTION:element-gstrtmp2src
+ * SECTION:element-rtmp2src
  *
  * The rtmp2src element receives input streams from an RTMP server.
  *
diff --git a/gst/videofilters/gstscenechange.c b/gst/videofilters/gstscenechange.c
index d44ab188ed..b9be4a7b43 100644
--- a/gst/videofilters/gstscenechange.c
+++ b/gst/videofilters/gstscenechange.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1335, USA.
  */
 /**
- * SECTION:element-gstscenechange
+ * SECTION:element-scenechange
  * @title: gstscenechange
  *
  * The scenechange element detects scene changes (also known as shot
diff --git a/gst/videofilters/gstvideodiff.c b/gst/videofilters/gstvideodiff.c
index 1181ad3c30..a6027590fd 100644
--- a/gst/videofilters/gstvideodiff.c
+++ b/gst/videofilters/gstvideodiff.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1335, USA.
  */
 /**
- * SECTION:element-gstvideodiff
+ * SECTION:element-videodiff
  * @title: gstvideodiff
  *
  * The videodiff element highlights the difference between a frame and its
diff --git a/gst/videofilters/gstzebrastripe.c b/gst/videofilters/gstzebrastripe.c
index 983f02d52f..e14ab99d28 100644
--- a/gst/videofilters/gstzebrastripe.c
+++ b/gst/videofilters/gstzebrastripe.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1335, USA.
  */
 /**
- * SECTION:element-gstzebrastripe
+ * SECTION:element-zebrastripe
  * @title: gstzebrastripe
  *
  * The zebrastripe element marks areas of images in a video stream
diff --git a/gst/videoparsers/gstdiracparse.c b/gst/videoparsers/gstdiracparse.c
index 219f584a75..105f4f4997 100644
--- a/gst/videoparsers/gstdiracparse.c
+++ b/gst/videoparsers/gstdiracparse.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 /**
- * SECTION:element-gstdiracparse
+ * SECTION:element-diracparse
  * @title: gstdiracparse
  *
  * The gstdiracparse element does FIXME stuff.
diff --git a/gst/y4m/gsty4mdec.c b/gst/y4m/gsty4mdec.c
index 6871381544..da8ae387d9 100644
--- a/gst/y4m/gsty4mdec.c
+++ b/gst/y4m/gsty4mdec.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 /**
- * SECTION:element-gsty4mdec
+ * SECTION:element-y4mdec
  * @title: gsty4mdec
  *
  * The gsty4mdec element decodes uncompressed video in YUV4MPEG format.