diff --git a/build-tools/generator-template/block/{name_sc}/data/default.yaml b/build-tools/generator-template/block/{name_sc}/data/{name-sc}.yaml
similarity index 100%
rename from build-tools/generator-template/block/{name_sc}/data/default.yaml
rename to build-tools/generator-template/block/{name_sc}/data/{name-sc}.yaml
diff --git a/src/app/component/block/paragraph/data/data-en.yaml b/src/app/component/block/paragraph/data/paragraph-en.yaml
similarity index 100%
rename from src/app/component/block/paragraph/data/data-en.yaml
rename to src/app/component/block/paragraph/data/paragraph-en.yaml
diff --git a/src/app/component/block/paragraph/data/data-nl.yaml b/src/app/component/block/paragraph/data/paragraph-nl.yaml
similarity index 100%
rename from src/app/component/block/paragraph/data/data-nl.yaml
rename to src/app/component/block/paragraph/data/paragraph-nl.yaml
diff --git a/src/app/component/block/paragraph/data/data-simple.json b/src/app/component/block/paragraph/data/paragraph-simple.json
similarity index 100%
rename from src/app/component/block/paragraph/data/data-simple.json
rename to src/app/component/block/paragraph/data/paragraph-simple.json
diff --git a/src/app/component/block/paragraph/data/data.js b/src/app/component/block/paragraph/data/paragraph.js
similarity index 100%
rename from src/app/component/block/paragraph/data/data.js
rename to src/app/component/block/paragraph/data/paragraph.js
diff --git a/src/app/component/block/paragraph/data/data.yaml b/src/app/component/block/paragraph/data/paragraph.yaml
similarity index 100%
rename from src/app/component/block/paragraph/data/data.yaml
rename to src/app/component/block/paragraph/data/paragraph.yaml
diff --git a/src/app/component/block/two-col/data/data.yaml b/src/app/component/block/two-col/data/two-col.yaml
similarity index 100%
rename from src/app/component/block/two-col/data/data.yaml
rename to src/app/component/block/two-col/data/two-col.yaml
diff --git a/src/data/about.yaml b/src/data/about.yaml
index 48db477b..abf7891a 100644
--- a/src/data/about.yaml
+++ b/src/data/about.yaml
@@ -12,4 +12,4 @@ blocks:
     data: {}
 
   - name: "paragraph"
-    data: "import!../app/component/block/paragraph/data/data.yaml"
+    data: "import!../app/component/block/paragraph/data/paragraph.yaml"
diff --git a/src/data/home.yaml b/src/data/home.yaml
index 7f80a1c8..f6a3e7cf 100644
--- a/src/data/home.yaml
+++ b/src/data/home.yaml
@@ -11,10 +11,10 @@ blocks:
     data: {}
 
   - name: "paragraph"
-    data: "import!../app/component/block/paragraph/data/data.yaml"
+    data: "import!../app/component/block/paragraph/data/paragraph.yaml"
 
   - name: "paragraph"
-    data: "import!../app/component/block/paragraph/data/data-${language}.yaml"
+    data: "import!../app/component/block/paragraph/data/paragraph-${language}.yaml"
 
   - name: 'two-col'
-    data: 'import!../app/component/block/two-col/data/data.yaml'
+    data: 'import!../app/component/block/two-col/data/two-col.yaml'
diff --git a/src/data/test.js b/src/data/test.js
index 334c2420..4c7df8ab 100644
--- a/src/data/test.js
+++ b/src/data/test.js
@@ -13,7 +13,7 @@ module.exports = () => ({
     },
     {
       name: 'paragraph',
-      data: 'import!../app/component/block/paragraph/data/data.js',
+      data: 'import!../app/component/block/paragraph/data/paragraph.js',
     },
   ],
 });