diff --git a/README.md b/README.md
index 0bd7356a6..7efa4baa6 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
 # HostsModule
-This module manages competition hosts
+This module manages competition events
diff --git a/client/src/Components/Event/Edit/index.js b/client/src/Components/Event/Edit/index.js
index 803c9e2cc..1a17154bb 100644
--- a/client/src/Components/Event/Edit/index.js
+++ b/client/src/Components/Event/Edit/index.js
@@ -21,7 +21,7 @@ class Edit extends React.Component {
           Enroll in an competition {this.props.match.params.slug}
         </Typography>
         <Query
-          query={showEventCalls.HOSTS_EVENT}
+          query={showEventCalls.EVENTS_EVENT}
           variables={{ designator: this.props.match.params.slug }}
         >
           {({ loading, error, data }) => {
@@ -29,7 +29,7 @@ class Edit extends React.Component {
             if (error) return `Error! ${error.message}`
             return (
               <p>
-                {data.hosts_Event.description}
+                {data.events_Event.description}
               </p>
             )
           }}
diff --git a/client/src/Components/Event/Show/index.js b/client/src/Components/Event/Show/index.js
index d0e89c9d6..aaf59fb06 100644
--- a/client/src/Components/Event/Show/index.js
+++ b/client/src/Components/Event/Show/index.js
@@ -21,7 +21,7 @@ class Show extends React.Component {
           Enroll in an competition {this.props.match.params.slug}
         </Typography>
         <Query
-          query={showEventCalls.HOSTS_EVENT}
+          query={showEventCalls.EVENTS_EVENT}
           variables={{ designator: this.props.match.params.slug }}
         >
           {({ loading, error, data }) => {
@@ -29,7 +29,7 @@ class Show extends React.Component {
             if (error) return `Error! ${error.message}`
             return (
               <p>
-                {data.hosts_Event.description}
+                {data.events_Event.description}
               </p>
             )
           }}
diff --git a/client/src/Components/HostedEvents/New.js b/client/src/Components/HostedEvents/New.js
index f5567122d..61b4d72ff 100644
--- a/client/src/Components/HostedEvents/New.js
+++ b/client/src/Components/HostedEvents/New.js
@@ -24,14 +24,14 @@ class New extends React.Component {
   render () {
     const { name, description, startDatetime, finishDatetime } = this.state
     return (
-      <Mutation mutation={hostedEventsCalls.HOSTS_HOSTEVENT}
+      <Mutation mutation={hostedEventsCalls.EVENTS_HOSTEVENT}
         update={(store, { data }) => {
-          const { hosts_EventsByHost: hostedEvents } = store.readQuery({ query: hostedEventsCalls.HOSTS_EVENTSBYHOST })
+          const { events_EventsByHost: hostedEvents } = store.readQuery({ query: hostedEventsCalls.EVENTS_EVENTSBYHOST })
           store.writeQuery({
-            query: hostedEventsCalls.HOSTS_EVENTSBYHOST,
-            data: { hosts_EventsByHost: hostedEvents.concat([data.hosts_HostEvent]) }
+            query: hostedEventsCalls.EVENTS_EVENTSBYHOST,
+            data: { events_EventsByHost: hostedEvents.concat([data.events_HostEvent]) }
           })
-          this.props.handleNewEvent(data.hosts_HostEvent)
+          this.props.handleNewEvent(data.events_HostEvent)
         }
         }
       >
diff --git a/client/src/Components/HostedEvents/index.js b/client/src/Components/HostedEvents/index.js
index ff6b6e600..4ccfd907d 100644
--- a/client/src/Components/HostedEvents/index.js
+++ b/client/src/Components/HostedEvents/index.js
@@ -40,12 +40,12 @@ class HostedEvent extends React.Component {
         </Button>
 
         <Query
-          query={hostedEventsCalls.HOSTS_EVENTSBYHOST}
+          query={hostedEventsCalls.EVENTS_EVENTSBYHOST}
         >
           {({ loading, error, data }) => {
             if (loading) return 'Loading...'
             if (error) return `Error! ${error.message}`
-            const list = data.hosts_EventsByHost.map((event, index) => {
+            const list = data.events_EventsByHost.map((event, index) => {
               return (
                 <Event key={index} event={event} />
               )
diff --git a/client/src/Components/Search/index.js b/client/src/Components/Search/index.js
index e432c8a8c..0d50b2f86 100644
--- a/client/src/Components/Search/index.js
+++ b/client/src/Components/Search/index.js
@@ -51,7 +51,7 @@ class Search extends React.Component {
     const { value } = this.state
     return (
       <Query
-        query={listEventsCalls.HOSTS_EVENTS}
+        query={listEventsCalls.EVENTS_EVENTS}
       >
         {({ loading, error, data }) => {
           if (loading) return 'Loading...'
@@ -59,10 +59,10 @@ class Search extends React.Component {
           const now = ~~(DateTime.local().valueOf() / 1000)
           const inTwoWeeks = ~~(DateTime.local().plus({ weeks: 2 }).valueOf() / 1000)
 
-          const IncomingEvents = data.hosts_Events.filter(event => event.startDatetime > now && event.startDatetime < inTwoWeeks)
-          const OngoingEvents = data.hosts_Events.filter(event => event.finishDatetime > now && event.startDatetime < now)
-          const FutureEvents = data.hosts_Events.filter(event => event.startDatetime > now)
-          const PastEvents = data.hosts_Events.filter(event => event.finishDatetime < now)
+          const IncomingEvents = data.events_Events.filter(event => event.startDatetime > now && event.startDatetime < inTwoWeeks)
+          const OngoingEvents = data.events_Events.filter(event => event.finishDatetime > now && event.startDatetime < now)
+          const FutureEvents = data.events_Events.filter(event => event.startDatetime > now)
+          const PastEvents = data.events_Events.filter(event => event.finishDatetime < now)
 
           return (
             <React.Fragment>
diff --git a/client/src/GraphQL/Calls/hostedEvents.js b/client/src/GraphQL/Calls/hostedEvents.js
index 850290690..05b3f77f2 100644
--- a/client/src/GraphQL/Calls/hostedEvents.js
+++ b/client/src/GraphQL/Calls/hostedEvents.js
@@ -1,23 +1,23 @@
 import gql from 'graphql-tag'
 import { eventMinimalInfo } from '../Fragments'
 
-const HOSTS_HOSTEVENT = gql`
+const EVENTS_HOSTEVENT = gql`
   mutation Hosts_HostEvent($name: String!, $description: String!, $startDatetime: Int!, $finishDatetime: Int!) {
-    hosts_HostEvent(name: $name, description: $description, startDatetime: $startDatetime, finishDatetime: $finishDatetime) {
+    events_HostEvent(name: $name, description: $description, startDatetime: $startDatetime, finishDatetime: $finishDatetime) {
       ...EventMinimalInfo
     }
   }
   ${eventMinimalInfo}
 `
-const HOSTS_EVENTSBYHOST = gql`
+const EVENTS_EVENTSBYHOST = gql`
   query Hosts_EventsByHost{
-    hosts_EventsByHost {
+    events_EventsByHost {
       ...EventMinimalInfo
     }
   }
   ${eventMinimalInfo}
 `
 export default {
-  HOSTS_HOSTEVENT,
-  HOSTS_EVENTSBYHOST
+  EVENTS_HOSTEVENT,
+  EVENTS_EVENTSBYHOST
 }
diff --git a/client/src/GraphQL/Calls/listEvents.js b/client/src/GraphQL/Calls/listEvents.js
index 39084f491..c115eb746 100644
--- a/client/src/GraphQL/Calls/listEvents.js
+++ b/client/src/GraphQL/Calls/listEvents.js
@@ -1,14 +1,14 @@
 import gql from 'graphql-tag'
 import { eventMinimalInfo } from '../Fragments'
 
-const HOSTS_EVENTS = gql`
+const EVENTS_EVENTS = gql`
   query Hosts_Events{
-    hosts_Events {
+    events_Events {
       ...EventMinimalInfo
     }
   }
   ${eventMinimalInfo}
 `
 export default {
-  HOSTS_EVENTS
+  EVENTS_EVENTS
 }
diff --git a/client/src/GraphQL/Calls/showEvent.js b/client/src/GraphQL/Calls/showEvent.js
index 1f06bf226..b26b0e0dc 100644
--- a/client/src/GraphQL/Calls/showEvent.js
+++ b/client/src/GraphQL/Calls/showEvent.js
@@ -1,9 +1,9 @@
 import gql from 'graphql-tag'
 import { eventFullInfo } from '../Fragments'
 
-const HOSTS_EVENT = gql`
+const EVENTS_EVENT = gql`
   query Hosts_Event($designator: ID!) {
-    hosts_Event(designator: $designator) {
+    events_Event(designator: $designator) {
       ...EventFullInfo
     }
   }
@@ -11,5 +11,5 @@ const HOSTS_EVENT = gql`
 `
 
 export default {
-  HOSTS_EVENT
+  EVENTS_EVENT
 }
diff --git a/client/src/GraphQL/Fragments/event.js b/client/src/GraphQL/Fragments/event.js
index 3b5f3c3ac..9fd7a4610 100644
--- a/client/src/GraphQL/Fragments/event.js
+++ b/client/src/GraphQL/Fragments/event.js
@@ -1,7 +1,7 @@
 import gql from 'graphql-tag'
 
 export const eventMinimalInfo = gql`
-  fragment EventMinimalInfo on hosts_Event {
+  fragment EventMinimalInfo on events_Event {
     name
     designator
     startDatetime
@@ -16,7 +16,7 @@ export const eventMinimalInfo = gql`
 `
 
 export const eventFullInfo = gql`
-  fragment EventFullInfo on hosts_Event {
+  fragment EventFullInfo on events_Event {
     designator
     name
     host{