diff --git a/docs/openapi/components/schemas/common/UsdaSc6.yml b/docs/openapi/components/schemas/common/USDASC6ExemptCommodity.yml
similarity index 97%
rename from docs/openapi/components/schemas/common/UsdaSc6.yml
rename to docs/openapi/components/schemas/common/USDASC6ExemptCommodity.yml
index 5e3b7b0ab..57973d196 100644
--- a/docs/openapi/components/schemas/common/UsdaSc6.yml
+++ b/docs/openapi/components/schemas/common/USDASC6ExemptCommodity.yml
@@ -1,7 +1,7 @@
 $linkedData:
-  term: UsdaSc6
-  '@id': https://w3id.org/traceability#UsdaSc6
-title: USDA Form SC-6
+  term: USDASC6ExemptCommodityForm
+  '@id': https://w3id.org/traceability#USDASC6ExemptCommodityForm
+title: USDA SC-6 Exempt Commodity Form
 description: >-
   Importer's Exempt Commodity Form (SC-6) to declare the intent to import an
   agricultural commodity exempt from grade requirements for the commodity.
@@ -13,9 +13,9 @@ properties:
         items:
           type: string
           enum:
-            - UsdaSc6
+            - USDASC6ExemptCommodityForm
       - type: string
-        const: UsdaSc6
+        const: USDASC6ExemptCommodityForm
   serialNumber:
     title: Serial Number
     description: Serial number of the form.
@@ -137,7 +137,7 @@ required:
   - type
 example: |-
   {
-    "type": "UsdaSc6",
+    "type": "USDASC6ExemptCommodityForm",
     "facility": {
       "type": [
         "Place"
@@ -347,4 +347,4 @@ example: |-
     "importerSignatureDate": "2021-02-15",
     "intendedUse": "Processing",
     "intendedUseCert": "Processing"
-  }
\ No newline at end of file
+  }
diff --git a/docs/openapi/openapi.yml b/docs/openapi/openapi.yml
index 0d7741392..63b574d30 100644
--- a/docs/openapi/openapi.yml
+++ b/docs/openapi/openapi.yml
@@ -2060,7 +2060,7 @@ paths:
                 $ref: './components/schemas/common/USDAPPQ587PlantImportPermit.yml'
     
 
-  /schemas/common/USDASpecialtyCrops237AForm.yml:
+  /schemas/common/USDASC6ExemptCommodity.yml:
     get:
       tags:
       - common
@@ -2069,10 +2069,10 @@ paths:
           content:
             application/yml:
               schema:
-                $ref: './components/schemas/common/USDASpecialtyCrops237AForm.yml'
+                $ref: './components/schemas/common/USDASC6ExemptCommodity.yml'
     
 
-  /schemas/common/USMCACertifier.yml:
+  /schemas/common/USDASpecialtyCrops237AForm.yml:
     get:
       tags:
       - common
@@ -2081,10 +2081,10 @@ paths:
           content:
             application/yml:
               schema:
-                $ref: './components/schemas/common/USMCACertifier.yml'
+                $ref: './components/schemas/common/USDASpecialtyCrops237AForm.yml'
     
 
-  /schemas/common/USMCAClaims.yml:
+  /schemas/common/USMCACertifier.yml:
     get:
       tags:
       - common
@@ -2093,10 +2093,10 @@ paths:
           content:
             application/yml:
               schema:
-                $ref: './components/schemas/common/USMCAClaims.yml'
+                $ref: './components/schemas/common/USMCACertifier.yml'
     
 
-  /schemas/common/USMCAProduct.yml:
+  /schemas/common/USMCAClaims.yml:
     get:
       tags:
       - common
@@ -2105,10 +2105,10 @@ paths:
           content:
             application/yml:
               schema:
-                $ref: './components/schemas/common/USMCAProduct.yml'
+                $ref: './components/schemas/common/USMCAClaims.yml'
     
 
-  /schemas/common/UsdaSc6.yml:
+  /schemas/common/USMCAProduct.yml:
     get:
       tags:
       - common
@@ -2117,7 +2117,7 @@ paths:
           content:
             application/yml:
               schema:
-                $ref: './components/schemas/common/UsdaSc6.yml'
+                $ref: './components/schemas/common/USMCAProduct.yml'
     
 
   /schemas/credentials/ActivityPubActorCard.yml: