diff --git a/data-model/Dockerfile b/data-model/Dockerfile
index 38bef71..a8a3a9f 100644
--- a/data-model/Dockerfile
+++ b/data-model/Dockerfile
@@ -7,9 +7,9 @@ COPY fdo-profile/annotation/0.1.0/schema schema-root/schemas/fdo-profile/annotat
 COPY fdo-profile/digital-specimen/0.1.0/schema/ schema-root/schemas/fdo-profile/digital-specimen/0.1.0
 COPY fdo-profile/doi-kernel/0.1.0/schema schema-root/schemas/fdo-profile/doi-kernel/0.1.0
 COPY fdo-profile/handle-kernel/0.1.0/schema schema-root/schemas/fdo-profile/handle-kernel/0.1.0
-COPY fdo-profile/mapping/0.1.0/schema schema-root/schemas/fdo-profile/mapping/0.1.0
+COPY fdo-profile/data-mapping/0.1.0/schema schema-root/schemas/fdo-profile/data-mapping/0.1.0
 COPY fdo-profile/mas/0.1.0/schema schema-root/schemas/fdo-profile/mas/0.1.0
-COPY fdo-profile/media-object/0.1.0/schema schema-root/schemas/fdo-profile/media-object/0.1.0
+COPY fdo-profile/digital-media/0.1.0/schema schema-root/schemas/fdo-profile/digital-media/0.1.0
 COPY fdo-profile/organisation/0.1.0/schema schema-root/schemas/fdo-profile/organisation/0.1.0
 COPY fdo-profile/source-system/0.1.0/schema schema-root/schemas/fdo-profile/source-system/0.1.0
 COPY fdo-profile/tettris-service/0.1.0/schema schema-root/schemas/fdo-profile/tettris-service/0.1.0
@@ -21,9 +21,9 @@ COPY fdo-profile/annotation/0.1.0/schema schema-root/schemas/fdo-profile/annotat
 COPY fdo-profile/digital-specimen/0.1.0/schema/ schema-root/schemas/fdo-profile/digital-specimen/latest
 COPY fdo-profile/doi-kernel/0.1.0/schema schema-root/schemas/fdo-profile/doi-kernel/latest
 COPY fdo-profile/handle-kernel/0.1.0/schema schema-root/schemas/fdo-profile/handle-kernel/latest
-COPY fdo-profile/mapping/0.1.0/schema schema-root/schemas/fdo-profile/mapping/latest
+COPY fdo-profile/data-mapping/0.1.0/schema schema-root/schemas/fdo-profile/data-mapping/latest
 COPY fdo-profile/mas/0.1.0/schema schema-root/schemas/fdo-profile/mas/latest
-COPY fdo-profile/media-object/0.1.0/schema schema-root/schemas/fdo-profile/media-object/latest
+COPY fdo-profile/digital-media/0.1.0/schema schema-root/schemas/fdo-profile/digital-media/latest
 COPY fdo-profile/organisation/0.1.0/schema schema-root/schemas/fdo-profile/organisation/latest
 COPY fdo-profile/source-system/0.1.0/schema schema-root/schemas/fdo-profile/source-system/latest
 COPY fdo-profile/tettris-service/0.1.0/schema schema-root/schemas/fdo-profile/tettris-service/latest
