diff --git a/apps/console/src/components/OrganizationSwitcher.tsx b/apps/console/src/components/OrganizationSwitcher.tsx
index dc36139a8..f7c278058 100644
--- a/apps/console/src/components/OrganizationSwitcher.tsx
+++ b/apps/console/src/components/OrganizationSwitcher.tsx
@@ -160,7 +160,7 @@ export function OrganizationSwitcher({
             <DropdownMenuSeparator />
             <DropdownMenuItem asChild>
               <Link
-                to="/organizations/create"
+                to="/organizations/new"
                 className="gap-2 p-2 cursor-pointer"
               >
                 <div className="flex size-6 items-center justify-center rounded-md border bg-background">
diff --git a/apps/console/src/pages/OrganizationSelectionPage.tsx b/apps/console/src/pages/OrganizationSelectionPage.tsx
index 64c08942a..029e5f10c 100644
--- a/apps/console/src/pages/OrganizationSelectionPage.tsx
+++ b/apps/console/src/pages/OrganizationSelectionPage.tsx
@@ -64,7 +64,7 @@ export default function OrganizationSelectionPage() {
             <CardFooter>
               <Button
                 className="w-full"
-                onClick={() => navigate("/organizations/create")}
+                onClick={() => navigate("/organizations/new")}
               >
                 <Plus className="mr-2 h-4 w-4" /> Create Organization
               </Button>
@@ -116,7 +116,7 @@ export default function OrganizationSelectionPage() {
               <Button
                 variant="outline"
                 className="w-full"
-                onClick={() => navigate("/organizations/create")}
+                onClick={() => navigate("/organizations/new")}
               >
                 <Plus className="mr-2 h-4 w-4" /> Create Organization
               </Button>
diff --git a/apps/console/src/pages/organizations/NoOrganizationLayout.tsx b/apps/console/src/pages/organizations/NoOrganizationLayout.tsx
index e5df74eee..46e7234b0 100644
--- a/apps/console/src/pages/organizations/NoOrganizationLayout.tsx
+++ b/apps/console/src/pages/organizations/NoOrganizationLayout.tsx
@@ -69,12 +69,12 @@ export default function NoOrganizationLayout() {
             <Routes>
               <Route path="*" element={<BreadcrumbHome />}>
                 <Route
-                  path="create"
+                  path="new"
                   element={
                     <>
                       <BreadcrumbSeparator />
                       <BreadcrumbItem>
-                        <BreadcrumbPage>Create Organization</BreadcrumbPage>
+                        <BreadcrumbPage>New Organization</BreadcrumbPage>
                       </BreadcrumbItem>
                     </>
                   }
diff --git a/apps/console/src/pages/organizations/OrganizationBreadcrumb.tsx b/apps/console/src/pages/organizations/OrganizationBreadcrumb.tsx
index 116c92ed5..06c6ab168 100644
--- a/apps/console/src/pages/organizations/OrganizationBreadcrumb.tsx
+++ b/apps/console/src/pages/organizations/OrganizationBreadcrumb.tsx
@@ -463,9 +463,9 @@ export function BreadCrumb() {
                 </Suspense>
               }
             />
-            <Route path="update" element={<Edit />} />
+            <Route path="edit" element={<Edit />} />
           </Route>
-          <Route path="create" element={<New />} />
+          <Route path="new" element={<New />} />
         </Route>
         <Route path="people" element={<BreadcrumbPeopleList />}>
           <Route
@@ -476,7 +476,7 @@ export function BreadCrumb() {
               </Suspense>
             }
           />
-          <Route path="create" element={<New />} />
+          <Route path="new" element={<New />} />
         </Route>
         <Route path="vendors" element={<BreadcrumbVendorList />}>
           <Route
@@ -497,9 +497,9 @@ export function BreadCrumb() {
               </Suspense>
             }
           >
-            <Route path="update" element={<Edit />} />
+            <Route path="edit" element={<Edit />} />
           </Route>
-          <Route path="create" element={<New />} />
+          <Route path="new" element={<New />} />
         </Route>
         <Route
           path="settings"
@@ -516,7 +516,7 @@ export function BreadCrumb() {
 
       <Route path="*" element={<BreadcrumbHome />}>
         <Route
-          path="create"
+          path="new"
           element={
             <>
               <BreadcrumbSeparator />
diff --git a/apps/console/src/pages/organizations/Routes.tsx b/apps/console/src/pages/organizations/Routes.tsx
index 02ed1a275..8493d5dec 100644
--- a/apps/console/src/pages/organizations/Routes.tsx
+++ b/apps/console/src/pages/organizations/Routes.tsx
@@ -34,17 +34,17 @@ export function OrganizationsRoutes() {
       <Route path=":organizationId/*" element={<OrganizationLayout />}>
         <Route index element={<HomePage />} />
         <Route path="people" element={<PeopleListPage />} />
-        <Route path="people/create" element={<CreatePeoplePage />} />
+        <Route path="people/new" element={<CreatePeoplePage />} />
         <Route path="people/:peopleId" element={<PeoplePage />} />
         <Route path="vendors" element={<VendorListPage />} />
         <Route path="frameworks" element={<FrameworkListPage />} />
-        <Route path="frameworks/create" element={<CreateFrameworkPage />} />
+        <Route path="frameworks/new" element={<CreateFrameworkPage />} />
         <Route path="frameworks/:frameworkId/*">
           <Route element={<FrameworkLayout />}>
             <Route index element={<FrameworkPage />} />
             <Route path="controls/:controlId" element={<ControlPage />} />
           </Route>
-          <Route path="update" element={<UpdateFrameworkPage />} />
+          <Route path="edit" element={<UpdateFrameworkPage />} />
           <Route path="*" element={<NotFoundPage />} />
         </Route>
         <Route path="mitigations" element={<MitigationListPage />} />
@@ -56,12 +56,9 @@ export function OrganizationsRoutes() {
         />
         <Route path="vendors/:vendorId" element={<VendorPage />} />
         <Route path="policies" element={<PolicyListPage />} />
-        <Route path="policies/create" element={<CreatePolicyPage />} />
+        <Route path="policies/new" element={<CreatePolicyPage />} />
         <Route path="policies/:policyId" element={<PolicyPage />} />
-        <Route
-          path="policies/:policyId/update"
-          element={<UpdatePolicyPage />}
-        />
+        <Route path="policies/:policyId/edit" element={<UpdatePolicyPage />} />
         <Route path="risks" element={<RiskListPage />} />
         <Route path="risks/new" element={<NewRiskPage />} />
         <Route path="risks/:riskId" element={<ShowRiskView />} />
@@ -70,7 +67,7 @@ export function OrganizationsRoutes() {
       </Route>
 
       <Route path="*" element={<NoOrganizationLayout />}>
-        <Route path="create" element={<CreateOrganizationPage />} />
+        <Route path="new" element={<CreateOrganizationPage />} />
       </Route>
     </Routes>
   );
diff --git a/apps/console/src/pages/organizations/frameworks/FrameworkListView.tsx b/apps/console/src/pages/organizations/frameworks/FrameworkListView.tsx
index d53b9f8e7..a595383cc 100644
--- a/apps/console/src/pages/organizations/frameworks/FrameworkListView.tsx
+++ b/apps/console/src/pages/organizations/frameworks/FrameworkListView.tsx
@@ -147,7 +147,7 @@ function FrameworkListViewContent({
             Import Framework
           </Button>
           <Button asChild>
-            <Link to={`/organizations/${organizationId}/frameworks/create`}>
+            <Link to={`/organizations/${organizationId}/frameworks/new`}>
               <Plus className="mr-2 h-4 w-4" />
               Create Framework
             </Link>
diff --git a/apps/console/src/pages/organizations/people/PeopleListView.tsx b/apps/console/src/pages/organizations/people/PeopleListView.tsx
index 4b6913270..51ae2eff1 100644
--- a/apps/console/src/pages/organizations/people/PeopleListView.tsx
+++ b/apps/console/src/pages/organizations/people/PeopleListView.tsx
@@ -185,7 +185,7 @@ function PeopleListContent({
           style={{ borderRadius: "0.5rem" }}
           className="gap-2"
         >
-          <Link to={`/organizations/${organizationId}/people/create`}>
+          <Link to={`/organizations/${organizationId}/people/new`}>
             <UserPlus className="h-4 w-4" />
             Add a person
           </Link>
diff --git a/apps/console/src/pages/organizations/policies/PolicyListView.tsx b/apps/console/src/pages/organizations/policies/PolicyListView.tsx
index 8e2d43053..b213e6223 100644
--- a/apps/console/src/pages/organizations/policies/PolicyListView.tsx
+++ b/apps/console/src/pages/organizations/policies/PolicyListView.tsx
@@ -225,7 +225,7 @@ function PolicyListViewContent({
       description="Manage your organization's policies"
       actions={
         <Button asChild>
-          <Link to={`/organizations/${organizationId}/policies/create`}>
+          <Link to={`/organizations/${organizationId}/policies/new`}>
             <Plus className="mr-2 h-4 w-4" />
             Create Policy
           </Link>
@@ -335,7 +335,7 @@ function PolicyListViewContent({
               </Button>
             ) : (
               <Button asChild>
-                <Link to={`/organizations/${organizationId}/policies/create`}>
+                <Link to={`/organizations/${organizationId}/policies/new`}>
                   <Plus className="mr-2 h-4 w-4" />
                   Create Policy
                 </Link>
diff --git a/apps/console/src/pages/organizations/policies/PolicyView.tsx b/apps/console/src/pages/organizations/policies/PolicyView.tsx
index 12de1ac09..17924c0ac 100644
--- a/apps/console/src/pages/organizations/policies/PolicyView.tsx
+++ b/apps/console/src/pages/organizations/policies/PolicyView.tsx
@@ -178,7 +178,7 @@ function PolicyViewContent({
         <div className="flex gap-2">
           <Button variant="outline" size="sm" asChild>
             <Link
-              to={`/organizations/${organizationId}/policies/${policy.id}/update`}
+              to={`/organizations/${organizationId}/policies/${policy.id}/edit`}
             >
               <Edit className="h-4 w-4 mr-2" />
               Edit
@@ -357,7 +357,7 @@ function PolicyViewContent({
 
           <Button asChild className="w-full">
             <Link
-              to={`/organizations/${organizationId}/policies/${policy.id}/update`}
+              to={`/organizations/${organizationId}/policies/${policy.id}/edit`}
             >
               <Edit className="mr-2 h-4 w-4" />
               Edit Policy