diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index af6b65bcd97f39280a9800ee8311208d029a7a6b..0b1018bf8d2e95e9a9ab9788be58227b0cf2c996 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -49,7 +49,7 @@ components:
             $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext'
       required:
         - expectationId
-    ServiceSupportExpectation:
+    EdgeServiceSupportExpectation:
       description: >-
         This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment    
       type: object
@@ -142,13 +142,13 @@ components:
               - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext'                                
     ServiceSupportExpectationObject: 
       description: >-
-        This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation
+        This data type is the "ExpectationObject" data type with specialisations for EdgeServiceSupportExpectation
       type: object
       properties:
         objectType:
           type: string
           enum:
-            - Service_Support 
+            - EdgeService_Support #value for Edge Service Support Expectation--#
         objectInstance:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
         objectContexts:
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index dadac31e250c94a7f4fd62d7b90e1906b53397a4..b7c60ef29dab9b9d4f2eac6bac440daa9d87a723 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -42,9 +42,9 @@ components:
             items:
               type: object
               oneOf:
-                - $ref: '#/components/schemas/IntentExpectation'
-                - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation'
-                - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/ServiceSupportExpectation'                
+                - $ref: "#/components/schemas/IntentExpectation"
+                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation"
+                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation"                
           intentContexts:
             type: array
             items:
@@ -130,7 +130,7 @@ components:
           type: string
           enum:
             - RAN_SubNetwork  #value for Radio Network Expectation--#
-            - Service_Support  #value for Service Support Expectation--#
+            - Edge_Service_Support  #value for Edge Service Support Expectation--#
         objectInstance:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
         objectContexts: