diff --git a/ChangeLog b/ChangeLog
index 6fc67b0e97..6da369407b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-11-21  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* ext/audioresample/gstaudioresample.c:
+	* ext/polyp/polypsink.c: (gst_polypsink_sink_fixate):
+	* gst/librfb/gstrfbsrc.c: (gst_rfbsrc_fixate):
+	* gst/modplug/gstmodplug.cc:
+	* sys/glsink/glimagesink.c: (gst_glimagesink_fixate):
+	* sys/v4l2/gstv4l2src.c: (gst_v4l2src_fixate):
+        Rename gst_caps_structure_fixate_* to gst_structure_fixate_*
+        (#322027)
+
 2005-11-21  Edgard Lima <edgard.lima@indt.org.br>
 
 	* ext/Makefile.am:
diff --git a/ext/audioresample/gstaudioresample.c b/ext/audioresample/gstaudioresample.c
index 363acd9b7d..46944b8005 100644
--- a/ext/audioresample/gstaudioresample.c
+++ b/ext/audioresample/gstaudioresample.c
@@ -212,7 +212,7 @@ static GstCaps *gst_audioresample_fixate (GstPad * pad, const GstCaps * caps)
   copy = gst_caps_copy (caps);
   structure = gst_caps_get_structure (copy, 0);
   if (rate) {
-    if (gst_caps_structure_fixate_field_nearest_int (structure, "rate", rate)) {
+    if (gst_structure_fixate_field_nearest_int (structure, "rate", rate)) {
       return copy;
     }
   }
diff --git a/ext/polyp/polypsink.c b/ext/polyp/polypsink.c
index 8afc87080c..a18569b4db 100644
--- a/ext/polyp/polypsink.c
+++ b/ext/polyp/polypsink.c
@@ -575,10 +575,10 @@ gst_polypsink_sink_fixate (GstPad * pad, const GstCaps * caps)
       NULL);
   structure = gst_caps_get_structure (newcaps, 0);
 
-  if (gst_caps_structure_fixate_field_nearest_int (structure, "rate", 44100) ||
-      gst_caps_structure_fixate_field_nearest_int (structure, "depth", 16) ||
-      gst_caps_structure_fixate_field_nearest_int (structure, "width", 16) ||
-      gst_caps_structure_fixate_field_nearest_int (structure, "channels", 2))
+  if (gst_structure_fixate_field_nearest_int (structure, "rate", 44100) ||
+      gst_structure_fixate_field_nearest_int (structure, "depth", 16) ||
+      gst_structure_fixate_field_nearest_int (structure, "width", 16) ||
+      gst_structure_fixate_field_nearest_int (structure, "channels", 2))
     return newcaps;
 
   gst_caps_free (newcaps);
diff --git a/gst/librfb/gstrfbsrc.c b/gst/librfb/gstrfbsrc.c
index 5f53a3a3e7..05fcc98deb 100644
--- a/gst/librfb/gstrfbsrc.c
+++ b/gst/librfb/gstrfbsrc.c
@@ -292,8 +292,7 @@ gst_rfbsrc_fixate (GstPad * pad, const GstCaps * caps)
   newcaps = gst_caps_copy (caps);
   structure = gst_caps_get_structure (newcaps, 0);
 
-  if (gst_caps_structure_fixate_field_nearest_double (structure, "framerate",
-          30.0)) {
+  if (gst_structure_fixate_field_nearest_double (structure, "framerate", 30.0)) {
     return newcaps;
   }
 
diff --git a/gst/modplug/gstmodplug.cc b/gst/modplug/gstmodplug.cc
index dabcfcb334..ec401793c9 100644
--- a/gst/modplug/gstmodplug.cc
+++ b/gst/modplug/gstmodplug.cc
@@ -480,9 +480,9 @@ gst_modplug_fixate (GstPad * pad, const GstCaps * caps)
 
     copy = gst_caps_copy (caps);
     structure = gst_caps_get_structure (copy, 0);
-    if (gst_caps_structure_fixate_field_nearest_int (structure, "rate", 44100))
+    if (gst_structure_fixate_field_nearest_int (structure, "rate", 44100))
       return copy;
-    if (gst_caps_structure_fixate_field_nearest_int (structure, "channels", 2))
+    if (gst_structure_fixate_field_nearest_int (structure, "channels", 2))
       return copy;
     gst_caps_free (copy);
   }
diff --git a/sys/glsink/glimagesink.c b/sys/glsink/glimagesink.c
index d1a760159e..efef625a34 100644
--- a/sys/glsink/glimagesink.c
+++ b/sys/glsink/glimagesink.c
@@ -840,14 +840,13 @@ gst_glimagesink_fixate (GstPad * pad, const GstCaps * caps)
   newcaps = gst_caps_copy (caps);
   structure = gst_caps_get_structure (newcaps, 0);
 
-  if (gst_caps_structure_fixate_field_nearest_int (structure, "width", 320)) {
+  if (gst_structure_fixate_field_nearest_int (structure, "width", 320)) {
     return newcaps;
   }
-  if (gst_caps_structure_fixate_field_nearest_int (structure, "height", 240)) {
+  if (gst_structure_fixate_field_nearest_int (structure, "height", 240)) {
     return newcaps;
   }
-  if (gst_caps_structure_fixate_field_nearest_double (structure, "framerate",
-          30.0)) {
+  if (gst_structure_fixate_field_nearest_double (structure, "framerate", 30.0)) {
     return newcaps;
   }
 
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index 7d0e16a2c9..ef0f2be7a7 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -690,8 +690,7 @@ gst_v4l2src_fixate (GstPad * pad, const GstCaps * const_caps)
   for (i = 0; i < gst_caps_get_size (caps); i++) {
     structure = gst_caps_get_structure (caps, i);
     changed |=
-        gst_caps_structure_fixate_field_nearest_int (structure, "width",
-        G_MAXINT);
+        gst_structure_fixate_field_nearest_int (structure, "width", G_MAXINT);
   }
   if (changed)
     return caps;
@@ -699,8 +698,7 @@ gst_v4l2src_fixate (GstPad * pad, const GstCaps * const_caps)
   for (i = 0; i < gst_caps_get_size (caps); i++) {
     structure = gst_caps_get_structure (caps, i);
     changed |=
-        gst_caps_structure_fixate_field_nearest_int (structure, "height",
-        G_MAXINT);
+        gst_structure_fixate_field_nearest_int (structure, "height", G_MAXINT);
   }
   if (changed)
     return caps;