diff --git a/packages/core/client/src/modules/blocks/data-blocks/table-selector/__e2e__/utils.ts b/packages/core/client/src/modules/blocks/data-blocks/table-selector/__e2e__/utils.ts
index 2c954e17ba..574ee01210 100644
--- a/packages/core/client/src/modules/blocks/data-blocks/table-selector/__e2e__/utils.ts
+++ b/packages/core/client/src/modules/blocks/data-blocks/table-selector/__e2e__/utils.ts
@@ -18,7 +18,7 @@ export async function createTable({
     .click();
 
   // create a table block
-  await page.getByLabel('schema-initializer-Grid-blockInitializers:tableSelector-users').hover();
+  await page.getByLabel('schema-initializer-Grid-popup:tableSelector:addBlock-users').hover();
   await page.getByRole('menuitem', { name: 'form Table' }).click();
   await page.mouse.move(300, 0);
 }
diff --git a/packages/core/client/src/modules/dialog/__e2e__/schemaInitializer.test.ts b/packages/core/client/src/modules/dialog/__e2e__/schemaInitializer.test.ts
index 5b0470900d..7595edf53a 100644
--- a/packages/core/client/src/modules/dialog/__e2e__/schemaInitializer.test.ts
+++ b/packages/core/client/src/modules/dialog/__e2e__/schemaInitializer.test.ts
@@ -225,7 +225,7 @@ test.describe('where to open a popup and what can be added to it', () => {
     await expect(page.getByLabel('block-item-Markdown.Void-roles-form')).toBeVisible();
 
     async function addBlock(name: string) {
-      await page.getByLabel('schema-initializer-Grid-blockInitializers:tableSelector-roles').hover();
+      await page.getByLabel('schema-initializer-Grid-popup:tableSelector:addBlock-roles').hover();
       await page.getByRole('menuitem', { name }).click();
       await page.mouse.move(300, 0);
     }
diff --git a/packages/core/client/src/modules/fields/component/Picker/TableSelectorInitializers.tsx b/packages/core/client/src/modules/fields/component/Picker/TableSelectorInitializers.tsx
index 7b5599d8e5..defd4cf93c 100644
--- a/packages/core/client/src/modules/fields/component/Picker/TableSelectorInitializers.tsx
+++ b/packages/core/client/src/modules/fields/component/Picker/TableSelectorInitializers.tsx
@@ -1,5 +1,5 @@
-import { CompatibleSchemaInitializer } from '../../../../application/schema-initializer/CompatibleSchemaInitializer';
 import { useCollection_deprecated } from '../../../..';
+import { CompatibleSchemaInitializer } from '../../../../application/schema-initializer/CompatibleSchemaInitializer';
 import { gridRowColWrap } from '../../../../schema-initializer/utils';
 
 /**
@@ -88,7 +88,7 @@ export const tableSelectorInitializers_deprecated = new CompatibleSchemaInitiali
 
 export const tableSelectorInitializers = new CompatibleSchemaInitializer(
   {
-    name: 'blockInitializers:tableSelector',
+    name: 'popup:tableSelector:addBlock',
     wrap: gridRowColWrap,
     title: '{{t("Add block")}}',
     icon: 'PlusOutlined',
diff --git a/packages/core/client/src/schema-component/antd/association-field/schema.ts b/packages/core/client/src/schema-component/antd/association-field/schema.ts
index abd51463a4..df035cb5aa 100644
--- a/packages/core/client/src/schema-component/antd/association-field/schema.ts
+++ b/packages/core/client/src/schema-component/antd/association-field/schema.ts
@@ -55,7 +55,7 @@ export default {
       grid: {
         type: 'void',
         'x-component': 'Grid',
-        'x-initializer': 'blockInitializers:tableSelector',
+        'x-initializer': 'popup:tableSelector:addBlock',
         properties: {},
       },
       footer: {
diff --git a/packages/core/client/src/schema-initializer/items/SelectActionInitializer.tsx b/packages/core/client/src/schema-initializer/items/SelectActionInitializer.tsx
index a7ca224df6..54768b091f 100644
--- a/packages/core/client/src/schema-initializer/items/SelectActionInitializer.tsx
+++ b/packages/core/client/src/schema-initializer/items/SelectActionInitializer.tsx
@@ -23,7 +23,7 @@ export const SelectActionInitializer = (props) => {
           grid: {
             type: 'void',
             'x-component': 'Grid',
-            'x-initializer': 'blockInitializers:tableSelector',
+            'x-initializer': 'popup:tableSelector:addBlock',
             properties: {},
           },
           footer: {
diff --git a/packages/core/test/src/e2e/templatesOfPage.ts b/packages/core/test/src/e2e/templatesOfPage.ts
index c276fc6200..da53575b01 100644
--- a/packages/core/test/src/e2e/templatesOfPage.ts
+++ b/packages/core/test/src/e2e/templatesOfPage.ts
@@ -2974,7 +2974,7 @@ export const oneFormBlockWithRolesFieldBasedUsers: PageConfig = {
                                                 version: '2.0',
                                                 type: 'void',
                                                 'x-component': 'Grid',
-                                                'x-initializer': 'blockInitializers:tableSelector',
+                                                'x-initializer': 'popup:tableSelector:addBlock',
                                                 'x-uid': 'lzt548tlewj',
                                                 'x-async': false,
                                                 'x-index': 1,
@@ -3191,7 +3191,7 @@ export const oneFormBlockWithAllAssociationFieldsAndSelectorMode: PageConfig = {
                                                 version: '2.0',
                                                 type: 'void',
                                                 'x-component': 'Grid',
-                                                'x-initializer': 'blockInitializers:tableSelector',
+                                                'x-initializer': 'popup:tableSelector:addBlock',
                                                 'x-uid': 'dge1apckyd3',
                                                 'x-async': false,
                                                 'x-index': 1,
@@ -3294,7 +3294,7 @@ export const oneFormBlockWithAllAssociationFieldsAndSelectorMode: PageConfig = {
                                                 version: '2.0',
                                                 type: 'void',
                                                 'x-component': 'Grid',
-                                                'x-initializer': 'blockInitializers:tableSelector',
+                                                'x-initializer': 'popup:tableSelector:addBlock',
                                                 'x-uid': 'k6nd50abevi',
                                                 'x-async': false,
                                                 'x-index': 1,
@@ -3397,7 +3397,7 @@ export const oneFormBlockWithAllAssociationFieldsAndSelectorMode: PageConfig = {
                                                 version: '2.0',
                                                 type: 'void',
                                                 'x-component': 'Grid',
-                                                'x-initializer': 'blockInitializers:tableSelector',
+                                                'x-initializer': 'popup:tableSelector:addBlock',
                                                 'x-uid': '2i6td26ppt2',
                                                 'x-async': false,
                                                 'x-index': 1,
@@ -3500,7 +3500,7 @@ export const oneFormBlockWithAllAssociationFieldsAndSelectorMode: PageConfig = {
                                                 version: '2.0',
                                                 type: 'void',
                                                 'x-component': 'Grid',
-                                                'x-initializer': 'blockInitializers:tableSelector',
+                                                'x-initializer': 'popup:tableSelector:addBlock',
                                                 'x-uid': 'zlj99lap4yq',
                                                 'x-async': false,
                                                 'x-index': 1,
@@ -3603,7 +3603,7 @@ export const oneFormBlockWithAllAssociationFieldsAndSelectorMode: PageConfig = {
                                                 version: '2.0',
                                                 type: 'void',
                                                 'x-component': 'Grid',
-                                                'x-initializer': 'blockInitializers:tableSelector',
+                                                'x-initializer': 'popup:tableSelector:addBlock',
                                                 'x-uid': 'ssclmlysxxl',
                                                 'x-async': false,
                                                 'x-index': 1,