diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/ComponentPicker/Category/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/ComponentPicker/Category/index.js
index 5353c1bd65..f501b930e0 100644
--- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/ComponentPicker/Category/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/ComponentPicker/Category/index.js
@@ -26,12 +26,12 @@ const Category = ({ category, components, isOdd, isOpen, onAddComponent, onToggl
       <AccordionContent>
         <Box paddingTop={4} paddingBottom={4} paddingLeft={3} paddingRight={3}>
           <Grid>
-            {components.map(({ componentUid, info: { label, icon, name } }) => {
+            {components.map(({ componentUid, info: { displayName, icon } }) => {
               return (
                 <ComponentCard
                   key={componentUid}
                   componentUid={componentUid}
-                  intlLabel={{ id: label || name, defaultMessage: label || name }}
+                  intlLabel={{ id: displayName, defaultMessage: displayName }}
                   icon={icon}
                   onClick={onAddComponent}
                 />
diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DynamicZoneList.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DynamicZoneList.js
index 0f448218fd..6b2601a0a3 100644
--- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DynamicZoneList.js
+++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DynamicZoneList.js
@@ -73,7 +73,7 @@ const DynamicZoneList = ({ components }) => {
           </CustomFlex>
           <Box paddingTop={1}>
             <Typography fontSize={1} textColor="neutral600" fontWeight="bold">
-              {get(componentLayouts, [componentUid, 'info', 'name'], '')}
+              {get(componentLayouts, [componentUid, 'info', 'displayName'], '')}
             </Typography>
           </Box>
         </CustomLink>
diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/index.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/index.js
index 6ea0ffe7f9..e50b001e52 100644
--- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/index.js
+++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/index.js
@@ -45,7 +45,7 @@ const EditSettingsView = ({ mainLayout, components, isContentTypeView, slug, upd
   const [isConfirmDialogOpen, setIsConfirmDialogOpen] = useState(false);
   const { componentLayouts, initialData, modifiedData, metaToEdit, metaForm } = reducerState;
   const { formatMessage } = useIntl();
-  const modelName = get(mainLayout, ['info', isContentTypeView ? 'displayName' : 'name'], '');
+  const modelName = get(mainLayout, ['info', 'displayName'], '');
   const attributes = get(modifiedData, ['attributes'], {});
 
   const entryTitleOptions = Object.keys(attributes).filter(attr => {