diff --git a/docs/api/sovity-edc-api-wrapper.yaml b/docs/api/sovity-edc-api-wrapper.yaml
index ef2167e31..638cf6556 100644
--- a/docs/api/sovity-edc-api-wrapper.yaml
+++ b/docs/api/sovity-edc-api-wrapper.yaml
@@ -603,11 +603,11 @@ components:
     DataSourceType:
       type: string
       description: Supported Data Source Types by UiDataSource
+      default: CUSTOM
       enum:
       - HTTP_DATA
       - ON_REQUEST
       - CUSTOM
-      default: CUSTOM
     SecretValue:
       type: object
       properties:
@@ -815,6 +815,7 @@ components:
     UiDataSourceHttpDataMethod:
       type: string
       description: Supported HTTP Methods by UiDataSource
+      default: GET
       enum:
       - GET
       - POST
@@ -822,7 +823,6 @@ components:
       - PATCH
       - DELETE
       - OPTIONS
-      default: GET
     UiDataSourceOnRequest:
       required:
       - contactEmail
diff --git a/extensions/catalog-crawler/catalog-crawler-db/src/main/resources/db-crawler/migration/V10__White_Label_Refactor.sql b/extensions/catalog-crawler/catalog-crawler-db/src/main/resources/db-crawler/migration/V10__White_Label_Refactor.sql
new file mode 100644
index 000000000..605ddb335
--- /dev/null
+++ b/extensions/catalog-crawler/catalog-crawler-db/src/main/resources/db-crawler/migration/V10__White_Label_Refactor.sql
@@ -0,0 +1,14 @@
+alter table organization
+    rename column mds_id to id;
+
+alter table "user"
+    rename column organization_mds_id to organization_id;
+
+alter table connector
+    rename column mds_id to organization_id;
+
+alter table connector
+    rename column provider_mds_id to provider_organization_id;
+
+alter table component
+    rename column mds_id to organization_id;
diff --git a/extensions/catalog-crawler/catalog-crawler-e2e-test/src/test/java/de/sovity/edc/ext/catalog/crawler/utils/TestData.java b/extensions/catalog-crawler/catalog-crawler-e2e-test/src/test/java/de/sovity/edc/ext/catalog/crawler/utils/TestData.java
index 77e056a98..dae2d3f36 100644
--- a/extensions/catalog-crawler/catalog-crawler-e2e-test/src/test/java/de/sovity/edc/ext/catalog/crawler/utils/TestData.java
+++ b/extensions/catalog-crawler/catalog-crawler-e2e-test/src/test/java/de/sovity/edc/ext/catalog/crawler/utils/TestData.java
@@ -35,13 +35,13 @@ public static void insertConnector(
             Consumer<ConnectorRecord> applier
     ) {
         var organization = dsl.newRecord(Tables.ORGANIZATION);
-        organization.setMdsId(connectorRef.getOrganizationId());
+        organization.setId(connectorRef.getOrganizationId());
         organization.setName(connectorRef.getOrganizationLegalName());
         organization.insert();
 
         var connector = dsl.newRecord(Tables.CONNECTOR);
         connector.setEnvironment(connectorRef.getEnvironmentId());
-        connector.setMdsId(connectorRef.getOrganizationId());
+        connector.setOrganizationId(connectorRef.getOrganizationId());
         connector.setConnectorId(connectorRef.getConnectorId());
         connector.setName(connectorRef.getConnectorId() + " Name");
         connector.setEndpointUrl(connectorRef.getEndpoint());
diff --git a/extensions/catalog-crawler/catalog-crawler/src/main/java/de/sovity/edc/ext/catalog/crawler/dao/connectors/ConnectorQueries.java b/extensions/catalog-crawler/catalog-crawler/src/main/java/de/sovity/edc/ext/catalog/crawler/dao/connectors/ConnectorQueries.java
index 4c3e3843b..b77a1b708 100644
--- a/extensions/catalog-crawler/catalog-crawler/src/main/java/de/sovity/edc/ext/catalog/crawler/dao/connectors/ConnectorQueries.java
+++ b/extensions/catalog-crawler/catalog-crawler/src/main/java/de/sovity/edc/ext/catalog/crawler/dao/connectors/ConnectorQueries.java
@@ -60,11 +60,11 @@ private Set<ConnectorRef> queryConnectorRefs(
                         c.CONNECTOR_ID.as("connectorId"),
                         c.ENVIRONMENT.as("environmentId"),
                         o.NAME.as("organizationLegalName"),
-                        o.MDS_ID.as("organizationId"),
+                        o.ID.as("organizationId"),
                         c.ENDPOINT_URL.as("endpoint")
                 )
                 .from(c)
-                .leftJoin(o).on(c.MDS_ID.eq(o.MDS_ID))
+                .leftJoin(o).on(c.ORGANIZATION_ID.eq(o.ID))
                 .where(condition.apply(c, o), c.ENVIRONMENT.eq(crawlerConfig.getEnvironmentId()))
                 .fetchInto(ConnectorRef.class);
 
diff --git a/extensions/catalog-crawler/catalog-crawler/src/test/java/de/sovity/edc/ext/catalog/crawler/TestData.java b/extensions/catalog-crawler/catalog-crawler/src/test/java/de/sovity/edc/ext/catalog/crawler/TestData.java
index b522c8881..102beb54c 100644
--- a/extensions/catalog-crawler/catalog-crawler/src/test/java/de/sovity/edc/ext/catalog/crawler/TestData.java
+++ b/extensions/catalog-crawler/catalog-crawler/src/test/java/de/sovity/edc/ext/catalog/crawler/TestData.java
@@ -44,13 +44,13 @@ public static void insertConnector(
             Consumer<ConnectorRecord> applier
     ) {
         var organization = dsl.newRecord(Tables.ORGANIZATION);
-        organization.setMdsId(connectorRef.getOrganizationId());
+        organization.setId(connectorRef.getOrganizationId());
         organization.setName(connectorRef.getOrganizationLegalName());
         organization.insert();
 
         var connector = dsl.newRecord(Tables.CONNECTOR);
         connector.setEnvironment(connectorRef.getEnvironmentId());
-        connector.setMdsId(connectorRef.getOrganizationId());
+        connector.setOrganizationId(connectorRef.getOrganizationId());
         connector.setConnectorId(connectorRef.getConnectorId());
         connector.setName(connectorRef.getConnectorId() + " Name");
         connector.setEndpointUrl(connectorRef.getEndpoint());