diff --git a/src/gatsby-node.js b/src/gatsby-node.js
index f30a175f..05d67981 100644
--- a/src/gatsby-node.js
+++ b/src/gatsby-node.js
@@ -72,7 +72,7 @@ const makeContentNode = (id, data, baseUrl, backlinks) => {
 
   // On 'Collection', remove 'query' field to hide GraphQL warnings
   if (node._type === 'Collection') {
-    delete node['query'];
+    delete node.query;
   }
 
   // TODO: Recognize query fields from any content type
@@ -246,7 +246,7 @@ exports.sourceNodes = async (
         // Fetch new node
         updateNodes.add(item._id);
         updateParents.add(parentId(item._id));
-      } else if (state.lastFetched < item['modified']) {
+      } else if (state.lastFetched < item.modified) {
         // Update changed node
         updateNodes.add(item._id);
         updateParents.add(parentId(item._id));
diff --git a/tests/gatsby-starter-default/src/templates/default.js b/tests/gatsby-starter-default/src/templates/default.js
index 9a636f97..edbd7346 100644
--- a/tests/gatsby-starter-default/src/templates/default.js
+++ b/tests/gatsby-starter-default/src/templates/default.js
@@ -9,46 +9,46 @@ import NewsItem from '../components/NewsItem';
 import Collection from '../components/Collection';
 
 const componentFor = data => {
-  const nodes = query => (query ? query['edges'] : []).map(edge => edge.node);
+  const nodes = query => (query ? query.edges : []).map(edge => edge.node);
   if (data) {
-    if (data['ploneCollection']) {
+    if (data.ploneCollection) {
       return (
         <Collection
-          data={data['ploneCollection']}
-          images={nodes(data['allPloneImage'])}
-          files={nodes(data['allPloneFile'])}
+          data={data.ploneCollection}
+          images={nodes(data.allPloneImage)}
+          files={nodes(data.allPloneFile)}
         />
       );
-    } else if (data['ploneDocument']) {
+    } else if (data.ploneDocument) {
       return (
         <Document
-          data={data['ploneDocument']}
-          images={nodes(data['allPloneImage'])}
-          files={nodes(data['allPloneFile'])}
+          data={data.ploneDocument}
+          images={nodes(data.allPloneImage)}
+          files={nodes(data.allPloneFile)}
         />
       );
-    } else if (data['ploneEvent']) {
+    } else if (data.ploneEvent) {
       return (
         <Event
-          data={data['ploneEvent']}
-          images={nodes(data['allPloneImage'])}
-          files={nodes(data['allPloneFile'])}
+          data={data.ploneEvent}
+          images={nodes(data.allPloneImage)}
+          files={nodes(data.allPloneFile)}
         />
       );
-    } else if (data['ploneFolder']) {
+    } else if (data.ploneFolder) {
       return (
         <Folder
-          data={data['ploneFolder']}
-          images={nodes(data['allPloneImage'])}
-          files={nodes(data['allPloneFile'])}
+          data={data.ploneFolder}
+          images={nodes(data.allPloneImage)}
+          files={nodes(data.allPloneFile)}
         />
       );
-    } else if (data['ploneNewsItem']) {
+    } else if (data.ploneNewsItem) {
       return (
         <NewsItem
-          data={data['ploneNewsItem']}
-          images={nodes(data['allPloneImage'])}
-          files={nodes(data['allPloneFile'])}
+          data={data.ploneNewsItem}
+          images={nodes(data.allPloneImage)}
+          files={nodes(data.allPloneFile)}
         />
       );
     } else {
@@ -60,7 +60,7 @@ const componentFor = data => {
 };
 
 const DefaultLayout = ({ data }) => (
-  <Layout breadcrumbs={data['ploneBreadcrumbs'] || []}>
+  <Layout breadcrumbs={data.ploneBreadcrumbs || []}>
     {componentFor(data)}
   </Layout>
 );