diff --git a/packages/builder/src/components/design/AppPreview/componentStructure.json b/packages/builder/src/components/design/AppPreview/componentStructure.json
index 9a87bb5761..c4fd33b084 100644
--- a/packages/builder/src/components/design/AppPreview/componentStructure.json
+++ b/packages/builder/src/components/design/AppPreview/componentStructure.json
@@ -3,8 +3,8 @@
     "name": "Blocks",
     "icon": "Article",
     "children": [
-      "tablewithsearch",
-      "cardlistwithsearch"
+      "tableblock",
+      "cardsblock"
     ]
   },
   "section",
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 2c49d7d524..4a50a11fce 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -2622,9 +2622,9 @@
       }
     ]
   },
-  "tablewithsearch": {
+  "tableblock": {
     "block": true,
-    "name": "Table with search",
+    "name": "Table block",
     "icon": "Table",
     "styles": ["size"],
     "info": "Only the first 3 search columns will be used.",
@@ -2769,9 +2769,9 @@
       }
     ]
   },
-  "cardlistwithsearch": {
+  "cardsblock": {
     "block": true,
-    "name": "Card list with search",
+    "name": "Cards block",
     "icon": "Table",
     "styles": ["size"],
     "info": "Only the first 3 search columns will be used.",
diff --git a/packages/client/src/components/app/blocks/CardListWithSearch.svelte b/packages/client/src/components/app/blocks/CardsBlock.svelte
similarity index 100%
rename from packages/client/src/components/app/blocks/CardListWithSearch.svelte
rename to packages/client/src/components/app/blocks/CardsBlock.svelte
diff --git a/packages/client/src/components/app/blocks/TableWithSearch.svelte b/packages/client/src/components/app/blocks/TableBlock.svelte
similarity index 100%
rename from packages/client/src/components/app/blocks/TableWithSearch.svelte
rename to packages/client/src/components/app/blocks/TableBlock.svelte
diff --git a/packages/client/src/components/app/blocks/index.js b/packages/client/src/components/app/blocks/index.js
index 7d0d15080a..af238b901d 100644
--- a/packages/client/src/components/app/blocks/index.js
+++ b/packages/client/src/components/app/blocks/index.js
@@ -1,2 +1,2 @@
-export { default as tablewithsearch } from "./TableWithSearch.svelte"
-export { default as cardlistwithsearch } from "./CardListWithSearch.svelte"
+export { default as tableblock } from "./TableBlock.svelte"
+export { default as cardsblock } from "./CardsBlock.svelte"