diff --git a/src/models/polygonParts/polygonPartRecord.ts b/src/models/polygonParts/polygonPartRecord.ts
index f62dc88..38e6ecf 100644
--- a/src/models/polygonParts/polygonPartRecord.ts
+++ b/src/models/polygonParts/polygonPartRecord.ts
@@ -15,10 +15,10 @@ interface IPropPYCSWMapping extends IPYCSWMapping {
 
 @graphqlClass({ alias: 'PolygonPartRecord' })
 export class PolygonPartRecord implements IPolygonPart, IOrmCatalog {
-  //#region METADATA: id
+  //#region METADATA: sourceId
   @catalogDB({
     column: {
-      name: 'id',
+      name: 'source_id',
       type: 'text',
       nullable: true,
     },
@@ -35,12 +35,12 @@ export class PolygonPartRecord implements IPolygonPart, IOrmCatalog {
     category: FieldCategory.MAIN,
   })
   //#endregion
-  public id: string | undefined = undefined;
+  public sourceId: string | undefined = undefined;
 
-  //#region METADATA: name
+  //#region METADATA: sourceName
   @catalogDB({
     column: {
-      name: 'name',
+      name: 'source_name',
       type: 'text',
       nullable: true,
     },
@@ -57,7 +57,7 @@ export class PolygonPartRecord implements IPolygonPart, IOrmCatalog {
     category: FieldCategory.MAIN,
   })
   //#endregion
-  public name: string | undefined = undefined;
+  public sourceName: string | undefined = undefined;
 
   //#region METADATA: productId
   @catalogDB({
@@ -450,11 +450,11 @@ export class PolygonPartRecord implements IPolygonPart, IOrmCatalog {
   //#endregion
   public geometry: GeoJSON | undefined = undefined;
 
-  //#region RECORD: internalId
+  //#region RECORD: id
   @catalogDB({
     column: {
-      name: 'internal_id',
-      type: 'number',
+      name: 'id',
+      type: 'text',
       nullable: false,
       primary: true,
     },
@@ -469,7 +469,7 @@ export class PolygonPartRecord implements IPolygonPart, IOrmCatalog {
   })
   //#endregion
   // eslint-disable-next-line @typescript-eslint/naming-convention
-  public internalId: number | undefined;
+  public id: string | undefined;
 
   //#region RECORD: partId
   @catalogDB({
@@ -490,10 +490,10 @@ export class PolygonPartRecord implements IPolygonPart, IOrmCatalog {
   //#endregion
   public partId: number | undefined;
 
-  //#region RECORD: recordId
+  //#region RECORD: catalogId
   @catalogDB({
     column: {
-      name: 'record_id',
+      name: 'catalog_id',
       type: 'text',
       nullable: false,
     },
@@ -507,12 +507,12 @@ export class PolygonPartRecord implements IPolygonPart, IOrmCatalog {
     isAutoGenerated: true,
   })
   //#endregion
-  public recordId: string | undefined = 'UNKNOWN';
+  public catalogId: string | undefined = 'UNKNOWN';
 
-  //#region RECORD: updatedInVersion [Version number of the best layer when it was updated]
+  //#region RECORD: productVersion [Version number of the best layer when it was updated]
   @catalogDB({
     column: {
-      name: 'updated_in_version',
+      name: 'product_version',
       type: 'text',
       nullable: true,
     },
@@ -536,7 +536,7 @@ export class PolygonPartRecord implements IPolygonPart, IOrmCatalog {
     ],
   })
   //#endregion
-  public updatedInVersion: string | undefined = undefined;
+  public productVersion: string | undefined = undefined;
 
   //#region RECORD: ingestionDateUTC
   @catalogDB({
@@ -615,8 +615,8 @@ export class PolygonPartRecord implements IPolygonPart, IOrmCatalog {
 }
 
 export interface IPolygonPart {
-  id: string | undefined;
-  name: string | undefined;
+  sourceId: string | undefined;
+  sourceName: string | undefined;
   description: string | undefined;
   resolutionDegree: number | undefined;
   resolutionMeter: number | undefined;
diff --git a/src/models/raster/ingestion/ingestionTypes.ts b/src/models/raster/ingestion/ingestionTypes.ts
index af3ce26..ee48d8a 100644
--- a/src/models/raster/ingestion/ingestionTypes.ts
+++ b/src/models/raster/ingestion/ingestionTypes.ts
@@ -64,7 +64,7 @@ export class NewRasterLayerMetadata extends BaseRasterLayerMetadata implements I
 
 export type PolygonPart = Pick<
   PolygonPartRecord,
-  | 'name'
+  | 'sourceName'
   | 'resolutionDegree'
   | 'resolutionMeter'
   | 'sourceResolutionMeter'
@@ -74,7 +74,7 @@ export type PolygonPart = Pick<
   | 'imagingTimeEndUTC'
   | 'geometry'
 > &
-  Partial<Pick<PolygonPartRecord, 'id' | 'description' | 'countries' | 'cities'>>;
+  Partial<Pick<PolygonPartRecord, 'sourceId' | 'description' | 'countries' | 'cities'>>;
 
 export interface InputFiles {
   originDirectory: string;
diff --git a/src/yaml/ingestionTrigger/partData/rasterLayerPartData.yaml b/src/yaml/ingestionTrigger/partData/rasterLayerPartData.yaml
index a726a96..07a4a54 100644
--- a/src/yaml/ingestionTrigger/partData/rasterLayerPartData.yaml
+++ b/src/yaml/ingestionTrigger/partData/rasterLayerPartData.yaml
@@ -8,7 +8,7 @@ components:
           type: object
           description: Layer polygon part data definitions
           required:
-            - name
+            - sourceName
             - imagingTimeBeginUTC
             - imagingTimeEndUTC
             - geometry
@@ -18,10 +18,10 @@ components:
             - horizontalAccuracyCE90
             - sensors
           properties:
-            id:
+            sourceId:
               type: string
               description: Layer's external identifier
-            name:
+            sourceName:
               type: string
               description: Layer's external name
             imagingTimeBeginUTC: