diff --git a/gstreamer-sharp/baseplugins/decodebin.metadata b/gstreamer-sharp/baseplugins/decodebin.metadata
index ce1c238d17..05cce23c9b 100644
--- a/gstreamer-sharp/baseplugins/decodebin.metadata
+++ b/gstreamer-sharp/baseplugins/decodebin.metadata
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <metadata>
-  <attr path="/element/element-signals/signal[1]/params/type[1]" name="name">Pad</attr>
-  <attr path="/element/element-signals/signal[1]/params/type[2]" name="name">Last</attr>
-  <attr path="/element/element-signals/signal[2]/params/type[1]" name="name">Pad</attr>
-  <attr path="/element/element-signals/signal[3]/params/type[1]" name="name">Pad</attr>
-  <attr path="/element/element-signals/signal[3]/params/type[2]" name="name">Caps</attr>
+  <attr path="/element/element-signals/signal/name[child::text()='new-decoded-pad']/../params/type[1]" name="name">Pad</attr>
+  <attr path="/element/element-signals/signal/name[child::text()='new-decoded-pad']/../params/type[2]" name="name">Last</attr>
+  <attr path="/element/element-signals/signal/name[child::text()='removed-decoded-pad']/../params/type[1]" name="name">Pad</attr>
+  <attr path="/element/element-signals/signal/name[child::text()='unknown-type']/../params/type[1]" name="name">Pad</attr>
+  <attr path="/element/element-signals/signal/name[child::text()='unknown-type']/../params/type[2]" name="name">Caps</attr>
 </metadata>
diff --git a/gstreamer-sharp/coreplugins/typefind.metadata b/gstreamer-sharp/coreplugins/typefind.metadata
index e476688051..0482aa4cae 100644
--- a/gstreamer-sharp/coreplugins/typefind.metadata
+++ b/gstreamer-sharp/coreplugins/typefind.metadata
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <metadata>
-  <attr path="/element/element-signals/signal[1]/params/type[1]" name="name">Probability</attr>
-  <attr path="/element/element-signals/signal[1]/params/type[2]" name="name">Caps</attr>
+  <attr path="/element/element-signals/signal/name[child::text()='have-type']/../params/type[1]" name="name">Probability</attr>
+  <attr path="/element/element-signals/signal/name[child::text()='have-type']/../params/type[2]" name="name">Caps</attr>
 </metadata>