diff --git a/apps/demo/config/blocks/ButtonGroup/index.tsx b/apps/demo/config/blocks/ButtonGroup/index.tsx
index 26d7a95593..0a30a77bbe 100644
--- a/apps/demo/config/blocks/ButtonGroup/index.tsx
+++ b/apps/demo/config/blocks/ButtonGroup/index.tsx
@@ -14,6 +14,7 @@ export type ButtonGroupProps = {
 };
 
 export const ButtonGroup: ComponentConfig<ButtonGroupProps> = {
+  label: "Button Group",
   fields: {
     buttons: {
       type: "array",
diff --git a/apps/demo/config/blocks/VerticalSpace/index.tsx b/apps/demo/config/blocks/VerticalSpace/index.tsx
index f56b3a842f..8befe58e39 100644
--- a/apps/demo/config/blocks/VerticalSpace/index.tsx
+++ b/apps/demo/config/blocks/VerticalSpace/index.tsx
@@ -8,6 +8,7 @@ export type VerticalSpaceProps = {
 };
 
 export const VerticalSpace: ComponentConfig<VerticalSpaceProps> = {
+  label: "Vertical Space",
   fields: {
     size: {
       type: "select",
diff --git a/packages/core/components/ComponentList/index.tsx b/packages/core/components/ComponentList/index.tsx
index 3f7e960bb1..4bd140a199 100644
--- a/packages/core/components/ComponentList/index.tsx
+++ b/packages/core/components/ComponentList/index.tsx
@@ -9,15 +9,16 @@ const getClassName = getClassNameFactory("ComponentList", styles);
 
 const ComponentListItem = ({
   name,
+  label,
   index,
 }: {
   name: string;
+  label?: string;
   index: number;
 }) => {
   const { overrides } = useAppContext();
-
   return (
-    <Drawer.Item name={name} index={index}>
+    <Drawer.Item label={label} name={name} index={index}>
       {overrides.componentItem}
     </Drawer.Item>
   );
@@ -71,6 +72,9 @@ const ComponentList = ({
               return (
                 <ComponentListItem
                   key={componentKey}
+                  label={
+                    config.components[componentKey]["label"] ?? componentKey
+                  }
                   name={componentKey}
                   index={i}
                 />
diff --git a/packages/core/components/Drawer/index.tsx b/packages/core/components/Drawer/index.tsx
index dc0c63b687..a52672ccf3 100644
--- a/packages/core/components/Drawer/index.tsx
+++ b/packages/core/components/Drawer/index.tsx
@@ -43,11 +43,13 @@ const DrawerItem = ({
   name,
   children,
   id,
+  label,
   index,
 }: {
   name: string;
   children?: (props: { children: ReactNode; name: string }) => ReactElement;
   id?: string;
+  label?: string;
   index: number;
 }) => {
   const ctx = useContext(drawerContext);
@@ -68,7 +70,7 @@ const DrawerItem = ({
       <CustomInner name={name}>
         <div className={getClassNameItem("draggableWrapper")}>
           <div className={getClassNameItem("draggable")}>
-            <div className={getClassNameItem("name")}>{name}</div>
+            <div className={getClassNameItem("name")}>{label ?? name}</div>
             <div className={getClassNameItem("icon")}>
               <DragIcon />
             </div>
diff --git a/packages/core/components/DropZone/index.tsx b/packages/core/components/DropZone/index.tsx
index d2670d152f..ed74ca5bf9 100644
--- a/packages/core/components/DropZone/index.tsx
+++ b/packages/core/components/DropZone/index.tsx
@@ -237,7 +237,10 @@ function DropZoneEdit({ zone, allow, disallow, style }: DropZoneProps) {
                       }}
                     >
                       <DraggableComponent
-                        label={item.type.toString()}
+                        label={
+                          config.components[item.type]["label"] ??
+                          item.type.toString()
+                        }
                         id={`draggable-${componentId}`}
                         index={i}
                         isSelected={isSelected}
diff --git a/packages/core/components/LayerTree/index.tsx b/packages/core/components/LayerTree/index.tsx
index 774a413fd6..fff9cce4a9 100644
--- a/packages/core/components/LayerTree/index.tsx
+++ b/packages/core/components/LayerTree/index.tsx
@@ -1,6 +1,6 @@
 import styles from "./styles.module.css";
 import getClassNameFactory from "../../lib/get-class-name-factory";
-import { Data } from "../../types/Config";
+import { Config, Data } from "../../types/Config";
 import { ItemSelector, getItem } from "../../lib/get-item";
 import { scrollIntoView } from "../../lib/scroll-into-view";
 import { ChevronDown, LayoutGrid, Layers, Type } from "lucide-react";
@@ -16,6 +16,7 @@ const getClassNameLayer = getClassNameFactory("Layer", styles);
 
 export const LayerTree = ({
   data,
+  config,
   zoneContent,
   itemSelector,
   setItemSelector,
@@ -23,6 +24,7 @@ export const LayerTree = ({
   label,
 }: {
   data: Data;
+  config: Config;
   zoneContent: Data["content"];
   itemSelector?: ItemSelector | null;
   setItemSelector: (item: ItemSelector | null) => void;
@@ -30,9 +32,7 @@ export const LayerTree = ({
   label?: string;
 }) => {
   const zones = data.zones || {};
-
   const ctx = useContext(dropZoneContext);
-
   return (
     <>
       {label && (
@@ -128,7 +128,9 @@ export const LayerTree = ({
                         <LayoutGrid size="16" />
                       )}
                     </div>
-                    <div className={getClassNameLayer("name")}>{item.type}</div>
+                    <div className={getClassNameLayer("name")}>
+                      {config.components[item.type]["label"] ?? item.type}
+                    </div>
                   </div>
                 </button>
               </div>
@@ -136,6 +138,7 @@ export const LayerTree = ({
                 Object.keys(zonesForItem).map((zoneKey, idx) => (
                   <div key={idx} className={getClassNameLayer("zones")}>
                     <LayerTree
+                      config={config}
                       data={data}
                       zoneContent={zones[zoneKey]}
                       setItemSelector={setItemSelector}
diff --git a/packages/core/components/Puck/components/Outline/index.tsx b/packages/core/components/Puck/components/Outline/index.tsx
index 541c0d57c8..bcfcdbfdda 100644
--- a/packages/core/components/Puck/components/Outline/index.tsx
+++ b/packages/core/components/Puck/components/Outline/index.tsx
@@ -8,7 +8,7 @@ import { useCallback, useMemo } from "react";
 import { ItemSelector } from "../../../../lib/get-item";
 
 export const Outline = () => {
-  const { dispatch, state, overrides } = useAppContext();
+  const { dispatch, state, overrides, config } = useAppContext();
   const { data, ui } = state;
   const { itemSelector } = ui;
 
@@ -23,7 +23,6 @@ export const Outline = () => {
   );
 
   const Wrapper = useMemo(() => overrides.outline || "div", [overrides]);
-
   return (
     <Wrapper>
       <dropZoneContext.Consumer>
@@ -31,6 +30,7 @@ export const Outline = () => {
           <>
             {ctx?.activeZones && ctx?.activeZones[rootDroppableId] && (
               <LayerTree
+                config={config}
                 data={data}
                 label={areaContainsZones(data, "root") ? rootDroppableId : ""}
                 zoneContent={data.content}
@@ -42,6 +42,7 @@ export const Outline = () => {
               ([zoneKey, zone]) => {
                 return (
                   <LayerTree
+                    config={config}
                     key={zoneKey}
                     data={data}
                     label={zoneKey}
diff --git a/packages/core/components/Puck/index.tsx b/packages/core/components/Puck/index.tsx
index 2df7821025..c7d4d51159 100644
--- a/packages/core/components/Puck/index.tsx
+++ b/packages/core/components/Puck/index.tsx
@@ -510,7 +510,12 @@ export function Puck<
                       noPadding
                       noBorderTop
                       showBreadcrumbs
-                      title={selectedItem ? selectedItem.type : "Page"}
+                      title={
+                        selectedItem
+                          ? config.components[selectedItem.type]["label"] ??
+                            selectedItem.type
+                          : "Page"
+                      }
                     >
                       <Fields />
                     </SidebarSection>
diff --git a/packages/core/lib/use-component-list.tsx b/packages/core/lib/use-component-list.tsx
index f8f3a4dee3..740663f95c 100644
--- a/packages/core/lib/use-component-list.tsx
+++ b/packages/core/lib/use-component-list.tsx
@@ -25,10 +25,13 @@ export const useComponentList = (config: Config, ui: UiState) => {
             >
               {category.components.map((componentName, i) => {
                 matchedComponents.push(componentName as string);
-
                 return (
                   <ComponentList.Item
                     key={componentName}
+                    label={
+                      (config.components[componentName]["label"] ??
+                        componentName) as string
+                    }
                     name={componentName as string}
                     index={i}
                   />
@@ -59,6 +62,10 @@ export const useComponentList = (config: Config, ui: UiState) => {
                 <ComponentList.Item
                   key={componentName}
                   name={componentName as string}
+                  label={
+                    (config.components[componentName]["label"] ??
+                      componentName) as string
+                  }
                   index={i}
                 />
               );
@@ -69,7 +76,7 @@ export const useComponentList = (config: Config, ui: UiState) => {
 
       setComponentList(_componentList);
     }
-  }, [config.categories, ui.componentList]);
+  }, [config.categories, config.components, ui.componentList]);
 
   return componentList;
 };
diff --git a/packages/core/types/Config.tsx b/packages/core/types/Config.tsx
index f72d25f1f1..b3d2c80dee 100644
--- a/packages/core/types/Config.tsx
+++ b/packages/core/types/Config.tsx
@@ -164,6 +164,7 @@ export type ComponentConfig<
   DataShape = ComponentData<ComponentProps>
 > = {
   render: PuckComponent<ComponentProps>;
+  label?: string;
   defaultProps?: DefaultProps;
   fields?: Fields<ComponentProps>;
   resolveData?: (