diff --git a/admin/src/App.tsx b/admin/src/App.tsx
index edee6b959..6ab2cabd3 100644
--- a/admin/src/App.tsx
+++ b/admin/src/App.tsx
@@ -46,7 +46,7 @@ const apiClient = createHttpClient(config.apiUrl);
 const categories: AllCategories = [
     {
         category: "MainNavigation",
-        label: <FormattedMessage id="comet.menu.pageTree.mainNavigation" defaultMessage="Main navigation" />,
+        label: <FormattedMessage id="menu.pageTree.mainNavigation" defaultMessage="Main navigation" />,
     },
 ];
 
diff --git a/admin/src/Routes.tsx b/admin/src/Routes.tsx
index fc112f08d..2fd0882fd 100644
--- a/admin/src/Routes.tsx
+++ b/admin/src/Routes.tsx
@@ -17,7 +17,7 @@ import { ProductsPage } from "./products/ProductsPage";
 const categories: AllCategories = [
     {
         category: "MainNavigation",
-        label: <FormattedMessage id="comet.menu.pageTree.mainNavigation" defaultMessage="Main navigation" />,
+        label: <FormattedMessage id="menu.pageTree.mainNavigation" defaultMessage="Main navigation" />,
     },
 ];
 
diff --git a/admin/src/common/MasterMenu.tsx b/admin/src/common/MasterMenu.tsx
index 7f4fdcc74..9bc0c8525 100644
--- a/admin/src/common/MasterMenu.tsx
+++ b/admin/src/common/MasterMenu.tsx
@@ -26,36 +26,33 @@ export const MasterMenu: React.FC = () => {
     return (
         <Menu variant={useTemporaryMenu ? "temporary" : "permanent"}>
             <MenuItemRouterLink
-                primary={intl.formatMessage({ id: "comet.menu.dashboard", defaultMessage: "Dashboard" })}
+                primary={intl.formatMessage({ id: "menu.dashboard", defaultMessage: "Dashboard" })}
                 icon={<Dashboard />}
                 to={`${match.url}/dashboard`}
             />
             <MenuItemRouterLink
-                primary={intl.formatMessage({ id: "comet.menu.pageTree", defaultMessage: "Page tree" })}
+                primary={intl.formatMessage({ id: "menu.pageTree", defaultMessage: "Page tree" })}
                 icon={<PageTree />}
                 to={`${match.url}/pages/pagetree/main-navigation`}
             />
-            <MenuCollapsibleItem
-                primary={intl.formatMessage({ id: "comet.menu.structuredContent", defaultMessage: "Structured content" })}
-                icon={<Data />}
-            >
+            <MenuCollapsibleItem primary={intl.formatMessage({ id: "menu.structuredContent", defaultMessage: "Structured content" })} icon={<Data />}>
                 <MenuItemRouterLink
-                    primary={intl.formatMessage({ id: "comet.menu.products", defaultMessage: "Products" })}
+                    primary={intl.formatMessage({ id: "menu.products", defaultMessage: "Products" })}
                     to={`${match.url}/structured-content/products`}
                 />
             </MenuCollapsibleItem>
             <MenuItemRouterLink
-                primary={intl.formatMessage({ id: "comet.menu.dam", defaultMessage: "Assets" })}
+                primary={intl.formatMessage({ id: "menu.dam", defaultMessage: "Assets" })}
                 icon={<Assets />}
                 to={`${match.url}/assets`}
             />
-            <MenuCollapsibleItem primary={intl.formatMessage({ id: "comet.menu.system", defaultMessage: "System" })} icon={<Wrench />}>
+            <MenuCollapsibleItem primary={intl.formatMessage({ id: "menu.system", defaultMessage: "System" })} icon={<Wrench />}>
                 <MenuItemRouterLink
-                    primary={intl.formatMessage({ id: "comet.menu.publisher", defaultMessage: "Publisher" })}
+                    primary={intl.formatMessage({ id: "menu.publisher", defaultMessage: "Publisher" })}
                     to={`${match.url}/system/publisher`}
                 />
                 <MenuItemRouterLink
-                    primary={intl.formatMessage({ id: "comet.menu.redirects", defaultMessage: "Redirects" })}
+                    primary={intl.formatMessage({ id: "menu.redirects", defaultMessage: "Redirects" })}
                     to={`${match.url}/system/redirects`}
                 />
             </MenuCollapsibleItem>
diff --git a/admin/src/common/blocks/LinkBlock.tsx b/admin/src/common/blocks/LinkBlock.tsx
index 3764f963e..2b8cfa99d 100644
--- a/admin/src/common/blocks/LinkBlock.tsx
+++ b/admin/src/common/blocks/LinkBlock.tsx
@@ -6,6 +6,6 @@ import { FormattedMessage } from "react-intl";
 export const LinkBlock: BlockInterface = createOneOfBlock({
     supportedBlocks: { internal: InternalLinkBlock, external: ExternalLinkBlock },
     name: "Link",
-    displayName: <FormattedMessage id="comet.blocks.link" defaultMessage="Link" />,
+    displayName: <FormattedMessage id="blocks.link" defaultMessage="Link" />,
     allowEmpty: false,
 });
diff --git a/admin/src/dashboard/LatestBuilds.tsx b/admin/src/dashboard/LatestBuilds.tsx
index 36206b6bd..d1c170a9e 100644
--- a/admin/src/dashboard/LatestBuilds.tsx
+++ b/admin/src/dashboard/LatestBuilds.tsx
@@ -41,7 +41,7 @@ export const LatestBuilds: React.FC = () => {
                         columns={[
                             {
                                 name: "runtime",
-                                header: intl.formatMessage({ id: "comet.dashboard.latestBuilds.runtime", defaultMessage: "Runtime" }),
+                                header: intl.formatMessage({ id: "dashboard.latestBuilds.runtime", defaultMessage: "Runtime" }),
                                 render: (row) => (
                                     <BuildRuntime
                                         startTime={row.startTime ? parseISO(row.startTime) : undefined}
@@ -51,7 +51,7 @@ export const LatestBuilds: React.FC = () => {
                             },
                             {
                                 name: "status",
-                                header: intl.formatMessage({ id: "comet.dashboard.latestBuilds.status", defaultMessage: "Status" }),
+                                header: intl.formatMessage({ id: "dashboard.latestBuilds.status", defaultMessage: "Status" }),
                                 render: (row) => {
                                     return <BuildStatus status={row.status}>{row.status}</BuildStatus>;
                                 },
diff --git a/admin/src/dashboard/LatestContentUpdates.tsx b/admin/src/dashboard/LatestContentUpdates.tsx
index bcff8b62d..46d4dda1d 100644
--- a/admin/src/dashboard/LatestContentUpdates.tsx
+++ b/admin/src/dashboard/LatestContentUpdates.tsx
@@ -71,11 +71,11 @@ export const LatestContentUpdates: React.FC = () => {
                         columns={[
                             {
                                 name: "pageTreeNode.name",
-                                header: intl.formatMessage({ id: "comet.dashboard.latestContentUpdates.name", defaultMessage: "Page Name" }),
+                                header: intl.formatMessage({ id: "dashboard.latestContentUpdates.name", defaultMessage: "Page Name" }),
                             },
                             {
                                 name: "updatedAt",
-                                header: intl.formatMessage({ id: "comet.dashboard.latestContentUpdates.updatedAt", defaultMessage: "Updated At" }),
+                                header: intl.formatMessage({ id: "dashboard.latestContentUpdates.updatedAt", defaultMessage: "Updated At" }),
                                 render: (row) => (
                                     <div>
                                         <FormattedDate value={row.updatedAt} day="2-digit" month="2-digit" year="numeric" />
diff --git a/admin/src/documents/links/EditLink.tsx b/admin/src/documents/links/EditLink.tsx
index 3894db055..e5cd3f295 100644
--- a/admin/src/documents/links/EditLink.tsx
+++ b/admin/src/documents/links/EditLink.tsx
@@ -79,7 +79,7 @@ export const EditLink: React.FC<Props> = ({ id }) => {
                 <RouterPrompt
                     message={(location) => {
                         return intl.formatMessage({
-                            id: "comet.editPage.discardChanges",
+                            id: "editPage.discardChanges",
                             defaultMessage: "Discard unsaved changes?",
                         });
                     }}
@@ -105,7 +105,7 @@ export const EditLink: React.FC<Props> = ({ id }) => {
             </Toolbar>
             <MainContent>
                 <RouterTabs>
-                    <RouterTab label={intl.formatMessage({ id: "comet.generic.content", defaultMessage: "Content" })} path="">
+                    <RouterTab label={intl.formatMessage({ id: "generic.content", defaultMessage: "Content" })} path="">
                         <AdminComponentRoot>{rootBlocksApi.content.adminUI}</AdminComponentRoot>
                     </RouterTab>
                 </RouterTabs>
diff --git a/admin/src/documents/links/Link.tsx b/admin/src/documents/links/Link.tsx
index 42a8f508c..9f4ece8f2 100644
--- a/admin/src/documents/links/Link.tsx
+++ b/admin/src/documents/links/Link.tsx
@@ -9,7 +9,7 @@ import { FormattedMessage } from "react-intl";
 import { EditLink } from "./EditLink";
 
 export const Link: DocumentInterface<Pick<GQLLink, "content">, GQLLinkInput> = {
-    displayName: <FormattedMessage id="comet.generic.link" defaultMessage="Link" />,
+    displayName: <FormattedMessage id="generic.link" defaultMessage="Link" />,
     editComponent: EditLink,
     menuIcon: LinkIcon,
     getQuery: gql`
diff --git a/admin/src/documents/pages/EditPage.tsx b/admin/src/documents/pages/EditPage.tsx
index 7e1a6bba3..84c6611e6 100644
--- a/admin/src/documents/pages/EditPage.tsx
+++ b/admin/src/documents/pages/EditPage.tsx
@@ -108,7 +108,7 @@ export const EditPage: React.FC<Props> = ({ id, category }) => {
                     message={(location) => {
                         if (location.pathname.startsWith(match.url)) return true; //we navigated within our self
                         return intl.formatMessage({
-                            id: "comet.editPage.discardChanges",
+                            id: "editPage.discardChanges",
                             defaultMessage: "Discard unsaved changes?",
                         });
                     }}
@@ -140,7 +140,7 @@ export const EditPage: React.FC<Props> = ({ id, category }) => {
                             }}
                             color="info"
                         >
-                            <FormattedMessage id="comet.pages.pages.page.edit.preview" defaultMessage="Web preview" />
+                            <FormattedMessage id="pages.pages.page.edit.preview" defaultMessage="Web preview" />
                         </Button>
                         {pageSaveButton}
                     </Stack>
@@ -153,12 +153,12 @@ export const EditPage: React.FC<Props> = ({ id, category }) => {
                             key: "content",
                             label: (
                                 <AdminTabLabel isValid={rootBlocksApi.content.isValid}>
-                                    <FormattedMessage id="comet.blocks" defaultMessage="Blocks" />
+                                    <FormattedMessage id="generic.blocks" defaultMessage="Blocks" />
                                 </AdminTabLabel>
                             ),
                             content: (
                                 <AdminComponentRoot
-                                    title={intl.formatMessage({ id: "comet.pages.pages.page.edit.pageBlocks.title", defaultMessage: "Page" })}
+                                    title={intl.formatMessage({ id: "pages.pages.page.edit.pageBlocks.title", defaultMessage: "Page" })}
                                 >
                                     {rootBlocksApi.content.adminUI}
                                 </AdminComponentRoot>
@@ -168,7 +168,7 @@ export const EditPage: React.FC<Props> = ({ id, category }) => {
                             key: "config",
                             label: (
                                 <AdminTabLabel isValid={rootBlocksApi.seo.isValid}>
-                                    <FormattedMessage id="comet.pages.pages.page.edit.config" defaultMessage="Config" />{" "}
+                                    <FormattedMessage id="pages.pages.page.edit.config" defaultMessage="Config" />{" "}
                                 </AdminTabLabel>
                             ),
                             content: rootBlocksApi.seo.adminUI,
diff --git a/admin/src/documents/pages/Page.tsx b/admin/src/documents/pages/Page.tsx
index bd402bb5f..878a46486 100644
--- a/admin/src/documents/pages/Page.tsx
+++ b/admin/src/documents/pages/Page.tsx
@@ -10,7 +10,7 @@ import { SeoBlock } from "./blocks/SeoBlock";
 import { EditPage } from "./EditPage";
 
 export const Page: DocumentInterface<Pick<GQLPage, "content" | "seo">, GQLPageInput> = {
-    displayName: <FormattedMessage id="comet.generic.page" defaultMessage="Page" />,
+    displayName: <FormattedMessage id="generic.page" defaultMessage="Page" />,
     editComponent: EditPage,
     menuIcon: File,
     hideInMenuIcon: FileNotMenu,
diff --git a/admin/src/pages/dashboard/Dashboard.tsx b/admin/src/pages/dashboard/Dashboard.tsx
index 425b78596..6aca4b2b2 100644
--- a/admin/src/pages/dashboard/Dashboard.tsx
+++ b/admin/src/pages/dashboard/Dashboard.tsx
@@ -48,30 +48,28 @@ export const Dashboard: React.FC = () => {
     const { data } = useQuery<GQLDashboardCurrentUserQuery, GQLDashboardCurrentUserQueryVariables>(currentUserQuery);
 
     return (
-        <Stack topLevelTitle={intl.formatMessage({ id: "comet.dashboard", defaultMessage: "Dashboard" })}>
+        <Stack topLevelTitle={intl.formatMessage({ id: "dashboard", defaultMessage: "Dashboard" })}>
             <Header>
                 <DateTime />
                 <Greeting variant="h1">
                     {data ? (
                         <FormattedMessage
-                            id="comet.pages.dashboard.helloUser"
+                            id="pages.dashboard.helloUser"
                             defaultMessage="Hallo {givenName}!"
                             values={{ givenName: data.currentUser.name }}
                         />
                     ) : (
-                        <FormattedMessage id="comet.pages.dashboard.hello" defaultMessage="Hallo!" />
+                        <FormattedMessage id="pages.dashboard.hello" defaultMessage="Hallo!" />
                     )}
                 </Greeting>
             </Header>
             <MainContent>
                 <Grid container direction="row" spacing={4}>
-                    <WidgetContainer
-                        header={<FormattedMessage id="comet.pages.dashboard.latestContentUpdates" defaultMessage="Latest Content Updates" />}
-                    >
+                    <WidgetContainer header={<FormattedMessage id="pages.dashboard.latestContentUpdates" defaultMessage="Latest Content Updates" />}>
                         <LatestContentUpdates />
                     </WidgetContainer>
                     {process.env.NODE_ENV !== "development" && (
-                        <WidgetContainer header={<FormattedMessage id="comet.pages.dashboard.latestBuilds" defaultMessage="Latest Builds" />}>
+                        <WidgetContainer header={<FormattedMessage id="pages.dashboard.latestBuilds" defaultMessage="Latest Builds" />}>
                             <LatestBuilds />
                         </WidgetContainer>
                     )}