diff --git a/sys/uvch264/gstuvch264.c b/sys/uvch264/gstuvch264.c
index 96f544f99d..d98d8f9172 100644
--- a/sys/uvch264/gstuvch264.c
+++ b/sys/uvch264/gstuvch264.c
@@ -32,11 +32,11 @@
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  if (!gst_element_register (plugin, "uvch264_mjpgdemux", GST_RANK_NONE,
+  if (!gst_element_register (plugin, "uvch264mjpgdemux", GST_RANK_NONE,
           GST_TYPE_UVC_H264_MJPG_DEMUX))
     return FALSE;
 
-  if (!gst_element_register (plugin, "uvch264_src", GST_RANK_NONE,
+  if (!gst_element_register (plugin, "uvch264src", GST_RANK_NONE,
           GST_TYPE_UVC_H264_SRC))
     return FALSE;
 
diff --git a/sys/uvch264/gstuvch264_mjpgdemux.c b/sys/uvch264/gstuvch264_mjpgdemux.c
index 28f9ce5d5c..8a5dd2fe18 100644
--- a/sys/uvch264/gstuvch264_mjpgdemux.c
+++ b/sys/uvch264/gstuvch264_mjpgdemux.c
@@ -22,7 +22,7 @@
  */
 
 /**
- * SECTION:element-uvch264-mjpgdemux
+ * SECTION:element-uvch264mjpgdemux
  * @short_description: UVC H264 compliant MJPG demuxer
  *
  * Parses a MJPG stream from a UVC H264 compliant encoding camera and extracts
@@ -221,7 +221,7 @@ gst_uvc_h264_mjpg_demux_class_init (GstUvcH264MjpgDemuxClass * klass)
           G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
 
   GST_DEBUG_CATEGORY_INIT (uvc_h264_mjpg_demux_debug,
-      "uvch264_mjpgdemux", 0, "UVC H264 MJPG Demuxer");
+      "uvch264mjpgdemux", 0, "UVC H264 MJPG Demuxer");
 }
 
 static void
diff --git a/sys/uvch264/gstuvch264_src.c b/sys/uvch264/gstuvch264_src.c
index 1e8e1319b3..4d22317697 100644
--- a/sys/uvch264/gstuvch264_src.c
+++ b/sys/uvch264/gstuvch264_src.c
@@ -265,7 +265,7 @@ gst_uvc_h264_src_class_init (GstUvcH264SrcClass * klass)
   gstbasecamerasrc_class->start_capture = gst_uvc_h264_src_start_capture;
   gstbasecamerasrc_class->stop_capture = gst_uvc_h264_src_stop_capture;
 
-  GST_DEBUG_CATEGORY_INIT (uvc_h264_src_debug, "uvch264_src",
+  GST_DEBUG_CATEGORY_INIT (uvc_h264_src_debug, "uvch264src",
       0, "UVC H264 Compliant camera bin source");
 
   gst_element_class_set_static_metadata (gstelement_class,
@@ -2753,7 +2753,7 @@ gst_uvc_h264_src_construct_pipeline (GstBaseCameraSrc * bcamsrc)
       break;
     case H264_JPG:
       GST_DEBUG_OBJECT (self, "H264+JPG");
-      self->mjpg_demux = gst_element_factory_make ("uvch264_mjpgdemux", NULL);
+      self->mjpg_demux = gst_element_factory_make ("uvch264mjpgdemux", NULL);
       if (!self->mjpg_demux || !gst_bin_add (GST_BIN (self), self->mjpg_demux))
         goto error_remove;
       gst_object_ref (self->mjpg_demux);
@@ -2767,7 +2767,7 @@ gst_uvc_h264_src_construct_pipeline (GstBaseCameraSrc * bcamsrc)
       break;
     case H264_RAW:
       GST_DEBUG_OBJECT (self, "H264+Raw");
-      self->mjpg_demux = gst_element_factory_make ("uvch264_mjpgdemux", NULL);
+      self->mjpg_demux = gst_element_factory_make ("uvch264mjpgdemux", NULL);
       self->vf_colorspace = gst_element_factory_make (self->colorspace_name,
           NULL);
       if (!self->mjpg_demux || !self->vf_colorspace)
@@ -2794,7 +2794,7 @@ gst_uvc_h264_src_construct_pipeline (GstBaseCameraSrc * bcamsrc)
       break;
     case H264_JPG2RAW:
       GST_DEBUG_OBJECT (self, "H264+Raw(jpegdec)");
-      self->mjpg_demux = gst_element_factory_make ("uvch264_mjpgdemux", NULL);
+      self->mjpg_demux = gst_element_factory_make ("uvch264mjpgdemux", NULL);
       self->jpeg_dec = gst_element_factory_make (self->jpeg_decoder_name, NULL);
       self->vf_colorspace = gst_element_factory_make (self->colorspace_name,
           NULL);
diff --git a/tests/check/elements/uvch264demux.c b/tests/check/elements/uvch264demux.c
index fdfc7fd7d7..e7fded608f 100644
--- a/tests/check/elements/uvch264demux.c
+++ b/tests/check/elements/uvch264demux.c
@@ -148,7 +148,7 @@ _setup_test (gboolean link_h264, gboolean link_yuy2, gboolean link_nv12,
   have_h264_eos = have_yuy2_eos = have_nv12_eos = have_jpg_eos = FALSE;
   buffer_h264 = buffer_yuy2 = buffer_nv12 = buffer_jpg = NULL;
 
-  demux = gst_element_factory_make ("uvch264_mjpgdemux", NULL);
+  demux = gst_element_factory_make ("uvch264mjpgdemux", NULL);
   fail_unless (demux != NULL);
 
   gst_element_set_bus (demux, bus);
diff --git a/tests/examples/uvch264/test-uvch264.c b/tests/examples/uvch264/test-uvch264.c
index 4541b863fe..4f07f1ca2b 100644
--- a/tests/examples/uvch264/test-uvch264.c
+++ b/tests/examples/uvch264/test-uvch264.c
@@ -530,7 +530,7 @@ main (int argc, char *argv[])
         argv[0], device);
 
 
-  self.bin = gst_parse_launch ("uvch264_src name=src src.vidsrc ! queue ! "
+  self.bin = gst_parse_launch ("uvch264src name=src src.vidsrc ! queue ! "
       "capsfilter name=vid_cf ! identity name=identity ! decodebin ! "
       "xvimagesink name=h264_sink async=false "
       "src.vfsrc ! queue ! capsfilter name=vf_cf ! "
diff --git a/tests/examples/uvch264/window.glade b/tests/examples/uvch264/window.glade
index 6b28d7e474..fc0d9547a5 100644
--- a/tests/examples/uvch264/window.glade
+++ b/tests/examples/uvch264/window.glade
@@ -3,7 +3,7 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window">
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Test for uvch264_src</property>
+    <property name="title" translatable="yes">Test for uvch264src</property>
     <signal name="destroy" handler="on_window_destroyed" swapped="no"/>
     <child>
       <object class="GtkHBox" id="hbox1">