diff --git a/file-formats/aifd/aifd-v1.json b/file-formats/aifd/aifd-v1.json
index b40b1861f..a4d1e2ab1 100644
--- a/file-formats/aifd/aifd-v1.json
+++ b/file-formats/aifd/aifd-v1.json
@@ -54,25 +54,25 @@
         "originalLanguage"
       ]
     },
-    "aifInterfaces": {
-      "title": "AIF Interfaces",
-      "description": "AIF interfaces",
+    "applicationInterfaces": {
+      "title": "Application Interfaces",
+      "description": "Application interfaces",
       "type": "array",
       "items": {
-        "title": "AIF Interface",
-        "description": "AIF interface",
+        "title": "Application Interface",
+        "description": "Application interface",
         "type": "object",
         "properties": {
-          "interfaceObjectName": {
-            "title": "Interface Object Name",
-            "description": "Interface object name",
+          "applicationInterface": {
+            "title": "Application Interface",
+            "description": "Application interface",
             "type": "string",
             "maxLength": 40
           }
         },
         "additionalProperties": false,
         "required": [
-          "interfaceObjectName"
+          "applicationInterface"
         ]
       }
     }
@@ -81,6 +81,6 @@
   "required": [
     "formatVersion",
     "header",
-    "aifInterfaces"
+    "applicationInterfaces"
   ]
 }
diff --git a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json
index 519255d51..7a81600ea 100644
--- a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json
+++ b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json
@@ -5,15 +5,15 @@
     "originalLanguage": "en",
     "abapLanguageVersion": "cloudDevelopment"
   },
-  "aifInterfaces":[
+  "applicationInterfaces":[
     {
-      "interfaceObjectName":"INT_OBJ_1"
+      "applicationInterface":"INT_OBJ_1"
     },
     {
-      "interfaceObjectName":"/AIFTCUST_WS_I00001"
+      "applicationInterface":"/AIFTCUST_WS_I00001"
     },
     {
-      "interfaceObjectName":"/AIFTCUST_WS_O00001"
+      "applicationInterface":"/AIFTCUST_WS_O00001"
     }
   ]
 }
diff --git a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap
index 06b45b2df..cadb5d626 100644
--- a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap
+++ b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap
@@ -1,31 +1,31 @@
 INTERFACE zif_aff_aifd_v1
   PUBLIC.
   TYPES:
-    "! <p class="shorttext">AIF Interface</p>
-    "! AIF interface
-    BEGIN OF ty_aif_interface,
-      "! <p class="shorttext">Interface Object Name</p>
-      "! Interface object name
+    "! <p class="shorttext">Application Interface</p>
+    "! Application interface
+    BEGIN OF ty_application_interface,
+      "! <p class="shorttext">Application Interface</p>
+      "! Application interface
       "! $required
-      interface_object_name TYPE c LENGTH 40,
-    END OF ty_aif_interface,
+      application_interface TYPE c LENGTH 40,
+    END OF ty_application_interface,
 
-    "! <p class="shorttext">AIF Interfaces</p>
-    "! AIF interfaces
-    ty_aif_interfaces TYPE STANDARD TABLE OF ty_aif_interface WITH DEFAULT KEY,
+    "! <p class="shorttext">Application Interfaces</p>
+    "! Application interfaces
+    ty_application_interfaces TYPE STANDARD TABLE OF ty_application_interface WITH DEFAULT KEY,
 
     "! <p class="shorttext">Deployment Scenario</p>
     "! Deployment scenario
     BEGIN OF ty_main,
       "! $required
-      format_version TYPE zif_aff_types_v1=>ty_format_version,
+      format_version         TYPE zif_aff_types_v1=>ty_format_version,
       "! <p class="shorttext">Header</p>
       "! Header
       "! $required
-      header         TYPE zif_aff_types_v1=>ty_header_60_cloud,
-      "! <p class="shorttext">AIF Interfaces</p>
-      "! AIF interfaces
+      header                 TYPE zif_aff_types_v1=>ty_header_60_cloud,
+      "! <p class="shorttext">Application Interfaces</p>
+      "! Application interfaces
       "! $required
-      aif_interfaces TYPE ty_aif_interfaces,
+      application_interfaces TYPE ty_application_interfaces,
     END OF ty_main.
 ENDINTERFACE.
