diff --git a/packages/react-sdk/src/app/custom-components/form.ws.tsx b/packages/react-sdk/src/app/custom-components/form.ws.tsx
index da97e5889a..e35b6b099c 100644
--- a/packages/react-sdk/src/app/custom-components/form.ws.tsx
+++ b/packages/react-sdk/src/app/custom-components/form.ws.tsx
@@ -45,7 +45,7 @@ export const meta: WsComponentMeta = {
     {
       type: "instance",
       component: "Input",
-      props: [{ type: "string", name: "email", value: "email" }],
+      props: [{ type: "string", name: "name", value: "email" }],
       children: [],
     },
     {
diff --git a/packages/react-sdk/src/components/button.ws.tsx b/packages/react-sdk/src/components/button.ws.tsx
index 074b7f130d..2acb7f51b0 100644
--- a/packages/react-sdk/src/components/button.ws.tsx
+++ b/packages/react-sdk/src/components/button.ws.tsx
@@ -14,7 +14,7 @@ const presetStyle = {
 } satisfies PresetStyle<typeof defaultTag>;
 
 export const meta: WsComponentMeta = {
-  category: "general",
+  category: "forms",
   type: "container",
   label: "Button",
   Icon: ButtonElementIcon,
diff --git a/packages/react-sdk/src/components/checkbox-field.ws.tsx b/packages/react-sdk/src/components/checkbox-field.ws.tsx
index d86582f3af..ac5a45d909 100644
--- a/packages/react-sdk/src/components/checkbox-field.ws.tsx
+++ b/packages/react-sdk/src/components/checkbox-field.ws.tsx
@@ -19,7 +19,7 @@ const presetStyle = {
 export const meta: WsComponentMeta = {
   category: "forms",
   type: "container",
-  label: "Checkbox Field",
+  label: "Checkbox",
   Icon: CheckboxCheckedIcon,
   states: defaultStates,
   presetStyle,
@@ -28,6 +28,7 @@ export const meta: WsComponentMeta = {
     {
       type: "instance",
       component: "TextBlock",
+      label: "Checkbox Label",
       props: [],
       children: [{ type: "text", value: "Checkbox" }],
     },
diff --git a/packages/react-sdk/src/components/checkbox.ws.tsx b/packages/react-sdk/src/components/checkbox.ws.tsx
index dc9c70a5ed..d04b1b6318 100644
--- a/packages/react-sdk/src/components/checkbox.ws.tsx
+++ b/packages/react-sdk/src/components/checkbox.ws.tsx
@@ -21,7 +21,7 @@ const presetStyle = {
 
 export const meta: WsComponentMeta = {
   type: "control",
-  label: "Checkbox",
+  label: "Checkbox Input",
   Icon: CheckboxCheckedIcon,
   presetStyle,
   states: [
diff --git a/packages/react-sdk/src/components/form.ws.tsx b/packages/react-sdk/src/components/form.ws.tsx
index 3b3f980c1a..9539536723 100644
--- a/packages/react-sdk/src/components/form.ws.tsx
+++ b/packages/react-sdk/src/components/form.ws.tsx
@@ -43,7 +43,7 @@ export const meta: WsComponentMeta = {
     {
       type: "instance",
       component: "Input",
-      props: [{ type: "string", name: "email", value: "email" }],
+      props: [{ type: "string", name: "name", value: "email" }],
       children: [],
     },
     {
diff --git a/packages/react-sdk/src/components/input.ws.tsx b/packages/react-sdk/src/components/input.ws.tsx
index a75aaabaff..7042c8bdf2 100644
--- a/packages/react-sdk/src/components/input.ws.tsx
+++ b/packages/react-sdk/src/components/input.ws.tsx
@@ -16,7 +16,7 @@ const presetStyle = {
 export const meta: WsComponentMeta = {
   category: "forms",
   type: "control",
-  label: "Text Field",
+  label: "Text Input",
   Icon: FormTextFieldIcon,
   presetStyle,
   states: [
diff --git a/packages/react-sdk/src/components/radio-button-field.ws.tsx b/packages/react-sdk/src/components/radio-button-field.ws.tsx
index 007ed88a1f..983272deff 100644
--- a/packages/react-sdk/src/components/radio-button-field.ws.tsx
+++ b/packages/react-sdk/src/components/radio-button-field.ws.tsx
@@ -19,7 +19,7 @@ const presetStyle = {
 export const meta: WsComponentMeta = {
   category: "forms",
   type: "container",
-  label: "Radio Button Field",
+  label: "Radio",
   Icon: RadioCheckedIcon,
   states: defaultStates,
   presetStyle,
@@ -28,6 +28,7 @@ export const meta: WsComponentMeta = {
     {
       type: "instance",
       component: "TextBlock",
+      label: "Radio Label",
       props: [],
       children: [{ type: "text", value: "Radio" }],
     },
diff --git a/packages/react-sdk/src/components/radio-button.ws.tsx b/packages/react-sdk/src/components/radio-button.ws.tsx
index 4d37162231..7660987baf 100644
--- a/packages/react-sdk/src/components/radio-button.ws.tsx
+++ b/packages/react-sdk/src/components/radio-button.ws.tsx
@@ -21,7 +21,7 @@ const presetStyle = {
 
 export const meta: WsComponentMeta = {
   type: "control",
-  label: "Radio Button",
+  label: "Radio Input",
   Icon: RadioCheckedIcon,
   presetStyle,
   states: [
diff --git a/packages/react-sdk/src/embed-template.ts b/packages/react-sdk/src/embed-template.ts
index 5ead7e46f0..963dbbe0f4 100644
--- a/packages/react-sdk/src/embed-template.ts
+++ b/packages/react-sdk/src/embed-template.ts
@@ -54,6 +54,7 @@ export type EmbedTemplateStyleDecl = z.infer<typeof EmbedTemplateStyleDecl>;
 export type EmbedTemplateInstance = {
   type: "instance";
   component: string;
+  label?: string;
   props?: EmbedTemplateProp[];
   styles?: EmbedTemplateStyleDecl[];
   children: Array<EmbedTemplateInstance | EmbedTemplateText>;
@@ -64,6 +65,7 @@ export const EmbedTemplateInstance: z.ZodType<EmbedTemplateInstance> = z.lazy(
     z.object({
       type: z.literal("instance"),
       component: z.string(),
+      label: z.optional(z.string()),
       props: z.optional(z.array(EmbedTemplateProp)),
       styles: z.optional(z.array(EmbedTemplateStyleDecl)),
       children: WsEmbedTemplate,
@@ -127,6 +129,7 @@ const createInstancesFromTemplate = (
       const instance: Instance = {
         type: "instance",
         id: instanceId,
+        label: item.label,
         component: item.component,
         children: [],
       };