diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c
index 7a965c6d3a..5c394abfb1 100644
--- a/app/core/gimpdrawable.c
+++ b/app/core/gimpdrawable.c
@@ -445,7 +445,7 @@ gimp_drawable_get_node (GimpFilter *filter)
 
   drawable->private->mode_node =
     gegl_node_new_child (node,
-                         "operation", "gimp:normal-mode",
+                         "operation", "gimp:normal",
                          NULL);
 
   input  = gegl_node_get_input_proxy  (node, "input");
diff --git a/app/gegl/gimp-gegl-nodes.c b/app/gegl/gimp-gegl-nodes.c
index d16156d26a..77d3d21a9d 100644
--- a/app/gegl/gimp-gegl-nodes.c
+++ b/app/gegl/gimp-gegl-nodes.c
@@ -143,7 +143,7 @@ gimp_gegl_mode_node_set_mode (GeglNode      *node,
                               GimpLayerMode  mode,
                               gboolean       linear)
 {
-  const gchar *operation = "gimp:normal-mode";
+  const gchar *operation = "gimp:normal";
   gdouble      opacity;
 
   g_return_if_fail (GEGL_IS_NODE (node));
@@ -151,7 +151,7 @@ gimp_gegl_mode_node_set_mode (GeglNode      *node,
   switch (mode)
     {
     case GIMP_LAYER_MODE_NORMAL:
-      operation = "gimp:normal-mode";
+      operation = "gimp:normal";
       break;
 
     case GIMP_LAYER_MODE_DISSOLVE:
diff --git a/app/gegl/gimpapplicator.c b/app/gegl/gimpapplicator.c
index d76b77fae9..efb14556e3 100644
--- a/app/gegl/gimpapplicator.c
+++ b/app/gegl/gimpapplicator.c
@@ -133,7 +133,7 @@ gimp_applicator_new (GeglNode *parent,
     gegl_node_get_output_proxy (applicator->node, "output");
 
   applicator->mode_node = gegl_node_new_child (applicator->node,
-                                               "operation", "gimp:normal-mode",
+                                               "operation", "gimp:normal",
                                                NULL);
 
   gimp_gegl_mode_node_set_mode (applicator->mode_node,
diff --git a/app/operations/gimplayermodefunctions.c b/app/operations/gimplayermodefunctions.c
index fec77cc7fb..7bd2dfc3a2 100644
--- a/app/operations/gimplayermodefunctions.c
+++ b/app/operations/gimplayermodefunctions.c
@@ -259,7 +259,8 @@ get_layer_mode_function (GimpLayerMode  paint_mode,
       break;
 
     default:
-      g_warning ("No direct function for layer mode (%d), using gimp:normal-mode", paint_mode);
+      g_warning ("No direct function for layer mode (%d), using gimp:normal",
+                 paint_mode);
       func = gimp_operation_normal_process_pixels;
       break;
     }
diff --git a/app/operations/layer-modes/gimpoperationnormal.c b/app/operations/layer-modes/gimpoperationnormal.c
index 528242ebe1..8e9ac698f3 100644
--- a/app/operations/layer-modes/gimpoperationnormal.c
+++ b/app/operations/layer-modes/gimpoperationnormal.c
@@ -55,7 +55,7 @@ G_DEFINE_TYPE (GimpOperationNormal, gimp_operation_normal,
 
 static const gchar* reference_xml = "<?xml version='1.0' encoding='UTF-8'?>"
 "<gegl>"
-"<node operation='gimp:normal-mode'>"
+"<node operation='gimp:normal'>"
 "  <node operation='gegl:load'>"
 "    <params>"
 "      <param name='path'>blending-test-B.png</param>"
@@ -80,7 +80,7 @@ gimp_operation_normal_class_init (GimpOperationNormalClass *klass)
   point_class     = GEGL_OPERATION_POINT_COMPOSER3_CLASS (klass);
 
   gegl_operation_class_set_keys (operation_class,
-                                 "name",                  "gimp:normal-mode",
+                                 "name",                  "gimp:normal",
                                  "description",           "GIMP normal mode operation",
                                  "reference-image",       "normal-mode.png",
                                  "reference-composition", reference_xml,