diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index f3a8348d05..d574585c62 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -62,7 +62,7 @@ EXTRA_HFILES = \
 	$(top_srcdir)/ext/lame/gstlamemp3enc.h \
 	$(top_srcdir)/ext/mad/gstmad.h \
 	$(top_srcdir)/ext/sidplay/gstsiddec.h \
-	$(top_srcdir)/ext/twolame/gsttwolame.h \
+	$(top_srcdir)/ext/twolame/gsttwolamemp2enc.h \
 	$(top_srcdir)/ext/x264/gstx264enc.h \
 	$(top_srcdir)/gst/asfdemux/gstrtspwms.h \
 	$(top_srcdir)/gst/xingmux/gstxingmux.h \
diff --git a/docs/plugins/gst-plugins-ugly-plugins-docs.sgml b/docs/plugins/gst-plugins-ugly-plugins-docs.sgml
index 1a7817e031..f5ae329a3a 100644
--- a/docs/plugins/gst-plugins-ugly-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-ugly-plugins-docs.sgml
@@ -31,7 +31,7 @@
     <xi:include href="xml/element-rtspreal.xml" />
     <xi:include href="xml/element-rtspwms.xml" />
     <xi:include href="xml/element-siddec.xml" />
-    <xi:include href="xml/element-twolame.xml" />
+    <xi:include href="xml/element-twolamemp2enc.xml" />
     <xi:include href="xml/element-synaesthesia.xml" />
     <xi:include href="xml/element-x264enc.xml" />
     <xi:include href="xml/element-xingmux.xml" />
diff --git a/docs/plugins/gst-plugins-ugly-plugins-sections.txt b/docs/plugins/gst-plugins-ugly-plugins-sections.txt
index e15dde4a59..8da3f39c9a 100644
--- a/docs/plugins/gst-plugins-ugly-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-ugly-plugins-sections.txt
@@ -246,7 +246,7 @@ gst_synaesthesia_get_type
 </SECTION>
 
 <SECTION>
-<FILE>element-twolame</FILE>
+<FILE>element-twolamemp2enc</FILE>
 <TITLE>twolame</TITLE>
 GstTwoLame
 <SUBSECTION Standard>
diff --git a/ext/twolame/Makefile.am b/ext/twolame/Makefile.am
index 1b32aae345..ff048e50da 100644
--- a/ext/twolame/Makefile.am
+++ b/ext/twolame/Makefile.am
@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES = libgsttwolame.la
 
-libgsttwolame_la_SOURCES = gsttwolame.c
+libgsttwolame_la_SOURCES = gsttwolamemp2enc.c
 libgsttwolame_la_CFLAGS = -DGST_USE_UNSTABLE_API \
 	$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(TWOLAME_CFLAGS)
 libgsttwolame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
@@ -9,4 +9,4 @@ libgsttwolame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
 libgsttwolame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgsttwolame_la_LIBTOOLFLAGS = --tag=disable-static
 
-noinst_HEADERS = gsttwolame.h
+noinst_HEADERS = gsttwolamemp2enc.h
diff --git a/ext/twolame/gsttwolame.c b/ext/twolame/gsttwolamemp2enc.c
similarity index 99%
rename from ext/twolame/gsttwolame.c
rename to ext/twolame/gsttwolamemp2enc.c
index 8839a424e4..9c8b874d10 100644
--- a/ext/twolame/gsttwolame.c
+++ b/ext/twolame/gsttwolamemp2enc.c
@@ -53,7 +53,7 @@
 #endif
 
 #include "string.h"
-#include "gsttwolame.h"
+#include "gsttwolamemp2enc.h"
 #include "gst/gst-i18n-plugin.h"
 
 GST_DEBUG_CATEGORY_STATIC (debug);
@@ -873,7 +873,7 @@ plugin_init (GstPlugin * plugin)
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 #endif /* ENABLE_NLS */
 
-  if (!gst_element_register (plugin, "twolame", GST_RANK_PRIMARY,
+  if (!gst_element_register (plugin, "twolamemp2enc", GST_RANK_PRIMARY,
           GST_TYPE_TWO_LAME))
     return FALSE;
 
diff --git a/ext/twolame/gsttwolame.h b/ext/twolame/gsttwolamemp2enc.h
similarity index 100%
rename from ext/twolame/gsttwolame.h
rename to ext/twolame/gsttwolamemp2enc.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b1250fd6a2..e8c4066b11 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,5 @@
 ext/cdio/gstcdiocddasrc.c
 ext/dvdread/dvdreadsrc.c
 ext/lame/gstlamemp3enc.c
-ext/twolame/gsttwolame.c
+ext/twolame/gsttwolamemp2enc.c
 gst/asfdemux/gstasfdemux.c