diff --git a/ChangeLog b/ChangeLog
index 2d4c5ddd58..ffddf8ee21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2004-01-20  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/gstelement.c: (gst_element_error_full):
+	* gst/gstelement.h:
+          change _extended to _full
+
+2004-01-20  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	reviewed by: <delete if not using a buddy>
+
+	* docs/gst/tmpl/gst.sgml:
+	* docs/gst/tmpl/gstbuffer.sgml:
+	* docs/gst/tmpl/gstclock.sgml:
+	* docs/gst/tmpl/gstelement.sgml:
+	* docs/gst/tmpl/gstreamer-unused.sgml:
+	* docs/gst/tmpl/gstxml.sgml:
+	* gst/gstelement.c: (gst_element_error_full):
+	* gst/gstelement.h:
+
 2004-01-20  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/gstelement.h: fix _gst_element_error_printf prototype
diff --git a/gst/gstelement.c b/gst/gstelement.c
index a06bd4ffc1..77a176f748 100644
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -2373,7 +2373,7 @@ _gst_element_error_printf (const gchar *format, ...)
 }
 
 /**
- * gst_element_error_extended:
+ * gst_element_error_full:
  * @element: a #GstElement with the error.
  * @domain: the GStreamer error domain this error belongs to.
  * @code: the error code belonging to the domain
@@ -2382,12 +2382,12 @@ _gst_element_error_printf (const gchar *format, ...)
  * debug: an allocated debug message to be used as a replacement for the
  *        default debugging information, or NULL
  *
- * signals an error condition on an element.
+ * Signals an error condition on an element.
  * This function is used internally by elements.
  * It results in the "error" signal.
  */
 void
-gst_element_error_extended
+gst_element_error_full
 (GstElement *element, GQuark domain, gint code, gchar *message, gchar *debug,
  const gchar *file, const gchar *function, gint line)
 {
diff --git a/gst/gstelement.h b/gst/gstelement.h
index 2eaa279e2f..f03a67743a 100644
--- a/gst/gstelement.h
+++ b/gst/gstelement.h
@@ -140,7 +140,7 @@ typedef enum {
 #define GST_ELEMENT_PADS(obj)			((obj)->pads)
 
 #define gst_element_error(el, domain, code, message, debug) G_STMT_START { \
-  gst_element_error_extended (GST_ELEMENT(el), \
+  gst_element_error_full (GST_ELEMENT(el), \
   GST_ ## domain ## _ERROR, GST_ ## domain ## _ERROR_ ## code, \
   _gst_element_error_printf message, \
   _gst_element_error_printf debug, \
@@ -365,8 +365,8 @@ void			gst_element_found_tags_for_pad	(GstElement *element, GstPad *pad, GstCloc
 
 void			gst_element_set_eos		(GstElement *element);
 
-gchar *			_gst_element_error_printf 	(const gchar *format, ...);
-void			gst_element_error_extended	(GstElement *element, GQuark domain, gint code, gchar *message, gchar *debug, const gchar *file, const gchar *function, gint line);
+gchar *			_gst_element_error_printf	(const gchar *format, ...);
+void			gst_element_error_full		(GstElement *element, GQuark domain, gint code, gchar *message, gchar *debug, const gchar *file, const gchar *function, gint line);
 
 gboolean		gst_element_is_locked_state	(GstElement *element);
 void			gst_element_set_locked_state	(GstElement *element, gboolean locked_state);