diff --git a/plugins/catalog-react/api-report-alpha.md b/plugins/catalog-react/api-report-alpha.md
index ea01122ccc..b82c7ae3e2 100644
--- a/plugins/catalog-react/api-report-alpha.md
+++ b/plugins/catalog-react/api-report-alpha.md
@@ -33,21 +33,21 @@ export const catalogReactTranslationRef: TranslationRef<
     readonly 'catalogFilter.buttonTitle': 'Filters';
     readonly 'entityKindPicker.title': 'Kind';
     readonly 'entityKindPicker.errorMessage': 'Failed to load entity kinds';
-    readonly entityLifecyclePickerTitle: 'Lifecycle';
-    readonly entityNamespacePickerTitle: 'Namespace';
-    readonly entityOwnerPickerTitle: 'Owner';
+    readonly 'entityLifecyclePicker.title': 'Lifecycle';
+    readonly 'entityNamespacePicker.title': 'Namespace';
+    readonly 'entityOwnerPicker.title': 'Owner';
+    readonly 'entityProcessingStatusPicker.title': 'Processing Status';
+    readonly 'entityTagPicker.title': 'Tags';
     readonly 'entityPeekAheadPopover.title': 'Drill into the entity to see all of the tags.';
     readonly 'entityPeekAheadPopover.entityCardActionsTitle': 'Show details';
     readonly 'entityPeekAheadPopover.emailCardAction.title': 'Email {{email}}';
     readonly 'entityPeekAheadPopover.emailCardAction.subTitle': 'mailto {{email}}';
-    readonly entityProcessingStatusPickerTitle: 'Processing Status';
-    readonly entitySearchBarPlaceholder: 'Search';
-    readonly entityTagPickerTitle: 'Tags';
+    readonly 'entitySearchBar.placeholder': 'Search';
     readonly 'entityTypePicker.title': 'Type';
     readonly 'entityTypePicker.errorMessage': 'Failed to load entity types';
     readonly 'entityTypePicker.optionAllTitle': 'all';
     readonly 'favoriteEntity.addToFavorites': 'Add to favorites';
-    readonly 'favoriteEntity.RemoveFromFavorites': 'Remove from favorites';
+    readonly 'favoriteEntity.removeFromFavorites': 'Remove from favorites';
     readonly 'inspectEntityDialog.title': 'Entity Inspector';
     readonly 'inspectEntityDialog.closeButtonTitle': 'Close';
     readonly 'inspectEntityDialog.ancestryPage.title': 'Ancestry';
