diff --git a/app/actions/context-commands.c b/app/actions/context-commands.c
index e0152676f7..2b2805af45 100644
--- a/app/actions/context-commands.c
+++ b/app/actions/context-commands.c
@@ -895,17 +895,16 @@ context_select_object (GimpActionSelectType  select_type,
                        GimpContainer        *container)
 {
   GimpObject *current;
+  GType       child_type;
 
-  current =
-    gimp_context_get_by_type (context,
-                              gimp_container_get_children_type (container));
+  child_type = gimp_container_get_child_type (container);
+
+  current = gimp_context_get_by_type (context, child_type);
 
   current = action_select_object (select_type, container, current);
 
   if (current)
-    gimp_context_set_by_type (context,
-                              gimp_container_get_children_type (container),
-                              current);
+    gimp_context_set_by_type (context, child_type, current);
 }
 
 static gint
diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c
index 63073e501d..400138a922 100644
--- a/app/actions/plug-in-commands.c
+++ b/app/actions/plug-in-commands.c
@@ -102,7 +102,7 @@ plug_in_run_cmd_callback (GimpAction *action,
           context   = gimp_container_view_get_context (editor->view);
 
           object = gimp_context_get_by_type (context,
-                                             gimp_container_get_children_type (container));
+                                             gimp_container_get_child_type (container));
 
           args = procedure_commands_get_data_args (procedure, object);
         }
