diff --git a/tools/element-templates/sinkpad-template b/tools/element-templates/sinkpad-template
index b06b346b11..785365d811 100644
--- a/tools/element-templates/sinkpad-template
+++ b/tools/element-templates/sinkpad-template
@@ -11,8 +11,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
 % methods
 % end
diff --git a/tools/element-templates/sinkpad-template-video b/tools/element-templates/sinkpad-template-video
index b317c6fd79..b11965d165 100644
--- a/tools/element-templates/sinkpad-template-video
+++ b/tools/element-templates/sinkpad-template-video
@@ -1,21 +1,12 @@
 /* vim: set filetype=c: */
 
 % instance-members
+  GstPad *sinkpad;
 % prototypes
 % pad-template
 /* FIXME: add/remove formats you can handle */
 #define VIDEO_SINK_CAPS \
-    GST_VIDEO_CAPS_RGBA "; " \
-    GST_VIDEO_CAPS_ARGB "; " \
-    GST_VIDEO_CAPS_BGRA "; " \
-    GST_VIDEO_CAPS_ABGR "; " \
-    GST_VIDEO_CAPS_RGBx "; " \
-    GST_VIDEO_CAPS_xRGB "; " \
-    GST_VIDEO_CAPS_BGRx "; " \
-    GST_VIDEO_CAPS_xBGR "; " \
-    GST_VIDEO_CAPS_RGB  "; " \
-    GST_VIDEO_CAPS_BGR  "; " \
-    GST_VIDEO_CAPS_YUV("{ AYUV }")
+    GST_VIDEO_CAPS_MAKE("{ I420, Y444, Y42B, UYVY, RGBA }")
 
 static GstStaticPadTemplate gst_replace_sink_template =
 GST_STATIC_PAD_TEMPLATE ("sink",
@@ -25,9 +16,11 @@ 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 (GST_ELEMENT_CLASS(klass),
+      gst_static_pad_template_get (&gst_replace_sink_template));
 % instance-init
+  replace->sinkpad = gst_pad_new_from_static_template (
+      &gst_replace_sink_template, "sink");
 % methods
 % end
 
diff --git a/tools/element-templates/srcpad-template b/tools/element-templates/srcpad-template
index dd0842bbd9..020f6a2814 100644
--- a/tools/element-templates/srcpad-template
+++ b/tools/element-templates/srcpad-template
@@ -11,8 +11,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
 % methods
 % end
diff --git a/tools/element-templates/srcpad-template-video b/tools/element-templates/srcpad-template-video
index 4f39320868..6e233dfe12 100644
--- a/tools/element-templates/srcpad-template-video
+++ b/tools/element-templates/srcpad-template-video
@@ -1,21 +1,12 @@
 /* vim: set filetype=c: */
 
 % instance-members
+  GstPad *srcpad;
 % prototypes
 % pad-template
 /* FIXME: add/remove formats you can handle */
 #define VIDEO_SRC_CAPS \
-    GST_VIDEO_CAPS_RGBA "; " \
-    GST_VIDEO_CAPS_ARGB "; " \
-    GST_VIDEO_CAPS_BGRA "; " \
-    GST_VIDEO_CAPS_ABGR "; " \
-    GST_VIDEO_CAPS_RGBx "; " \
-    GST_VIDEO_CAPS_xRGB "; " \
-    GST_VIDEO_CAPS_BGRx "; " \
-    GST_VIDEO_CAPS_xBGR "; " \
-    GST_VIDEO_CAPS_RGB  "; " \
-    GST_VIDEO_CAPS_BGR  "; " \
-    GST_VIDEO_CAPS_YUV("{ AYUV }")
+    GST_VIDEO_CAPS_MAKE("{ I420, Y444, Y42B, UYVY, RGBA }")
 
 static GstStaticPadTemplate gst_replace_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
@@ -25,8 +16,11 @@ 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 (GST_ELEMENT_CLASS(klass),
+      gst_static_pad_template_get (&gst_replace_src_template));
+% instance-init
+  replace->srcpad = gst_pad_new_from_static_template (
+      &gst_replace_src_template, "src");
 % instance-init
 % methods
 % end