diff --git a/examples/snippets/app/.well-known/vercel/flags/route.ts b/examples/snippets/app/.well-known/vercel/flags/route.ts
index b6a4d09a..c623ab46 100644
--- a/examples/snippets/app/.well-known/vercel/flags/route.ts
+++ b/examples/snippets/app/.well-known/vercel/flags/route.ts
@@ -6,7 +6,7 @@ import * as adapterFlags from '../../../concepts/adapters/flags';
 import * as basicIdentifyFlags from '../../../concepts/identify/basic/flags';
 import * as fullIdentifyFlags from '../../../concepts/identify/full/flags';
 import * as dashboardFlags from '../../../examples/dashboard-pages/flags';
-import * as basicEdgeMiddlewareFlags from '../../../examples/feature-flags-in-edge-middleware/flags';
+import * as basicProxyFlags from '../../../examples/feature-flags-in-proxy/flags';
 // The @/ import is not working in the ".well-known" folder due do the dot in the path.
 // We need to use relative paths instead. This seems like a TypeScript issue.
 import * as marketingFlags from '../../../examples/marketing-pages/flags';
@@ -21,7 +21,7 @@ export async function GET(request: NextRequest) {
       ...dashboardFlags,
       ...topLevelFlags,
       ...adapterFlags,
-      ...basicEdgeMiddlewareFlags,
+      ...basicProxyFlags,
       ...basicIdentifyFlags,
       ...fullIdentifyFlags,
     }),
diff --git a/examples/snippets/app/concepts/precompute/automatic/[code]/middleware.ts b/examples/snippets/app/concepts/precompute/automatic/[code]/proxy.ts
similarity index 82%
rename from examples/snippets/app/concepts/precompute/automatic/[code]/middleware.ts
rename to examples/snippets/app/concepts/precompute/automatic/[code]/proxy.ts
index ca9b2181..1d939af0 100644
--- a/examples/snippets/app/concepts/precompute/automatic/[code]/middleware.ts
+++ b/examples/snippets/app/concepts/precompute/automatic/[code]/proxy.ts
@@ -2,7 +2,7 @@ import { precompute } from 'flags/next';
 import { type NextRequest, NextResponse } from 'next/server';
 import { marketingFlags } from './flags';
 
