diff --git a/libgimp/GimpUi-3.0.metadata b/libgimp/GimpUi-3.0.metadata
index 4353d26be7..213dcbd380 100644
--- a/libgimp/GimpUi-3.0.metadata
+++ b/libgimp/GimpUi-3.0.metadata
@@ -1,3 +1,5 @@
+GimpUi name="GimpUi"
+
 // Extra metadata for Vala, to deal with
 // annotations that GIR can't handle.
 //
diff --git a/plug-ins/goat-exercises/goat-exercise-vala.vala b/plug-ins/goat-exercises/goat-exercise-vala.vala
index 6a6b5e467a..e684f2f63f 100755
--- a/plug-ins/goat-exercises/goat-exercise-vala.vala
+++ b/plug-ins/goat-exercises/goat-exercise-vala.vala
@@ -47,7 +47,7 @@ public class Goat : Gimp.PlugIn {
                                 PLUG_IN_PROC);
     procedure.add_menu_path("<Image>/Filters/Development/Goat exercises/");
     procedure.set_attribution("Niels De Graef", "Niels De Graef", "2020");
-    procedure.set_icon_name(Gimp.ICON_GEGL);
+    procedure.set_icon_name(GimpUi.ICON_GEGL);
 
     return procedure;
   }
@@ -58,14 +58,14 @@ public class Goat : Gimp.PlugIn {
                              Gimp.Drawable drawable,
                              Gimp.ValueArray args) {
     if (run_mode == Gimp.RunMode.INTERACTIVE) {
-      Gimp.ui_init(PLUG_IN_BINARY);
+      GimpUi.init(PLUG_IN_BINARY);
 
       var dialog =
-          new Gimp.Dialog(_("Exercise a goat (Vala)"),
+          new GimpUi.Dialog(_("Exercise a goat (Vala)"),
                           PLUG_IN_ROLE,
                           null,
                           Gtk.DialogFlags.USE_HEADER_BAR,
-                          Gimp.standard_help_func,
+                          GimpUi.standard_help_func,
                           PLUG_IN_PROC,
                           _("_Cancel"), Gtk.ResponseType.CANCEL,
                           _("_Source"), Gtk.ResponseType.APPLY,