diff --git a/src/functionalTest/resources/conf/tasks/task-with-fallback-action.conf b/src/functionalTest/resources/conf/tasks/task-with-fallback-action.conf
index 220765dd..b2a9315d 100644
--- a/src/functionalTest/resources/conf/tasks/task-with-fallback-action.conf
+++ b/src/functionalTest/resources/conf/tasks/task-with-fallback-action.conf
@@ -2,7 +2,7 @@ global.handler.fragmentsHandler.config {
   tasks {
     tags-listing {
       action = tags
-      onTransitions {
+      on {
         _success {
           action = te-hbs
         }
@@ -13,7 +13,7 @@ global.handler.fragmentsHandler.config {
     }
     authors-listing {
       action = author
-      onTransitions {
+      on {
         _success {
           action = te-hbs
         }
@@ -28,7 +28,7 @@ global.handler.fragmentsHandler.config {
           action = author
         }
       ]
-      onTransitions {
+      on {
         _success {
           action = te-hbs
         }
diff --git a/src/functionalTest/resources/scenarios/circuit-breaker-times-out-and-retries/tasks.conf b/src/functionalTest/resources/scenarios/circuit-breaker-times-out-and-retries/tasks.conf
index 731fe411..2145141e 100644
--- a/src/functionalTest/resources/scenarios/circuit-breaker-times-out-and-retries/tasks.conf
+++ b/src/functionalTest/resources/scenarios/circuit-breaker-times-out-and-retries/tasks.conf
@@ -2,7 +2,7 @@ global.handler.fragmentsHandler.config {
   tasks {
     web-api-test {
       action = fetch-user-info
-      onTransitions._success {
+      on._success {
         actions = [
           {
             action = fetch-payment-providers
@@ -11,7 +11,7 @@ global.handler.fragmentsHandler.config {
             action = fetch-offers-with-cb
           }
         ]
-        onTransitions {
+        on {
           _success {
             action = create-response
           }
diff --git a/src/functionalTest/resources/scenarios/circuit-breaker-times-out/tasks.conf b/src/functionalTest/resources/scenarios/circuit-breaker-times-out/tasks.conf
index e6862659..ef19dbae 100644
--- a/src/functionalTest/resources/scenarios/circuit-breaker-times-out/tasks.conf
+++ b/src/functionalTest/resources/scenarios/circuit-breaker-times-out/tasks.conf
@@ -2,19 +2,19 @@ global.handler.fragmentsHandler.config {
   tasks {
     web-api-test {
       action = fetch-user-info
-      onTransitions._success {
+      on._success {
         actions = [
           {
             action = fetch-payment-providers
           }
           {
             action = fetch-offers-with-cb
-            onTransitions._fallback {
+            on._fallback {
               action = fetch-offers-fallback
             }
           }
         ]
-        onTransitions._success {
+        on._success {
           action = create-response
         }
       }
diff --git a/src/functionalTest/resources/scenarios/dependent-http-actions-scenario-test/tasks.conf b/src/functionalTest/resources/scenarios/dependent-http-actions-scenario-test/tasks.conf
index 71010dcd..017d9f14 100644
--- a/src/functionalTest/resources/scenarios/dependent-http-actions-scenario-test/tasks.conf
+++ b/src/functionalTest/resources/scenarios/dependent-http-actions-scenario-test/tasks.conf
@@ -2,9 +2,9 @@ global.handler.fragmentsHandler.config {
   tasks {
     web-api-test {
       action = obtain-auth-token
-      onTransitions._success {
+      on._success {
         action = reload-database
-        onTransitions {
+        on {
           _success {
             action = create-response
           }
diff --git a/src/functionalTest/resources/scenarios/failed-knotx-fragment/tasks.conf b/src/functionalTest/resources/scenarios/failed-knotx-fragment/tasks.conf
index f3a40122..377edf0a 100644
--- a/src/functionalTest/resources/scenarios/failed-knotx-fragment/tasks.conf
+++ b/src/functionalTest/resources/scenarios/failed-knotx-fragment/tasks.conf
@@ -2,7 +2,7 @@ global.handler.fragmentsHandler.config {
   tasks {
     error-task {
       action = fetch-incorrect-data
-      onTransitions._success {
+      on._success {
         action = te-pebble
       }
     }
diff --git a/src/functionalTest/resources/scenarios/failing-http-services-with-fallbacks/tasks.conf b/src/functionalTest/resources/scenarios/failing-http-services-with-fallbacks/tasks.conf
index ecec3e2b..3e65cb2e 100644
--- a/src/functionalTest/resources/scenarios/failing-http-services-with-fallbacks/tasks.conf
+++ b/src/functionalTest/resources/scenarios/failing-http-services-with-fallbacks/tasks.conf
@@ -2,7 +2,7 @@ global.handler.fragmentsHandler.config {
   tasks {
     books-listing {
       action = book
-      onTransitions {
+      on {
         _error {
           action = book-inline-body-fallback
         }
@@ -10,10 +10,10 @@ global.handler.fragmentsHandler.config {
     }
     authors-listing {
       action = author
-      onTransitions {
+      on {
         _error {
           action = author-inline-payload-fallback
-          onTransitions._success {
+          on._success {
             action = te-hbs
           }
         }
@@ -23,7 +23,7 @@ global.handler.fragmentsHandler.config {
       subtasks = [
         {
           action = book
-          onTransitions._error {
+          on._error {
             action = book-inline-payload-fallback
           }
         },
@@ -31,10 +31,10 @@ global.handler.fragmentsHandler.config {
           action = author
         }
       ]
-      onTransitions {
+      on {
         _error {
           action = author-inline-payload-fallback
-          onTransitions._success {
+          on._success {
             action = te-hbs
           }
         }
diff --git a/src/functionalTest/resources/scenarios/fragments-debug-data/tasks.conf b/src/functionalTest/resources/scenarios/fragments-debug-data/tasks.conf
index 10299254..1d9d2099 100644
--- a/src/functionalTest/resources/scenarios/fragments-debug-data/tasks.conf
+++ b/src/functionalTest/resources/scenarios/fragments-debug-data/tasks.conf
@@ -3,48 +3,48 @@ global.handler.fragmentsHandler.config {
     # HTML Templating Scenario
     user-task {
       action = fetch-user-info // _success
-      onTransitions._success {
+      on._success {
         action = te-hbs
       }
     }
     # HTML Templating Scenario
     payments-task {
       action = fetch-user-info // _success
-      onTransitions._success {
+      on._success {
         actions = [
           {
             action = fetch-payment-providers // _success
-            onTransitions._error {
+            on._error {
               action = fetch-payment-providers-fallback
             }
           }
           {
             action = fetch-offers // _error
-            onTransitions._error {
+            on._error {
               action = fetch-offers-fallback // _success
             }
           }
           {
             action = fetch-delivery-options-cb // 2 x 500 -> _fallback
-            onTransitions._fallback {
+            on._fallback {
               action = fetch-delivery-fallback // _success
             }
           }
           {
             action = notify-analytics-cb // 2 x timeout -> _fallback
-            onTransitions._fallback {
+            on._fallback {
               action = notify-analytics-fallback // _success
             }
           }
         ]
-        onTransitions._success {
+        on._success {
           action = te-pebble // _success
         }
       }
-      onTransitions._error {
+      on._error {
         action = fetch-user-info-fallback
       }
-      onTransitions._custom {
+      on._custom {
         action = fetch-user-info-custom
       }
     }
diff --git a/src/functionalTest/resources/scenarios/http-service-responds-with-invalid-json/tasks.conf b/src/functionalTest/resources/scenarios/http-service-responds-with-invalid-json/tasks.conf
index 2b3fed83..0bcd368b 100644
--- a/src/functionalTest/resources/scenarios/http-service-responds-with-invalid-json/tasks.conf
+++ b/src/functionalTest/resources/scenarios/http-service-responds-with-invalid-json/tasks.conf
@@ -2,19 +2,19 @@ global.handler.fragmentsHandler.config {
   tasks {
     web-api-test {
       action = fetch-user-info
-      onTransitions._success {
+      on._success {
         actions = [
           {
             action = fetch-payment-providers
           }
           {
             action = fetch-offers
-            onTransitions._error {
+            on._error {
               action = fetch-offers-fallback
             }
           }
         ]
-        onTransitions._success {
+        on._success {
           action = create-response
         }
       }
diff --git a/src/functionalTest/resources/scenarios/long-running-http-service-with-circuit-breaker/tasks.conf b/src/functionalTest/resources/scenarios/long-running-http-service-with-circuit-breaker/tasks.conf
index f69bc586..71c55d5d 100644
--- a/src/functionalTest/resources/scenarios/long-running-http-service-with-circuit-breaker/tasks.conf
+++ b/src/functionalTest/resources/scenarios/long-running-http-service-with-circuit-breaker/tasks.conf
@@ -2,13 +2,13 @@ global.handler.fragmentsHandler.config {
   tasks {
     books-listing {
       action = book-with-circuit-breaker
-      onTransitions._fallback {
+      on._fallback {
         action = book-inline-body-fallback
       }
     }
     authors-listing {
       action = author
-      onTransitions {
+      on {
         _success {
           action = te-hbs
         }
@@ -18,7 +18,7 @@ global.handler.fragmentsHandler.config {
       actions = [
         {
           action = book-with-circuit-breaker
-          onTransitions._fallback {
+          on._fallback {
             action = book-inline-payload-fallback
           }
         },
@@ -26,7 +26,7 @@ global.handler.fragmentsHandler.config {
           action = author
         }
       ]
-      onTransitions {
+      on {
         _success {
           action = te-hbs
         }
diff --git a/src/functionalTest/resources/scenarios/pebble-template-engine/tasks.conf b/src/functionalTest/resources/scenarios/pebble-template-engine/tasks.conf
index ba9ab1e5..d28f20ab 100644
--- a/src/functionalTest/resources/scenarios/pebble-template-engine/tasks.conf
+++ b/src/functionalTest/resources/scenarios/pebble-template-engine/tasks.conf
@@ -2,7 +2,7 @@ global.handler.fragmentsHandler.config {
   tasks {
     tags-listing {
       action = tags
-      onTransitions {
+      on {
         _success {
           action = te-pebble
         }
@@ -13,7 +13,7 @@ global.handler.fragmentsHandler.config {
     }
     books-listing {
       action = book
-      onTransitions {
+      on {
         _success {
           action = te-pebble
         }
@@ -21,7 +21,7 @@ global.handler.fragmentsHandler.config {
     }
     authors-listing {
       action = author
-      onTransitions {
+      on {
         _success {
           action = te-pebble
         }
@@ -36,7 +36,7 @@ global.handler.fragmentsHandler.config {
           action = author
         }
       ]
-      onTransitions {
+      on {
         _success {
           action = te-pebble
         }
diff --git a/src/functionalTest/resources/scenarios/template-engines-integration/tasks.conf b/src/functionalTest/resources/scenarios/template-engines-integration/tasks.conf
index 743d374e..acc1b130 100644
--- a/src/functionalTest/resources/scenarios/template-engines-integration/tasks.conf
+++ b/src/functionalTest/resources/scenarios/template-engines-integration/tasks.conf
@@ -2,13 +2,13 @@ global.handler.fragmentsHandler.config {
   tasks {
     user-task {
       action = fetch-user-info // _success
-      onTransitions._success {
+      on._success {
         action = te-hbs
       }
     }
     payments-task {
       action = fetch-user-info // _success
-      onTransitions._success {
+      on._success {
         actions = [
           {
             action = fetch-payment-providers // _success
@@ -17,7 +17,7 @@ global.handler.fragmentsHandler.config {
             action = fetch-offers // _success
           }
         ]
-        onTransitions._success {
+        on._success {
           action = te-pebble // _success
         }
       }
diff --git a/src/functionalTest/resources/scenarios/various-methods-for-http-action/tasks.conf b/src/functionalTest/resources/scenarios/various-methods-for-http-action/tasks.conf
index a92dc3ae..d1562c0a 100644
--- a/src/functionalTest/resources/scenarios/various-methods-for-http-action/tasks.conf
+++ b/src/functionalTest/resources/scenarios/various-methods-for-http-action/tasks.conf
@@ -21,7 +21,7 @@ global.handler.fragmentsHandler.config {
           action = head
         }
       ]
-      onTransitions._success {
+      on._success {
         action = te-hbs
       }
     }