-export async function automaticPrecomputeMiddleware(request: NextRequest) {
+export async function automaticPrecomputeProxy(request: NextRequest) {
   // precompute the flags
   const code = await precompute(marketingFlags);
 
diff --git a/examples/snippets/app/concepts/precompute/manual/middleware.ts b/examples/snippets/app/concepts/precompute/manual/proxy.ts
similarity index 83%
rename from examples/snippets/app/concepts/precompute/manual/middleware.ts
rename to examples/snippets/app/concepts/precompute/manual/proxy.ts
index f88d0cb0..ff17bce5 100644
--- a/examples/snippets/app/concepts/precompute/manual/middleware.ts
+++ b/examples/snippets/app/concepts/precompute/manual/proxy.ts
@@ -1,7 +1,7 @@
 import { type NextRequest, NextResponse } from 'next/server';
 import { manualPrecomputeFlag } from './flags';
 
-export async function manualPrecomputeMiddleware(request: NextRequest) {
+export async function manualPrecomputeProxy(request: NextRequest) {
   // use the flag
   const value = await manualPrecomputeFlag();
 
diff --git a/examples/snippets/app/examples/feature-flags-in-edge-middleware/flags.ts b/examples/snippets/app/examples/feature-flags-in-edge-middleware/flags.ts
deleted file mode 100644
index 9f776d33..00000000
--- a/examples/snippets/app/examples/feature-flags-in-edge-middleware/flags.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { flag } from 'flags/next';
-
-export const basicEdgeMiddlewareFlag = flag<boolean>({
-  key: 'basic-edge-middleware-flag',
-  decide({ cookies }) {
-    return cookies.get('basic-edge-middleware-flag')?.value === '1';
-  },
-});
diff --git a/examples/snippets/app/examples/feature-flags-in-edge-middleware/middleware.ts b/examples/snippets/app/examples/feature-flags-in-edge-middleware/middleware.ts
deleted file mode 100644
index f2fd4c52..00000000
--- a/examples/snippets/app/examples/feature-flags-in-edge-middleware/middleware.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { type NextRequest, NextResponse } from 'next/server';
-import { basicEdgeMiddlewareFlag } from './flags';
-
-export async function featureFlagsInEdgeMiddleware(request: NextRequest) {
-  const active = await basicEdgeMiddlewareFlag();
-  const variant = active ? 'variant-on' : 'variant-off';
-
-  return NextResponse.rewrite(
-    new URL(
-      `/examples/feature-flags-in-edge-middleware/${variant}`,
-      request.url,
-    ),
-  );
-}
diff --git a/examples/snippets/app/examples/feature-flags-in-proxy/flags.ts b/examples/snippets/app/examples/feature-flags-in-proxy/flags.ts
new file mode 100644
index 00000000..2583d041
--- /dev/null
+++ b/examples/snippets/app/examples/feature-flags-in-proxy/flags.ts
@@ -0,0 +1,8 @@
+import { flag } from 'flags/next';
+
+export const basicProxyFlag = flag<boolean>({
+  key: 'basic-proxy-flag',
+  decide({ cookies }) {
+    return cookies.get('basic-proxy-flag')?.value === '1';
+  },
+});
diff --git a/examples/snippets/app/examples/feature-flags-in-edge-middleware/handlers.ts b/examples/snippets/app/examples/feature-flags-in-proxy/handlers.ts
similarity index 53%
rename from examples/snippets/app/examples/feature-flags-in-edge-middleware/handlers.ts
rename to examples/snippets/app/examples/feature-flags-in-proxy/handlers.ts
index 3d649a20..ca8c5b2c 100644
--- a/examples/snippets/app/examples/feature-flags-in-edge-middleware/handlers.ts
+++ b/examples/snippets/app/examples/feature-flags-in-proxy/handlers.ts
@@ -1,17 +1,17 @@
 'use client';
 
 export function actAsFlaggedInUser() {
-  document.cookie = 'basic-edge-middleware-flag=1; Path=/';
+  document.cookie = 'basic-proxy-flag=1; Path=/';
   window.location.reload();
 }
 
 export function actAsFlaggedOutUser() {
-  document.cookie = 'basic-edge-middleware-flag=0; Path=/';
+  document.cookie = 'basic-proxy-flag=0; Path=/';
   window.location.reload();
 }
 
 export function clear() {
   document.cookie =
-    'basic-edge-middleware-flag=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT';
+    'basic-proxy-flag=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT';
   window.location.reload();
 }
diff --git a/examples/snippets/app/examples/feature-flags-in-proxy/proxy.ts b/examples/snippets/app/examples/feature-flags-in-proxy/proxy.ts
new file mode 100644
index 00000000..f7d5dc97
--- /dev/null
+++ b/examples/snippets/app/examples/feature-flags-in-proxy/proxy.ts
@@ -0,0 +1,11 @@
+import { type NextRequest, NextResponse } from 'next/server';
+import { basicProxyFlag } from './flags';
+
+export async function featureFlagsInProxy(request: NextRequest) {
+  const active = await basicProxyFlag();
+  const variant = active ? 'variant-on' : 'variant-off';
+
+  return NextResponse.rewrite(
+    new URL(`/examples/feature-flags-in-proxy/${variant}`, request.url),
+  );
+}
diff --git a/examples/snippets/app/examples/feature-flags-in-edge-middleware/shared.tsx b/examples/snippets/app/examples/feature-flags-in-proxy/shared.tsx
similarity index 85%
rename from examples/snippets/app/examples/feature-flags-in-edge-middleware/shared.tsx
rename to examples/snippets/app/examples/feature-flags-in-proxy/shared.tsx
index 7fd4c0dc..1a8dfd27 100644
--- a/examples/snippets/app/examples/feature-flags-in-edge-middleware/shared.tsx
+++ b/examples/snippets/app/examples/feature-flags-in-proxy/shared.tsx
@@ -1,6 +1,6 @@
 import { DemoFlag } from '@/components/demo-flag';
 import { Button } from '@/components/ui/button';
-import { basicEdgeMiddlewareFlag } from './flags';
+import { basicProxyFlag } from './flags';
 import { actAsFlaggedInUser, actAsFlaggedOutUser, clear } from './handlers';
 
 // This component  does not actually use the feature flag, but the
@@ -8,7 +8,7 @@ import { actAsFlaggedInUser, actAsFlaggedOutUser, clear } from './handlers';
 export function Shared({ variant }: { variant: 'on' | 'off' }) {
   return (
     <>
-      <DemoFlag name={basicEdgeMiddlewareFlag.key} value={variant === 'on'} />
+      <DemoFlag name={basicProxyFlag.key} value={variant === 'on'} />
       <div className="flex gap-2">
         <Button onClick={actAsFlaggedInUser} variant="outline">
           Act as a flagged in user
diff --git a/examples/snippets/app/examples/feature-flags-in-edge-middleware/variant-off/page.tsx b/examples/snippets/app/examples/feature-flags-in-proxy/variant-off/page.tsx
similarity index 100%
rename from examples/snippets/app/examples/feature-flags-in-edge-middleware/variant-off/page.tsx
rename to examples/snippets/app/examples/feature-flags-in-proxy/variant-off/page.tsx
diff --git a/examples/snippets/app/examples/feature-flags-in-edge-middleware/variant-on/page.tsx b/examples/snippets/app/examples/feature-flags-in-proxy/variant-on/page.tsx
similarity index 100%
rename from examples/snippets/app/examples/feature-flags-in-edge-middleware/variant-on/page.tsx
rename to examples/snippets/app/examples/feature-flags-in-proxy/variant-on/page.tsx
diff --git a/examples/snippets/app/examples/marketing-pages/get-or-generate-visitor-id.tsx b/examples/snippets/app/examples/marketing-pages/get-or-generate-visitor-id.tsx
index 9dd6e07e..5dd251e3 100644
--- a/examples/snippets/app/examples/marketing-pages/get-or-generate-visitor-id.tsx
+++ b/examples/snippets/app/examples/marketing-pages/get-or-generate-visitor-id.tsx
@@ -18,7 +18,7 @@ export const getOrGenerateVisitorId = async (
   const cookieVisitorId = cookies.get('marketing-visitor-id')?.value;
   if (cookieVisitorId) return cookieVisitorId;
 
-  // check headers in case middleware set a cookie on the response, as it will
+  // check headers in case proxy set a cookie on the response, as it will
   // not be present on the initial request
   const headerVisitorId = headers.get('x-marketing-visitor-id');
   if (headerVisitorId) return headerVisitorId;
diff --git a/examples/snippets/app/examples/marketing-pages/middleware.tsx b/examples/snippets/app/examples/marketing-pages/proxy.tsx
similarity index 93%
rename from examples/snippets/app/examples/marketing-pages/middleware.tsx
rename to examples/snippets/app/examples/marketing-pages/proxy.tsx
index 899dfb46..aa38b5c4 100644
--- a/examples/snippets/app/examples/marketing-pages/middleware.tsx
+++ b/examples/snippets/app/examples/marketing-pages/proxy.tsx
@@ -3,7 +3,7 @@ import { type NextRequest, NextResponse } from 'next/server';
 import { marketingFlags } from './flags';
 import { getOrGenerateVisitorId } from './get-or-generate-visitor-id';
 
-export async function marketingMiddleware(request: NextRequest) {
+export async function marketingProxy(request: NextRequest) {
   // assign a cookie to the visitor
   const visitorId = await getOrGenerateVisitorId(
     request.cookies,
diff --git a/examples/snippets/app/examples/suspense-fallbacks/middleware.tsx b/examples/snippets/app/examples/suspense-fallbacks/proxy.tsx
similarity index 84%
rename from examples/snippets/app/examples/suspense-fallbacks/middleware.tsx
rename to examples/snippets/app/examples/suspense-fallbacks/proxy.tsx
index 8895fd0f..6454c641 100644
--- a/examples/snippets/app/examples/suspense-fallbacks/middleware.tsx
+++ b/examples/snippets/app/examples/suspense-fallbacks/proxy.tsx
@@ -2,7 +2,7 @@ import { precompute } from 'flags/next';
 import { type NextRequest, NextResponse } from 'next/server';
 import { coreFlags } from './flags';
 
-export async function pprShellsMiddleware(request: NextRequest) {
+export async function pprShellsProxy(request: NextRequest) {
   // precompute the flags
   const code = await precompute(coreFlags);
 
diff --git a/examples/snippets/app/page.tsx b/examples/snippets/app/page.tsx
index 5a968f48..952270a6 100644
--- a/examples/snippets/app/page.tsx
+++ b/examples/snippets/app/page.tsx
@@ -89,9 +89,9 @@ export default function Page() {
           href="/examples/marketing-pages"
         />
         <ConceptCard
-          title="Feature Flags in Edge Middleware"
-          description="Manually using feature flags in Edge Middleware"
-          href="/examples/feature-flags-in-edge-middleware"
+          title="Feature Flags in Proxy"
+          description="Manually using feature flags in Proxy"
+          href="/examples/feature-flags-in-proxy"
         />
         <ConceptCard
           title="Pages Router (Basic)"
diff --git a/examples/snippets/lib/pages-router-precomputed/middleware.ts b/examples/snippets/lib/pages-router-precomputed/proxy.ts
similarity index 82%
rename from examples/snippets/lib/pages-router-precomputed/middleware.ts
rename to examples/snippets/lib/pages-router-precomputed/proxy.ts
index 3f407505..c907c559 100644
--- a/examples/snippets/lib/pages-router-precomputed/middleware.ts
+++ b/examples/snippets/lib/pages-router-precomputed/proxy.ts
@@ -2,7 +2,7 @@ import { precompute } from 'flags/next';
 import { type NextRequest, NextResponse } from 'next/server';
 import { exampleFlags } from './flags';
 
-export async function pagesRouterMiddleware(request: NextRequest) {
+export async function pagesRouterProxy(request: NextRequest) {
   // precompute the flags
   const code = await precompute(exampleFlags);
 
diff --git a/examples/snippets/proxy.ts b/examples/snippets/proxy.ts
index 7351df04..cf0942c2 100644
--- a/examples/snippets/proxy.ts
+++ b/examples/snippets/proxy.ts
@@ -1,36 +1,34 @@
 import type { NextRequest } from 'next/server';
 import { NextResponse } from 'next/server';
-import { automaticPrecomputeMiddleware } from './app/concepts/precompute/automatic/[code]/middleware';
-import { manualPrecomputeMiddleware } from './app/concepts/precompute/manual/middleware';
-import { featureFlagsInEdgeMiddleware } from './app/examples/feature-flags-in-edge-middleware/middleware';
-import { marketingMiddleware } from './app/examples/marketing-pages/middleware';
-import { pprShellsMiddleware } from './app/examples/suspense-fallbacks/middleware';
-import { pagesRouterMiddleware } from './lib/pages-router-precomputed/middleware';
+import { automaticPrecomputeProxy } from './app/concepts/precompute/automatic/[code]/proxy';
+import { manualPrecomputeProxy } from './app/concepts/precompute/manual/proxy';
+import { featureFlagsInProxy } from './app/examples/feature-flags-in-proxy/proxy';
+import { marketingProxy } from './app/examples/marketing-pages/proxy';
+import { pprShellsProxy } from './app/examples/suspense-fallbacks/proxy';
+import { pagesRouterProxy } from './lib/pages-router-precomputed/proxy';
 
 export function proxy(request: NextRequest) {
   if (request.nextUrl.pathname === '/concepts/precompute/manual') {
-    return manualPrecomputeMiddleware(request);
+    return manualPrecomputeProxy(request);
   }
 
   if (request.nextUrl.pathname === '/concepts/precompute/automatic') {
-    return automaticPrecomputeMiddleware(request);
+    return automaticPrecomputeProxy(request);
   }
 
   if (request.nextUrl.pathname === '/examples/marketing-pages') {
-    return marketingMiddleware(request);
+    return marketingProxy(request);
   }
 
-  if (
-    request.nextUrl.pathname === '/examples/feature-flags-in-edge-middleware'
-  ) {
-    return featureFlagsInEdgeMiddleware(request);
+  if (request.nextUrl.pathname === '/examples/feature-flags-in-proxy') {
+    return featureFlagsInProxy(request);
   }
 
   if (request.nextUrl.pathname === '/examples/pages-router-precomputed') {
-    return pagesRouterMiddleware(request);
+    return pagesRouterProxy(request);
   }
   if (request.nextUrl.pathname === '/examples/suspense-fallbacks') {
-    return pprShellsMiddleware(request);
+    return pprShellsProxy(request);
   }
 
   return NextResponse.next();
@@ -41,7 +39,7 @@ export const config = {
     '/concepts/precompute/manual',
     '/concepts/precompute/automatic',
     '/examples/marketing-pages',
-    '/examples/feature-flags-in-edge-middleware',
+    '/examples/feature-flags-in-proxy',
     '/examples/pages-router-precomputed',
     '/examples/suspense-fallbacks',
   ],
diff --git a/packages/adapter-posthog/README.md b/packages/adapter-posthog/README.md
index 1b7569be..3e458fd7 100644
--- a/packages/adapter-posthog/README.md
+++ b/packages/adapter-posthog/README.md
@@ -33,7 +33,7 @@ export const marketingGate = flag<boolean>({
 
 Note: `posthog-node` does not support the Edge Runtime.
 
-To use with middleware and precompute, read more: [Middleware now supports Node.js](https://vercel.com/changelog/middleware-now-supports-node-js)
+To use with Routing Middleware and precompute, read more: [Middleware now supports Node.js](https://vercel.com/changelog/middleware-now-supports-node-js)
 
 ## Documentation
 
diff --git a/packages/flags/README.md b/packages/flags/README.md
index 48d55143..980d5650 100644
--- a/packages/flags/README.md
+++ b/packages/flags/README.md
@@ -7,7 +7,7 @@ The feature flags toolkit for Next.js and SvelteKit.
 From the creators of Next.js, the Flags SDK is a free open-source library that gives you the tools you need to use feature flags in Next.js and SvelteKit applications.
 
 - Works with any flag provider, custom setups or no flag provider at all
-- Compatible with App Router, Pages Router, and Edge Middleware
+- Compatible with App Router, Pages Router, and Routing Middleware
 - Built for feature flags and experimentation
 
 See [flags-sdk.dev](https://flags-sdk.dev/) for full docs and examples.
@@ -62,7 +62,7 @@ export default async function Page() {
 }
 ```
 
-Feature Flags can also be called in Edge Middleware and API Routes.
+Feature Flags can also be called in Routing Middleware and API Routes.
 
 ## Adapters
 
diff --git a/packages/flags/src/sveltekit/env.ts b/packages/flags/src/sveltekit/env.ts
index 53227089..e2d7b5ac 100644
--- a/packages/flags/src/sveltekit/env.ts
+++ b/packages/flags/src/sveltekit/env.ts
@@ -1,5 +1,5 @@
 // We're doing this dance so that the flags package is usable both in the SvelteKit environment
-// as well as other environments that don't know about '$env/dynamic/private', such as Edge Middleware
+// as well as other environments that don't know about '$env/dynamic/private', such as Routing Middleware
 let default_secret: string | undefined = process.env.FLAGS_SECRET;
 
 export async function tryGetSecret(secret?: string): Promise<string> {
diff --git a/packages/flags/src/sveltekit/index.ts b/packages/flags/src/sveltekit/index.ts
index 316dec97..10fff36d 100644
--- a/packages/flags/src/sveltekit/index.ts
+++ b/packages/flags/src/sveltekit/index.ts
@@ -122,7 +122,7 @@ function getIdentify<ValueType, EntitiesType>(
 
 /**
  * Used when a flag is called outside of a request context, i.e. outside of the lifecycle of the `handle` hook.
- * This could be the case when the flag is called from edge middleware.
+ * This could be the case when the flag is called from routing functions.
  */
 const requestMap = new WeakMap<Request, AsyncLocalContext>();
 
diff --git a/packages/flags/src/sveltekit/types.ts b/packages/flags/src/sveltekit/types.ts
index d7a12368..758744fa 100644
--- a/packages/flags/src/sveltekit/types.ts
+++ b/packages/flags/src/sveltekit/types.ts
@@ -10,7 +10,7 @@ type FlagsMeta<ReturnValue> = {
 type RegularFlag<ReturnValue> = {
   (): ReturnValue | Promise<ReturnValue>;
   (
-    /** Only provide this if you're retrieving the flag value outside of the lifecycle of the `handle` hook, e.g. when calling it inside edge middleware. */
+    /** Only provide this if you're retrieving the flag value outside of the lifecycle of the `handle` hook, e.g. when calling it inside routing functions. */
     request?: Request,
     secret?: string,
   ): ReturnValue | Promise<ReturnValue>;
diff --git a/tests/next-16/proxy.ts b/tests/next-16/proxy.ts
index 408d0a37..593d9bd1 100644
--- a/tests/next-16/proxy.ts
+++ b/tests/next-16/proxy.ts
@@ -6,7 +6,7 @@ export const config = {
   matcher: ['/', '/pages-router', '/app-router-static', '/pages-router-static'],
 };
 
-export default async function middleware(request: NextRequest) {
+export default async function proxy(request: NextRequest) {
   if (
     request.nextUrl.pathname === '/' ||
     request.nextUrl.pathname === '/pages-router'