diff --git a/file-formats/edck/README.md b/file-formats/edck/README.md
new file mode 100644
index 000000000..6f471a428
--- /dev/null
+++ b/file-formats/edck/README.md
@@ -0,0 +1,5 @@
+# EDCK File Format
+
+File | Cardinality | Definition | Schema | Example
+:--- | :--- | :--- | :--- | :---
+`<name>.edck.json` | 1 | [`zif_aff_edck_v1.intf.abap`](./type/zif_aff_edck_v1.intf.abap) | [`edck-v1.json`](./edck-v1.json) | [`z_aff_example_edck.edck.json`](./examples/z_aff_example_edck.edck.json)
diff --git a/file-formats/edck/edck-v1.json b/file-formats/edck/edck-v1.json
new file mode 100644
index 000000000..2c6b198f3
--- /dev/null
+++ b/file-formats/edck/edck-v1.json
@@ -0,0 +1,125 @@
+{
+  "$comment": "This file is autogenerated, do not edit manually, see https://github.com/SAP/abap-file-formats for more information.",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://github.com/SAP/abap-file-formats/blob/main/file-formats/edck/edck-v1.json",
+  "title": "Consistency Check ID",
+  "description": "Consistency check ID",
+  "type": "object",
+  "properties": {
+    "formatVersion": {
+      "title": "ABAP File Format Version",
+      "description": "The ABAP file format version",
+      "type": "string",
+      "const": "1"
+    },
+    "header": {
+      "title": "Header",
+      "description": "Header",
+      "type": "object",
+      "properties": {
+        "description": {
+          "title": "Description",
+          "description": "Description of the ABAP object",
+          "type": "string",
+          "maxLength": 60
+        },
+        "originalLanguage": {
+          "title": "Original Language",
+          "description": "Original language of the ABAP object",
+          "type": "string",
+          "minLength": 2
+        },
+        "abapLanguageVersion": {
+          "title": "ABAP Language Version",
+          "description": "ABAP language version",
+          "type": "string",
+          "enum": [
+            "standard",
+            "cloudDevelopment"
+          ],
+          "enumTitles": [
+            "Standard",
+            "ABAP Cloud Development"
+          ],
+          "enumDescriptions": [
+            "Standard",
+            "ABAP cloud development"
+          ],
+          "default": "standard"
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "description",
+        "originalLanguage"
+      ]
+    },
+    "generalInformation": {
+      "title": "General Information",
+      "description": "General information of consistency check ID",
+      "type": "object",
+      "properties": {
+        "checkCategory": {
+          "title": "Check Category",
+          "description": "Consistency check category",
+          "type": "string",
+          "enum": [
+            "existenceCheck",
+            "statusCheck",
+            "edocumentExistenceCheck",
+            "contentMismatchCheck"
+          ],
+          "enumTitles": [
+            "Existence Check",
+            "Status Check",
+            "Edocument Existence Check",
+            "Content Mismatch Check"
+          ],
+          "enumDescriptions": [
+            "Existence check",
+            "Status check",
+            "Edocument existence check",
+            "Content mismatch check"
+          ],
+          "default": "existenceCheck"
+        },
+        "checkClassification": {
+          "title": "Check Classification",
+          "description": "Consistency check ID classification",
+          "type": "string",
+          "enum": [
+            "coreDeliveredChecks",
+            "additionalImplementedChecks"
+          ],
+          "enumTitles": [
+            "Core Delivered Checks",
+            "Additionally (Extended) Implemented Checks"
+          ],
+          "enumDescriptions": [
+            "Core delivered checks",
+            "Additionally (Extended) implemented checks"
+          ],
+          "default": "coreDeliveredChecks"
+        },
+        "additionalCheckClass": {
+          "title": "Additional Check Class",
+          "description": "Consistency check class",
+          "type": "string",
+          "maxLength": 30
+        },
+        "resultProcessDerived": {
+          "title": "Result Process Derived",
+          "description": "Result process derived",
+          "type": "boolean"
+        }
+      },
+      "additionalProperties": false
+    }
+  },
+  "additionalProperties": false,
+  "required": [
+    "formatVersion",
+    "header",
+    "generalInformation"
+  ]
+}
diff --git a/file-formats/edck/examples/z_aff_example_edck.edck.json b/file-formats/edck/examples/z_aff_example_edck.edck.json
new file mode 100644
index 000000000..c34df0fa9
--- /dev/null
+++ b/file-formats/edck/examples/z_aff_example_edck.edck.json
@@ -0,0 +1,13 @@
+{
+  "formatVersion": "1",
+  "header": {
+    "description": "Example Check ID",
+    "originalLanguage": "en",
+    "abapLanguageVersion": "cloudDevelopment"
+  },
+  "generalInformation": {
+    "checkCategory": "existenceCheck",
+    "checkClassification": "coreDeliveredChecks",
+    "resultProcessDerived": false
+  }
+}
diff --git a/file-formats/edck/type/zif_aff_edck_v1.intf.abap b/file-formats/edck/type/zif_aff_edck_v1.intf.abap
new file mode 100644
index 000000000..f5ecbdb44
--- /dev/null
+++ b/file-formats/edck/type/zif_aff_edck_v1.intf.abap
@@ -0,0 +1,72 @@
+INTERFACE zif_aff_edck_v1
+  PUBLIC.
+
+  TYPES ty_check_classification TYPE c LENGTH 1.
+  TYPES ty_check_category TYPE c LENGTH 6.
+
+  TYPES:
+    BEGIN OF ty_attributes,
+      "! <p class="shorttext">Check Category</p>
+      "! Consistency check category
+      "! $values {@link zif_aff_edck_v1.data:co_check_category}
+      "! $default {@link zif_aff_edck_v1.data:co_check_category.existence_check}
+      check_category         TYPE ty_check_category,
+      "! <p class="shorttext">Check Classification</p>
+      "! Consistency check ID classification
+      "! $values {@link zif_aff_edck_v1.data:co_check_classification}
+      "! $default {@link zif_aff_edck_v1.data:co_check_classification.core_delivered_checks}
+      check_classification   TYPE ty_check_classification,
+      "! <p class="shorttext">Additional Check Class</p>
+      "! Consistency check class
+      additional_check_class TYPE zif_aff_types_v1=>ty_object_name_30,
+      "! <p class="shorttext">Result Process Derived</p>
+      "! Result process derived
+      result_process_derived TYPE abap_bool,
+    END OF ty_attributes.
+
+  TYPES:
+    "! <p class="shorttext">Consistency Check ID</p>
+    "! Consistency check ID
+    BEGIN OF ty_main,
+      "! $required
+      format_version      TYPE zif_aff_types_v1=>ty_format_version,
+      "! <p class="shorttext">Header</p>
+      "! Header
+      "! $required
+      header              TYPE zif_aff_types_v1=>ty_header_60_cloud,
+      "! <p class="shorttext">General Information</p>
+      "! General information of consistency check ID
+      "! $required
+      general_information TYPE ty_attributes,
+    END OF ty_main.
+
+  CONSTANTS:
+    "! <p class="shorttext">Check Classification</p>
+    "! Check classification
+    BEGIN OF co_check_classification,
+      "! <p class="shorttext">Core Delivered Checks</p>
+      "! Core delivered checks
+      core_delivered_checks         TYPE ty_check_classification VALUE 'C',
+      "! <p class="shorttext">Additionally (Extended) Implemented Checks</p>
+      "! Additionally (Extended) implemented checks
+      additional_implemented_checks TYPE ty_check_classification VALUE 'A',
+    END OF co_check_classification.
+
+  CONSTANTS:
+    "! <p class="shorttext">Check Category</p>
+    "! Check category
+    BEGIN OF co_check_category,
+      "! <p class="shorttext">Existence Check</p>
+      "! Existence check
+      existence_check           TYPE ty_check_category VALUE 'EXIST',
+      "! <p class="shorttext">Status Check</p>
+      "! Status check
+      status_check              TYPE ty_check_category VALUE 'STATUS',
+      "! <p class="shorttext">Edocument Existence Check</p>
+      "! Edocument existence check
+      edocument_existence_check TYPE ty_check_category VALUE 'EDOCHK',
+      "! <p class="shorttext">Content Mismatch Check</p>
+      "!  Content mismatch check
+      content_mismatch_check    TYPE ty_check_category VALUE 'CONMIS',
+    END OF co_check_category.
+ENDINTERFACE.
diff --git a/file-formats/edck/type/zif_aff_edck_v1.intf.json b/file-formats/edck/type/zif_aff_edck_v1.intf.json
new file mode 100644
index 000000000..59f7f02e7
--- /dev/null
+++ b/file-formats/edck/type/zif_aff_edck_v1.intf.json
@@ -0,0 +1,7 @@
+{
+  "formatVersion": "1",
+  "header": {
+    "description": "AFF type for EDCK",
+    "originalLanguage": "en"
+  }
+}