diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c
index 636f23c314..14318c1c2d 100644
--- a/app/actions/layers-commands.c
+++ b/app/actions/layers-commands.c
@@ -972,7 +972,7 @@ layers_alpha_remove_cmd_callback (GtkAction *action,
 
   if (gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)))
     {
-      gimp_layer_flatten (layer, action_data_get_context (data));
+      gimp_layer_remove_alpha (layer, action_data_get_context (data));
       gimp_image_flush (image);
     }
 }
diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c
index 2792ca84cd..3f31780448 100644
--- a/app/core/gimplayer.c
+++ b/app/core/gimplayer.c
@@ -1906,8 +1906,8 @@ gimp_layer_add_alpha (GimpLayer *layer)
 }
 
 void
-gimp_layer_flatten (GimpLayer   *layer,
-                    GimpContext *context)
+gimp_layer_remove_alpha (GimpLayer   *layer,
+                         GimpContext *context)
 {
   GeglBuffer *new_buffer;
   GimpRGB     background;
diff --git a/app/core/gimplayer.h b/app/core/gimplayer.h
index bc3d8ab7f9..b01131f713 100644
--- a/app/core/gimplayer.h
+++ b/app/core/gimplayer.h
@@ -105,7 +105,7 @@ void            gimp_layer_set_show_mask       (GimpLayer           *layer,
 gboolean        gimp_layer_get_show_mask       (GimpLayer           *layer);
 
 void            gimp_layer_add_alpha           (GimpLayer            *layer);
-void            gimp_layer_flatten             (GimpLayer            *layer,
+void            gimp_layer_remove_alpha        (GimpLayer            *layer,
                                                 GimpContext          *context);
 
 void            gimp_layer_resize_to_image     (GimpLayer            *layer,
diff --git a/app/pdb/layer-cmds.c b/app/pdb/layer-cmds.c
index 5bc5727ae7..234f7b1bf6 100644
--- a/app/pdb/layer-cmds.c
+++ b/app/pdb/layer-cmds.c
@@ -329,7 +329,9 @@ layer_add_alpha_invoker (GimpProcedure         *procedure,
       if (gimp_pdb_item_is_modifyable (GIMP_ITEM (layer),
                                        GIMP_PDB_ITEM_CONTENT, error) &&
           gimp_pdb_item_is_not_group (GIMP_ITEM (layer), error))
-        gimp_layer_add_alpha (layer);
+        {
+          gimp_layer_add_alpha (layer);
+        }
       else
        success = FALSE;
     }
@@ -356,7 +358,9 @@ layer_flatten_invoker (GimpProcedure         *procedure,
       if (gimp_pdb_item_is_modifyable (GIMP_ITEM (layer),
                                        GIMP_PDB_ITEM_CONTENT, error) &&
           gimp_pdb_item_is_not_group (GIMP_ITEM (layer), error))
-        gimp_layer_flatten (layer, context);
+        {
+          gimp_layer_remove_alpha (layer, context);
+        }
       else
        success = FALSE;
     }
diff --git a/tools/pdbgen/pdb/layer.pdb b/tools/pdbgen/pdb/layer.pdb
index 277f499a84..b7dd101ca6 100644
--- a/tools/pdbgen/pdb/layer.pdb
+++ b/tools/pdbgen/pdb/layer.pdb
@@ -668,7 +668,9 @@ HELP
   if (gimp_pdb_item_is_modifyable (GIMP_ITEM (layer),
                                    GIMP_PDB_ITEM_CONTENT, error) &&
       gimp_pdb_item_is_not_group (GIMP_ITEM (layer), error))
-    gimp_layer_add_alpha (layer);
+    {
+      gimp_layer_add_alpha (layer);
+    }
   else
    success = FALSE;
 }
@@ -701,7 +703,9 @@ HELP
   if (gimp_pdb_item_is_modifyable (GIMP_ITEM (layer),
                                    GIMP_PDB_ITEM_CONTENT, error) &&
       gimp_pdb_item_is_not_group (GIMP_ITEM (layer), error))
-    gimp_layer_flatten (layer, context);
+    {
+      gimp_layer_remove_alpha (layer, context);
+    }
   else
    success = FALSE;
 }