diff --git a/ChangeLog b/ChangeLog
index e840079925..f324d0f4c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-07-05  Andy Wingo  <wingo@pobox.com>
 
+	* ext/gnomevfs/gstgnomevfssrc.c:
+	* gst/sine/gstsinesrc.c:
+	* gst/tcp/gsttcpserversrc.c:
+	* gst/tcp/gsttcpclientsrc.c: s/BASESRC/BASE_SRC/.
+
 	* sys/v4l/: Port from 0.8.
 
 	* Many files: Null if we got it....
diff --git a/ext/gnomevfs/gstgnomevfssrc.c b/ext/gnomevfs/gstgnomevfssrc.c
index cd08570ce2..79d2ca7861 100644
--- a/ext/gnomevfs/gstgnomevfssrc.c
+++ b/ext/gnomevfs/gstgnomevfssrc.c
@@ -178,7 +178,7 @@ gst_gnomevfssrc_get_type (void)
     };
 
     gnomevfssrc_type =
-        g_type_register_static (GST_TYPE_BASESRC,
+        g_type_register_static (GST_TYPE_BASE_SRC,
         "GstGnomeVFSSrc", &gnomevfssrc_info, 0);
     g_type_add_interface_static (gnomevfssrc_type, GST_TYPE_URI_HANDLER,
         &urihandler_info);
@@ -211,7 +211,7 @@ gst_gnomevfssrc_class_init (GstGnomeVFSSrcClass * klass)
 
   gobject_class = G_OBJECT_CLASS (klass);
   gstelement_class = GST_ELEMENT_CLASS (klass);
-  gstbasesrc_class = GST_BASESRC_CLASS (klass);
+  gstbasesrc_class = GST_BASE_SRC_CLASS (klass);
 
   parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
 
diff --git a/gst/sine/gstsinesrc.c b/gst/sine/gstsinesrc.c
index 7f54471e19..2654ebab9f 100644
--- a/gst/sine/gstsinesrc.c
+++ b/gst/sine/gstsinesrc.c
@@ -112,7 +112,7 @@ gst_sinesrc_get_type (void)
       (GInstanceInitFunc) gst_sinesrc_init,
     };
 
-    sinesrc_type = g_type_register_static (GST_TYPE_BASESRC, "GstSineSrc",
+    sinesrc_type = g_type_register_static (GST_TYPE_BASE_SRC, "GstSineSrc",
         &sinesrc_info, 0);
   }
   return sinesrc_type;
@@ -139,7 +139,7 @@ gst_sinesrc_class_init (GstSineSrcClass * klass)
   gstelement_class = (GstElementClass *) klass;
   gstbasesrc_class = (GstBaseSrcClass *) klass;
 
-  parent_class = g_type_class_ref (GST_TYPE_BASESRC);
+  parent_class = g_type_class_ref (GST_TYPE_BASE_SRC);
 
   gobject_class->set_property = gst_sinesrc_set_property;
   gobject_class->get_property = gst_sinesrc_get_property;
@@ -182,7 +182,7 @@ gst_sinesrc_class_init (GstSineSrcClass * klass)
 static void
 gst_sinesrc_init (GstSineSrc * src)
 {
-  src->srcpad = GST_BASESRC (src)->srcpad;
+  src->srcpad = GST_BASE_SRC (src)->srcpad;
 
   gst_pad_set_fixatecaps_function (src->srcpad, gst_sinesrc_src_fixate);
   gst_pad_set_query_function (src->srcpad, gst_sinesrc_src_query);
diff --git a/gst/tcp/gsttcpclientsrc.c b/gst/tcp/gsttcpclientsrc.c
index ac70b094f7..d93d5abd72 100644
--- a/gst/tcp/gsttcpclientsrc.c
+++ b/gst/tcp/gsttcpclientsrc.c
@@ -177,7 +177,7 @@ gst_tcpclientsrc_init (GstTCPClientSrc * this)
   this->caps = NULL;
   this->curoffset = 0;
 
-  gst_base_src_set_live (GST_BASESRC (this), TRUE);
+  gst_base_src_set_live (GST_BASE_SRC (this), TRUE);
 
   GST_FLAG_UNSET (this, GST_TCPCLIENTSRC_OPEN);
 }
@@ -421,7 +421,7 @@ gst_tcpclientsrc_start (GstBaseSrc * bsrc)
       sizeof (src->server_sin));
 
   if (ret) {
-    gst_tcpclientsrc_stop (GST_BASESRC (src));
+    gst_tcpclientsrc_stop (GST_BASE_SRC (src));
     switch (errno) {
       case ECONNREFUSED:
         GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
@@ -466,12 +466,12 @@ no_socket:
   }
 name_resolv:
   {
-    gst_tcpclientsrc_stop (GST_BASESRC (src));
+    gst_tcpclientsrc_stop (GST_BASE_SRC (src));
     return FALSE;
   }
 no_caps:
   {
-    gst_tcpclientsrc_stop (GST_BASESRC (src));
+    gst_tcpclientsrc_stop (GST_BASE_SRC (src));
     GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL),
         ("Could not read caps through GDP"));
     return FALSE;
diff --git a/gst/tcp/gsttcpserversrc.c b/gst/tcp/gsttcpserversrc.c
index 5698976ab3..5886a15f26 100644
--- a/gst/tcp/gsttcpserversrc.c
+++ b/gst/tcp/gsttcpserversrc.c
@@ -234,7 +234,7 @@ gst_tcpserversrc_create (GstPushSrc * psrc, GstBuffer ** outbuf)
         GST_DEBUG_OBJECT (src, "Received caps through GDP: %s", string);
         g_free (string);
 
-        gst_pad_set_caps (GST_BASESRC_PAD (psrc), caps);
+        gst_pad_set_caps (GST_BASE_SRC_PAD (psrc), caps);
       }
 
       /* now receive the buffer header */