5 files changed, 9 insertions, 9 deletions
diff --git a/tools/element-templates/element b/tools/element-templates/element
index f0d76ebc3..38ab6e4da 100644
--- a/tools/element-templates/element
+++ b/tools/element-templates/element
@@ -97,7 +97,7 @@ static gboolean
 gst_replace_set_clock (GstElement * element, GstClock * clock)
 {
 
-  return TRUE;
+  return GST_ELEMENT_CLASS (parent_class)->set_clock (element, clock);
 }
 
 static GstIndex *
diff --git a/tools/element-templates/sinkpad b/tools/element-templates/sinkpad
index ec8a98060..6d3bad1fb 100644
--- a/tools/element-templates/sinkpad
+++ b/tools/element-templates/sinkpad
@@ -30,8 +30,8 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     );
 
 % base-init
-  gst_element_class_add_static_pad_template (element_class,
-      &gst_replace_sink_template);
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_replace_sink_template));
 % instance-init
 
   replace->sinkpad = gst_pad_new_from_static_template (&gst_replace_sink_template
diff --git a/tools/element-templates/sinkpad-simple b/tools/element-templates/sinkpad-simple
index 822079bee..e8538b6ec 100644
--- a/tools/element-templates/sinkpad-simple
+++ b/tools/element-templates/sinkpad-simple
@@ -12,8 +12,8 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     );
 
 % base-init
-  gst_element_class_add_static_pad_template (element_class,
-      &gst_replace_sink_template);
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_replace_sink_template));
 % instance-init
 
   replace->sinkpad = gst_pad_new_from_static_template (&gst_replace_sink_template
diff --git a/tools/element-templates/srcpad b/tools/element-templates/srcpad
index 9c4f32052..d1f799267 100644
--- a/tools/element-templates/srcpad
+++ b/tools/element-templates/srcpad
@@ -28,8 +28,8 @@ GST_STATIC_PAD_TEMPLATE ("src",
     );
 
 % base-init
-  gst_element_class_add_static_pad_template (element_class,
-      &gst_replace_src_template);
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_replace_src_template));
 % instance-init
 
   replace->srcpad = gst_pad_new_from_static_template (&gst_replace_src_template
diff --git a/tools/element-templates/srcpad-simple b/tools/element-templates/srcpad-simple
index efb3190c6..0fca9157e 100644
--- a/tools/element-templates/srcpad-simple
+++ b/tools/element-templates/srcpad-simple
@@ -12,8 +12,8 @@ GST_STATIC_PAD_TEMPLATE ("src",
     );
 
 % base-init
-  gst_element_class_add_static_pad_template (element_class,
-      &gst_replace_src_template);
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_replace_src_template));
 % instance-init
 
   replace->srcpad = gst_pad_new_from_static_template (&gst_replace_src_template