diff --git a/.eleventy.js b/.eleventy.js
index d5edb79..3907d73 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -7,8 +7,8 @@ module.exports = config => {
 
   config.addLayoutAlias('base', 'layouts/base.html');
 
-  config.addCollection("subpages", (collectionApi) => {
-    const sections = collectionApi.getFilteredByGlob("./src/pages/subpages/**")
+  config.addCollection("sections", (collectionApi) => {
+    const sections = collectionApi.getFilteredByGlob("./src/pages/sections/**")
       .sort((a, b) => a.data.order - b.data.order);
     process.env.DEBUG && console.log(inspect(sections));
     return sections;
diff --git a/src/_includes/hero.liquid b/src/_includes/hero.liquid
index b0b4484..796d88c 100644
--- a/src/_includes/hero.liquid
+++ b/src/_includes/hero.liquid
@@ -1,8 +1,8 @@
-<section id="{{ subpage.data.title | slug }}" class="wrapper-full hero">
+<section id="{{ section.data.title | slug }}" class="wrapper-full hero">
   <div>
-    <h1 class="hero-title">{% if subpage.data.displayedTitle %}{{ subpage.data.displayedTitle }}{% else %}{{ subpage.data.title }}{% endif %}</h1>
-    <p>{{subpage.data.description}}</p>
-    {{ subpage.templateContent }}
+    <h1 class="hero-title">{% if section.data.displayedTitle %}{{ section.data.displayedTitle }}{% else %}{{ section.data.title }}{% endif %}</h1>
+    <p>{{section.data.description}}</p>
+    {{ section.templateContent }}
     {% render 'partials/components/socials', socials: author.socials, mail: author.mail, showLabel: true %}
   </div>
 </section>
\ No newline at end of file
diff --git a/src/_includes/page.liquid b/src/_includes/page.liquid
index a658fac..6efe1d6 100644
--- a/src/_includes/page.liquid
+++ b/src/_includes/page.liquid
@@ -1,6 +1,6 @@
-<section id="{{ subpage.data.title | slug }}" class="{{ subpage.data.classes }} wrapper-full">
-  {% if subpage.data.showTitle != false %}
-    <h2>{% if subpage.data.displayedTitle %}{{ subpage.data.displayedTitle }}{% else %}{{ subpage.data.title }}{% endif %}</h2>
+<section id="{{ section.data.title | slug }}" class="{{ section.data.classes }} wrapper-full">
+  {% if section.data.showTitle != false %}
+    <h2>{% if section.data.displayedTitle %}{{ section.data.displayedTitle }}{% else %}{{ section.data.title }}{% endif %}</h2>
   {% endif %}
-  {{ subpage.templateContent }}
+  {{ section.templateContent }}
 </section>
\ No newline at end of file
diff --git a/src/_includes/partials/navigation.liquid b/src/_includes/partials/navigation.liquid
index 73f4e62..b548370 100644
--- a/src/_includes/partials/navigation.liquid
+++ b/src/_includes/partials/navigation.liquid
@@ -1,6 +1,6 @@
 <nav>
   <ul>
-    {% for item in collections.subpages %}
+    {% for item in collections.sections %}
       {% if item.data.excludeFromNav != true %}
         <li>
           <a href="#{{ item.data.title | slug }}">{{ item.data.title }}</a>
diff --git a/src/pages/index.liquid b/src/pages/index.liquid
index ecdadaf..32ace29 100644
--- a/src/pages/index.liquid
+++ b/src/pages/index.liquid
@@ -4,9 +4,9 @@ layout: 'base'
 permalink: /
 ---
 
-{% for subpage in collections.subpages %}
-  {% if subpage.data.excludeFromList != true %}
-    {% if subpage.data.template == 'hero' %}
+{% for section in collections.sections %}
+  {% if section.data.excludeFromList != true %}
+    {% if section.data.template == 'hero' %}
       {% include 'hero' %}
     {% else %}
       {% include 'page' %}
diff --git a/src/pages/subpages/competences.liquid b/src/pages/sections/competences.liquid
similarity index 100%
rename from src/pages/subpages/competences.liquid
rename to src/pages/sections/competences.liquid
diff --git a/src/pages/subpages/download.liquid b/src/pages/sections/download.liquid
similarity index 100%
rename from src/pages/subpages/download.liquid
rename to src/pages/sections/download.liquid
diff --git a/src/pages/subpages/experiences.liquid b/src/pages/sections/experiences.liquid
similarity index 100%
rename from src/pages/subpages/experiences.liquid
rename to src/pages/sections/experiences.liquid
diff --git a/src/pages/subpages/hero.liquid b/src/pages/sections/hero.liquid
similarity index 100%
rename from src/pages/subpages/hero.liquid
rename to src/pages/sections/hero.liquid
diff --git a/src/pages/subpages/projects.liquid b/src/pages/sections/projects.liquid
similarity index 100%
rename from src/pages/subpages/projects.liquid
rename to src/pages/sections/projects.liquid
diff --git a/src/pages/sections/sections.11tydata.js b/src/pages/sections/sections.11tydata.js
new file mode 100644
index 0000000..89b033f
--- /dev/null
+++ b/src/pages/sections/sections.11tydata.js
@@ -0,0 +1,3 @@
+module.exports = {
+    permalink: false
+};
\ No newline at end of file
diff --git a/src/pages/subpages/subpages.11tydata.js b/src/pages/subpages/subpages.11tydata.js
deleted file mode 100644
index 9196fac..0000000
--- a/src/pages/subpages/subpages.11tydata.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
-    permalink: false,
-    tags: ["subpage"]
-};
\ No newline at end of file