diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index 576c3bdc1a77ee8f45502cb1fe45b83ba18a51f2..f47928a96d6dbb1cb2e46dae388eeea12440c366 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -45,7 +45,7 @@ components:
             $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" 
       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
@@ -55,7 +55,7 @@ components:
         expectationVerb:
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb"
         expectationObject:
-          $ref: "#/components/schemas/ServiceSupportExpectationObject"
+          $ref: "#/components/schemas/EdgeServiceSupportExpectationObject"
         expectationTargets:
           type: array
           items:
@@ -108,9 +108,9 @@ components:
               - $ref: "#/components/schemas/NRFqBandContext"
               - $ref: "#/components/schemas/RATContext"
               - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext"               
-    ServiceSupportExpectationObject: 
+    EdgeServiceSupportExpectationObject: 
       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:
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index d44b0fa4764cc45dd1611ac66ac3c7bb9f50a880..7a42caaa54750e8b2d4b0d915787808f1774922e 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -44,7 +44,7 @@ components:
               oneOf:
                 - $ref: "#/components/schemas/IntentExpectation"
                 - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation"
-                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/ServiceSupportExpectation"                
+                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation"                
           intentContexts:
             type: array
             items:
@@ -89,7 +89,7 @@ components:
           type: string
           enum:
             - RAN_SubNetwork  #value for Radio Network Expectation--#
-            - Service_Support  #value for Service Support Expectation--#
+            - EdgeService_Support  #value for Service Support Expectation--#
         objectInstance:
           $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"
         objectContexts: