diff --git a/gui/rpk-gui/src/lib/crud/components/crud-form.tsx b/gui/rpk-gui/src/lib/crud/components/crud-form.tsx
index 0a63776..53e739d 100644
--- a/gui/rpk-gui/src/lib/crud/components/crud-form.tsx
+++ b/gui/rpk-gui/src/lib/crud/components/crud-form.tsx
@@ -37,6 +37,7 @@ export const CrudForm: React.FC<CrudFormProps> = (props) => {
     onMutationSuccess: (data: any) => { if (onSuccess) { onSuccess(data) } },
   });
 
+  const schemaValue = id === undefined ? `${schemaName}Create` : `${schemaName}Update`;
   const record = query?.data?.data;
   const [formData, setFormData] = useState(record);
 
@@ -46,7 +47,7 @@ export const CrudForm: React.FC<CrudFormProps> = (props) => {
   useEffect(() => {
     const fetchSchema = async () => {
       try {
-        const resourceSchema = await jsonschemaProvider.getResourceSchema(schemaName);
+        const resourceSchema = await jsonschemaProvider.getResourceSchema(schemaValue);
         setSchema(resourceSchema);
         setLoading(false);
       } catch (error) {
diff --git a/gui/rpk-gui/src/pages/firm/ContractRoutes.tsx b/gui/rpk-gui/src/pages/firm/ContractRoutes.tsx
index fb88227..3210f36 100644
--- a/gui/rpk-gui/src/pages/firm/ContractRoutes.tsx
+++ b/gui/rpk-gui/src/pages/firm/ContractRoutes.tsx
@@ -26,9 +26,9 @@ const ListContract = () => {
 }
 
 const EditContract = () => {
-  return <Edit<Contract> resource={`contracts`} schemaName={"ContractUpdate"} />
+  return <Edit<Contract> resource={`contracts`} schemaName={"Contract"} />
 }
 
 const CreateContract = () => {
-  return <New<Contract> resource={`contracts`} schemaName={"ContractCreate"} />
+  return <New<Contract> resource={`contracts`} schemaName={"Contract"} />
 }
diff --git a/gui/rpk-gui/src/pages/firm/DraftRoutes.tsx b/gui/rpk-gui/src/pages/firm/DraftRoutes.tsx
index 42ca200..79d5b67 100644
--- a/gui/rpk-gui/src/pages/firm/DraftRoutes.tsx
+++ b/gui/rpk-gui/src/pages/firm/DraftRoutes.tsx
@@ -26,9 +26,9 @@ const ListDraft = () => {
 }
 
 const EditDraft = () => {
-  return <Edit<Draft> resource={`contracts/drafts`} schemaName={"ContractDraftUpdate"} />
+  return <Edit<Draft> resource={`contracts/drafts`} schemaName={"ContractDraft"} />
 }
 
 const CreateDraft = () => {
-  return <New<Draft> resource={`contracts/drafts`} schemaName={"ContractDraftCreate"} />
+  return <New<Draft> resource={`contracts/drafts`} schemaName={"ContractDraft"} />
 }
diff --git a/gui/rpk-gui/src/pages/firm/EntityRoutes.tsx b/gui/rpk-gui/src/pages/firm/EntityRoutes.tsx
index c48b115..bb79cc7 100644
--- a/gui/rpk-gui/src/pages/firm/EntityRoutes.tsx
+++ b/gui/rpk-gui/src/pages/firm/EntityRoutes.tsx
@@ -29,9 +29,9 @@ const ListEntity = () => {
 }
 
 const EditEntity = () => {
-  return <Edit<Entity> resource={`entities`} schemaName={"EntityUpdate"} />
+  return <Edit<Entity> resource={`entities`} schemaName={"Entity"} />
 }
 
 const CreateEntity = () => {
-  return <New<Entity> resource={`entities`} schemaName={"EntityCreate"} />
+  return <New<Entity> resource={`entities`} schemaName={"Entity"} />
 }
diff --git a/gui/rpk-gui/src/pages/firm/ProvisionRoutes.tsx b/gui/rpk-gui/src/pages/firm/ProvisionRoutes.tsx
index a185688..5c136d5 100644
--- a/gui/rpk-gui/src/pages/firm/ProvisionRoutes.tsx
+++ b/gui/rpk-gui/src/pages/firm/ProvisionRoutes.tsx
@@ -27,9 +27,9 @@ const ListProvision = () => {
 }
 
 const EditProvision = () => {
-  return <Edit<Provision> resource={`templates/provisions`} schemaName={"ProvisionTemplateUpdate"} />
+  return <Edit<Provision> resource={`templates/provisions`} schemaName={"ProvisionTemplate"} />
 }
 
 const CreateProvision = () => {
-  return <New<Provision> resource={`templates/provisions`} schemaName={"ProvisionTemplateCreate"} />
+  return <New<Provision> resource={`templates/provisions`} schemaName={"ProvisionTemplate"} />
 }
diff --git a/gui/rpk-gui/src/pages/firm/TemplateRoutes.tsx b/gui/rpk-gui/src/pages/firm/TemplateRoutes.tsx
index 27d5e81..3a1f42d 100644
--- a/gui/rpk-gui/src/pages/firm/TemplateRoutes.tsx
+++ b/gui/rpk-gui/src/pages/firm/TemplateRoutes.tsx
@@ -26,9 +26,9 @@ const ListTemplate = () => {
 }
 
 const EditTemplate = () => {
-  return <Edit<Template> resource={`templates/contracts`} schemaName={"ContractTemplateUpdate"} />
+  return <Edit<Template> resource={`templates/contracts`} schemaName={"ContractTemplate"} />
 }
 
 const CreateTemplate = () => {
-  return <New<Template> resource={`templates/contracts`} schemaName={"ContractTemplateCreate"} />
+  return <New<Template> resource={`templates/contracts`} schemaName={"ContractTemplate"} />
 }