diff --git a/packages/backend/src/apps/discord/info.json b/packages/backend/src/apps/discord/info.json
index e7d6ef61..3422f30f 100644
--- a/packages/backend/src/apps/discord/info.json
+++ b/packages/backend/src/apps/discord/info.json
@@ -47,7 +47,7 @@
       "step": 1,
       "type": "mutation",
       "name": "createConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "key",
           "value": "{key}"
@@ -55,7 +55,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "consumerKey",
               "value": "{fields.consumerKey}"
@@ -72,7 +72,7 @@
       "step": 2,
       "type": "mutation",
       "name": "createAuthData",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{createConnection.id}"
@@ -83,7 +83,7 @@
       "step": 3,
       "type": "openWithPopup",
       "name": "openAuthPopup",
-      "fields": [
+      "arguments": [
         {
           "name": "url",
           "value": "{createAuthData.url}"
@@ -94,7 +94,7 @@
       "step": 4,
       "type": "mutation",
       "name": "updateConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{createConnection.id}"
@@ -102,7 +102,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "oauthVerifier",
               "value": "{openAuthPopup.code}"
@@ -115,7 +115,7 @@
       "step": 5,
       "type": "mutation",
       "name": "verifyConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{createConnection.id}"
@@ -128,7 +128,7 @@
       "step": 1,
       "type": "mutation",
       "name": "resetConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -139,7 +139,7 @@
       "step": 2,
       "type": "mutation",
       "name": "updateConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -147,7 +147,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "consumerKey",
               "value": "{fields.consumerKey}"
@@ -164,7 +164,7 @@
       "step": 3,
       "type": "mutation",
       "name": "createAuthData",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -175,7 +175,7 @@
       "step": 4,
       "type": "openWithPopup",
       "name": "openAuthPopup",
-      "fields": [
+      "arguments": [
         {
           "name": "url",
           "value": "{createAuthData.url}"
@@ -186,7 +186,7 @@
       "step": 5,
       "type": "mutation",
       "name": "updateConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -194,7 +194,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "oauthVerifier",
               "value": "{openAuthPopup.code}"
@@ -207,7 +207,7 @@
       "step": 6,
       "type": "mutation",
       "name": "verifyConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
diff --git a/packages/backend/src/apps/firebase/info.json b/packages/backend/src/apps/firebase/info.json
index 8e906d98..33f375dc 100644
--- a/packages/backend/src/apps/firebase/info.json
+++ b/packages/backend/src/apps/firebase/info.json
@@ -47,7 +47,7 @@
       "step": 1,
       "type": "mutation",
       "name": "createConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "key",
           "value": "{key}"
@@ -55,7 +55,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "consumerKey",
               "value": "{fields.consumerKey}"
@@ -72,7 +72,7 @@
       "step": 2,
       "type": "mutation",
       "name": "createAuthData",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{createConnection.id}"
@@ -83,7 +83,7 @@
       "step": 3,
       "type": "openWithPopup",
       "name": "openAuthPopup",
-      "fields": [
+      "arguments": [
         {
           "name": "url",
           "value": "{createAuthData.url}"
@@ -94,7 +94,7 @@
       "step": 4,
       "type": "mutation",
       "name": "updateConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{createConnection.id}"
@@ -102,7 +102,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "oauthVerifier",
               "value": "{openAuthPopup.code}"
@@ -115,7 +115,7 @@
       "step": 5,
       "type": "mutation",
       "name": "verifyConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{createConnection.id}"
@@ -128,7 +128,7 @@
       "step": 1,
       "type": "mutation",
       "name": "resetConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -139,7 +139,7 @@
       "step": 2,
       "type": "mutation",
       "name": "updateConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -147,7 +147,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "consumerKey",
               "value": "{fields.consumerKey}"
@@ -164,7 +164,7 @@
       "step": 3,
       "type": "mutation",
       "name": "createAuthData",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -175,7 +175,7 @@
       "step": 4,
       "type": "openWithPopup",
       "name": "openAuthPopup",
-      "fields": [
+      "arguments": [
         {
           "name": "url",
           "value": "{createAuthData.url}"
@@ -186,7 +186,7 @@
       "step": 5,
       "type": "mutation",
       "name": "updateConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -194,7 +194,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "oauthVerifier",
               "value": "{openAuthPopup.code}"
@@ -207,7 +207,7 @@
       "step": 6,
       "type": "mutation",
       "name": "verifyConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
diff --git a/packages/backend/src/apps/flickr/info.json b/packages/backend/src/apps/flickr/info.json
index d93c5f13..b75b55dd 100644
--- a/packages/backend/src/apps/flickr/info.json
+++ b/packages/backend/src/apps/flickr/info.json
@@ -47,7 +47,7 @@
       "step": 1,
       "type": "mutation",
       "name": "createConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "key",
           "value": "{key}"
@@ -55,7 +55,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "consumerKey",
               "value": "{fields.consumerKey}"
@@ -72,7 +72,7 @@
       "step": 2,
       "type": "mutation",
       "name": "createAuthData",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{createConnection.id}"
@@ -83,7 +83,7 @@
       "step": 3,
       "type": "openWithPopup",
       "name": "openAuthPopup",
-      "fields": [
+      "arguments": [
         {
           "name": "url",
           "value": "{createAuthData.url}"
@@ -94,7 +94,7 @@
       "step": 4,
       "type": "mutation",
       "name": "updateConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{createConnection.id}"
@@ -102,7 +102,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "oauthVerifier",
               "value": "{openAuthPopup.oauth_verifier}"
@@ -115,7 +115,7 @@
       "step": 5,
       "type": "mutation",
       "name": "verifyConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{createConnection.id}"
@@ -128,7 +128,7 @@
       "step": 1,
       "type": "mutation",
       "name": "resetConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -139,7 +139,7 @@
       "step": 2,
       "type": "mutation",
       "name": "updateConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -147,7 +147,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "consumerKey",
               "value": "{fields.consumerKey}"
@@ -164,7 +164,7 @@
       "step": 3,
       "type": "mutation",
       "name": "createAuthData",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -175,7 +175,7 @@
       "step": 4,
       "type": "openWithPopup",
       "name": "openAuthPopup",
-      "fields": [
+      "arguments": [
         {
           "name": "url",
           "value": "{createAuthData.url}"
@@ -186,7 +186,7 @@
       "step": 5,
       "type": "mutation",
       "name": "updateConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -194,7 +194,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "oauthVerifier",
               "value": "{openAuthPopup.oauth_verifier}"
@@ -207,7 +207,7 @@
       "step": 6,
       "type": "mutation",
       "name": "verifyConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
diff --git a/packages/backend/src/apps/smtp/info.json b/packages/backend/src/apps/smtp/info.json
index aac1358f..fc1ea420 100644
--- a/packages/backend/src/apps/smtp/info.json
+++ b/packages/backend/src/apps/smtp/info.json
@@ -83,7 +83,7 @@
       "step": 1,
       "type": "mutation",
       "name": "createConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "key",
           "value": "{key}"
@@ -91,7 +91,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "host",
               "value": "{fields.host}"
@@ -124,7 +124,7 @@
       "step": 2,
       "type": "mutation",
       "name": "verifyConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{createConnection.id}"
@@ -137,7 +137,7 @@
       "step": 1,
       "type": "mutation",
       "name": "resetConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -148,7 +148,7 @@
       "step": 2,
       "type": "mutation",
       "name": "updateConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -156,7 +156,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "host",
               "value": "{fields.host}"
@@ -189,7 +189,7 @@
       "step": 3,
       "type": "mutation",
       "name": "verifyConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
diff --git a/packages/backend/src/apps/twitch/info.json b/packages/backend/src/apps/twitch/info.json
index 1e91c0c7..3110789d 100644
--- a/packages/backend/src/apps/twitch/info.json
+++ b/packages/backend/src/apps/twitch/info.json
@@ -47,7 +47,7 @@
       "step": 1,
       "type": "mutation",
       "name": "createConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "key",
           "value": "{key}"
@@ -55,7 +55,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "consumerKey",
               "value": "{fields.consumerKey}"
@@ -72,7 +72,7 @@
       "step": 2,
       "type": "mutation",
       "name": "createAuthData",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{createConnection.id}"
@@ -83,7 +83,7 @@
       "step": 3,
       "type": "openWithPopup",
       "name": "openAuthPopup",
-      "fields": [
+      "arguments": [
         {
           "name": "url",
           "value": "{createAuthData.url}"
@@ -94,7 +94,7 @@
       "step": 4,
       "type": "mutation",
       "name": "updateConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{createConnection.id}"
@@ -102,7 +102,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "oauthVerifier",
               "value": "{openAuthPopup.code}"
@@ -115,7 +115,7 @@
       "step": 5,
       "type": "mutation",
       "name": "verifyConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{createConnection.id}"
@@ -128,7 +128,7 @@
       "step": 1,
       "type": "mutation",
       "name": "resetConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -139,7 +139,7 @@
       "step": 2,
       "type": "mutation",
       "name": "updateConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -147,7 +147,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "consumerKey",
               "value": "{fields.consumerKey}"
@@ -164,7 +164,7 @@
       "step": 3,
       "type": "mutation",
       "name": "createAuthData",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -175,7 +175,7 @@
       "step": 4,
       "type": "openWithPopup",
       "name": "openAuthPopup",
-      "fields": [
+      "arguments": [
         {
           "name": "url",
           "value": "{createAuthData.url}"
@@ -186,7 +186,7 @@
       "step": 5,
       "type": "mutation",
       "name": "updateConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -194,7 +194,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "oauthVerifier",
               "value": "{openAuthPopup.code}"
@@ -207,7 +207,7 @@
       "step": 6,
       "type": "mutation",
       "name": "verifyConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
diff --git a/packages/backend/src/apps/twitter/info.json b/packages/backend/src/apps/twitter/info.json
index 7f74c36f..a91ce781 100644
--- a/packages/backend/src/apps/twitter/info.json
+++ b/packages/backend/src/apps/twitter/info.json
@@ -47,7 +47,7 @@
       "step": 1,
       "type": "mutation",
       "name": "createConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "key",
           "value": "{key}"
@@ -55,7 +55,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "consumerKey",
               "value": "{fields.consumerKey}"
@@ -72,7 +72,7 @@
       "step": 2,
       "type": "mutation",
       "name": "createAuthData",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{createConnection.id}"
@@ -83,7 +83,7 @@
       "step": 3,
       "type": "openWithPopup",
       "name": "openAuthPopup",
-      "fields": [
+      "arguments": [
         {
           "name": "url",
           "value": "{createAuthData.url}"
@@ -94,7 +94,7 @@
       "step": 4,
       "type": "mutation",
       "name": "updateConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{createConnection.id}"
@@ -102,7 +102,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "oauthVerifier",
               "value": "{openAuthPopup.oauth_verifier}"
@@ -115,7 +115,7 @@
       "step": 5,
       "type": "mutation",
       "name": "verifyConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{createConnection.id}"
@@ -128,7 +128,7 @@
       "step": 1,
       "type": "mutation",
       "name": "resetConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -139,7 +139,7 @@
       "step": 2,
       "type": "mutation",
       "name": "updateConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -147,7 +147,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "consumerKey",
               "value": "{fields.consumerKey}"
@@ -164,7 +164,7 @@
       "step": 3,
       "type": "mutation",
       "name": "createAuthData",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -175,7 +175,7 @@
       "step": 4,
       "type": "openWithPopup",
       "name": "openAuthPopup",
-      "fields": [
+      "arguments": [
         {
           "name": "url",
           "value": "{createAuthData.url}"
@@ -186,7 +186,7 @@
       "step": 5,
       "type": "mutation",
       "name": "updateConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
@@ -194,7 +194,7 @@
         {
           "name": "data",
           "value": null,
-          "fields": [
+          "properties": [
             {
               "name": "oauthVerifier",
               "value": "{openAuthPopup.oauth_verifier}"
@@ -207,7 +207,7 @@
       "step": 6,
       "type": "mutation",
       "name": "verifyConnection",
-      "fields": [
+      "arguments": [
         {
           "name": "id",
           "value": "{connection.id}"
diff --git a/packages/backend/src/graphql/types/authentication-step.ts b/packages/backend/src/graphql/types/authentication-step.ts
index 68150978..db7e7fab 100644
--- a/packages/backend/src/graphql/types/authentication-step.ts
+++ b/packages/backend/src/graphql/types/authentication-step.ts
@@ -6,17 +6,17 @@ const authenticationStepType = new GraphQLObjectType({
     step: { type: GraphQLInt },
     type: { type: GraphQLString },
     name: { type: GraphQLString },
-    fields: { 
+    arguments: { 
       type: GraphQLList(
         new GraphQLObjectType({
-          name: 'AuthenticationStepFields',
+          name: 'AuthenticationStepArgument',
           fields: {
             name: { type: GraphQLString },
             value: { type: GraphQLString },
-            fields: {  
+            properties: {  
               type: GraphQLList(
                 new GraphQLObjectType({
-                  name: 'TwitterAuthenticationStepFields',
+                  name: 'AuthenticationStepProperty',
                   fields: {
                     name: { type: GraphQLString },
                     value: { type: GraphQLString }
diff --git a/packages/backend/src/graphql/types/reconnection-step.ts b/packages/backend/src/graphql/types/reconnection-step.ts
index bae72393..8c6dd64f 100644
--- a/packages/backend/src/graphql/types/reconnection-step.ts
+++ b/packages/backend/src/graphql/types/reconnection-step.ts
@@ -6,17 +6,17 @@ const reconnectionStepType = new GraphQLObjectType({
     step: { type: GraphQLInt },
     type: { type: GraphQLString },
     name: { type: GraphQLString },
-    fields: { 
+    arguments: { 
       type: GraphQLList(
         new GraphQLObjectType({
-          name: 'ReconnectionStepFields',
+          name: 'ReconnectionStepArgument',
           fields: {
             name: { type: GraphQLString },
             value: { type: GraphQLString },
-            fields: {  
+            properties: {  
               type: GraphQLList(
                 new GraphQLObjectType({
-                  name: 'TwitterReconnectionStepFields',
+                  name: 'ReconnectionStepProperty',
                   fields: {
                     name: { type: GraphQLString },
                     value: { type: GraphQLString }