diff --git a/src/components/Organizations/NewGroup/index.js b/src/components/Organizations/NewGroup/index.js
index ba033212..a57d180c 100644
--- a/src/components/Organizations/NewGroup/index.js
+++ b/src/components/Organizations/NewGroup/index.js
@@ -12,8 +12,8 @@ import styled from 'styled-components';
 import { Footer, StyledNotification } from '../SharedStyles';
 
 const ADD_GROUP_MUTATION = gql`
-  mutation addGroup($group: String!, $organization: Int!) {
-    addGroup(input: { name: $group, organization: $organization }) {
+  mutation addGroupToOrganization($group: String!, $organization: Int!) {
+    addGroupToOrganization(input: { name: $group, organization: $organization }) {
       name
     }
   }
diff --git a/src/lib/query/organizations/GroupByNameAndOrganization.js b/src/lib/query/organizations/GroupByNameAndOrganization.js
index 3918c8ec..ddc05274 100644
--- a/src/lib/query/organizations/GroupByNameAndOrganization.js
+++ b/src/lib/query/organizations/GroupByNameAndOrganization.js
@@ -21,7 +21,7 @@ export default gql`
       }
     }
 
-    organization: organizationById (organization: $organization){
+    organization: organizationById (id: $organization){
       id
       name
       description
diff --git a/src/lib/query/organizations/OrganizationByID.js b/src/lib/query/organizations/OrganizationByID.js
index 4e286844..35c501b2 100644
--- a/src/lib/query/organizations/OrganizationByID.js
+++ b/src/lib/query/organizations/OrganizationByID.js
@@ -7,7 +7,7 @@ import WebhookFragment from 'lib/fragment/Webhook';
 
 export default gql`
   query getOrganization($id: Int!) {
-    organization: organizationById(organization: $id) {
+    organization: organizationById(id: $id) {
       id
       name
       description
diff --git a/src/lib/query/organizations/OrganizationNotificationsByID.js b/src/lib/query/organizations/OrganizationNotificationsByID.js
index 7bf17f67..0fa93602 100644
--- a/src/lib/query/organizations/OrganizationNotificationsByID.js
+++ b/src/lib/query/organizations/OrganizationNotificationsByID.js
@@ -7,7 +7,7 @@ import WebhookFragment from 'lib/fragment/Webhook';
 
 export default gql`
   query getNotifications($id: Int!){
-    organization: organizationById (organization: $id){
+    organization: organizationById (id: $id){
       id
       name
       description
diff --git a/src/lib/query/organizations/ProjectAndOrganizationByID.js b/src/lib/query/organizations/ProjectAndOrganizationByID.js
index 44440415..cae02ede 100644
--- a/src/lib/query/organizations/ProjectAndOrganizationByID.js
+++ b/src/lib/query/organizations/ProjectAndOrganizationByID.js
@@ -22,7 +22,7 @@ export default gql`
       }
     }
 
-    organization: organizationById (organization: $id){
+    organization: organizationById (id: $id){
       id
       name
       quotaGroup
diff --git a/src/lib/query/organizations/UsersByOrganization.js b/src/lib/query/organizations/UsersByOrganization.js
index 50d1c640..d8786a8f 100644
--- a/src/lib/query/organizations/UsersByOrganization.js
+++ b/src/lib/query/organizations/UsersByOrganization.js
@@ -17,7 +17,7 @@ export default gql`
 
 export const getOrganization = gql`
   query getOrganization($id: Int!) {
-    organization: organizationById(organization: $id) {
+    organization: organizationById(id: $id) {
       id
       name
       groups{