diff --git a/packages/pg-bundler-test/esbuild-cloudflare.config.mjs b/packages/pg-bundler-test/esbuild-cloudflare.config.mjs
index d083bc506..b9947d626 100644
--- a/packages/pg-bundler-test/esbuild-cloudflare.config.mjs
+++ b/packages/pg-bundler-test/esbuild-cloudflare.config.mjs
@@ -4,5 +4,5 @@ await esbuild.build({
   entryPoints: ['./src/index.mjs'],
   bundle: true,
   outfile: './dist/esbuild-cloudflare.js',
-  conditions: ['import', 'cloudflare'],
+  conditions: ['import', 'workerd'],
 })
diff --git a/packages/pg-bundler-test/rollup-cloudflare.config.mjs b/packages/pg-bundler-test/rollup-cloudflare.config.mjs
index 6e5c8824d..592b477ea 100644
--- a/packages/pg-bundler-test/rollup-cloudflare.config.mjs
+++ b/packages/pg-bundler-test/rollup-cloudflare.config.mjs
@@ -8,6 +8,6 @@ export default defineConfig({
     file: 'dist/rollup-cloudflare.js',
     format: 'es',
   },
-  plugins: [nodeResolve({ exportConditions: ['import', 'cloudflare'], preferBuiltins: true }), commonjs()],
+  plugins: [nodeResolve({ exportConditions: ['import', 'workerd'], preferBuiltins: true }), commonjs()],
   external: ['cloudflare:sockets'],
 })
diff --git a/packages/pg-bundler-test/vite-cloudflare.config.mjs b/packages/pg-bundler-test/vite-cloudflare.config.mjs
index c48720ebe..58ed0827d 100644
--- a/packages/pg-bundler-test/vite-cloudflare.config.mjs
+++ b/packages/pg-bundler-test/vite-cloudflare.config.mjs
@@ -14,7 +14,7 @@ export default defineConfig({
     },
   },
   resolve: {
-    conditions: ['import', 'cloudflare'],
+    conditions: ['import', 'workerd'],
   },
   plugins: [commonjs()],
 })
diff --git a/packages/pg-bundler-test/webpack-cloudflare.config.mjs b/packages/pg-bundler-test/webpack-cloudflare.config.mjs
index 4645d485a..50d4ff4a2 100644
--- a/packages/pg-bundler-test/webpack-cloudflare.config.mjs
+++ b/packages/pg-bundler-test/webpack-cloudflare.config.mjs
@@ -6,7 +6,7 @@ export default {
   output: {
     filename: 'webpack-cloudflare.js',
   },
-  resolve: { conditionNames: ['import', 'cloudflare'] },
+  resolve: { conditionNames: ['import', 'workerd'] },
   plugins: [
     // ignore cloudflare:sockets imports
     new webpack.IgnorePlugin({
diff --git a/packages/pg-cloudflare/README.md b/packages/pg-cloudflare/README.md
index 32c3faef7..68663c45c 100644
--- a/packages/pg-cloudflare/README.md
+++ b/packages/pg-cloudflare/README.md
@@ -19,7 +19,7 @@ config. For example:
   ```js
   export default {
     ...,
-    resolve: { conditionNames: [..., "cloudflare"] },
+    resolve: { conditionNames: [..., "workerd"] },
     plugins: [
       // ignore cloudflare:sockets imports
       new webpack.IgnorePlugin({
@@ -29,11 +29,15 @@ config. For example:
   }
   ```
 - `vite.config.js`
+
+  > [!NOTE]
+  > If you are using the [Cloudflare Vite plugin](https://www.npmjs.com/package/@cloudflare/vite-plugin) then the following configuration is not necessary.
+
   ```js
   export default defineConfig({
     ...,
     resolve: {
-      conditions: [..., "cloudflare"],
+      conditions: [..., "workerd"],
     },
     build: {
       ...,
@@ -44,11 +48,12 @@ config. For example:
     },
   })
   ```
+
 - `rollup.config.js`
   ```js
   export default defineConfig({
     ...,
-    plugins: [..., nodeResolve({ exportConditions: [..., 'cloudflare'] })],
+    plugins: [..., nodeResolve({ exportConditions: [..., 'workerd'] })],
     // don't try to bundle cloudflare:sockets
     external: [..., 'cloudflare:sockets'],
   })
@@ -57,7 +62,7 @@ config. For example:
   ```js
   await esbuild.build({
     ...,
-    conditions: [..., 'cloudflare'],
+    conditions: [..., 'workerd'],
   })
   ```
 
diff --git a/packages/pg-cloudflare/package.json b/packages/pg-cloudflare/package.json
index a52919d1a..98f30aacb 100644
--- a/packages/pg-cloudflare/package.json
+++ b/packages/pg-cloudflare/package.json
@@ -11,7 +11,7 @@
   },
   "exports": {
     ".": {
-      "cloudflare": {
+      "workerd": {
         "import": "./esm/index.mjs",
         "require": "./dist/index.js"
       },
diff --git a/packages/pg-esm-test/package.json b/packages/pg-esm-test/package.json
index 9f1ec6246..9c66c40b4 100644
--- a/packages/pg-esm-test/package.json
+++ b/packages/pg-esm-test/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "type": "module",
   "scripts": {
-    "test": "node --test --conditions=cloudflare"
+    "test": "node --test --conditions=workerd"
   },
   "keywords": [
     "postgres",