diff --git a/app/actions/templates-commands.c b/app/actions/templates-commands.c
index e9b30c7a84..f9a457078f 100644
--- a/app/actions/templates-commands.c
+++ b/app/actions/templates-commands.c
@@ -166,7 +166,7 @@ templates_duplicate_cmd_callback (GimpAction *action,
 
       gimp_container_add (container, GIMP_OBJECT (new_template));
       gimp_context_set_by_type (context,
-                                gimp_container_get_children_type (container),
+                                gimp_container_get_child_type (container),
                                 GIMP_OBJECT (new_template));
       g_object_unref (new_template);
 
@@ -326,7 +326,7 @@ templates_delete_response (GtkWidget          *dialog,
         {
           if (new_active)
             gimp_context_set_by_type (delete_data->context,
-                                      gimp_container_get_children_type (delete_data->container),
+                                      gimp_container_get_child_type (delete_data->container),
                                       new_active);
 
           gimp_container_remove (delete_data->container,
diff --git a/app/core/gimpcontainer-filter.c b/app/core/gimpcontainer-filter.c
index 5ffc6010ae..3fb93777ee 100644
--- a/app/core/gimpcontainer-filter.c
+++ b/app/core/gimpcontainer-filter.c
@@ -71,7 +71,7 @@ gimp_container_filter (GimpContainer        *container,
 
   result =
     g_object_new (G_TYPE_FROM_INSTANCE (container),
-                  "child-type", gimp_container_get_children_type (container),
+                  "child-type", gimp_container_get_child_type (container),
                   "policy",     GIMP_CONTAINER_POLICY_WEAK,
                   NULL);
 
diff --git a/app/core/gimpcontainer.c b/app/core/gimpcontainer.c
index f1723f600e..032f4c8406 100644
--- a/app/core/gimpcontainer.c
+++ b/app/core/gimpcontainer.c
@@ -363,7 +363,7 @@ gimp_container_real_remove (GimpContainer *container,
 static GType
 gimp_container_get_item_type (GListModel *list)
 {
-  return gimp_container_get_children_type (GIMP_CONTAINER (list));
+  return gimp_container_get_child_type (GIMP_CONTAINER (list));
 }
 
 static guint
@@ -603,7 +603,7 @@ gimp_container_free_handler (GimpContainer        *container,
 }
 
 GType
-gimp_container_get_children_type (GimpContainer *container)
+gimp_container_get_child_type (GimpContainer *container)
 {
   g_return_val_if_fail (GIMP_IS_CONTAINER (container), G_TYPE_NONE);
 
diff --git a/app/core/gimpcontainer.h b/app/core/gimpcontainer.h
index 3cf4e1b242..b1040b92fc 100644
--- a/app/core/gimpcontainer.h
+++ b/app/core/gimpcontainer.h
@@ -84,7 +84,7 @@ struct _GimpContainerClass
 
 GType        gimp_container_get_type           (void) G_GNUC_CONST;
 
-GType        gimp_container_get_children_type  (GimpContainer           *container);
+GType        gimp_container_get_child_type     (GimpContainer           *container);
 GimpContainerPolicy gimp_container_get_policy  (GimpContainer           *container);
 gint         gimp_container_get_n_children     (GimpContainer           *container);
 
diff --git a/app/core/gimpdatafactory.c b/app/core/gimpdatafactory.c
index aca637d9b2..5309484eec 100644
--- a/app/core/gimpdatafactory.c
+++ b/app/core/gimpdatafactory.c
@@ -850,7 +850,7 @@ gimp_data_factory_get_data_type (GimpDataFactory *factory)
 {
   g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), G_TYPE_NONE);
 
-  return gimp_container_get_children_type (factory->priv->container);
+  return gimp_container_get_child_type (factory->priv->container);
 }
 
 GimpContainer *
diff --git a/app/core/gimpdrawablestack.c b/app/core/gimpdrawablestack.c
index bd348d1aab..6e9e07edfd 100644
--- a/app/core/gimpdrawablestack.c
+++ b/app/core/gimpdrawablestack.c
@@ -104,7 +104,7 @@ gimp_drawable_stack_constructed (GObject *object)
 
   G_OBJECT_CLASS (parent_class)->constructed (object);
 
-  gimp_assert (g_type_is_a (gimp_container_get_children_type (container),
+  gimp_assert (g_type_is_a (gimp_container_get_child_type (container),
                             GIMP_TYPE_DRAWABLE));
 
   gimp_container_add_handler (container, "update",
diff --git a/app/core/gimpfilteredcontainer.c b/app/core/gimpfilteredcontainer.c
index b1e09dac01..d16e3dc981 100644
--- a/app/core/gimpfilteredcontainer.c
+++ b/app/core/gimpfilteredcontainer.c
@@ -309,7 +309,7 @@ gimp_filtered_container_new (GimpContainer        *src_container,
 
   g_return_val_if_fail (GIMP_IS_LIST (src_container), NULL);
 
-  child_type = gimp_container_get_children_type (src_container);
+  child_type = gimp_container_get_child_type (src_container);
   sort_func  = gimp_list_get_sort_func (GIMP_LIST (src_container));
 
   return g_object_new (GIMP_TYPE_FILTERED_CONTAINER,
diff --git a/app/core/gimpfilterstack.c b/app/core/gimpfilterstack.c
index 8d16bcfaf6..819b8e2d34 100644
--- a/app/core/gimpfilterstack.c
+++ b/app/core/gimpfilterstack.c
@@ -83,7 +83,7 @@ gimp_filter_stack_constructed (GObject *object)
 
   G_OBJECT_CLASS (parent_class)->constructed (object);
 
-  gimp_assert (g_type_is_a (gimp_container_get_children_type (container),
+  gimp_assert (g_type_is_a (gimp_container_get_child_type (container),
                             GIMP_TYPE_FILTER));
 
   gimp_container_add_handler (container, "active-changed",
diff --git a/app/core/gimpitemstack.c b/app/core/gimpitemstack.c
index 4ae06a8ca6..0534f098ac 100644
--- a/app/core/gimpitemstack.c
+++ b/app/core/gimpitemstack.c
@@ -73,7 +73,7 @@ gimp_item_stack_constructed (GObject *object)
 
   G_OBJECT_CLASS (parent_class)->constructed (object);
 
-  gimp_assert (g_type_is_a (gimp_container_get_children_type (container),
+  gimp_assert (g_type_is_a (gimp_container_get_child_type (container),
                          GIMP_TYPE_ITEM));
 }
 
diff --git a/app/core/gimplayerstack.c b/app/core/gimplayerstack.c
index f3d881d5aa..3a5eb8a61b 100644
--- a/app/core/gimplayerstack.c
+++ b/app/core/gimplayerstack.c
@@ -85,7 +85,7 @@ gimp_layer_stack_constructed (GObject *object)
 
   G_OBJECT_CLASS (parent_class)->constructed (object);
 
-  gimp_assert (g_type_is_a (gimp_container_get_children_type (container),
+  gimp_assert (g_type_is_a (gimp_container_get_child_type (container),
                             GIMP_TYPE_LAYER));
 
   gimp_container_add_handler (container, "active-changed",
diff --git a/app/core/gimptaggedcontainer.c b/app/core/gimptaggedcontainer.c
index 17927094f5..b3db6d1e19 100644
--- a/app/core/gimptaggedcontainer.c
+++ b/app/core/gimptaggedcontainer.c
@@ -266,7 +266,7 @@ gimp_tagged_container_new (GimpContainer *src_container)
 
   g_return_val_if_fail (GIMP_IS_LIST (src_container), NULL);
 
-  child_type = gimp_container_get_children_type (src_container);
+  child_type = gimp_container_get_child_type (src_container);
   sort_func  = gimp_list_get_sort_func (GIMP_LIST (src_container));
 
   tagged_container = g_object_new (GIMP_TYPE_TAGGED_CONTAINER,
diff --git a/app/core/gimptreeproxy.c b/app/core/gimptreeproxy.c
index 61bc6f3a23..fa0724be73 100644
--- a/app/core/gimptreeproxy.c
+++ b/app/core/gimptreeproxy.c
@@ -532,7 +532,7 @@ gimp_tree_proxy_new_for_container (GimpContainer *container)
   g_return_val_if_fail (GIMP_IS_CONTAINER (container), NULL);
 
   tree_proxy = GIMP_TREE_PROXY (
-    gimp_tree_proxy_new (gimp_container_get_children_type (container)));
+    gimp_tree_proxy_new (gimp_container_get_child_type (container)));
 
   gimp_tree_proxy_set_container (tree_proxy, container);
 
@@ -551,12 +551,12 @@ gimp_tree_proxy_set_container (GimpTreeProxy *tree_proxy,
       GTypeClass *children_class;
 
       children_class = g_type_class_ref (
-        gimp_container_get_children_type (container));
+        gimp_container_get_child_type (container));
 
       g_return_if_fail (
         G_TYPE_CHECK_CLASS_TYPE (
           children_class,
-          gimp_container_get_children_type (GIMP_CONTAINER (tree_proxy))));
+          gimp_container_get_child_type (GIMP_CONTAINER (tree_proxy))));
 
       g_type_class_unref (children_class);
     }
diff --git a/app/dialogs/data-delete-dialog.c b/app/dialogs/data-delete-dialog.c
index 75602f5403..cb119531a1 100644
--- a/app/dialogs/data-delete-dialog.c
+++ b/app/dialogs/data-delete-dialog.c
@@ -136,7 +136,7 @@ data_delete_dialog_response (GtkWidget        *dialog,
       if (private->context &&
           GIMP_OBJECT (data) ==
           gimp_context_get_by_type (private->context,
-                                    gimp_container_get_children_type (container)))
+                                    gimp_container_get_child_type (container)))
         {
           new_active = gimp_container_get_neighbor_of (container,
                                                        GIMP_OBJECT (data));
@@ -152,7 +152,7 @@ data_delete_dialog_response (GtkWidget        *dialog,
 
       if (new_active)
         gimp_context_set_by_type (private->context,
-                                  gimp_container_get_children_type (container),
+                                  gimp_container_get_child_type (container),
                                   new_active);
     }
 
diff --git a/app/operations/gimp-operation-config.c b/app/operations/gimp-operation-config.c
index 9add601a3e..9ae8ee79f9 100644
--- a/app/operations/gimp-operation-config.c
+++ b/app/operations/gimp-operation-config.c
@@ -296,7 +296,7 @@ gimp_operation_config_serialize (Gimp          *gimp,
     }
   else
     {
-      GType config_type = gimp_container_get_children_type (container);
+      GType config_type = gimp_container_get_child_type (container);
 
       file = gimp_operation_config_get_file (config_type);
     }
@@ -339,7 +339,7 @@ gimp_operation_config_deserialize (Gimp          *gimp,
     }
   else
     {
-      GType config_type = gimp_container_get_children_type (container);
+      GType config_type = gimp_container_get_child_type (container);
 
       file = gimp_operation_config_get_file (config_type);
     }
@@ -631,7 +631,7 @@ gimp_operation_config_add_sep (GimpContainer *container)
 
   if (! sep)
     {
-      sep = g_object_new (gimp_container_get_children_type (container),
+      sep = g_object_new (gimp_container_get_child_type (container),
                           NULL);
 
       gimp_container_add (container, sep);
diff --git a/app/pdb/brush-select-cmds.c b/app/pdb/brush-select-cmds.c
index cb11c63fec..9dc25b69a9 100644
--- a/app/pdb/brush-select-cmds.c
+++ b/app/pdb/brush-select-cmds.c
@@ -66,7 +66,7 @@ brushes_popup_invoker (GimpProcedure         *procedure,
       if (gimp->no_interface ||
           ! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
           ! gimp_pdb_dialog_new (gimp, context, progress,
-                                 gimp_container_get_children_type (container),
+                                 gimp_container_get_child_type (container),
                                  parent_window, popup_title, brush_callback,
                                  GIMP_OBJECT (initial_brush), NULL))
         success = FALSE;
@@ -96,7 +96,7 @@ brushes_close_popup_invoker (GimpProcedure         *procedure,
       if (gimp->no_interface ||
           ! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
           ! gimp_pdb_dialog_close (gimp,
-                                   gimp_container_get_children_type (container),
+                                   gimp_container_get_child_type (container),
                                    brush_callback))
         success = FALSE;
     }
@@ -127,7 +127,7 @@ brushes_set_popup_invoker (GimpProcedure         *procedure,
       if (gimp->no_interface ||
           ! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
           ! gimp_pdb_dialog_set (gimp,
-                                 gimp_container_get_children_type (container),
+                                 gimp_container_get_child_type (container),
                                  brush_callback, GIMP_OBJECT (brush), NULL))
         success = FALSE;
     }
diff --git a/app/pdb/font-select-cmds.c b/app/pdb/font-select-cmds.c
index 5df8da8a85..d715cdaccc 100644
--- a/app/pdb/font-select-cmds.c
+++ b/app/pdb/font-select-cmds.c
@@ -67,7 +67,7 @@ fonts_popup_invoker (GimpProcedure         *procedure,
           ! gimp_pdb_lookup_procedure (gimp->pdb, font_callback) ||
           ! gimp_data_factory_data_wait (gimp->font_factory)     ||
           ! gimp_pdb_dialog_new (gimp, context, progress,
-                                 gimp_container_get_children_type (container),
+                                 gimp_container_get_child_type (container),
                                  parent_window, popup_title, font_callback,
                                  GIMP_OBJECT (initial_font), NULL))
         success = FALSE;
@@ -97,7 +97,7 @@ fonts_close_popup_invoker (GimpProcedure         *procedure,
       if (gimp->no_interface ||
           ! gimp_pdb_lookup_procedure (gimp->pdb, font_callback) ||
           ! gimp_pdb_dialog_close (gimp,
-                                   gimp_container_get_children_type (container),
+                                   gimp_container_get_child_type (container),
                                    font_callback))
         success = FALSE;
     }
@@ -129,7 +129,7 @@ fonts_set_popup_invoker (GimpProcedure         *procedure,
           ! gimp_pdb_lookup_procedure (gimp->pdb, font_callback) ||
           ! gimp_data_factory_data_wait (gimp->font_factory)     ||
           ! gimp_pdb_dialog_set (gimp,
-                                 gimp_container_get_children_type (container),
+                                 gimp_container_get_child_type (container),
                                  font_callback, GIMP_OBJECT (font), NULL))
         success = FALSE;
     }
diff --git a/app/pdb/gradient-select-cmds.c b/app/pdb/gradient-select-cmds.c
index 16733ea7af..8bfc9084ec 100644
--- a/app/pdb/gradient-select-cmds.c
+++ b/app/pdb/gradient-select-cmds.c
@@ -72,7 +72,7 @@ gradients_popup_invoker (GimpProcedure         *procedure,
       if (gimp->no_interface ||
           ! gimp_pdb_lookup_procedure (gimp->pdb, gradient_callback) ||
           ! gimp_pdb_dialog_new (gimp, context, progress,
-                                 gimp_container_get_children_type (container),
+                                 gimp_container_get_child_type (container),
                                  parent_window, popup_title, gradient_callback,
                                  GIMP_OBJECT (initial_gradient), NULL))
         success = FALSE;
@@ -102,7 +102,7 @@ gradients_close_popup_invoker (GimpProcedure         *procedure,
       if (gimp->no_interface ||
           ! gimp_pdb_lookup_procedure (gimp->pdb, gradient_callback) ||
           ! gimp_pdb_dialog_close (gimp,
-                                   gimp_container_get_children_type (container),
+                                   gimp_container_get_child_type (container),
                                    gradient_callback))
         success = FALSE;
     }
@@ -133,7 +133,7 @@ gradients_set_popup_invoker (GimpProcedure         *procedure,
       if (gimp->no_interface ||
           ! gimp_pdb_lookup_procedure (gimp->pdb, gradient_callback) ||
           ! gimp_pdb_dialog_set (gimp,
-                                 gimp_container_get_children_type (container),
+                                 gimp_container_get_child_type (container),
                                  gradient_callback, GIMP_OBJECT (gradient), NULL))
         success = FALSE;
     }
diff --git a/app/pdb/palette-select-cmds.c b/app/pdb/palette-select-cmds.c
index c350c27113..7c70ab100f 100644
--- a/app/pdb/palette-select-cmds.c
+++ b/app/pdb/palette-select-cmds.c
@@ -66,7 +66,7 @@ palettes_popup_invoker (GimpProcedure         *procedure,
       if (gimp->no_interface ||
           ! gimp_pdb_lookup_procedure (gimp->pdb, palette_callback) ||
           ! gimp_pdb_dialog_new (gimp, context, progress,
-                                 gimp_container_get_children_type (container),
+                                 gimp_container_get_child_type (container),
                                  parent_window, popup_title, palette_callback,
                                  GIMP_OBJECT (initial_palette), NULL))
         success = FALSE;
@@ -96,7 +96,7 @@ palettes_close_popup_invoker (GimpProcedure         *procedure,
       if (gimp->no_interface ||
           ! gimp_pdb_lookup_procedure (gimp->pdb, palette_callback) ||
           ! gimp_pdb_dialog_close (gimp,
-                                   gimp_container_get_children_type (container),
+                                   gimp_container_get_child_type (container),
                                    palette_callback))
         success = FALSE;
     }
@@ -127,7 +127,7 @@ palettes_set_popup_invoker (GimpProcedure         *procedure,
       if (gimp->no_interface ||
           ! gimp_pdb_lookup_procedure (gimp->pdb, palette_callback) ||
           ! gimp_pdb_dialog_set (gimp,
-                                 gimp_container_get_children_type (container),
+                                 gimp_container_get_child_type (container),
                                  palette_callback, GIMP_OBJECT (palette), NULL))
         success = FALSE;
     }
diff --git a/app/pdb/pattern-select-cmds.c b/app/pdb/pattern-select-cmds.c
index 2826f87f96..5aa0dc181e 100644
--- a/app/pdb/pattern-select-cmds.c
+++ b/app/pdb/pattern-select-cmds.c
@@ -66,7 +66,7 @@ patterns_popup_invoker (GimpProcedure         *procedure,
       if (gimp->no_interface ||
           ! gimp_pdb_lookup_procedure (gimp->pdb, pattern_callback) ||
           ! gimp_pdb_dialog_new (gimp, context, progress,
-                                 gimp_container_get_children_type (container),
+                                 gimp_container_get_child_type (container),
                                  parent_window, popup_title, pattern_callback,
                                  GIMP_OBJECT (initial_pattern), NULL))
         success = FALSE;
@@ -96,7 +96,7 @@ patterns_close_popup_invoker (GimpProcedure         *procedure,
       if (gimp->no_interface ||
           ! gimp_pdb_lookup_procedure (gimp->pdb, pattern_callback) ||
           ! gimp_pdb_dialog_close (gimp,
-                                   gimp_container_get_children_type (container),
+                                   gimp_container_get_child_type (container),
                                    pattern_callback))
         success = FALSE;
     }
@@ -127,7 +127,7 @@ patterns_set_popup_invoker (GimpProcedure         *procedure,
       if (gimp->no_interface ||
           ! gimp_pdb_lookup_procedure (gimp->pdb, pattern_callback) ||
           ! gimp_pdb_dialog_set (gimp,
-                                 gimp_container_get_children_type (container),
+                                 gimp_container_get_child_type (container),
                                  pattern_callback, GIMP_OBJECT (pattern), NULL))
         success = FALSE;
     }
diff --git a/app/widgets/gimpcontainerbox.c b/app/widgets/gimpcontainerbox.c
index b8c4fc12a2..1699412665 100644
--- a/app/widgets/gimpcontainerbox.c
+++ b/app/widgets/gimpcontainerbox.c
@@ -203,7 +203,8 @@ gimp_container_box_get_preview (GimpDocked   *docked,
 
   gtk_icon_size_lookup (size, &width, &height);
 
-  prop_name = gimp_context_type_to_prop_name (gimp_container_get_children_type (container));
+  prop_name =
+    gimp_context_type_to_prop_name (gimp_container_get_child_type (container));
 
   preview = gimp_prop_view_new (G_OBJECT (context), prop_name,
                                 context, height);
diff --git a/app/widgets/gimpcontainereditor.c b/app/widgets/gimpcontainereditor.c
index f5ae0c116e..3df0539de8 100644
--- a/app/widgets/gimpcontainereditor.c
+++ b/app/widgets/gimpcontainereditor.c
@@ -291,7 +291,7 @@ gimp_container_editor_constructed (GObject *object)
   {
     GList      *objects = NULL;
     GimpObject *object  = gimp_context_get_by_type (editor->priv->context,
-                                                    gimp_container_get_children_type (editor->priv->container));
+                                                    gimp_container_get_child_type (editor->priv->container));
 
     if (object)
       objects = g_list_prepend (objects, object);
@@ -464,7 +464,7 @@ gimp_container_editor_select_items (GimpContainerView   *view,
       const gchar *signal_name;
       GType        child_type;
 
-      child_type  = gimp_container_get_children_type (editor->priv->container);
+      child_type  = gimp_container_get_child_type (editor->priv->container);
       signal_name = gimp_context_type_to_signal_name (child_type);
 
       if (signal_name)
diff --git a/app/widgets/gimpcontainericonview.c b/app/widgets/gimpcontainericonview.c
index 75ca0d03f8..556f7ab7e0 100644
--- a/app/widgets/gimpcontainericonview.c
+++ b/app/widgets/gimpcontainericonview.c
@@ -322,9 +322,9 @@ gimp_container_icon_view_set_container (GimpContainerView *view,
       if (! container)
         {
           if (gimp_dnd_viewable_source_remove (GTK_WIDGET (icon_view->view),
-                                               gimp_container_get_children_type (old_container)))
+                                               gimp_container_get_child_type (old_container)))
             {
-              if (GIMP_VIEWABLE_CLASS (g_type_class_peek (gimp_container_get_children_type (old_container)))->get_size)
+              if (GIMP_VIEWABLE_CLASS (g_type_class_peek (gimp_container_get_child_type (old_container)))->get_size)
                 gimp_dnd_pixbuf_source_remove (GTK_WIDGET (icon_view->view));
 
               gtk_drag_source_unset (GTK_WIDGET (icon_view->view));
@@ -339,15 +339,15 @@ gimp_container_icon_view_set_container (GimpContainerView *view,
     {
       if (gimp_dnd_drag_source_set_by_type (GTK_WIDGET (icon_view->view),
                                             GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
-                                            gimp_container_get_children_type (container),
+                                            gimp_container_get_child_type (container),
                                             GDK_ACTION_COPY))
         {
           gimp_dnd_viewable_source_add (GTK_WIDGET (icon_view->view),
-                                        gimp_container_get_children_type (container),
+                                        gimp_container_get_child_type (container),
                                         gimp_container_icon_view_drag_viewable,
                                         icon_view);
 
-          if (GIMP_VIEWABLE_CLASS (g_type_class_peek (gimp_container_get_children_type (container)))->get_size)
+          if (GIMP_VIEWABLE_CLASS (g_type_class_peek (gimp_container_get_child_type (container)))->get_size)
             gimp_dnd_pixbuf_source_add (GTK_WIDGET (icon_view->view),
                                         gimp_container_icon_view_drag_pixbuf,
                                         icon_view);
@@ -908,7 +908,7 @@ gimp_container_icon_view_get_selected (GimpContainerView    *view,
       GType        child_type;
 
       context     = gimp_container_view_get_context (view);
-      child_type  = gimp_container_get_children_type (container);
+      child_type  = gimp_container_get_child_type (container);
       signal_name = gimp_context_type_to_signal_name (child_type);
 
       /* As a special case, for containers tied to a context object, we
diff --git a/app/widgets/gimpcontainerpopup.c b/app/widgets/gimpcontainerpopup.c
index 35ef1002b7..a93c62f65c 100644
--- a/app/widgets/gimpcontainerpopup.c
+++ b/app/widgets/gimpcontainerpopup.c
@@ -118,9 +118,9 @@ gimp_container_popup_confirm (GimpPopup *popup)
   GimpObject         *object;
 
   object = gimp_context_get_by_type (c_popup->context,
-                                     gimp_container_get_children_type (c_popup->container));
+                                     gimp_container_get_child_type (c_popup->container));
   gimp_context_set_by_type (c_popup->orig_context,
-                            gimp_container_get_children_type (c_popup->container),
+                            gimp_container_get_child_type (c_popup->container),
                             object);
 
   GIMP_POPUP_CLASS (parent_class)->confirm (popup);
@@ -174,7 +174,7 @@ gimp_container_popup_new (GimpContainer     *container,
   popup->view_border_width = view_border_width;
 
   g_signal_connect (popup->context,
-                    gimp_context_type_to_signal_name (gimp_container_get_children_type (container)),
+                    gimp_context_type_to_signal_name (gimp_container_get_child_type (container)),
                     G_CALLBACK (gimp_container_popup_context_changed),
                     popup);
 
@@ -341,7 +341,7 @@ gimp_container_popup_create_view (GimpContainerPopup *popup)
   /* Special-casing the object types managed by the context to make sure
    * the right items are selected when opening the popup.
    */
-  child_type  = gimp_container_get_children_type (popup->container);
+  child_type  = gimp_container_get_child_type (popup->container);
   signal_name = gimp_context_type_to_signal_name (child_type);
 
   if (signal_name)
diff --git a/app/widgets/gimpcontainertreeview-dnd.c b/app/widgets/gimpcontainertreeview-dnd.c
index b29562523e..342012b01b 100644
--- a/app/widgets/gimpcontainertreeview-dnd.c
+++ b/app/widgets/gimpcontainertreeview-dnd.c
@@ -765,7 +765,7 @@ gimp_container_tree_view_real_drop_possible (GimpContainerTreeView   *tree_view,
 
 
       if (g_type_is_a (G_TYPE_FROM_INSTANCE (src_viewable),
-                       gimp_container_get_children_type (container)))
+                       gimp_container_get_child_type (container)))
         {
           /* The drop won't change a thing. This is not a fatal drop
            * failure, unless there is only one source viewable.
@@ -805,7 +805,7 @@ gimp_container_tree_view_real_drop_possible (GimpContainerTreeView   *tree_view,
       if (return_drag_action)
         {
           if (! g_type_is_a (G_TYPE_FROM_INSTANCE (src_viewable),
-                             gimp_container_get_children_type (container)))
+                             gimp_container_get_child_type (container)))
             *return_drag_action = GDK_ACTION_COPY;
         }
     }
diff --git a/app/widgets/gimpcontainertreeview.c b/app/widgets/gimpcontainertreeview.c
index 73632e81a7..7e91685ec6 100644
--- a/app/widgets/gimpcontainertreeview.c
+++ b/app/widgets/gimpcontainertreeview.c
@@ -650,9 +650,9 @@ gimp_container_tree_view_set_container (GimpContainerView *view,
       if (! container)
         {
           if (gimp_dnd_viewable_list_source_remove (GTK_WIDGET (tree_view->view),
-                                                    gimp_container_get_children_type (old_container)))
+                                                    gimp_container_get_child_type (old_container)))
             {
-              if (GIMP_VIEWABLE_CLASS (g_type_class_peek (gimp_container_get_children_type (old_container)))->get_size)
+              if (GIMP_VIEWABLE_CLASS (g_type_class_peek (gimp_container_get_child_type (old_container)))->get_size)
                 gimp_dnd_pixbuf_source_remove (GTK_WIDGET (tree_view->view));
 
               gtk_drag_source_unset (GTK_WIDGET (tree_view->view));
@@ -667,19 +667,19 @@ gimp_container_tree_view_set_container (GimpContainerView *view,
     {
       if (gimp_dnd_drag_source_set_by_type (GTK_WIDGET (tree_view->view),
                                             GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
-                                            gimp_container_get_children_type (container),
+                                            gimp_container_get_child_type (container),
                                             GDK_ACTION_COPY))
         {
           gimp_dnd_viewable_list_source_add (GTK_WIDGET (tree_view->view),
-                                             gimp_container_get_children_type (container),
+                                             gimp_container_get_child_type (container),
                                              gimp_container_tree_view_drag_viewable_list,
                                              tree_view);
           gimp_dnd_viewable_source_add (GTK_WIDGET (tree_view->view),
-                                        gimp_container_get_children_type (container),
+                                        gimp_container_get_child_type (container),
                                         gimp_container_tree_view_drag_viewable,
                                         tree_view);
 
-          if (GIMP_VIEWABLE_CLASS (g_type_class_peek (gimp_container_get_children_type (container)))->get_size)
+          if (GIMP_VIEWABLE_CLASS (g_type_class_peek (gimp_container_get_child_type (container)))->get_size)
             gimp_dnd_pixbuf_source_add (GTK_WIDGET (tree_view->view),
                                         gimp_container_tree_view_drag_pixbuf,
                                         tree_view);
diff --git a/app/widgets/gimpcontainerview-utils.c b/app/widgets/gimpcontainerview-utils.c
index 1c1a964ee5..abbe7c3b5c 100644
--- a/app/widgets/gimpcontainerview-utils.c
+++ b/app/widgets/gimpcontainerview-utils.c
@@ -73,7 +73,7 @@ gimp_container_view_remove_active (GimpContainerView *view)
       GType       child_type;
       GimpObject *active;
 
-      child_type = gimp_container_get_children_type (container);
+      child_type = gimp_container_get_child_type (container);
 
       active = gimp_context_get_by_type (context, child_type);
 
diff --git a/app/widgets/gimpcontainerview.c b/app/widgets/gimpcontainerview.c
index 4d20295f9f..0560990e1c 100644
--- a/app/widgets/gimpcontainerview.c
+++ b/app/widgets/gimpcontainerview.c
@@ -323,7 +323,7 @@ gimp_container_view_set_container (GimpContainerView *view,
   g_return_if_fail (GIMP_IS_CONTAINER_VIEW (view));
   g_return_if_fail (container == NULL || GIMP_IS_CONTAINER (container));
   if (container)
-    g_return_if_fail (g_type_is_a (gimp_container_get_children_type (container),
+    g_return_if_fail (g_type_is_a (gimp_container_get_child_type (container),
                                    GIMP_TYPE_VIEWABLE));
 
   private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view);
@@ -623,7 +623,7 @@ gimp_container_view_item_selected (GimpContainerView *view,
       GType        child_type;
       const gchar *signal_name;
 
-      child_type  = gimp_container_get_children_type (private->container);
+      child_type  = gimp_container_get_child_type (private->container);
       signal_name = gimp_context_type_to_signal_name (child_type);
 
       if (signal_name)
@@ -646,7 +646,7 @@ gimp_container_view_item_selected (GimpContainerView *view,
        *  become NULL by calling gimp_context_set_by_type()
        */
       context    = g_object_ref (private->context);
-      child_type = gimp_container_get_children_type (private->container);
+      child_type = gimp_container_get_child_type (private->container);
 
       g_signal_handlers_block_by_func (context,
                                        gimp_container_view_context_changed,
@@ -981,7 +981,7 @@ gimp_container_view_real_get_selected (GimpContainerView  *view,
   if (! private->container || ! private->context)
     return 0;
 
-  child_type = gimp_container_get_children_type (private->container);
+  child_type = gimp_container_get_child_type (private->container);
   if (gimp_context_type_to_property (child_type) == -1)
     {
       /* If you experience this warning, it means you should implement
@@ -1021,7 +1021,7 @@ gimp_container_view_add_container (GimpContainerView *view,
       GType              child_type;
       GimpViewableClass *viewable_class;
 
-      child_type  = gimp_container_get_children_type (container);
+      child_type  = gimp_container_get_child_type (container);
       viewable_class = g_type_class_ref (child_type);
 
       private->name_changed_handler =
@@ -1237,7 +1237,7 @@ gimp_container_view_thaw (GimpContainerView *view,
       GType        child_type;
       const gchar *signal_name;
 
-      child_type  = gimp_container_get_children_type (private->container);
+      child_type  = gimp_container_get_child_type (private->container);
       signal_name = gimp_context_type_to_signal_name (child_type);
 
       if (signal_name)
@@ -1292,7 +1292,7 @@ gimp_container_view_connect_context (GimpContainerView *view)
   GType                     child_type;
   const gchar              *signal_name;
 
-  child_type  = gimp_container_get_children_type (private->container);
+  child_type  = gimp_container_get_child_type (private->container);
   signal_name = gimp_context_type_to_signal_name (child_type);
 
   if (signal_name)
@@ -1325,7 +1325,7 @@ gimp_container_view_disconnect_context (GimpContainerView *view)
   GType                     child_type;
   const gchar              *signal_name;
 
-  child_type  = gimp_container_get_children_type (private->container);
+  child_type  = gimp_container_get_child_type (private->container);
   signal_name = gimp_context_type_to_signal_name (child_type);
 
   if (signal_name)
diff --git a/app/widgets/gimpviewablebutton.c b/app/widgets/gimpviewablebutton.c
index 56e037d753..c86cf6d2df 100644
--- a/app/widgets/gimpviewablebutton.c
+++ b/app/widgets/gimpviewablebutton.c
@@ -179,7 +179,7 @@ gimp_viewable_button_scroll_event (GtkWidget      *widget,
   gint                index;
 
   object = gimp_context_get_by_type (button->context,
-                                     gimp_container_get_children_type (button->container));
+                                     gimp_container_get_child_type (button->container));
 
   index = gimp_container_get_child_index (button->container, object);
 
@@ -212,7 +212,7 @@ gimp_viewable_button_scroll_event (GtkWidget      *widget,
 
           if (object)
             gimp_context_set_by_type (button->context,
-                                      gimp_container_get_children_type (button->container),
+                                      gimp_container_get_child_type (button->container),
                                       object);
         }
     }
@@ -310,7 +310,7 @@ gimp_viewable_button_new (GimpContainer     *container,
       button->dialog_tooltip    = g_strdup (dialog_tooltip);
     }
 
-  prop_name = gimp_context_type_to_prop_name (gimp_container_get_children_type (container));
+  prop_name = gimp_context_type_to_prop_name (gimp_container_get_child_type (container));
 
   button->view = gimp_prop_view_new (G_OBJECT (context), prop_name,
                                      context, button->button_view_size);
diff --git a/pdb/groups/brush_select.pdb b/pdb/groups/brush_select.pdb
index 05ca2beb80..a6b583f3fb 100644
--- a/pdb/groups/brush_select.pdb
+++ b/pdb/groups/brush_select.pdb
@@ -41,7 +41,7 @@ sub brushes_popup {
   if (gimp->no_interface ||
       ! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
       ! gimp_pdb_dialog_new (gimp, context, progress,
-                             gimp_container_get_children_type (container),
+                             gimp_container_get_child_type (container),
                              parent_window, popup_title, brush_callback,
                              GIMP_OBJECT (initial_brush), NULL))
     success = FALSE;
@@ -69,7 +69,7 @@ sub brushes_close_popup {
   if (gimp->no_interface ||
       ! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
       ! gimp_pdb_dialog_close (gimp,
-                               gimp_container_get_children_type (container),
+                               gimp_container_get_child_type (container),
                                brush_callback))
     success = FALSE;
 }
@@ -98,7 +98,7 @@ sub brushes_set_popup {
   if (gimp->no_interface ||
       ! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
       ! gimp_pdb_dialog_set (gimp,
-                             gimp_container_get_children_type (container),
+                             gimp_container_get_child_type (container),
                              brush_callback, GIMP_OBJECT (brush), NULL))
     success = FALSE;
 }
diff --git a/pdb/groups/font_select.pdb b/pdb/groups/font_select.pdb
index a88f449be9..63416d3147 100644
--- a/pdb/groups/font_select.pdb
+++ b/pdb/groups/font_select.pdb
@@ -43,7 +43,7 @@ sub fonts_popup {
       ! gimp_pdb_lookup_procedure (gimp->pdb, font_callback) ||
       ! gimp_data_factory_data_wait (gimp->font_factory)     ||
       ! gimp_pdb_dialog_new (gimp, context, progress,
-                             gimp_container_get_children_type (container),
+                             gimp_container_get_child_type (container),
                              parent_window, popup_title, font_callback,
                              GIMP_OBJECT (initial_font), NULL))
     success = FALSE;
@@ -71,7 +71,7 @@ sub fonts_close_popup {
   if (gimp->no_interface ||
       ! gimp_pdb_lookup_procedure (gimp->pdb, font_callback) ||
       ! gimp_pdb_dialog_close (gimp,
-                               gimp_container_get_children_type (container),
+                               gimp_container_get_child_type (container),
                                font_callback))
     success = FALSE;
 }
@@ -101,7 +101,7 @@ sub fonts_set_popup {
       ! gimp_pdb_lookup_procedure (gimp->pdb, font_callback) ||
       ! gimp_data_factory_data_wait (gimp->font_factory)     ||
       ! gimp_pdb_dialog_set (gimp,
-                             gimp_container_get_children_type (container),
+                             gimp_container_get_child_type (container),
                              font_callback, GIMP_OBJECT (font), NULL))
     success = FALSE;
 }
diff --git a/pdb/groups/gradient_select.pdb b/pdb/groups/gradient_select.pdb
index 0f6638e8b5..a0e4fa94da 100644
--- a/pdb/groups/gradient_select.pdb
+++ b/pdb/groups/gradient_select.pdb
@@ -48,7 +48,7 @@ sub gradients_popup {
   if (gimp->no_interface ||
       ! gimp_pdb_lookup_procedure (gimp->pdb, gradient_callback) ||
       ! gimp_pdb_dialog_new (gimp, context, progress,
-                             gimp_container_get_children_type (container),
+                             gimp_container_get_child_type (container),
                              parent_window, popup_title, gradient_callback,
                              GIMP_OBJECT (initial_gradient), NULL))
     success = FALSE;
@@ -76,7 +76,7 @@ sub gradients_close_popup {
   if (gimp->no_interface ||
       ! gimp_pdb_lookup_procedure (gimp->pdb, gradient_callback) ||
       ! gimp_pdb_dialog_close (gimp,
-                               gimp_container_get_children_type (container),
+                               gimp_container_get_child_type (container),
                                gradient_callback))
     success = FALSE;
 }
@@ -105,7 +105,7 @@ sub gradients_set_popup {
   if (gimp->no_interface ||
       ! gimp_pdb_lookup_procedure (gimp->pdb, gradient_callback) ||
       ! gimp_pdb_dialog_set (gimp,
-                             gimp_container_get_children_type (container),
+                             gimp_container_get_child_type (container),
                              gradient_callback, GIMP_OBJECT (gradient), NULL))
     success = FALSE;
 }
diff --git a/pdb/groups/palette_select.pdb b/pdb/groups/palette_select.pdb
index bb03b3a2d4..d2ed53b690 100644
--- a/pdb/groups/palette_select.pdb
+++ b/pdb/groups/palette_select.pdb
@@ -41,7 +41,7 @@ sub palettes_popup {
   if (gimp->no_interface ||
       ! gimp_pdb_lookup_procedure (gimp->pdb, palette_callback) ||
       ! gimp_pdb_dialog_new (gimp, context, progress,
-                             gimp_container_get_children_type (container),
+                             gimp_container_get_child_type (container),
                              parent_window, popup_title, palette_callback,
                              GIMP_OBJECT (initial_palette), NULL))
     success = FALSE;
@@ -69,7 +69,7 @@ sub palettes_close_popup {
   if (gimp->no_interface ||
       ! gimp_pdb_lookup_procedure (gimp->pdb, palette_callback) ||
       ! gimp_pdb_dialog_close (gimp,
-                               gimp_container_get_children_type (container),
+                               gimp_container_get_child_type (container),
                                palette_callback))
     success = FALSE;
 }
@@ -98,7 +98,7 @@ sub palettes_set_popup {
   if (gimp->no_interface ||
       ! gimp_pdb_lookup_procedure (gimp->pdb, palette_callback) ||
       ! gimp_pdb_dialog_set (gimp,
-                             gimp_container_get_children_type (container),
+                             gimp_container_get_child_type (container),
                              palette_callback, GIMP_OBJECT (palette), NULL))
     success = FALSE;
 }
diff --git a/pdb/groups/pattern_select.pdb b/pdb/groups/pattern_select.pdb
index 22b7b00300..eafa4672bb 100644
--- a/pdb/groups/pattern_select.pdb
+++ b/pdb/groups/pattern_select.pdb
@@ -41,7 +41,7 @@ sub patterns_popup {
   if (gimp->no_interface ||
       ! gimp_pdb_lookup_procedure (gimp->pdb, pattern_callback) ||
       ! gimp_pdb_dialog_new (gimp, context, progress,
-                             gimp_container_get_children_type (container),
+                             gimp_container_get_child_type (container),
                              parent_window, popup_title, pattern_callback,
                              GIMP_OBJECT (initial_pattern), NULL))
     success = FALSE;
@@ -69,7 +69,7 @@ sub patterns_close_popup {
   if (gimp->no_interface ||
       ! gimp_pdb_lookup_procedure (gimp->pdb, pattern_callback) ||
       ! gimp_pdb_dialog_close (gimp,
-                               gimp_container_get_children_type (container),
+                               gimp_container_get_child_type (container),
                                pattern_callback))
     success = FALSE;
 }
@@ -98,7 +98,7 @@ sub patterns_set_popup {
   if (gimp->no_interface ||
       ! gimp_pdb_lookup_procedure (gimp->pdb, pattern_callback) ||
       ! gimp_pdb_dialog_set (gimp,
-                             gimp_container_get_children_type (container),
+                             gimp_container_get_child_type (container),
                              pattern_callback, GIMP_OBJECT (pattern), NULL))
     success = FALSE;
 }