diff --git a/Gir_GstApp.toml b/Gir_GstApp.toml
index db14a9f27..b33e75318 100644
--- a/Gir_GstApp.toml
+++ b/Gir_GstApp.toml
@@ -9,6 +9,8 @@ work_mode = "sys"
 external_libraries = [
     "GLib",
     "GObject",
-    "Gst",
-    "GstBase",
 ]
+
+[external_libraries]
+gstreamer="Gst"
+gstreamer_base="GstBase"
diff --git a/Gir_GstAudio.toml b/Gir_GstAudio.toml
index 134fff11f..bb43adf3e 100644
--- a/Gir_GstAudio.toml
+++ b/Gir_GstAudio.toml
@@ -9,7 +9,9 @@ work_mode = "sys"
 external_libraries = [
     "GLib",
     "GObject",
-    "Gst",
-    "GstBase",
-    "GstTag",
 ]
+
+[external_libraries]
+gstreamer="Gst"
+gstreamer_base="GstBase"
+gstreamer_tag="GstTag"
diff --git a/Gir_GstBase.toml b/Gir_GstBase.toml
index bb2d2389b..07e89f1cb 100644
--- a/Gir_GstBase.toml
+++ b/Gir_GstBase.toml
@@ -9,5 +9,7 @@ work_mode = "sys"
 external_libraries = [
     "GLib",
     "GObject",
-    "Gst",
 ]
+
+[external_libraries]
+gstreamer="Gst"
diff --git a/Gir_GstMpegts.toml b/Gir_GstMpegts.toml
index 892f0813f..ec9069784 100644
--- a/Gir_GstMpegts.toml
+++ b/Gir_GstMpegts.toml
@@ -9,5 +9,7 @@ work_mode = "sys"
 external_libraries = [
     "GLib",
     "GObject",
-    "Gst",
 ]
+
+[external_libraries]
+gstreamer="Gst"
diff --git a/Gir_GstNet.toml b/Gir_GstNet.toml
index fe5847d5b..8b4a6287b 100644
--- a/Gir_GstNet.toml
+++ b/Gir_GstNet.toml
@@ -10,5 +10,7 @@ external_libraries = [
     "GLib",
     "GObject",
     "Gio",
-    "Gst",
 ]
+
+[external_libraries]
+gstreamer="Gst"
diff --git a/Gir_GstPbutils.toml b/Gir_GstPbutils.toml
index d354ff4c0..e6c37fd9d 100644
--- a/Gir_GstPbutils.toml
+++ b/Gir_GstPbutils.toml
@@ -9,8 +9,10 @@ work_mode = "sys"
 external_libraries = [
     "GLib",
     "GObject",
-    "Gst",
-    "GstTag",
-    "GstAudio",
-    "GstVideo",
 ]
+
+[external_libraries]
+gstreamer="Gst"
+gstreamer_tag="GstTag"
+gstreamer_audio="GstAudio"
+gstreamer_video="GstVideo"
diff --git a/Gir_GstPlayer.toml b/Gir_GstPlayer.toml
index 907fc1d83..add98db8f 100644
--- a/Gir_GstPlayer.toml
+++ b/Gir_GstPlayer.toml
@@ -9,6 +9,8 @@ work_mode = "sys"
 external_libraries = [
     "GLib",
     "GObject",
-    "Gst",
-    "GstVideo",
 ]
+
+[external_libraries]
+gstreamer="Gst"
+gstreamer_video="GstVideo"
diff --git a/Gir_GstTag.toml b/Gir_GstTag.toml
index d9df5df79..52af02c0e 100644
--- a/Gir_GstTag.toml
+++ b/Gir_GstTag.toml
@@ -9,6 +9,8 @@ work_mode = "sys"
 external_libraries = [
     "GLib",
     "GObject",
-    "Gst",
-    "GstBase",
 ]
+
+[external_libraries]
+gstreamer="Gst"
+gstreamer_base="GstBase"
diff --git a/Gir_GstVideo.toml b/Gir_GstVideo.toml
index a1142df1e..7845c8070 100644
--- a/Gir_GstVideo.toml
+++ b/Gir_GstVideo.toml
@@ -9,6 +9,8 @@ work_mode = "sys"
 external_libraries = [
     "GLib",
     "GObject",
-    "Gst",
-    "GstBase",
 ]
+
+[external_libraries]
+gstreamer="Gst"
+gstreamer_base="GstBase"