diff --git a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
index 3c4e9e5573..2d8a0dea32 100644
--- a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
@@ -41,7 +41,7 @@ export const EntityLifecyclePicker = (props: { initialFilter?: string[] }) => {
 
   return (
     <EntityAutocompletePicker
-      label={t('entityLifecyclePickerTitle')}
+      label={t('entityLifecyclePicker.title')}
       name="lifecycles"
       path="spec.lifecycle"
       Filter={EntityLifecycleFilter}
diff --git a/plugins/catalog-react/src/components/EntityNamespacePicker/EntityNamespacePicker.tsx b/plugins/catalog-react/src/components/EntityNamespacePicker/EntityNamespacePicker.tsx
index 5239c9db42..412a11e02b 100644
--- a/plugins/catalog-react/src/components/EntityNamespacePicker/EntityNamespacePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityNamespacePicker/EntityNamespacePicker.tsx
@@ -51,7 +51,7 @@ export const EntityNamespacePicker = (props: EntityNamespacePickerProps) => {
 
   return (
     <EntityAutocompletePicker
-      label={t('entityNamespacePickerTitle')}
+      label={t('entityNamespacePicker.title')}
       name="namespace"
       path="metadata.namespace"
       Filter={EntityNamespaceFilter}
diff --git a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
index 883be7af49..1b78630f9e 100644
--- a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
+++ b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
@@ -179,7 +179,7 @@ export const EntityOwnerPicker = (props?: EntityOwnerPickerProps) => {
   return (
     <Box className={classes.root} pb={1} pt={1}>
       <Typography className={classes.label} variant="button" component="label">
-        {t('entityOwnerPickerTitle')}
+        {t('entityOwnerPicker.title')}
         <Autocomplete
           PopperComponent={popperProps => (
             <div {...popperProps}>{popperProps.children as ReactNode}</div>
diff --git a/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx b/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx
index 08ce756923..20190a9907 100644
--- a/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx
+++ b/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx
@@ -74,7 +74,7 @@ export const EntityProcessingStatusPicker = () => {
   return (
     <Box className={classes.root} pb={1} pt={1}>
       <Typography className={classes.label} variant="button" component="label">
-        {t('entityProcessingStatusPickerTitle')}
+        {t('entityProcessingStatusPicker.title')}
         <Autocomplete<string, true>
           PopperComponent={popperProps => (
             <div {...popperProps}>{popperProps.children as ReactNode}</div>
diff --git a/plugins/catalog-react/src/components/EntitySearchBar/EntitySearchBar.tsx b/plugins/catalog-react/src/components/EntitySearchBar/EntitySearchBar.tsx
index 671d582a57..abde5430bc 100644
--- a/plugins/catalog-react/src/components/EntitySearchBar/EntitySearchBar.tsx
+++ b/plugins/catalog-react/src/components/EntitySearchBar/EntitySearchBar.tsx
@@ -88,7 +88,7 @@ export const EntitySearchBar = () => {
           aria-label="search"
           id="input-with-icon-adornment"
           className={classes.input}
-          placeholder={t('entitySearchBarPlaceholder')}
+          placeholder={t('entitySearchBar.placeholder')}
           autoComplete="off"
           onChange={event => setSearch(event.target.value)}
           value={search}
diff --git a/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx b/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx
index a18e4f3b4e..2ab3622474 100644
--- a/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx
+++ b/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx
@@ -41,7 +41,7 @@ export const EntityTagPicker = (props: EntityTagPickerProps) => {
 
   return (
     <EntityAutocompletePicker
-      label={t('entityTagPickerTitle')}
+      label={t('entityTagPicker.title')}
       name="tags"
       path="metadata.tags"
       Filter={EntityTagFilter}
diff --git a/plugins/catalog-react/src/components/FavoriteEntity/FavoriteEntity.tsx b/plugins/catalog-react/src/components/FavoriteEntity/FavoriteEntity.tsx
index b788579e41..8848857976 100644
--- a/plugins/catalog-react/src/components/FavoriteEntity/FavoriteEntity.tsx
+++ b/plugins/catalog-react/src/components/FavoriteEntity/FavoriteEntity.tsx
@@ -56,7 +56,7 @@ export const FavoriteEntity = (props: FavoriteEntityProps) => {
       <Tooltip
         title={
           isStarredEntity
-            ? t('favoriteEntity.RemoveFromFavorites')
+            ? t('favoriteEntity.removeFromFavorites')
             : t('favoriteEntity.addToFavorites')
         }
       >
diff --git a/plugins/catalog-react/src/translation.ts b/plugins/catalog-react/src/translation.ts
index 685bf1fd00..7f9661380f 100644
--- a/plugins/catalog-react/src/translation.ts
+++ b/plugins/catalog-react/src/translation.ts
@@ -28,9 +28,21 @@ export const catalogReactTranslationRef = createTranslationRef({
       title: 'Kind',
       errorMessage: 'Failed to load entity kinds',
     },
-    entityLifecyclePickerTitle: 'Lifecycle',
-    entityNamespacePickerTitle: 'Namespace',
-    entityOwnerPickerTitle: 'Owner',
+    entityLifecyclePicker: {
+      title: 'Lifecycle',
+    },
+    entityNamespacePicker: {
+      title: 'Namespace',
+    },
+    entityOwnerPicker: {
+      title: 'Owner',
+    },
+    entityProcessingStatusPicker: {
+      title: 'Processing Status',
+    },
+    entityTagPicker: {
+      title: 'Tags',
+    },
     entityPeekAheadPopover: {
       title: 'Drill into the entity to see all of the tags.',
       emailCardAction: {
@@ -39,9 +51,9 @@ export const catalogReactTranslationRef = createTranslationRef({
       },
       entityCardActionsTitle: 'Show details',
     },
-    entityProcessingStatusPickerTitle: 'Processing Status',
-    entitySearchBarPlaceholder: 'Search',
-    entityTagPickerTitle: 'Tags',
+    entitySearchBar: {
+      placeholder: 'Search',
+    },
     entityTypePicker: {
       title: 'Type',
       errorMessage: 'Failed to load entity types',
@@ -49,7 +61,7 @@ export const catalogReactTranslationRef = createTranslationRef({
     },
     favoriteEntity: {
       addToFavorites: 'Add to favorites',
-      RemoveFromFavorites: 'Remove from favorites',
+      removeFromFavorites: 'Remove from favorites',
     },
     inspectEntityDialog: {
       title: 'Entity Inspector',