diff --git a/ChangeLog b/ChangeLog
index ff83685dc3..2ef92519ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2004-12-09  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* ext/cdparanoia/gstcdparanoia.c: (cdparanoia_class_init),
+	(cdparanoia_set_property), (cdparanoia_get_property):
+	* ext/dvdnav/dvdnavsrc.c: (dvdnavsrc_class_init),
+	(dvdnavsrc_set_property), (dvdnavsrc_get_property):
+	* ext/dvdread/dvdreadsrc.c: (dvdreadsrc_class_init),
+	(dvdreadsrc_init), (dvdreadsrc_set_property),
+	(dvdreadsrc_get_property):
+	* sys/vcd/vcdsrc.c: (gst_vcdsrc_class_init),
+	(gst_vcdsrc_set_property), (gst_vcdsrc_get_property):
+	  Synchronize property names where not yet the case. Devices are
+	  now device=X, other versions are deprecated (but still exist).
+	  Also use g_free() unconditionally.
+	* gst/playback/gstplaybasebin.c: (gst_play_base_bin_class_init),
+	(setup_source), (gst_play_base_bin_get_property):
+	  Expose source.
+
 2004-12-09  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac: move GCONF macro outside conditional for the am
diff --git a/sys/vcd/vcdsrc.c b/sys/vcd/vcdsrc.c
index 770c977bfe..d0894bd59c 100644
--- a/sys/vcd/vcdsrc.c
+++ b/sys/vcd/vcdsrc.c
@@ -47,6 +47,7 @@ enum
 {
   ARG_0,
   ARG_LOCATION,
+  ARG_DEVICE,
   ARG_TRACK,
   ARG_BYTESPERREAD,
   ARG_OFFSET,
@@ -145,6 +146,10 @@ gst_vcdsrc_class_init (GstVCDSrcClass * klass)
 
   g_object_class_install_property (gobject_class, ARG_LOCATION,
       g_param_spec_string ("location", "Location",
+          "CD device location (deprecated; use device)",
+          NULL, G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class, ARG_DEVICE,
+      g_param_spec_string ("device", "Device",
           "CD device location", NULL, G_PARAM_READWRITE));
   g_object_class_install_property (gobject_class, ARG_TRACK,
       g_param_spec_int ("track", "Track",
@@ -211,12 +216,12 @@ gst_vcdsrc_set_property (GObject * object, guint prop_id, const GValue * value,
   src = GST_VCDSRC (object);
 
   switch (prop_id) {
+    case ARG_DEVICE:
     case ARG_LOCATION:
       /* the element must be stopped in order to do this */
 /*      g_return_if_fail(!GST_FLAG_IS_SET(src,GST_STATE_RUNNING)); */
 
-      if (src->device)
-        g_free (src->device);
+      g_free (src->device);
       /* clear the filename if we get a NULL (is that possible?) */
       if (g_value_get_string (value) == NULL)
         src->device = NULL;
@@ -251,6 +256,7 @@ gst_vcdsrc_get_property (GObject * object, guint prop_id, GValue * value,
   src = GST_VCDSRC (object);
 
   switch (prop_id) {
+    case ARG_DEVICE:
     case ARG_LOCATION:
       g_value_set_string (value, src->device);
       break;