diff --git a/docs/oas3_0_0/TripService.json b/docs/oas3_0_0/TripService.json
index b097d92..85f6c2b 100644
--- a/docs/oas3_0_0/TripService.json
+++ b/docs/oas3_0_0/TripService.json
@@ -589,7 +589,7 @@
           "Airports"
         ],
         "summary": "Invoke functionImport GetNearestAirport",
-        "operationId": "OperationImport-GetNearestAirport",
+        "operationId": "FunctionImport.GetNearestAirport",
         "parameters": [
           {
             "name": "lat",
@@ -667,7 +667,7 @@
           "People"
         ],
         "summary": "Invoke functionImport GetPersonWithMostFriends",
-        "operationId": "OperationImport-GetPersonWithMostFriends",
+        "operationId": "FunctionImport.GetPersonWithMostFriends",
         "responses": {
           "200": {
             "description": "Success",
@@ -3798,7 +3798,7 @@
           "ResetDataSource"
         ],
         "summary": "Invoke actionImport ResetDataSource",
-        "operationId": "OperationImport.ResetDataSource",
+        "operationId": "ActionImport.ResetDataSource",
         "responses": {
           "204": {
             "description": "Success"
diff --git a/docs/oas_2_0/TripService.json b/docs/oas_2_0/TripService.json
index c681841..0fdf919 100644
--- a/docs/oas_2_0/TripService.json
+++ b/docs/oas_2_0/TripService.json
@@ -534,7 +534,7 @@
           "Airports"
         ],
         "summary": "Invoke functionImport GetNearestAirport",
-        "operationId": "OperationImport-GetNearestAirport",
+        "operationId": "FunctionImport.GetNearestAirport",
         "produces": [
           "application/json"
         ],
@@ -570,7 +570,7 @@
           "People"
         ],
         "summary": "Invoke functionImport GetPersonWithMostFriends",
-        "operationId": "OperationImport-GetPersonWithMostFriends",
+        "operationId": "FunctionImport.GetPersonWithMostFriends",
         "produces": [
           "application/json"
         ],
@@ -3294,7 +3294,7 @@
           "ResetDataSource"
         ],
         "summary": "Invoke actionImport ResetDataSource",
-        "operationId": "OperationImport.ResetDataSource",
+        "operationId": "ActionImport.ResetDataSource",
         "responses": {
           "204": {
             "description": "Success"
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationImportOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationImportOperationHandler.cs
index 8da88a5..94ae8e3 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationImportOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationImportOperationHandler.cs
@@ -44,7 +44,7 @@ namespace Microsoft.OpenApi.OData.Operation
             {
                 if (EdmOperationImport.IsActionImport())
                 {
-                    operation.OperationId = "OperationImport." + EdmOperationImport.Name;
+                    operation.OperationId = "ActionImport." + EdmOperationImport.Name;
                 }
                 else
                 {
@@ -53,11 +53,11 @@ namespace Microsoft.OpenApi.OData.Operation
                     if (Context.Model.IsOperationImportOverload(EdmOperationImport))
                     {
                         string hash = pathItemName.GetHashSHA256();
-                        operation.OperationId = "OperationImport-" + EdmOperationImport.Name + "-" + hash.Substring(0, 4);
+                        operation.OperationId = "FunctionImport." + EdmOperationImport.Name + "-" + hash.Substring(0, 4);
                     }
                     else
                     {
-                        operation.OperationId = "OperationImport-" + EdmOperationImport.Name;
+                        operation.OperationId = "FunctionImport." + EdmOperationImport.Name;
                     }
                 }
             }
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Operation/EdmActionImportOperationHandlerTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/Operation/EdmActionImportOperationHandlerTests.cs
index ecfac16..74bf833 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Operation/EdmActionImportOperationHandlerTests.cs
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Operation/EdmActionImportOperationHandlerTests.cs
@@ -80,7 +80,7 @@ namespace Microsoft.OpenApi.OData.Operation.Tests
 
             if (enableOperationId)
             {
-                Assert.Equal("OperationImport.MyAction", operation.OperationId);
+                Assert.Equal("ActionImport.MyAction", operation.OperationId);
             }
             else
             {
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Operation/EdmFunctionImportOperationHandlerTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/Operation/EdmFunctionImportOperationHandlerTests.cs
index 09a1211..ff7e82a 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Operation/EdmFunctionImportOperationHandlerTests.cs
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Operation/EdmFunctionImportOperationHandlerTests.cs
@@ -82,7 +82,7 @@ namespace Microsoft.OpenApi.OData.Operation.Tests
 
             if (enableOperationId)
             {
-                Assert.Equal("OperationImport-MyFunction", operation.OperationId);
+                Assert.Equal("FunctionImport.MyFunction", operation.OperationId);
             }
             else
             {
@@ -133,7 +133,7 @@ namespace Microsoft.OpenApi.OData.Operation.Tests
 
             if (enableOperationId)
             {
-                Assert.Equal("OperationImport-MyFunction-3e3f", operation.OperationId);
+                Assert.Equal("FunctionImport.MyFunction-3e3f", operation.OperationId);
             }
             else
             {
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.json b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.json
index bdf7055..ad0b5ec 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.json
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.json
@@ -535,7 +535,7 @@
           "Airports"
         ],
         "summary": "Invoke functionImport GetNearestAirport",
-        "operationId": "OperationImport-GetNearestAirport",
+        "operationId": "FunctionImport.GetNearestAirport",
         "produces": [
           "application/json"
         ],
@@ -573,7 +573,7 @@
           "People"
         ],
         "summary": "Invoke functionImport GetPersonWithMostFriends",
-        "operationId": "OperationImport-GetPersonWithMostFriends",
+        "operationId": "FunctionImport.GetPersonWithMostFriends",
         "produces": [
           "application/json"
         ],
@@ -3489,7 +3489,7 @@
           "ResetDataSource"
         ],
         "summary": "Invoke actionImport ResetDataSource",
-        "operationId": "OperationImport.ResetDataSource",
+        "operationId": "ActionImport.ResetDataSource",
         "responses": {
           "204": {
             "description": "Success"
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.yaml b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.yaml
index 9c3d829..383a32f 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.yaml
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.yaml
@@ -357,7 +357,7 @@ paths:
       tags:
         - Airports
       summary: Invoke functionImport GetNearestAirport
-      operationId: OperationImport-GetNearestAirport
+      operationId: FunctionImport.GetNearestAirport
       produces:
         - application/json
       parameters:
@@ -382,7 +382,7 @@ paths:
       tags:
         - People
       summary: Invoke functionImport GetPersonWithMostFriends
-      operationId: OperationImport-GetPersonWithMostFriends
+      operationId: FunctionImport.GetPersonWithMostFriends
       produces:
         - application/json
       responses:
@@ -2452,7 +2452,7 @@ paths:
       tags:
         - ResetDataSource
       summary: Invoke actionImport ResetDataSource
-      operationId: OperationImport.ResetDataSource
+      operationId: ActionImport.ResetDataSource
       responses:
         '204':
           description: Success
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.json b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.json
index b49e172..8e83761 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.json
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.json
@@ -589,7 +589,7 @@
           "Airports"
         ],
         "summary": "Invoke functionImport GetNearestAirport",
-        "operationId": "OperationImport-GetNearestAirport",
+        "operationId": "FunctionImport.GetNearestAirport",
         "parameters": [
           {
             "name": "lat",
@@ -667,7 +667,7 @@
           "People"
         ],
         "summary": "Invoke functionImport GetPersonWithMostFriends",
-        "operationId": "OperationImport-GetPersonWithMostFriends",
+        "operationId": "FunctionImport.GetPersonWithMostFriends",
         "responses": {
           "200": {
             "description": "Success",
@@ -3987,7 +3987,7 @@
           "ResetDataSource"
         ],
         "summary": "Invoke actionImport ResetDataSource",
-        "operationId": "OperationImport.ResetDataSource",
+        "operationId": "ActionImport.ResetDataSource",
         "responses": {
           "204": {
             "description": "Success"
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.yaml b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.yaml
index 0880988..e2cfcdc 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.yaml
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.yaml
@@ -387,7 +387,7 @@ paths:
       tags:
         - Airports
       summary: Invoke functionImport GetNearestAirport
-      operationId: OperationImport-GetNearestAirport
+      operationId: FunctionImport.GetNearestAirport
       parameters:
         - name: lat
           in: path
@@ -430,7 +430,7 @@ paths:
       tags:
         - People
       summary: Invoke functionImport GetPersonWithMostFriends
-      operationId: OperationImport-GetPersonWithMostFriends
+      operationId: FunctionImport.GetPersonWithMostFriends
       responses:
         '200':
           description: Success
@@ -2725,7 +2725,7 @@ paths:
       tags:
         - ResetDataSource
       summary: Invoke actionImport ResetDataSource
-      operationId: OperationImport.ResetDataSource
+      operationId: ActionImport.ResetDataSource
       responses:
         '204':
           description: Success