diff --git a/gatsby-config.js b/gatsby-config.js
index d893702..be516c9 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -24,7 +24,7 @@ module.exports = {
         includedRoutes: [
           "**/*/*/categories",
           "**/*/*/events",
-          "**/*/*/event_type",
+          "**/*/*/event_types",
           "**/*/*/posts",
           "**/*/*/pages",
           "**/*/*/media",
diff --git a/gatsby-node.js b/gatsby-node.js
index 7e20d40..bb542f2 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -161,7 +161,7 @@ exports.createPages = ({ actions, graphql }) => {
     .then(() => {
       return graphql(`
         {
-          allWordpressWpEventType(filter: { count: { gt: 0 } }) {
+          allWordpressWpEventTypes(filter: { count: { gt: 0 } }) {
             edges {
               node {
                 id
@@ -184,7 +184,7 @@ exports.createPages = ({ actions, graphql }) => {
 
       const eventTypeTemplate = path.resolve(`./src/templates/event-type.js`)
 
-      _.each(result.data.allWordpressWpEventType.edges, ({ node: event_type }) => {
+      _.each(result.data.allWordpressWpEventTypes.edges, ({ node: event_type }) => {
         createPage({
           path: event_type.fields.link,
           component: eventTypeTemplate,
@@ -314,7 +314,7 @@ exports.onCreateNode = ({ node, actions, getNode }) => {
 
   if ((node.internal.type === 'wordpress__POST') ||
       (node.internal.type === 'wordpress__wp_events') ||
-      (node.internal.type === 'wordpress__wp_event_type')) {
+      (node.internal.type === 'wordpress__wp_event_types')) {
     const link = new URL(node.link).pathname
     createNodeField({
       node,
diff --git a/src/components/EventList.js b/src/components/EventList.js
index 7222991..e1736ba 100644
--- a/src/components/EventList.js
+++ b/src/components/EventList.js
@@ -34,10 +34,10 @@ export default class EventList extends React.Component {
                 <span className="event-date-year">{moment(event.start_time).format('YYYY')} </span>
               }
             </span>
-            {event.event_type && event.event_type.length &&
+            {event.event_types && event.event_types.length &&
               <div className="event-types">
                 <ul className="event-types-list">
-                  {event.event_type.map(type => (
+                  {event.event_types.map(type => (
                     <li key={`${type.slug}`}>
                       {type.name}
                       {/* TODO: We're already inside a link. Maybe we don't link to the event concept from here
@@ -79,7 +79,7 @@ EventList.propTypes = {
 
 export const pageQuery = graphql`
   fragment EventTypeFields on wordpress__wp_events {
-    event_type {
+    event_types {
       name
       slug
       fields {
@@ -100,12 +100,6 @@ export const pageQuery = graphql`
     fields {
       link
     }
-    event_type {
-      name
-      slug
-      fields {
-        link
-      }
-    }
+    ...EventTypeFields
   }
 `
diff --git a/src/templates/event-type.js b/src/templates/event-type.js
index d5996c7..1039e79 100644
--- a/src/templates/event-type.js
+++ b/src/templates/event-type.js
@@ -20,7 +20,7 @@ export default class EventTypeProgram extends React.Component {
 
 EventTypeProgram.propTypes = {
   data: PropTypes.shape({
-    allWordpressWpEventType: PropTypes.shape({
+    allWordpressWpEventTypes: PropTypes.shape({
       edges: PropTypes.array,
     }),
   }),
@@ -34,7 +34,7 @@ export const pageQuery = graphql`
       }
     }
     allWordpressWpEvents(
-      filter: { event_type: { elemMatch: { slug: { eq: $slug } } } },
+      filter: { event_types: { elemMatch: { slug: { eq: $slug } } } },
       sort: { fields: date, order: DESC }
     ) {
       totalCount
diff --git a/src/templates/event.js b/src/templates/event.js
index 8c6a04f..2152f02 100644
--- a/src/templates/event.js
+++ b/src/templates/event.js
@@ -122,7 +122,7 @@ const Event = ({ data }) => {
         ticketUrl={event.ticket_url}
         priceStudent={event.price_member}
         priceRegular={event.price_regular}
-        eventTypes={event.event_type}
+        eventTypes={event.event_types}
       />
     </Layout>
   )
diff --git a/src/wordpress.js b/src/wordpress.js
index ee446ce..d929168 100644
--- a/src/wordpress.js
+++ b/src/wordpress.js
@@ -20,21 +20,21 @@ const decodeTitles = entities => {
 }
 
 const mapEventsToEventTypes = entities => {
-  const eventTaxonomies = [`wordpress__wp_event_type`, ]
+  const eventTaxonomies = [`wordpress__wp_event_types`, ]
   const eventTypes = entities.filter(e => eventTaxonomies.includes(e.__type))
 
   return entities.map(e => {
     // Replace event types with links to their nodes.
-    let eventHasType = e.event_type && Array.isArray(e.event_type) && e.event_type.length
+    let eventHasType = e.event_types && Array.isArray(e.event_types) && e.event_types.length
     if (eventTypes.length && eventHasType) {
-      e.event_type___NODE = e.event_type.map(
+      e.event_types___NODE = e.event_types.map(
         t =>
           eventTypes.find(
             tObj =>
               (Number.isInteger(t) ? t : t.wordpress_id) === tObj.wordpress_id
           ).id
       )
-      delete e.event_type
+      delete e.event_types
     }
 
     return e