diff --git a/connectors/asana/element-templates/asana-connector.json b/connectors/asana/element-templates/asana-connector.json
index 4c9c371c98..67d664412c 100644
--- a/connectors/asana/element-templates/asana-connector.json
+++ b/connectors/asana/element-templates/asana-connector.json
@@ -27,10 +27,6 @@
       "id": "authentication",
       "label": "Authentication"
     },
-    {
-      "id": "operation",
-      "label": "Operation"
-    },
     {
       "id": "output",
       "label": "Output"
diff --git a/connectors/blue-prism/element-templates/blue-prism-connector.json b/connectors/blue-prism/element-templates/blue-prism-connector.json
index 548413201d..ad5beb4d09 100644
--- a/connectors/blue-prism/element-templates/blue-prism-connector.json
+++ b/connectors/blue-prism/element-templates/blue-prism-connector.json
@@ -174,7 +174,7 @@
       }
     },
     {
-      "id": "authenticationType",
+      "id": "authentication.clientAuthentication",
       "group": "authentication",
       "value": "basicAuthHeader",
       "type": "Hidden",
@@ -448,7 +448,7 @@
     },
     {
       "label": "Result expression",
-      "id": "resultExpressionGet",
+      "id": "resultExpressionGetItemState",
       "description": "Expression to map the response into process variables. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/#result-expression\" target=\"_blank\">documentation</a>",
       "group": "output",
       "type": "String",
@@ -467,7 +467,7 @@
     },
     {
       "label": "Result expression",
-      "id": "resultExpressionGet",
+      "id": "resultExpressionGetItemId",
       "description": "Expression to map the response into process variables. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/#result-expression\" target=\"_blank\">documentation</a>",
       "group": "output",
       "type": "String",
diff --git a/connectors/http/polling/element-templates/http-polling-connector-boundary.json b/connectors/http/polling/element-templates/http-polling-connector-boundary.json
index 7231b87287..91f8250626 100644
--- a/connectors/http/polling/element-templates/http-polling-connector-boundary.json
+++ b/connectors/http/polling/element-templates/http-polling-connector-boundary.json
@@ -307,7 +307,7 @@
     },
     {
       "label": "Client authentication",
-      "id": "authenticationType",
+      "id": "authentication.clientAuthentication",
       "group": "authentication",
       "description": "Send client ID and client secret as Basic Auth request in the header, or as client credentials in the request body",
       "value": "basicAuthHeader",
diff --git a/connectors/http/polling/element-templates/http-polling-connector.json b/connectors/http/polling/element-templates/http-polling-connector.json
index b4e90099bf..1c8fcf01aa 100644
--- a/connectors/http/polling/element-templates/http-polling-connector.json
+++ b/connectors/http/polling/element-templates/http-polling-connector.json
@@ -308,7 +308,7 @@
     },
     {
       "label": "Client authentication",
-      "id": "authenticationType",
+      "id": "authentication.clientAuthentication",
       "group": "authentication",
       "description": "Send client ID and client secret as Basic Auth request in the header, or as client credentials in the request body",
       "value": "basicAuthHeader",
diff --git a/connectors/salesforce/element-templates/salesforce-connector.json b/connectors/salesforce/element-templates/salesforce-connector.json
index c5fbd32658..315f6411b6 100644
--- a/connectors/salesforce/element-templates/salesforce-connector.json
+++ b/connectors/salesforce/element-templates/salesforce-connector.json
@@ -415,7 +415,7 @@
     },
     {
       "description": "Client authentication type",
-      "id": "authenticationType",
+      "id": "authentication.clientAuthentication",
       "value": "credentialsBody",
       "type": "Hidden",
       "binding": {
diff --git a/connectors/uipath/element-templates/uipath-connector.json b/connectors/uipath/element-templates/uipath-connector.json
index dd6159531a..14dc65d92c 100644
--- a/connectors/uipath/element-templates/uipath-connector.json
+++ b/connectors/uipath/element-templates/uipath-connector.json
@@ -176,7 +176,7 @@
       }
     },
     {
-      "id": "authenticationType",
+      "id": "authentication.clientAuthentication",
       "group": "authentication",
       "value": "basicAuthHeader",
       "type": "Hidden",
@@ -455,7 +455,7 @@
     },
     {
       "label": "Result expression",
-      "id": "resultExpressionGet",
+      "id": "resultExpressionGetBodyId",
       "description": "Expression to map the response into process variables. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/#result-expression\" target=\"_blank\">documentation</a>",
       "group": "output",
       "type": "String",
@@ -474,7 +474,7 @@
     },
     {
       "label": "Result expression",
-      "id": "resultExpressionGet",
+      "id": "resultExpressionGetStatus",
       "description": "Expression to map the response into process variables. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/#result-expression\" target=\"_blank\">documentation</a>",
       "group": "output",
       "type": "String",