diff --git a/content/footer/footer.md b/content/footer/footer.md
index f37c5c01a..f61b5ad81 100644
--- a/content/footer/footer.md
+++ b/content/footer/footer.md
@@ -73,8 +73,8 @@ items:
       link: /news
     - name: Forum
       link: https://forum.threefold.io/
-    - name: Team
-      link: /team
+    - name: People
+      link: /people
     - name: Contact Us
       link: 'mailto:info@threefold.io'
 ---
diff --git a/content/navigation/navigation.md b/content/navigation/navigation.md
index fffe088f6..970a61339 100644
--- a/content/navigation/navigation.md
+++ b/content/navigation/navigation.md
@@ -123,8 +123,8 @@ navLinks:
         path: https://forum.threefold.io
         external: true
 
-      - title: Team
-        path: /team
+      - title: People
+        path: /people
 
       - title: Contact Us
         path: "mailto:info@threefold.io"
diff --git a/gridsome.config.js b/gridsome.config.js
index 068bb1323..4d1943501 100644
--- a/gridsome.config.js
+++ b/gridsome.config.js
@@ -6,9 +6,9 @@
 
 module.exports = {
     siteName: 'ThreeFold',
-    
-	pathPrefix: "threefold",
-	plugins: [
+
+    pathPrefix: "threefold",
+    plugins: [
 
         // Local models
         {
@@ -460,7 +460,7 @@ module.exports = {
         }],
 
         Membership: [{
-            path: '/team/memberships/:id',
+            path: '/people/memberships/:id',
             component: '~/templates/Membership.vue'
         }],
 
@@ -475,11 +475,11 @@ module.exports = {
         }],
 
         Person: [{
-            path: '/team/:id',
+            path: '/people/:id',
             component: '~/templates/Person.vue'
         }],
         PersonTag: [{
-            path: '/team/tags/:id',
+            path: '/people/tags/:id',
             component: '~/templates/Tag.vue'
         }],
 
@@ -495,9 +495,9 @@ module.exports = {
             externalLinksTarget: '_blank',
             externalLinksRel: ['nofollow', 'noopener', 'noreferrer'],
             anchorClassName: 'icon icon-link',
-            
-	pathPrefix: "threefold",
-	plugins: [
+
+            pathPrefix: "threefold",
+            plugins: [
                 ['gridsome-plugin-remark-prismjs-all', {
                         highlightClassName: "gridsome-highlight",
                         codeTitleClassName: "gridsome-code-title",
diff --git a/gridsome.server.js b/gridsome.server.js
index b415bf189..0f8f51ba3 100644
--- a/gridsome.server.js
+++ b/gridsome.server.js
@@ -184,8 +184,8 @@ module.exports = function(api) {
 
     api.createPages(({ createPage }) => {
         createPage({
-            path: '/team',
-            component: './src/templates/Team.vue',
+            path: '/people',
+            component: './src/templates/People.vue',
             context: {
                 private: private
             }
diff --git a/src/templates/Membership.vue b/src/templates/Membership.vue
index 40c9c96fe..552d7366e 100644
--- a/src/templates/Membership.vue
+++ b/src/templates/Membership.vue
@@ -88,7 +88,7 @@ export default {
 
   computed: {
     memberships() {
-      var res = [{ title: "All", path: "/team" }];
+      var res = [{ title: "All", path: "/people" }];
       this.$page.allMembership.edges.forEach((edge) =>
         res.push({ title: edge.node.title, path: edge.node.path })
       );
diff --git a/src/templates/Team.vue b/src/templates/People.vue
similarity index 97%
rename from src/templates/Team.vue
rename to src/templates/People.vue
index ca298ba22..c899b04ef 100644
--- a/src/templates/Team.vue
+++ b/src/templates/People.vue
@@ -68,7 +68,7 @@ export default {
   },
   computed: {
     memberships() {
-      var res = [{ title: "All", path: "/team" }];
+      var res = [{ title: "All", path: "/people" }];
       this.$page.memberships.edges.forEach((edge) =>
         res.push({ title: edge.node.title, path: edge.node.path })
       );
diff --git a/src/templates/Person.vue b/src/templates/Person.vue
index 6e4ff2b4a..bb5b97b2a 100644
--- a/src/templates/Person.vue
+++ b/src/templates/Person.vue
@@ -50,11 +50,11 @@
               </div>
             </div>
             <g-link
-              v-for="edge in $page.memberships.edges"
-              :key="edge.node.id"
-              :to="edge.node.path"
+              v-for="membership in $page.person.memberships"
+              :key="membership.id"
+              :to="membership.path"
               class="text-xs bg-transparent hover:text-blue-700 py-2 px-4 mr-2 border hover:border-blue-500 border-gray-600 text-gray-700 rounded-full"
-              >{{ edge.node.title }}</g-link
+              >{{ membership.title }}</g-link
             >
           </section>
         </div>
@@ -148,7 +148,7 @@
       }
     }
 
-     memberships: allMembership(filter: {title: {in: ["foundation", "tech", "farmers", "ambassadors"]}}){
+     memberships: allMembership{
      edges{
       node{
         id