diff --git a/openapi-internal.yaml b/openapi-internal.yaml
index 6a74bd4..f92b03b 100644
--- a/openapi-internal.yaml
+++ b/openapi-internal.yaml
@@ -27,7 +27,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/Id"
+                $ref: "#/components/schemas/MapfixID"
         default:
           description: General Error
           content:
@@ -163,7 +163,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/Id"
+                $ref: "#/components/schemas/SubmissionID"
         default:
           description: General Error
           content:
@@ -320,7 +320,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/Id"
+                $ref: "#/components/schemas/ScriptPolicyID"
         default:
           description: General Error
           content:
@@ -394,7 +394,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/Id"
+                $ref: "#/components/schemas/ScriptID"
         default:
           description: General Error
           content:
@@ -474,12 +474,36 @@ components:
         minimum: 1
         maximum: 100
   schemas:
-    Id:
+    MapfixID:
       required:
-      - ID
+      - MapfixID
       type: object
       properties:
-        ID:
+        MapfixID:
+          type: integer
+          format: int64
+    SubmissionID:
+      required:
+      - SubmissionID
+      type: object
+      properties:
+        SubmissionID:
+          type: integer
+          format: int64
+    ScriptID:
+      required:
+      - ScriptID
+      type: object
+      properties:
+        ScriptID:
+          type: integer
+          format: int64
+    ScriptPolicyID:
+      required:
+      - ScriptPolicyID
+      type: object
+      properties:
+        ScriptPolicyID:
           type: integer
           format: int64
     MapfixCreate:
diff --git a/openapi.yaml b/openapi.yaml
index 3970378..6e4e93f 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -831,7 +831,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/Id"
+                $ref: "#/components/schemas/ScriptPolicyID"
         default:
           description: General Error
           content:
@@ -966,7 +966,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/Id"
+                $ref: "#/components/schemas/ScriptID"
         default:
           description: General Error
           content:
@@ -1106,14 +1106,6 @@ components:
         minimum: 1
         maximum: 100
   schemas:
-    Id:
-      required:
-      - ID
-      type: object
-      properties:
-        ID:
-          type: integer
-          format: int64
     OperationID:
       required:
       - OperationID
@@ -1122,6 +1114,22 @@ components:
         OperationID:
           type: integer
           format: int32
+    ScriptID:
+      required:
+      - ScriptID
+      type: object
+      properties:
+        ScriptID:
+          type: integer
+          format: int64
+    ScriptPolicyID:
+      required:
+      - ScriptPolicyID
+      type: object
+      properties:
+        ScriptPolicyID:
+          type: integer
+          format: int64
     Roles:
       required:
       - Roles