diff --git a/data-model/fdo-profile/mapping/0.1.0/examples/example-mapping-request.json b/data-model/fdo-profile/data-mapping/0.1.0/examples/example-data-mapping-request.json
similarity index 100%
rename from data-model/fdo-profile/mapping/0.1.0/examples/example-mapping-request.json
rename to data-model/fdo-profile/data-mapping/0.1.0/examples/example-data-mapping-request.json
diff --git a/data-model/fdo-profile/mapping/0.1.0/examples/example-mapping.json b/data-model/fdo-profile/data-mapping/0.1.0/examples/example-data-mapping.json
similarity index 100%
rename from data-model/fdo-profile/mapping/0.1.0/examples/example-mapping.json
rename to data-model/fdo-profile/data-mapping/0.1.0/examples/example-data-mapping.json
diff --git a/data-model/fdo-profile/mapping/0.1.0/schema/mapping-request.json b/data-model/fdo-profile/data-mapping/0.1.0/schema/data-mapping-request.json
similarity index 91%
rename from data-model/fdo-profile/mapping/0.1.0/schema/mapping-request.json
rename to data-model/fdo-profile/data-mapping/0.1.0/schema/data-mapping-request.json
index 068797a..70a063a 100644
--- a/data-model/fdo-profile/mapping/0.1.0/schema/mapping-request.json
+++ b/data-model/fdo-profile/data-mapping/0.1.0/schema/data-mapping-request.json
@@ -1,7 +1,7 @@
 {
-  "$id": "https://schemas.dissco.tech/schemas/fdo-profile/mapping/0.1.0/mapping-request.json",
+  "$id": "https://schemas.dissco.tech/schemas/fdo-profile/data-mapping/0.1.0/data-mapping-request.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "description": "FDO Profile for mapping from source data standard to DiSSCo data model",
+  "description": "Request to publish FDO Profile for data mapping from source data standard to DiSSCo data model",
   "$comment": "FDO Profile Version 0.1.0",
   "properties": {
     "data": {
diff --git a/data-model/fdo-profile/mapping/0.1.0/schema/mapping.json b/data-model/fdo-profile/data-mapping/0.1.0/schema/data-mapping.json
similarity index 95%
rename from data-model/fdo-profile/mapping/0.1.0/schema/mapping.json
rename to data-model/fdo-profile/data-mapping/0.1.0/schema/data-mapping.json
index 3217179..f9ecb5b 100644
--- a/data-model/fdo-profile/mapping/0.1.0/schema/mapping.json
+++ b/data-model/fdo-profile/data-mapping/0.1.0/schema/data-mapping.json
@@ -1,7 +1,7 @@
 {
-  "$id": "https://schemas.dissco.tech/schemas/fdo-profile/mapping/0.1.0/mapping.json",
+  "$id": "https://schemas.dissco.tech/schemas/fdo-profile/data-mapping/0.1.0/data-mapping.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "description": "FDO Profile for mapping from source data standard to DiSSCo data model",
+  "description": "FDO Profile for data mapping from source data standard to DiSSCo data model",
   "$comment": "FDO Profile Version 0.1.0",
   "properties": {
     "fdoProfile" : {
diff --git a/data-model/fdo-profile/media-object/0.1.0/examples/example-media-object-request.json b/data-model/fdo-profile/digital-media/0.1.0/examples/example-digital-media-request.json
similarity index 100%
rename from data-model/fdo-profile/media-object/0.1.0/examples/example-media-object-request.json
rename to data-model/fdo-profile/digital-media/0.1.0/examples/example-digital-media-request.json
diff --git a/data-model/fdo-profile/media-object/0.1.0/examples/example-media-object.json b/data-model/fdo-profile/digital-media/0.1.0/examples/example-digital-media.json
similarity index 97%
rename from data-model/fdo-profile/media-object/0.1.0/examples/example-media-object.json
rename to data-model/fdo-profile/digital-media/0.1.0/examples/example-digital-media.json
index 8acdf1c..2cbc204 100644
--- a/data-model/fdo-profile/media-object/0.1.0/examples/example-media-object.json
+++ b/data-model/fdo-profile/digital-media/0.1.0/examples/example-digital-media.json
@@ -13,7 +13,7 @@
   "pidRecordIssueNumber": 1,
   "structuralType": "digital",
   "pidStatus": "TEST",
-  "referentType": "mediaObject",
+  "referentType": "Digital Media",
   "referentDoiName": "TEST/J7C-4MC-1HK",
   "referentName": "https://doi.org/21.T11148/bbad8c4e101e8af01115 for TEST/VNG-KCR-A4C",
   "primaryReferentType": "creation",
diff --git a/data-model/fdo-profile/media-object/0.1.0/schema/media-object-request.json b/data-model/fdo-profile/digital-media/0.1.0/schema/digital-media-request.json
similarity index 97%
rename from data-model/fdo-profile/media-object/0.1.0/schema/media-object-request.json
rename to data-model/fdo-profile/digital-media/0.1.0/schema/digital-media-request.json
index c4ec146..53fba2d 100644
--- a/data-model/fdo-profile/media-object/0.1.0/schema/media-object-request.json
+++ b/data-model/fdo-profile/digital-media/0.1.0/schema/digital-media-request.json
@@ -1,7 +1,7 @@
 {
-  "$id": "https://schemas.dissco.tech/schemas/fdo-profile/media-object/0.1.0/media-object-request.json",
+  "$id": "https://schemas.dissco.tech/schemas/fdo-profile/digital-media/0.1.0/digital-media-request.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "description": "Schema for creating new PID records for media objects using the DiSSCO PID API. API maps requests to media-object.json profile",
+  "description": "Schema for creating new PID records for digital media using the DiSSCO PID API. API maps requests to digital-media.json profile",
   "$comment": "FDO Profile Version 0.1.0",
   "properties": {
     "data": {
diff --git a/data-model/fdo-profile/media-object/0.1.0/schema/media-object.json b/data-model/fdo-profile/digital-media/0.1.0/schema/digital-media.json
similarity index 99%
rename from data-model/fdo-profile/media-object/0.1.0/schema/media-object.json
rename to data-model/fdo-profile/digital-media/0.1.0/schema/digital-media.json
index 1beb6bd..60062b8 100644
--- a/data-model/fdo-profile/media-object/0.1.0/schema/media-object.json
+++ b/data-model/fdo-profile/digital-media/0.1.0/schema/digital-media.json
@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.dissco.tech/schemas/fdo-profile/media-object/0.1.0/media-object.json",
+  "$id": "https://schemas.dissco.tech/schemas/fdo-profile/digital-media/0.1.0/digital-media.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "description": "FDO Profile for digital media object",
   "$comment": "FDO Profile Version 0.1.0",