diff --git a/src/App.tsx b/src/App.tsx
index 0ee7429ff..d16c87612 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -97,8 +97,8 @@ const navigation: NavigationItems = [
     resourceName: tables.incident
   },
   {
-    name: "Config",
-    href: "/configs",
+    name: "Catalog",
+    href: "/catalog",
     icon: VscJson,
     featureName: features.config,
     resourceName: tables.database
@@ -368,7 +368,10 @@ export function IncidentManagerRoutes({ sidebar }: { sidebar: ReactNode }) {
         />
       </Route>
 
-      <Route path="configs" element={sidebar}>
+      {/* Redirect configs to catalog */}
+      <Route path="configs" element={<Navigate to="/catalog" />} />
+
+      <Route path="catalog" element={sidebar}>
         <Route
           index
           element={withAccessCheck(<ConfigListPage />, tables.database, "read")}
diff --git a/src/components/BreadcrumbNav/ConfigsDetailsBreadCrumb.tsx b/src/components/BreadcrumbNav/ConfigsDetailsBreadCrumb.tsx
index ea80496d5..fe15e7996 100644
--- a/src/components/BreadcrumbNav/ConfigsDetailsBreadCrumb.tsx
+++ b/src/components/BreadcrumbNav/ConfigsDetailsBreadCrumb.tsx
@@ -17,7 +17,7 @@ export function ConfigsDetailsBreadcrumbNav({ configId, config }: Props) {
   return (
     <BreadcrumbNav
       list={[
-        <BreadcrumbRoot link="/configs">Config</BreadcrumbRoot>,
+        <BreadcrumbRoot link="/catalog">Catalog</BreadcrumbRoot>,
         isLoading && !configItem ? (
           <TextSkeletonLoader />
         ) : (
diff --git a/src/components/ConfigAnalysis/ConfigInsightsColumns.tsx b/src/components/ConfigAnalysis/ConfigInsightsColumns.tsx
index e542607c7..dd2d4a1cb 100644
--- a/src/components/ConfigAnalysis/ConfigInsightsColumns.tsx
+++ b/src/components/ConfigAnalysis/ConfigInsightsColumns.tsx
@@ -12,7 +12,7 @@ export const ConfigInsightsColumns: ColumnDef<
   any
 >[] = [
   {
-    header: "Config",
+    header: "Catalog",
     id: "config",
     aggregatedCell: "",
     size: 100,
@@ -23,7 +23,7 @@ export const ConfigInsightsColumns: ColumnDef<
         <div className="flex max-w-full truncate">
           <Link
             className="space-x-2  items-center"
-            to={`/configs/${config?.id}`}
+            to={`/catalog/${config?.id}`}
           >
             <Icon
               className="w-4 h-4"
diff --git a/src/components/ConfigBreadcrumb/index.tsx b/src/components/ConfigBreadcrumb/index.tsx
index dd57c563d..14df22200 100644
--- a/src/components/ConfigBreadcrumb/index.tsx
+++ b/src/components/ConfigBreadcrumb/index.tsx
@@ -13,7 +13,7 @@ export function ConfigBreadcrumb({ setTitle }: ConfigBreadcrumbProps) {
 
   useEffect(() => {
     if (!id) {
-      setTitle(<BreadcrumbNav list={["Config"]} />);
+      setTitle(<BreadcrumbNav list={["Catalog"]} />);
       return;
     }
 
@@ -23,7 +23,7 @@ export function ConfigBreadcrumb({ setTitle }: ConfigBreadcrumbProps) {
         setTitle(
           <BreadcrumbNav
             list={[
-              { to: "/configs", title: "Config" },
+              { to: "/catalog", title: "Catalog" },
               <span>
                 <Icon
                   name={data?.type}
diff --git a/src/components/ConfigChangeHistory/index.tsx b/src/components/ConfigChangeHistory/index.tsx
index 6d09f2a99..8a0ad47d6 100644
--- a/src/components/ConfigChangeHistory/index.tsx
+++ b/src/components/ConfigChangeHistory/index.tsx
@@ -56,7 +56,7 @@ const columns: ColumnDef<ConfigTypeChanges>[] = [
 
 const configLinkCol: ColumnDef<ConfigTypeChanges>[] = [
   {
-    header: "Config",
+    header: "Catalog",
     accessorKey: "config_id",
     cell: function ConfigLinkCell({ row, column }) {
       const config = row.original.config;
diff --git a/src/components/ConfigLink/ConfigLink.tsx b/src/components/ConfigLink/ConfigLink.tsx
index 8ca13c3ae..1e4dcb304 100644
--- a/src/components/ConfigLink/ConfigLink.tsx
+++ b/src/components/ConfigLink/ConfigLink.tsx
@@ -26,7 +26,7 @@ export default function ConfigLink({
     return (
       <Link
         to={{
-          pathname: `/configs/${configId}`
+          pathname: `/catalog/${configId}`
         }}
         className={clsx("flex flex-row space-x-1", className)}
       >
diff --git a/src/components/ConfigListToggledDeletedItems/ConfigListToggledDeletedItems.tsx b/src/components/ConfigListToggledDeletedItems/ConfigListToggledDeletedItems.tsx
index e91703f24..77733e70f 100644
--- a/src/components/ConfigListToggledDeletedItems/ConfigListToggledDeletedItems.tsx
+++ b/src/components/ConfigListToggledDeletedItems/ConfigListToggledDeletedItems.tsx
@@ -24,7 +24,7 @@ export function ConfigListToggledDeletedItems() {
               setHideDeletedConfigs("no");
             }
           }}
-          label="Hide Deleted Configs"
+          label="Hide Deleted Catalog"
           value={hideDeletedConfigs === "yes"}
         />
       </div>
diff --git a/src/components/ConfigsPage/ConfigTabsLinks.tsx b/src/components/ConfigsPage/ConfigTabsLinks.tsx
index 16072e6b4..5df116876 100644
--- a/src/components/ConfigsPage/ConfigTabsLinks.tsx
+++ b/src/components/ConfigsPage/ConfigTabsLinks.tsx
@@ -1,17 +1,17 @@
 import { useParams } from "react-router-dom";
 
 export const configTabsLists = [
-  { label: "Config", path: "/configs" },
-  { label: "Changes", path: "/configs/changes" },
-  { label: "Insights", path: "/configs/insights" }
+  { label: "Catalog", path: "/catalog" },
+  { label: "Changes", path: "/catalog/changes" },
+  { label: "Insights", path: "/catalog/insights" }
 ];
 
 export function useConfigDetailsTabs() {
   const { id } = useParams<{ id: string }>();
 
   return [
-    { label: "Config", path: `/configs/${id}` },
-    { label: "Changes", path: `/configs/${id}/changes` },
-    { label: "Insights", path: `/configs/${id}/insights` }
+    { label: "Catalog", path: `/catalog/${id}` },
+    { label: "Changes", path: `/catalog/${id}/changes` },
+    { label: "Insights", path: `/catalog/${id}/insights` }
   ];
 }
diff --git a/src/components/IncidentDetails/ResponderTypes/AwsServiceRequest/AwsServiceRequest.stories.tsx b/src/components/IncidentDetails/ResponderTypes/AwsServiceRequest/AwsServiceRequest.stories.tsx
index cfbbbc731..d6f828a13 100644
--- a/src/components/IncidentDetails/ResponderTypes/AwsServiceRequest/AwsServiceRequest.stories.tsx
+++ b/src/components/IncidentDetails/ResponderTypes/AwsServiceRequest/AwsServiceRequest.stories.tsx
@@ -1,6 +1,8 @@
 import { useForm } from "react-hook-form";
 import { AddResponderFormValues } from "../../AddResponders/AddResponder";
 import { AwsServiceRequest } from "./index";
+import { ComponentStory, StoryFn } from "@storybook/react";
+import { ComponentProps } from "react";
 
 export default {
   title: "AwsServiceRequest",
@@ -56,7 +58,7 @@ const FormContainer = () => {
   );
 };
 
-const Template = (arg) => <FormContainer {...arg} />;
+const Template: StoryFn = (arg) => <FormContainer {...arg} />;
 
 export const Variant1 = Template.bind({});
 Variant1.args = {};
diff --git a/src/components/IncidentDetails/ResponderTypes/AwsSupport/AwsSupport.stories.tsx b/src/components/IncidentDetails/ResponderTypes/AwsSupport/AwsSupport.stories.tsx
index 1e55136c2..4f181d054 100644
--- a/src/components/IncidentDetails/ResponderTypes/AwsSupport/AwsSupport.stories.tsx
+++ b/src/components/IncidentDetails/ResponderTypes/AwsSupport/AwsSupport.stories.tsx
@@ -1,6 +1,7 @@
 import { useForm } from "react-hook-form";
 import { AddResponderFormValues } from "../../AddResponders/AddResponder";
 import { AwsSupport } from "./index";
+import { StoryFn } from "@storybook/react";
 
 export default {
   title: "AwsSupport",
@@ -52,7 +53,7 @@ const FormContainer = () => {
   );
 };
 
-const Template = (arg) => <FormContainer {...arg} />;
+const Template: StoryFn = (arg) => <FormContainer {...arg} />;
 
 export const Variant1 = Template.bind({});
 Variant1.args = {};
diff --git a/src/components/IncidentDetails/ResponderTypes/CA/CA.stories.tsx b/src/components/IncidentDetails/ResponderTypes/CA/CA.stories.tsx
index 3833d49c3..6795532a8 100644
--- a/src/components/IncidentDetails/ResponderTypes/CA/CA.stories.tsx
+++ b/src/components/IncidentDetails/ResponderTypes/CA/CA.stories.tsx
@@ -1,6 +1,7 @@
 import { useForm } from "react-hook-form";
 import { AddResponderFormValues } from "../../AddResponders/AddResponder";
 import { CA } from "./index";
+import { StoryFn } from "@storybook/react";
 
 export default {
   title: "CA",
@@ -52,7 +53,7 @@ const FormContainer = () => {
   );
 };
 
-const Template = (arg) => <FormContainer {...arg} />;
+const Template: StoryFn = (arg) => <FormContainer {...arg} />;
 
 export const Variant1 = Template.bind({});
 Variant1.args = {};
diff --git a/src/components/IncidentDetails/ResponderTypes/Email/Email.stories.tsx b/src/components/IncidentDetails/ResponderTypes/Email/Email.stories.tsx
index 9332033b3..e67619872 100644
--- a/src/components/IncidentDetails/ResponderTypes/Email/Email.stories.tsx
+++ b/src/components/IncidentDetails/ResponderTypes/Email/Email.stories.tsx
@@ -1,6 +1,7 @@
 import { useForm } from "react-hook-form";
 import { AddResponderFormValues } from "../../AddResponders/AddResponder";
 import { Email } from "./index";
+import { StoryFn } from "@storybook/react";
 
 export default {
   title: "Email",
@@ -52,7 +53,7 @@ const FormContainer = () => {
   );
 };
 
-const Template = (arg) => <FormContainer {...arg} />;
+const Template: StoryFn = (arg) => <FormContainer {...arg} />;
 
 export const Variant1 = Template.bind({});
 Variant1.args = {};
diff --git a/src/components/IncidentDetails/ResponderTypes/Jira/Jira.stories.tsx b/src/components/IncidentDetails/ResponderTypes/Jira/Jira.stories.tsx
index 201d81aa7..5caf5fc38 100644
--- a/src/components/IncidentDetails/ResponderTypes/Jira/Jira.stories.tsx
+++ b/src/components/IncidentDetails/ResponderTypes/Jira/Jira.stories.tsx
@@ -1,6 +1,7 @@
 import { useForm } from "react-hook-form";
 import { AddResponderFormValues } from "../../AddResponders/AddResponder";
 import { Jira } from "./index";
+import { StoryFn } from "@storybook/react";
 
 export default {
   title: "Jira",
@@ -39,7 +40,7 @@ const FormContainer = () => {
   };
   return (
     <div className="flex flex-col">
-      <Jira control={control} errors={errors} setValue={setValue} />
+      <Jira control={control} errors={errors} setValue={setValue} teamId="" />
       <div className="flex flex-row">
         <button className="btn-secondary p-2 m-2" onClick={(e) => reset()}>
           reset
@@ -52,7 +53,7 @@ const FormContainer = () => {
   );
 };
 
-const Template = (arg) => <FormContainer {...arg} />;
+const Template: StoryFn = (arg) => <FormContainer {...arg} />;
 
 export const Variant1 = Template.bind({});
 Variant1.args = {};
diff --git a/src/components/IncidentDetails/ResponderTypes/Jira/index.tsx b/src/components/IncidentDetails/ResponderTypes/Jira/index.tsx
index 31b3b2601..d0db84f81 100644
--- a/src/components/IncidentDetails/ResponderTypes/Jira/index.tsx
+++ b/src/components/IncidentDetails/ResponderTypes/Jira/index.tsx
@@ -3,7 +3,7 @@ import { useEffect, useRef, useState } from "react";
 import {
   Control,
   Controller,
-  FieldErrors,
+  FieldErrorsImpl,
   UseFormSetValue
 } from "react-hook-form";
 import { searchConfigs } from "../../../../api/services/configs";
@@ -14,7 +14,7 @@ import { AddResponderFormValues } from "../../AddResponders/AddResponder";
 type JiraProps = {
   teamId: string;
   control: Control;
-  errors: FieldErrors;
+  errors: FieldErrorsImpl<AddResponderFormValues>;
   setValue: UseFormSetValue<AddResponderFormValues>;
   defaultValues?: { [key: string]: any } | undefined;
   values?: { [key: string]: any } | undefined;
@@ -91,7 +91,7 @@ export const Jira = ({
           }}
           label={
             <label className="block text-sm font-bold text-gray-700 mb-2">
-              Jira Config Type
+              Jira Instance
             </label>
           }
           value={jiraProjectType}
diff --git a/src/components/IncidentDetails/ResponderTypes/MicrosoftPlanner/MicrosoftPlanner.stories.tsx b/src/components/IncidentDetails/ResponderTypes/MicrosoftPlanner/MicrosoftPlanner.stories.tsx
index 9479e1013..78afa55ec 100644
--- a/src/components/IncidentDetails/ResponderTypes/MicrosoftPlanner/MicrosoftPlanner.stories.tsx
+++ b/src/components/IncidentDetails/ResponderTypes/MicrosoftPlanner/MicrosoftPlanner.stories.tsx
@@ -1,6 +1,7 @@
 import { useForm } from "react-hook-form";
 import { AddResponderFormValues } from "../../AddResponders/AddResponder";
 import { MicrosoftPlanner } from "./index";
+import { StoryFn } from "@storybook/react";
 
 export default {
   title: "MicrosoftPlanner",
@@ -39,7 +40,12 @@ const FormContainer = () => {
   };
   return (
     <div className="flex flex-col">
-      <MicrosoftPlanner control={control} errors={errors} setValue={setValue} />
+      <MicrosoftPlanner
+        teamId=""
+        control={control}
+        errors={errors}
+        setValue={setValue}
+      />
       <div className="flex flex-row">
         <button className="btn-secondary p-2 m-2" onClick={(e) => reset()}>
           reset
@@ -52,7 +58,7 @@ const FormContainer = () => {
   );
 };
 
-const Template = (arg) => <FormContainer {...arg} />;
+const Template: StoryFn = (arg) => <FormContainer {...arg} />;
 
 export const Variant1 = Template.bind({});
 Variant1.args = {};
diff --git a/src/components/IncidentDetails/ResponderTypes/MicrosoftPlanner/index.tsx b/src/components/IncidentDetails/ResponderTypes/MicrosoftPlanner/index.tsx
index eae9846d4..6dfadc760 100644
--- a/src/components/IncidentDetails/ResponderTypes/MicrosoftPlanner/index.tsx
+++ b/src/components/IncidentDetails/ResponderTypes/MicrosoftPlanner/index.tsx
@@ -91,7 +91,7 @@ export const MicrosoftPlanner = ({
           }}
           label={
             <label className="block text-sm font-bold text-gray-700 mb-2">
-              MSPlanner Config Type
+              Microsoft Planner Instance
             </label>
           }
           value={msProjectType}
diff --git a/src/components/IncidentDetails/ResponderTypes/Oracle/Oracle.stories.tsx b/src/components/IncidentDetails/ResponderTypes/Oracle/Oracle.stories.tsx
index e6c27ba1a..ad519258e 100644
--- a/src/components/IncidentDetails/ResponderTypes/Oracle/Oracle.stories.tsx
+++ b/src/components/IncidentDetails/ResponderTypes/Oracle/Oracle.stories.tsx
@@ -1,6 +1,7 @@
 import { useForm } from "react-hook-form";
 import { AddResponderFormValues } from "../../AddResponders/AddResponder";
 import { Oracle } from "./index";
+import { StoryFn } from "@storybook/react";
 
 export default {
   title: "Oracle",
@@ -52,7 +53,7 @@ const FormContainer = () => {
   );
 };
 
-const Template = (arg) => <FormContainer {...arg} />;
+const Template: StoryFn = (arg) => <FormContainer {...arg} />;
 
 export const Variant1 = Template.bind({});
 Variant1.args = {};
diff --git a/src/components/IncidentDetails/ResponderTypes/Person/Person.stories.tsx b/src/components/IncidentDetails/ResponderTypes/Person/Person.stories.tsx
index c7e03fb51..5cc4feab0 100644
--- a/src/components/IncidentDetails/ResponderTypes/Person/Person.stories.tsx
+++ b/src/components/IncidentDetails/ResponderTypes/Person/Person.stories.tsx
@@ -1,6 +1,7 @@
 import { useForm } from "react-hook-form";
 import { AddResponderFormValues } from "../../AddResponders/AddResponder";
 import { Person } from "./index";
+import { StoryFn } from "@storybook/react";
 
 export default {
   title: "Person",
@@ -52,7 +53,7 @@ const FormContainer = () => {
   );
 };
 
-const Template = (arg) => <FormContainer {...arg} />;
+const Template: StoryFn = (arg) => <FormContainer {...arg} />;
 
 export const Variant1 = Template.bind({});
 Variant1.args = {};
diff --git a/src/components/IncidentDetails/ResponderTypes/Redhat/Redhat.stories.tsx b/src/components/IncidentDetails/ResponderTypes/Redhat/Redhat.stories.tsx
index 3d031ffba..c90d15b62 100644
--- a/src/components/IncidentDetails/ResponderTypes/Redhat/Redhat.stories.tsx
+++ b/src/components/IncidentDetails/ResponderTypes/Redhat/Redhat.stories.tsx
@@ -1,6 +1,7 @@
 import { useForm } from "react-hook-form";
 import { AddResponderFormValues } from "../../AddResponders/AddResponder";
 import { Redhat } from "./index";
+import { StoryFn } from "@storybook/react";
 
 export default {
   title: "Redhat",
@@ -52,7 +53,7 @@ const FormContainer = () => {
   );
 };
 
-const Template = (arg) => <FormContainer {...arg} />;
+const Template: StoryFn = (arg) => <FormContainer {...arg} />;
 
 export const Variant1 = Template.bind({});
 Variant1.args = {};
diff --git a/src/components/IncidentDetails/ResponderTypes/ServiceNow/ServiceNow.stories.tsx b/src/components/IncidentDetails/ResponderTypes/ServiceNow/ServiceNow.stories.tsx
index a031b7ae1..1a0035042 100644
--- a/src/components/IncidentDetails/ResponderTypes/ServiceNow/ServiceNow.stories.tsx
+++ b/src/components/IncidentDetails/ResponderTypes/ServiceNow/ServiceNow.stories.tsx
@@ -1,6 +1,7 @@
 import { useForm } from "react-hook-form";
 import { AddResponderFormValues } from "../../AddResponders/AddResponder";
 import { ServiceNow } from "./index";
+import { StoryFn } from "@storybook/react";
 
 export default {
   title: "ServiceNow",
@@ -52,7 +53,7 @@ const FormContainer = () => {
   );
 };
 
-const Template = (arg) => <FormContainer {...arg} />;
+const Template: StoryFn = (arg) => <FormContainer {...arg} />;
 
 export const Variant1 = Template.bind({});
 Variant1.args = {};
diff --git a/src/components/IncidentDetails/ResponderTypes/VMWare/VWWare.stories.tsx b/src/components/IncidentDetails/ResponderTypes/VMWare/VWWare.stories.tsx
index 16e159e60..7f948da73 100644
--- a/src/components/IncidentDetails/ResponderTypes/VMWare/VWWare.stories.tsx
+++ b/src/components/IncidentDetails/ResponderTypes/VMWare/VWWare.stories.tsx
@@ -1,6 +1,7 @@
 import { useForm } from "react-hook-form";
 import { AddResponderFormValues } from "../../AddResponders/AddResponder";
 import { VMWare } from "./index";
+import { StoryFn } from "@storybook/react";
 
 export default {
   title: "VMWare",
@@ -52,7 +53,7 @@ const FormContainer = () => {
   );
 };
 
-const Template = (arg) => <FormContainer {...arg} />;
+const Template: StoryFn = (arg) => <FormContainer {...arg} />;
 
 export const Variant1 = Template.bind({});
 Variant1.args = {};
diff --git a/src/components/JobsHistory/Filters/JobsHistoryFilters.tsx b/src/components/JobsHistory/Filters/JobsHistoryFilters.tsx
index 60ffdb293..0b91300bd 100644
--- a/src/components/JobsHistory/Filters/JobsHistoryFilters.tsx
+++ b/src/components/JobsHistory/Filters/JobsHistoryFilters.tsx
@@ -50,7 +50,7 @@ export const jobHistoryResourceTypes = [
     value: "topology"
   },
   {
-    label: "Config Scraper",
+    label: "Catalog Scraper",
     value: "config_scraper"
   }
 ];
diff --git a/src/components/Playbooks/Settings/PlaybookSpecsTable.tsx b/src/components/Playbooks/Settings/PlaybookSpecsTable.tsx
index 1ada902e6..22e48058b 100644
--- a/src/components/Playbooks/Settings/PlaybookSpecsTable.tsx
+++ b/src/components/Playbooks/Settings/PlaybookSpecsTable.tsx
@@ -35,7 +35,7 @@ const playbookSpecsTableColumns: ColumnDef<PlaybookSpec>[] = [
     size: 150
   },
   {
-    header: "Source Config",
+    header: "Source",
     accessorKey: "source",
     id: "source",
     size: 150
diff --git a/src/components/SchemaResourcePage/SchemaResourceEdit.tsx b/src/components/SchemaResourcePage/SchemaResourceEdit.tsx
index 7f1bcbf11..1059bbfd4 100644
--- a/src/components/SchemaResourcePage/SchemaResourceEdit.tsx
+++ b/src/components/SchemaResourcePage/SchemaResourceEdit.tsx
@@ -284,7 +284,7 @@ export function SchemaResourceEdit({
                                 </h2>
                                 {!!source && (
                                   <div className="px-2">
-                                    <a href={`${source}`}>Config source</a>
+                                    <a href={`${source}`}>Catalog source</a>
                                   </div>
                                 )}
                               </div>
diff --git a/src/components/SchemaResourcePage/resourceTypes.tsx b/src/components/SchemaResourcePage/resourceTypes.tsx
index de535eadf..2500b3e31 100644
--- a/src/components/SchemaResourcePage/resourceTypes.tsx
+++ b/src/components/SchemaResourcePage/resourceTypes.tsx
@@ -12,7 +12,7 @@ export type SchemaResourceType = {
   name:
     | "Teams"
     | "Rules"
-    | "Config Scraper"
+    | "Catalog Scraper"
     | "Health Check"
     | "Search"
     | "Topology"
@@ -119,7 +119,7 @@ export const schemaResourceTypes: SchemaResourceType[] = [
     ]
   },
   {
-    name: "Config Scraper",
+    name: "Catalog Scraper",
     table: "config_scrapers",
     api: "config-db",
     icon: SearchInListIcon,
diff --git a/src/components/Sidebars/configs.tsx b/src/components/Sidebars/configs.tsx
index 510c62573..75dc1b850 100644
--- a/src/components/Sidebars/configs.tsx
+++ b/src/components/Sidebars/configs.tsx
@@ -163,7 +163,7 @@ export default function Configs({
       isCollapsed={isCollapsed}
       Header={
         <div className="flex flex-row items-center space-x-2">
-          <Title title="Configs" icon={<VscJson className="w-6 h-auto" />} />
+          <Title title="Catalog" icon={<VscJson className="w-6 h-auto" />} />
           <Badge
             className="w-5 h-5 flex items-center justify-center"
             roundedClass="rounded-full"
diff --git a/src/components/SpecEditor/HealthSpecEditor.tsx b/src/components/SpecEditor/HealthSpecEditor.tsx
index 99fe53099..472f27856 100644
--- a/src/components/SpecEditor/HealthSpecEditor.tsx
+++ b/src/components/SpecEditor/HealthSpecEditor.tsx
@@ -23,7 +23,7 @@ type HealthSpecEditorProps = {
 
 export default function HealthSpecEditor({
   resourceValue,
-  onSubmit = () => { },
+  onSubmit = () => {},
   resourceInfo
 }: HealthSpecEditorProps) {
   const configTypes = useMemo(
@@ -375,7 +375,7 @@ export default function HealthSpecEditor({
         },
         {
           name: "configDB",
-          label: "Mission Control Config",
+          label: "Mission Control Catalog",
           updateSpec: (value: Record<string, any>) => {
             onSubmit(value);
           },
diff --git a/src/components/TopologyCard/TopologyConfigAnalysisLine.tsx b/src/components/TopologyCard/TopologyConfigAnalysisLine.tsx
index de7e50fc4..7038d7682 100644
--- a/src/components/TopologyCard/TopologyConfigAnalysisLine.tsx
+++ b/src/components/TopologyCard/TopologyConfigAnalysisLine.tsx
@@ -58,7 +58,7 @@ export function TopologyConfigAnalysisLine({
         const icon = <InsightTypeToIcon type={type} size={17} />;
         const label = count ?? 0;
         const key = `${type}-${severity}`;
-        const url = `/configs/insights?component=${topology.id}&type=${type}&severity=${severity}`;
+        const url = `/catalog/insights?component=${topology.id}&type=${type}&severity=${severity}`;
         analysisToCountMap[key] = {
           color,
           icon,
@@ -71,7 +71,7 @@ export function TopologyConfigAnalysisLine({
     return {
       icon: <MdOutlineInsights className="w-4 h-4" />,
       label: "Insights",
-      url: `/configs/insights?component=${topology.id}`,
+      url: `/catalog/insights?component=${topology.id}`,
       statuses: Object.values(analysisToCountMap)
     };
   }, [insights, topology.id]);
diff --git a/src/components/TopologyConfigLinkModal/TopologyConfigLinkModal.tsx b/src/components/TopologyConfigLinkModal/TopologyConfigLinkModal.tsx
index 3db5cbfd1..a1ea49e86 100644
--- a/src/components/TopologyConfigLinkModal/TopologyConfigLinkModal.tsx
+++ b/src/components/TopologyConfigLinkModal/TopologyConfigLinkModal.tsx
@@ -116,7 +116,7 @@ export function TopologyConfigLinkModal({
       <div className="flex flex-col divide-y divide-gray-200 space-y-4">
         <div className={clsx("flex flex-col px-4 py-4")}>
           <div className="text-sm font-bold text-gray-700 inline-block">
-            Config
+            Catalog
           </div>
           <div className="flex flex-col w-full">
             {isLoading ? (
diff --git a/src/pages/config/ConfigChangesPage.tsx b/src/pages/config/ConfigChangesPage.tsx
index 41e76a9a9..b6da60fb5 100644
--- a/src/pages/config/ConfigChangesPage.tsx
+++ b/src/pages/config/ConfigChangesPage.tsx
@@ -72,13 +72,13 @@ export function ConfigChangesPage() {
 
   return (
     <>
-      <Head prefix="Config Changes" />
+      <Head prefix="Catalog Changes" />
       <SearchLayout
         title={
           <BreadcrumbNav
             list={[
-              <BreadcrumbRoot link="/configs/changes">
-                Config Changes
+              <BreadcrumbRoot link="/catalog/changes">
+                Catalog Changes
               </BreadcrumbRoot>
             ]}
           />
diff --git a/src/pages/config/ConfigDetailsChangesPage.tsx b/src/pages/config/ConfigDetailsChangesPage.tsx
index 24a296b72..5a58e0863 100644
--- a/src/pages/config/ConfigDetailsChangesPage.tsx
+++ b/src/pages/config/ConfigDetailsChangesPage.tsx
@@ -72,7 +72,7 @@ export function ConfigDetailsChangesPage() {
 
   return (
     <>
-      <Head prefix={configItem ? `Config Changes - ${configItem.name}` : ""} />
+      <Head prefix={configItem ? `Catalog Changes - ${configItem.name}` : ""} />
       <SearchLayout
         title={
           <div className="flex space-x-2">
diff --git a/src/pages/config/ConfigDetailsInsightsPage.tsx b/src/pages/config/ConfigDetailsInsightsPage.tsx
index b299c3e83..60eb0f766 100644
--- a/src/pages/config/ConfigDetailsInsightsPage.tsx
+++ b/src/pages/config/ConfigDetailsInsightsPage.tsx
@@ -26,7 +26,7 @@ export function ConfigDetailsInsightsPage() {
   return (
     <>
       <Head
-        prefix={`Config Insights${
+        prefix={`Catalog Insights${
           configItem?.name ? ` - ${configItem?.name}` : ""
         }`}
       />
diff --git a/src/pages/config/ConfigDetailsPage.tsx b/src/pages/config/ConfigDetailsPage.tsx
index 6d71e8553..a55d6f9db 100644
--- a/src/pages/config/ConfigDetailsPage.tsx
+++ b/src/pages/config/ConfigDetailsPage.tsx
@@ -107,7 +107,7 @@ export function ConfigDetailsPage() {
 
   return (
     <>
-      <Head prefix={configDetails ? `Config - ${configDetails.name}` : ""} />
+      <Head prefix={configDetails ? `Catalog - ${configDetails.name}` : ""} />
       <SearchLayout
         title={
           <div className="flex space-x-2">
diff --git a/src/pages/config/ConfigInsightsList.tsx b/src/pages/config/ConfigInsightsList.tsx
index 7997ce9d2..346cf44c2 100644
--- a/src/pages/config/ConfigInsightsList.tsx
+++ b/src/pages/config/ConfigInsightsList.tsx
@@ -17,13 +17,13 @@ export function ConfigInsightsPage() {
 
   return (
     <>
-      <Head prefix="Config Insights" />
+      <Head prefix="Catalog Insights" />
       <SearchLayout
         title={
           <BreadcrumbNav
             list={[
-              <BreadcrumbRoot link="/configs/insights">
-                Config Insights
+              <BreadcrumbRoot link="/catalog/insights">
+                Catalog Insights
               </BreadcrumbRoot>
             ]}
           />
diff --git a/src/pages/config/ConfigList.tsx b/src/pages/config/ConfigList.tsx
index daa579c51..137f7fbb8 100644
--- a/src/pages/config/ConfigList.tsx
+++ b/src/pages/config/ConfigList.tsx
@@ -100,21 +100,21 @@ export function ConfigListPage() {
   const handleRowClick = (row?: { original?: { id: string } }) => {
     const id = row?.original?.id;
     if (id) {
-      navigate(`/configs/${id}`);
+      navigate(`/catalog/${id}`);
     }
   };
 
   return (
     <>
-      <Head prefix={`Configs`} />
+      <Head prefix={`Catalog`} />
       <SearchLayout
         title={
           <BreadcrumbNav
             list={[
-              <BreadcrumbRoot link="/configs">Configs</BreadcrumbRoot>,
+              <BreadcrumbRoot link="/catalog">Catalog</BreadcrumbRoot>,
               ...(configType
                 ? [
-                    <BreadcrumbRoot link={`/configs/${configType}`}>
+                    <BreadcrumbRoot link={`/catalog/${configType}`}>
                       <ConfigsTypeIcon
                         config={{ type: configType }}
                         showSecondaryIcon
@@ -131,7 +131,7 @@ export function ConfigListPage() {
         contentClass="p-0 h-full"
       >
         <div className={`flex flex-row h-full`}>
-          <TabbedLinks tabLinks={configTabsLists} activeTabName="Config">
+          <TabbedLinks tabLinks={configTabsLists} activeTabName="Catalog">
             <div className={`flex flex-col flex-1 h-full space-y-4`}>
               <div className="flex flex-row items-center">
                 <ConfigsListFilters />