diff --git a/packages/connect-express/src/express-connect-middleware.ts b/packages/connect-express/src/express-connect-middleware.ts
index 0e276f84..e2036a00 100644
--- a/packages/connect-express/src/express-connect-middleware.ts
+++ b/packages/connect-express/src/express-connect-middleware.ts
@@ -13,15 +13,15 @@
 // limitations under the License.
 
 import type { JsonValue } from "@bufbuild/protobuf";
-import { createConnectRouter, Code, ConnectError } from "@bufbuild/connect";
-import type { ConnectRouter, ConnectRouterOptions } from "@bufbuild/connect";
-import type { UniversalHandler } from "@bufbuild/connect/protocol";
+import { createConnectRouter, Code, ConnectError } from "@apache/dubbo";
+import type { ConnectRouter, ConnectRouterOptions } from "@apache/dubbo";
+import type { UniversalHandler } from "@apache/dubbo/protocol";
 import {
   compressionBrotli,
   compressionGzip,
   universalRequestFromNodeRequest,
   universalResponseToNodeResponse,
-} from "@bufbuild/connect-node";
+} from "@apache/dubbo-node";
 import type * as express from "express";
 
 interface ExpressConnectMiddlewareOptions extends ConnectRouterOptions {
@@ -31,7 +31,7 @@ interface ExpressConnectMiddlewareOptions extends ConnectRouterOptions {
    * Create a file `connect.ts` with a default export such as this:
    *
    * ```ts
-   * import {ConnectRouter} from "@bufbuild/connect";
+   * import {ConnectRouter} from "@apache/dubbo";
    *
    * export default (router: ConnectRouter) => {
    *   router.service(ElizaService, {});
diff --git a/packages/connect-fastify/src/fastify-connect-plugin.ts b/packages/connect-fastify/src/fastify-connect-plugin.ts
index 1afa9b0d..aec3217d 100644
--- a/packages/connect-fastify/src/fastify-connect-plugin.ts
+++ b/packages/connect-fastify/src/fastify-connect-plugin.ts
@@ -13,17 +13,17 @@
 // limitations under the License.
 
 import type { JsonValue } from "@bufbuild/protobuf";
-import { Code, ConnectError, createConnectRouter } from "@bufbuild/connect";
-import type { ConnectRouter, ConnectRouterOptions } from "@bufbuild/connect";
-import * as protoConnect from "@bufbuild/connect/protocol-connect";
-import * as protoGrpcWeb from "@bufbuild/connect/protocol-grpc-web";
-import * as protoGrpc from "@bufbuild/connect/protocol-grpc";
+import { Code, ConnectError, createConnectRouter } from "@apache/dubbo";
+import type { ConnectRouter, ConnectRouterOptions } from "@apache/dubbo";
+import * as protoConnect from "@apache/dubbo/protocol-connect";
+import * as protoGrpcWeb from "@apache/dubbo/protocol-grpc-web";
+import * as protoGrpc from "@apache/dubbo/protocol-grpc";
 import {
   compressionBrotli,
   compressionGzip,
   universalRequestFromNodeRequest,
   universalResponseToNodeResponse,
-} from "@bufbuild/connect-node";
+} from "@apache/dubbo-node";
 import type { FastifyInstance } from "fastify/types/instance";
 
 interface FastifyConnectPluginOptions extends ConnectRouterOptions {
@@ -33,7 +33,7 @@ interface FastifyConnectPluginOptions extends ConnectRouterOptions {
    * Create a file `connect.ts` with a default export such as this:
    *
    * ```ts
-   * import {ConnectRouter} from "@bufbuild/connect";
+   * import {ConnectRouter} from "@apache/dubbo";
    *
    * export default (router: ConnectRouter) => {
    *   router.service(ElizaService, {});
diff --git a/packages/connect-next/src/connect-nextjs-adapter.ts b/packages/connect-next/src/connect-nextjs-adapter.ts
index 032b8ccf..0d6b216e 100644
--- a/packages/connect-next/src/connect-nextjs-adapter.ts
+++ b/packages/connect-next/src/connect-nextjs-adapter.ts
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createConnectRouter } from "@bufbuild/connect";
-import type { ConnectRouter, ConnectRouterOptions } from "@bufbuild/connect";
-import type { UniversalHandler } from "@bufbuild/connect/protocol";
+import { createConnectRouter } from "@apache/dubbo";
+import type { ConnectRouter, ConnectRouterOptions } from "@apache/dubbo";
+import type { UniversalHandler } from "@apache/dubbo/protocol";
 import {
   compressionBrotli,
   compressionGzip,
   universalRequestFromNodeRequest,
   universalResponseToNodeResponse,
-} from "@bufbuild/connect-node";
+} from "@apache/dubbo-node";
 import type { NextApiRequest, NextApiResponse, PageConfig } from "next";
 import type { JsonValue } from "@bufbuild/protobuf";
 
@@ -37,7 +37,7 @@ interface NextJsApiRouterOptions extends ConnectRouterOptions {
    * Create a file `connect.ts` with a default export such as this:
    *
    * ```ts
-   * import {ConnectRouter} from "@bufbuild/connect";
+   * import {ConnectRouter} from "@apache/dubbo";
    *
    * export default (router: ConnectRouter) => {
    *   router.service(ElizaService, {});
diff --git a/packages/connect-node-test/connect-node-h1-server.mjs b/packages/connect-node-test/connect-node-h1-server.mjs
index 21ec7edb..3b59af28 100644
--- a/packages/connect-node-test/connect-node-h1-server.mjs
+++ b/packages/connect-node-test/connect-node-h1-server.mjs
@@ -88,7 +88,7 @@ switch (command) {
     break;
 
   case "startinternal":
-    const server = createTestServers().servers["@bufbuild/connect-node (h1)"];
+    const server = createTestServers().servers["@apache/dubbo-node (h1)"];
     await server.start(PORT);
     writeFileSync(lockFile, "server listening at " + server.getUrl(), {
       encoding: "utf-8",
diff --git a/packages/connect-node-test/src/badweather/broken-input.spec.ts b/packages/connect-node-test/src/badweather/broken-input.spec.ts
index e10cc7bd..e852e174 100644
--- a/packages/connect-node-test/src/badweather/broken-input.spec.ts
+++ b/packages/connect-node-test/src/badweather/broken-input.spec.ts
@@ -14,13 +14,13 @@
 
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { createTestServers } from "../helpers/testserver.js";
-import { Code, ConnectError } from "@bufbuild/connect";
-import { createMethodUrl } from "@bufbuild/connect/protocol";
+import { Code, ConnectError } from "@apache/dubbo";
+import { createMethodUrl } from "@apache/dubbo/protocol";
 import {
   endStreamFromJson,
   codeFromHttpStatus,
   errorFromJsonBytes,
-} from "@bufbuild/connect/protocol-connect";
+} from "@apache/dubbo/protocol-connect";
 import { http2Request } from "../helpers/http2-request.js";
 
 describe("broken input", () => {
@@ -28,7 +28,7 @@ describe("broken input", () => {
   beforeAll(async () => await servers.start());
 
   servers.describeServers(
-    ["connect-go (h2)", "@bufbuild/connect-node (h2c)"],
+    ["connect-go (h2)", "@apache/dubbo-node (h2c)"],
     (server, serverName) => {
       const rejectUnauthorized = serverName !== "connect-go (h2)"; // TODO set up cert for go server correctly
 
@@ -64,7 +64,7 @@ describe("broken input", () => {
           );
           expect(status).toBe(400);
           expect(error.code).toBe(Code.InvalidArgument);
-          if (serverName == "@bufbuild/connect-node (h2c)") {
+          if (serverName == "@apache/dubbo-node (h2c)") {
             expect(error.rawMessage).toMatch(
               /^cannot decode grpc.testing.SimpleRequest from JSON: Unexpected token '?h'?.*JSON/
             );
@@ -104,7 +104,7 @@ describe("broken input", () => {
             const { status, endStream } = await streamingRequest(body);
             expect(status).toBe(200);
             expect(endStream.error?.code).toBe(Code.InvalidArgument);
-            if (serverName == "@bufbuild/connect-node (h2c)") {
+            if (serverName == "@apache/dubbo-node (h2c)") {
               // Error messages tend to change across Node versions. Should this happen again, this link is useful to
               // build the correct RegExp:  https://regex101.com/r/By9VEN/1
               expect(endStream.error?.rawMessage).toMatch(
diff --git a/packages/connect-node-test/src/badweather/unsupported-content-encoding.spec.ts b/packages/connect-node-test/src/badweather/unsupported-content-encoding.spec.ts
index b3c43b7b..8b82533f 100644
--- a/packages/connect-node-test/src/badweather/unsupported-content-encoding.spec.ts
+++ b/packages/connect-node-test/src/badweather/unsupported-content-encoding.spec.ts
@@ -14,13 +14,13 @@
 
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { createTestServers } from "../helpers/testserver.js";
-import { Code, ConnectError } from "@bufbuild/connect";
-import { createMethodUrl } from "@bufbuild/connect/protocol";
+import { Code, ConnectError } from "@apache/dubbo";
+import { createMethodUrl } from "@apache/dubbo/protocol";
 import {
   codeFromHttpStatus,
   endStreamFromJson,
   errorFromJsonBytes,
-} from "@bufbuild/connect/protocol-connect";
+} from "@apache/dubbo/protocol-connect";
 import { http2Request } from "../helpers/http2-request.js";
 
 describe("unsupported content encoding", () => {
@@ -28,7 +28,7 @@ describe("unsupported content encoding", () => {
   beforeAll(async () => await servers.start());
 
   servers.describeServers(
-    ["@bufbuild/connect-node (h2c)", "connect-go (h2)"],
+    ["@apache/dubbo-node (h2c)", "connect-go (h2)"],
     (server, serverName) => {
       const rejectUnauthorized = serverName !== "connect-go (h2)"; // TODO set up cert for go server correctly
 
diff --git a/packages/connect-node-test/src/badweather/unsupported-media-type.spec.ts b/packages/connect-node-test/src/badweather/unsupported-media-type.spec.ts
index bfeb166a..d0e0fe99 100644
--- a/packages/connect-node-test/src/badweather/unsupported-media-type.spec.ts
+++ b/packages/connect-node-test/src/badweather/unsupported-media-type.spec.ts
@@ -14,7 +14,7 @@
 
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { createTestServers } from "../helpers/testserver.js";
-import { createMethodUrl } from "@bufbuild/connect/protocol";
+import { createMethodUrl } from "@apache/dubbo/protocol";
 import { http2Request } from "../helpers/http2-request.js";
 
 describe("unsupported media type", () => {
@@ -22,7 +22,7 @@ describe("unsupported media type", () => {
   beforeAll(async () => await servers.start());
 
   servers.describeServers(
-    ["@bufbuild/connect-node (h2c)", "connect-go (h2)"],
+    ["@apache/dubbo-node (h2c)", "connect-go (h2)"],
     (server, serverName) => {
       const rejectUnauthorized = serverName !== "connect-go (h2)"; // TODO set up cert for go server correctly
 
diff --git a/packages/connect-node-test/src/badweather/unsupported-method.spec.ts b/packages/connect-node-test/src/badweather/unsupported-method.spec.ts
index c7e6da7a..1ef85e56 100644
--- a/packages/connect-node-test/src/badweather/unsupported-method.spec.ts
+++ b/packages/connect-node-test/src/badweather/unsupported-method.spec.ts
@@ -14,7 +14,7 @@
 
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { createTestServers } from "../helpers/testserver.js";
-import { createMethodUrl } from "@bufbuild/connect/protocol";
+import { createMethodUrl } from "@apache/dubbo/protocol";
 import { http2Request } from "../helpers/http2-request.js";
 
 describe("unsupported method", () => {
@@ -22,7 +22,7 @@ describe("unsupported method", () => {
   beforeAll(async () => await servers.start());
 
   servers.describeServers(
-    ["@bufbuild/connect-node (h2c)", "connect-go (h2)"],
+    ["@apache/dubbo-node (h2c)", "connect-go (h2)"],
     (server, serverName) => {
       const rejectUnauthorized = serverName !== "connect-go (h2)"; // TODO set up cert for go server correctly
 
diff --git a/packages/connect-node-test/src/compression.spec.ts b/packages/connect-node-test/src/compression.spec.ts
index 97edbbbe..50d4cbc8 100644
--- a/packages/connect-node-test/src/compression.spec.ts
+++ b/packages/connect-node-test/src/compression.spec.ts
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ConnectError } from "@bufbuild/connect";
-import { compressionBrotli, compressionGzip } from "@bufbuild/connect-node";
+import { ConnectError } from "@apache/dubbo";
+import { compressionBrotli, compressionGzip } from "@apache/dubbo-node";
 import * as zlib from "zlib";
 
 describe("compression", () => {
diff --git a/packages/connect-node-test/src/crosstest/cacheable_unary.spec.ts b/packages/connect-node-test/src/crosstest/cacheable_unary.spec.ts
index ccfeebc9..8a285444 100644
--- a/packages/connect-node-test/src/crosstest/cacheable_unary.spec.ts
+++ b/packages/connect-node-test/src/crosstest/cacheable_unary.spec.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createCallbackClient, createPromiseClient } from "@bufbuild/connect";
+import { createCallbackClient, createPromiseClient } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { SimpleRequest } from "../gen/grpc/testing/messages_pb.js";
 import { createTestServers } from "../helpers/testserver.js";
diff --git a/packages/connect-node-test/src/crosstest/cancel_after_begin.spec.ts b/packages/connect-node-test/src/crosstest/cancel_after_begin.spec.ts
index baa09d2e..a5847d84 100644
--- a/packages/connect-node-test/src/crosstest/cancel_after_begin.spec.ts
+++ b/packages/connect-node-test/src/crosstest/cancel_after_begin.spec.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Code, ConnectError, createPromiseClient } from "@bufbuild/connect";
+import { Code, ConnectError, createPromiseClient } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { PayloadType } from "../gen/grpc/testing/messages_pb.js";
 import { createTestServers } from "../helpers/testserver.js";
diff --git a/packages/connect-node-test/src/crosstest/cancel_after_first_response.spec.ts b/packages/connect-node-test/src/crosstest/cancel_after_first_response.spec.ts
index 401d3529..3e741edf 100644
--- a/packages/connect-node-test/src/crosstest/cancel_after_first_response.spec.ts
+++ b/packages/connect-node-test/src/crosstest/cancel_after_first_response.spec.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Code, ConnectError, createPromiseClient } from "@bufbuild/connect";
+import { Code, ConnectError, createPromiseClient } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import {
   PayloadType,
@@ -36,41 +36,41 @@ describe("cancel_after_first_response", function () {
   servers.describeTransportsExcluding(
     [
       // All following Transports run over HTTP/1, which cannot support full-duplex.
-      "@bufbuild/connect-node (Connect, JSON, http) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (Connect, binary, http) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (Connect, binary, https) against @bufbuild/connect-node (h1 + tls)",
-      "@bufbuild/connect-node (Connect, JSON, https) against @bufbuild/connect-node (h1 + tls)",
-      "@bufbuild/connect-node (Connect, binary, http) against connect-go (h1)",
-      "@bufbuild/connect-node (Connect, binary, http, gzip) against connect-go (h1)",
-      "@bufbuild/connect-node (Connect, JSON, http) against connect-go (h1)",
-      "@bufbuild/connect-node (Connect, JSON, http, gzip) against connect-go (h1)",
-      "@bufbuild/connect-node (Connect, JSON, http, gzip) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (Connect, binary, http, gzip) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (Connect, JSON, http, gzip) against @bufbuild/connect-express (h1)",
-      "@bufbuild/connect-node (Connect, binary, http, gzip) against @bufbuild/connect-express (h1)",
-      "@bufbuild/connect-node (gRPC, binary, http) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (gRPC, JSON, http) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (gRPC, JSON, https) against @bufbuild/connect-node (h1 + tls)",
-      "@bufbuild/connect-node (gRPC, binary, https) against @bufbuild/connect-node (h1 + tls)",
-      "@bufbuild/connect-node (gRPC, binary, https) against connect-go (h1)",
-      "@bufbuild/connect-node (gRPC, JSON, https) against connect-go (h1)",
-      "@bufbuild/connect-node (gRPC, JSON, http, gzip) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (gRPC, binary, http, gzip) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (gRPC, binary, http, gzip) against connect-go (h1)",
-      "@bufbuild/connect-node (gRPC, JSON, http, gzip) against connect-go (h1)",
-      "@bufbuild/connect-node (gRPC, JSON, http, gzip) against @bufbuild/connect-express (h1)",
-      "@bufbuild/connect-node (gRPC, binary, http, gzip) against @bufbuild/connect-express (h1)",
-      "@bufbuild/connect-node (gRPC-web, binary, http) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (gRPC-web, JSON, http) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (gRPC-web, JSON, https) against @bufbuild/connect-node (h1 + tls)",
-      "@bufbuild/connect-node (gRPC-web, binary, https) against @bufbuild/connect-node (h1 + tls)",
-      "@bufbuild/connect-node (gRPC-web, binary, https) against connect-go (h1)",
-      "@bufbuild/connect-node (gRPC-web, JSON, https) against connect-go (h1)",
-      "@bufbuild/connect-node (gRPC-web, JSON, http, gzip) against connect-go (h1)",
-      "@bufbuild/connect-node (gRPC-web, JSON, http, gzip) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (gRPC-web, binary, http, gzip) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (gRPC-web, JSON, http, gzip) against @bufbuild/connect-express (h1)",
-      "@bufbuild/connect-node (gRPC-web, binary, http, gzip) against @bufbuild/connect-express (h1)",
+      "@apache/dubbo-node (Connect, JSON, http) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (Connect, binary, http) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (Connect, binary, https) against @apache/dubbo-node (h1 + tls)",
+      "@apache/dubbo-node (Connect, JSON, https) against @apache/dubbo-node (h1 + tls)",
+      "@apache/dubbo-node (Connect, binary, http) against connect-go (h1)",
+      "@apache/dubbo-node (Connect, binary, http, gzip) against connect-go (h1)",
+      "@apache/dubbo-node (Connect, JSON, http) against connect-go (h1)",
+      "@apache/dubbo-node (Connect, JSON, http, gzip) against connect-go (h1)",
+      "@apache/dubbo-node (Connect, JSON, http, gzip) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (Connect, binary, http, gzip) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (Connect, JSON, http, gzip) against @apache/dubbo-express (h1)",
+      "@apache/dubbo-node (Connect, binary, http, gzip) against @apache/dubbo-express (h1)",
+      "@apache/dubbo-node (gRPC, binary, http) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (gRPC, JSON, http) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (gRPC, JSON, https) against @apache/dubbo-node (h1 + tls)",
+      "@apache/dubbo-node (gRPC, binary, https) against @apache/dubbo-node (h1 + tls)",
+      "@apache/dubbo-node (gRPC, binary, https) against connect-go (h1)",
+      "@apache/dubbo-node (gRPC, JSON, https) against connect-go (h1)",
+      "@apache/dubbo-node (gRPC, JSON, http, gzip) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (gRPC, binary, http, gzip) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (gRPC, binary, http, gzip) against connect-go (h1)",
+      "@apache/dubbo-node (gRPC, JSON, http, gzip) against connect-go (h1)",
+      "@apache/dubbo-node (gRPC, JSON, http, gzip) against @apache/dubbo-express (h1)",
+      "@apache/dubbo-node (gRPC, binary, http, gzip) against @apache/dubbo-express (h1)",
+      "@apache/dubbo-node (gRPC-web, binary, http) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (gRPC-web, JSON, http) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (gRPC-web, JSON, https) against @apache/dubbo-node (h1 + tls)",
+      "@apache/dubbo-node (gRPC-web, binary, https) against @apache/dubbo-node (h1 + tls)",
+      "@apache/dubbo-node (gRPC-web, binary, https) against connect-go (h1)",
+      "@apache/dubbo-node (gRPC-web, JSON, https) against connect-go (h1)",
+      "@apache/dubbo-node (gRPC-web, JSON, http, gzip) against connect-go (h1)",
+      "@apache/dubbo-node (gRPC-web, JSON, http, gzip) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (gRPC-web, binary, http, gzip) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (gRPC-web, JSON, http, gzip) against @apache/dubbo-express (h1)",
+      "@apache/dubbo-node (gRPC-web, binary, http, gzip) against @apache/dubbo-express (h1)",
     ],
     (transport) => {
       const servers = createTestServers();
diff --git a/packages/connect-node-test/src/crosstest/client_streaming.spec.ts b/packages/connect-node-test/src/crosstest/client_streaming.spec.ts
index 2d68559e..2520c980 100644
--- a/packages/connect-node-test/src/crosstest/client_streaming.spec.ts
+++ b/packages/connect-node-test/src/crosstest/client_streaming.spec.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createPromiseClient } from "@bufbuild/connect";
+import { createPromiseClient } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { PayloadType } from "../gen/grpc/testing/messages_pb.js";
 import { createTestServers } from "../helpers/testserver.js";
diff --git a/packages/connect-node-test/src/crosstest/custom_metadata.spec.ts b/packages/connect-node-test/src/crosstest/custom_metadata.spec.ts
index 7c32b232..ae0fa0ac 100644
--- a/packages/connect-node-test/src/crosstest/custom_metadata.spec.ts
+++ b/packages/connect-node-test/src/crosstest/custom_metadata.spec.ts
@@ -17,7 +17,7 @@ import {
   createPromiseClient,
   decodeBinaryHeader,
   encodeBinaryHeader,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import {
   SimpleRequest,
diff --git a/packages/connect-node-test/src/crosstest/custom_metadata_server_streaming.spec.ts b/packages/connect-node-test/src/crosstest/custom_metadata_server_streaming.spec.ts
index ec9c24f0..a88bbb35 100644
--- a/packages/connect-node-test/src/crosstest/custom_metadata_server_streaming.spec.ts
+++ b/packages/connect-node-test/src/crosstest/custom_metadata_server_streaming.spec.ts
@@ -17,7 +17,7 @@ import {
   createPromiseClient,
   decodeBinaryHeader,
   encodeBinaryHeader,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import {
   StreamingOutputCallRequest,
diff --git a/packages/connect-node-test/src/crosstest/empty_stream.spec.ts b/packages/connect-node-test/src/crosstest/empty_stream.spec.ts
index e1de7563..fcf30944 100644
--- a/packages/connect-node-test/src/crosstest/empty_stream.spec.ts
+++ b/packages/connect-node-test/src/crosstest/empty_stream.spec.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createCallbackClient, createPromiseClient } from "@bufbuild/connect";
+import { createCallbackClient, createPromiseClient } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { StreamingOutputCallRequest } from "../gen/grpc/testing/messages_pb.js";
 import { createTestServers } from "../helpers/testserver.js";
diff --git a/packages/connect-node-test/src/crosstest/empty_unary.spec.ts b/packages/connect-node-test/src/crosstest/empty_unary.spec.ts
index f3d337c2..bed55b3a 100644
--- a/packages/connect-node-test/src/crosstest/empty_unary.spec.ts
+++ b/packages/connect-node-test/src/crosstest/empty_unary.spec.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createCallbackClient, createPromiseClient } from "@bufbuild/connect";
+import { createCallbackClient, createPromiseClient } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { Empty } from "../gen/grpc/testing/empty_pb.js";
 import { createTestServers } from "../helpers/testserver.js";
diff --git a/packages/connect-node-test/src/crosstest/empty_unary_with_timeout.spec.ts b/packages/connect-node-test/src/crosstest/empty_unary_with_timeout.spec.ts
index 32474043..8042e297 100644
--- a/packages/connect-node-test/src/crosstest/empty_unary_with_timeout.spec.ts
+++ b/packages/connect-node-test/src/crosstest/empty_unary_with_timeout.spec.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createCallbackClient, createPromiseClient } from "@bufbuild/connect";
+import { createCallbackClient, createPromiseClient } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { Empty } from "../gen/grpc/testing/empty_pb.js";
 import { createTestServers } from "../helpers/testserver.js";
diff --git a/packages/connect-node-test/src/crosstest/fail_server_streaming.spec.ts b/packages/connect-node-test/src/crosstest/fail_server_streaming.spec.ts
index c9354906..bd0835c3 100644
--- a/packages/connect-node-test/src/crosstest/fail_server_streaming.spec.ts
+++ b/packages/connect-node-test/src/crosstest/fail_server_streaming.spec.ts
@@ -17,7 +17,7 @@ import {
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import {
   ErrorDetail,
diff --git a/packages/connect-node-test/src/crosstest/fail_server_streaming_after_response.spec.ts b/packages/connect-node-test/src/crosstest/fail_server_streaming_after_response.spec.ts
index a43c030e..402e2adf 100644
--- a/packages/connect-node-test/src/crosstest/fail_server_streaming_after_response.spec.ts
+++ b/packages/connect-node-test/src/crosstest/fail_server_streaming_after_response.spec.ts
@@ -17,7 +17,7 @@ import {
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import {
   ErrorDetail,
diff --git a/packages/connect-node-test/src/crosstest/fail_unary.spec.ts b/packages/connect-node-test/src/crosstest/fail_unary.spec.ts
index 1709588d..5ea47855 100644
--- a/packages/connect-node-test/src/crosstest/fail_unary.spec.ts
+++ b/packages/connect-node-test/src/crosstest/fail_unary.spec.ts
@@ -17,7 +17,7 @@ import {
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { ErrorDetail } from "../gen/grpc/testing/messages_pb.js";
 import { createTestServers } from "../helpers/testserver.js";
diff --git a/packages/connect-node-test/src/crosstest/large_unary.spec.ts b/packages/connect-node-test/src/crosstest/large_unary.spec.ts
index b2308259..0622fb41 100644
--- a/packages/connect-node-test/src/crosstest/large_unary.spec.ts
+++ b/packages/connect-node-test/src/crosstest/large_unary.spec.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createCallbackClient, createPromiseClient } from "@bufbuild/connect";
+import { createCallbackClient, createPromiseClient } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { SimpleRequest } from "../gen/grpc/testing/messages_pb.js";
 import { createTestServers } from "../helpers/testserver.js";
diff --git a/packages/connect-node-test/src/crosstest/ping_pong.spec.ts b/packages/connect-node-test/src/crosstest/ping_pong.spec.ts
index 6f3bb721..871dffd6 100644
--- a/packages/connect-node-test/src/crosstest/ping_pong.spec.ts
+++ b/packages/connect-node-test/src/crosstest/ping_pong.spec.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createPromiseClient } from "@bufbuild/connect";
+import { createPromiseClient } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { PayloadType } from "../gen/grpc/testing/messages_pb.js";
 import { createTestServers } from "../helpers/testserver.js";
@@ -26,41 +26,41 @@ describe("ping_pong", () => {
   servers.describeTransportsExcluding(
     // All following Transports run over HTTP/1, which cannot support full-duplex.
     [
-      "@bufbuild/connect-node (Connect, JSON, http) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (Connect, binary, http) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (Connect, binary, https) against @bufbuild/connect-node (h1 + tls)",
-      "@bufbuild/connect-node (Connect, JSON, https) against @bufbuild/connect-node (h1 + tls)",
-      "@bufbuild/connect-node (Connect, binary, http) against connect-go (h1)",
-      "@bufbuild/connect-node (Connect, binary, http, gzip) against connect-go (h1)",
-      "@bufbuild/connect-node (Connect, JSON, http) against connect-go (h1)",
-      "@bufbuild/connect-node (Connect, JSON, http, gzip) against connect-go (h1)",
-      "@bufbuild/connect-node (Connect, JSON, http, gzip) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (Connect, binary, http, gzip) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (Connect, JSON, http, gzip) against @bufbuild/connect-express (h1)",
-      "@bufbuild/connect-node (Connect, binary, http, gzip) against @bufbuild/connect-express (h1)",
-      "@bufbuild/connect-node (gRPC, binary, http) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (gRPC, JSON, http) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (gRPC, JSON, https) against @bufbuild/connect-node (h1 + tls)",
-      "@bufbuild/connect-node (gRPC, binary, https) against @bufbuild/connect-node (h1 + tls)",
-      "@bufbuild/connect-node (gRPC, binary, https) against connect-go (h1)",
-      "@bufbuild/connect-node (gRPC, JSON, https) against connect-go (h1)",
-      "@bufbuild/connect-node (gRPC, JSON, http, gzip) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (gRPC, binary, http, gzip) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (gRPC, binary, http, gzip) against connect-go (h1)",
-      "@bufbuild/connect-node (gRPC, JSON, http, gzip) against connect-go (h1)",
-      "@bufbuild/connect-node (gRPC, JSON, http, gzip) against @bufbuild/connect-express (h1)",
-      "@bufbuild/connect-node (gRPC, binary, http, gzip) against @bufbuild/connect-express (h1)",
-      "@bufbuild/connect-node (gRPC-web, binary, http) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (gRPC-web, JSON, http) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (gRPC-web, JSON, https) against @bufbuild/connect-node (h1 + tls)",
-      "@bufbuild/connect-node (gRPC-web, binary, https) against @bufbuild/connect-node (h1 + tls)",
-      "@bufbuild/connect-node (gRPC-web, binary, https) against connect-go (h1)",
-      "@bufbuild/connect-node (gRPC-web, JSON, https) against connect-go (h1)",
-      "@bufbuild/connect-node (gRPC-web, JSON, http, gzip) against connect-go (h1)",
-      "@bufbuild/connect-node (gRPC-web, JSON, http, gzip) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (gRPC-web, binary, http, gzip) against @bufbuild/connect-node (h1)",
-      "@bufbuild/connect-node (gRPC-web, JSON, http, gzip) against @bufbuild/connect-express (h1)",
-      "@bufbuild/connect-node (gRPC-web, binary, http, gzip) against @bufbuild/connect-express (h1)",
+      "@apache/dubbo-node (Connect, JSON, http) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (Connect, binary, http) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (Connect, binary, https) against @apache/dubbo-node (h1 + tls)",
+      "@apache/dubbo-node (Connect, JSON, https) against @apache/dubbo-node (h1 + tls)",
+      "@apache/dubbo-node (Connect, binary, http) against connect-go (h1)",
+      "@apache/dubbo-node (Connect, binary, http, gzip) against connect-go (h1)",
+      "@apache/dubbo-node (Connect, JSON, http) against connect-go (h1)",
+      "@apache/dubbo-node (Connect, JSON, http, gzip) against connect-go (h1)",
+      "@apache/dubbo-node (Connect, JSON, http, gzip) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (Connect, binary, http, gzip) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (Connect, JSON, http, gzip) against @apache/dubbo-express (h1)",
+      "@apache/dubbo-node (Connect, binary, http, gzip) against @apache/dubbo-express (h1)",
+      "@apache/dubbo-node (gRPC, binary, http) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (gRPC, JSON, http) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (gRPC, JSON, https) against @apache/dubbo-node (h1 + tls)",
+      "@apache/dubbo-node (gRPC, binary, https) against @apache/dubbo-node (h1 + tls)",
+      "@apache/dubbo-node (gRPC, binary, https) against connect-go (h1)",
+      "@apache/dubbo-node (gRPC, JSON, https) against connect-go (h1)",
+      "@apache/dubbo-node (gRPC, JSON, http, gzip) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (gRPC, binary, http, gzip) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (gRPC, binary, http, gzip) against connect-go (h1)",
+      "@apache/dubbo-node (gRPC, JSON, http, gzip) against connect-go (h1)",
+      "@apache/dubbo-node (gRPC, JSON, http, gzip) against @apache/dubbo-express (h1)",
+      "@apache/dubbo-node (gRPC, binary, http, gzip) against @apache/dubbo-express (h1)",
+      "@apache/dubbo-node (gRPC-web, binary, http) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (gRPC-web, JSON, http) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (gRPC-web, JSON, https) against @apache/dubbo-node (h1 + tls)",
+      "@apache/dubbo-node (gRPC-web, binary, https) against @apache/dubbo-node (h1 + tls)",
+      "@apache/dubbo-node (gRPC-web, binary, https) against connect-go (h1)",
+      "@apache/dubbo-node (gRPC-web, JSON, https) against connect-go (h1)",
+      "@apache/dubbo-node (gRPC-web, JSON, http, gzip) against connect-go (h1)",
+      "@apache/dubbo-node (gRPC-web, JSON, http, gzip) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (gRPC-web, binary, http, gzip) against @apache/dubbo-node (h1)",
+      "@apache/dubbo-node (gRPC-web, JSON, http, gzip) against @apache/dubbo-express (h1)",
+      "@apache/dubbo-node (gRPC-web, binary, http, gzip) against @apache/dubbo-express (h1)",
     ],
     (transport) => {
       it("with promise client", async function () {
diff --git a/packages/connect-node-test/src/crosstest/server_streaming.spec.ts b/packages/connect-node-test/src/crosstest/server_streaming.spec.ts
index 79b3b757..d325c4ef 100644
--- a/packages/connect-node-test/src/crosstest/server_streaming.spec.ts
+++ b/packages/connect-node-test/src/crosstest/server_streaming.spec.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createCallbackClient, createPromiseClient } from "@bufbuild/connect";
+import { createCallbackClient, createPromiseClient } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { StreamingOutputCallRequest } from "../gen/grpc/testing/messages_pb.js";
 import { createTestServers } from "../helpers/testserver.js";
diff --git a/packages/connect-node-test/src/crosstest/special_status.spec.ts b/packages/connect-node-test/src/crosstest/special_status.spec.ts
index 2977b017..19767452 100644
--- a/packages/connect-node-test/src/crosstest/special_status.spec.ts
+++ b/packages/connect-node-test/src/crosstest/special_status.spec.ts
@@ -17,7 +17,7 @@ import {
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { SimpleRequest } from "../gen/grpc/testing/messages_pb.js";
 import { createTestServers } from "../helpers/testserver.js";
diff --git a/packages/connect-node-test/src/crosstest/status_code_and_message.spec.ts b/packages/connect-node-test/src/crosstest/status_code_and_message.spec.ts
index 37613b10..531f88ad 100644
--- a/packages/connect-node-test/src/crosstest/status_code_and_message.spec.ts
+++ b/packages/connect-node-test/src/crosstest/status_code_and_message.spec.ts
@@ -17,7 +17,7 @@ import {
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { SimpleRequest } from "../gen/grpc/testing/messages_pb.js";
 import { createTestServers } from "../helpers/testserver.js";
diff --git a/packages/connect-node-test/src/crosstest/timeout_on_sleeping_server.spec.ts b/packages/connect-node-test/src/crosstest/timeout_on_sleeping_server.spec.ts
index f66b0fbc..da185f72 100644
--- a/packages/connect-node-test/src/crosstest/timeout_on_sleeping_server.spec.ts
+++ b/packages/connect-node-test/src/crosstest/timeout_on_sleeping_server.spec.ts
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import type { CallOptions } from "@bufbuild/connect";
+import type { CallOptions } from "@apache/dubbo";
 import {
   Code,
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { StreamingOutputCallRequest } from "../gen/grpc/testing/messages_pb.js";
 import { createTestServers } from "../helpers/testserver.js";
diff --git a/packages/connect-node-test/src/crosstest/unimplemented_method.spec.ts b/packages/connect-node-test/src/crosstest/unimplemented_method.spec.ts
index 387bc97f..21e30c95 100644
--- a/packages/connect-node-test/src/crosstest/unimplemented_method.spec.ts
+++ b/packages/connect-node-test/src/crosstest/unimplemented_method.spec.ts
@@ -17,7 +17,7 @@ import {
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { createTestServers } from "../helpers/testserver.js";
 
diff --git a/packages/connect-node-test/src/crosstest/unimplemented_server_streaming_method.spec.ts b/packages/connect-node-test/src/crosstest/unimplemented_server_streaming_method.spec.ts
index 548cc0f9..7274d136 100644
--- a/packages/connect-node-test/src/crosstest/unimplemented_server_streaming_method.spec.ts
+++ b/packages/connect-node-test/src/crosstest/unimplemented_server_streaming_method.spec.ts
@@ -17,7 +17,7 @@ import {
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { Empty } from "../gen/grpc/testing/empty_pb.js";
 import { createTestServers } from "../helpers/testserver.js";
diff --git a/packages/connect-node-test/src/crosstest/unimplemented_server_streaming_service.spec.ts b/packages/connect-node-test/src/crosstest/unimplemented_server_streaming_service.spec.ts
index 8d78625f..92767d11 100644
--- a/packages/connect-node-test/src/crosstest/unimplemented_server_streaming_service.spec.ts
+++ b/packages/connect-node-test/src/crosstest/unimplemented_server_streaming_service.spec.ts
@@ -17,7 +17,7 @@ import {
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { UnimplementedService } from "../gen/grpc/testing/test_connect.js";
 import { Empty } from "../gen/grpc/testing/empty_pb.js";
 import { createTestServers } from "../helpers/testserver.js";
diff --git a/packages/connect-node-test/src/crosstest/unimplemented_service.spec.ts b/packages/connect-node-test/src/crosstest/unimplemented_service.spec.ts
index 6f10770f..1fec79b4 100644
--- a/packages/connect-node-test/src/crosstest/unimplemented_service.spec.ts
+++ b/packages/connect-node-test/src/crosstest/unimplemented_service.spec.ts
@@ -17,7 +17,7 @@ import {
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { UnimplementedService } from "../gen/grpc/testing/test_connect.js";
 import { createTestServers } from "../helpers/testserver.js";
 
diff --git a/packages/connect-node-test/src/crosstest/unresolvable_host.spec.ts b/packages/connect-node-test/src/crosstest/unresolvable_host.spec.ts
index 8e790700..37af11c1 100644
--- a/packages/connect-node-test/src/crosstest/unresolvable_host.spec.ts
+++ b/packages/connect-node-test/src/crosstest/unresolvable_host.spec.ts
@@ -17,12 +17,12 @@ import {
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import {
   createConnectTransport,
   createGrpcTransport,
   createGrpcWebTransport,
-} from "@bufbuild/connect-node";
+} from "@apache/dubbo-node";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { PayloadType } from "../gen/grpc/testing/messages_pb.js";
 
@@ -40,23 +40,23 @@ describe("unresolvable_host", function () {
   };
   const transports = [
     [
-      "@bufbuild/connect-node (gRPC-web, http2)",
+      "@apache/dubbo-node (gRPC-web, http2)",
       createGrpcWebTransport(optionsHttp2),
     ],
     [
-      "@bufbuild/connect-node (gRPC-web, http)",
+      "@apache/dubbo-node (gRPC-web, http)",
       createGrpcTransport(optionsHttp1),
     ],
     [
-      "@bufbuild/connect-node (Connect, http2)",
+      "@apache/dubbo-node (Connect, http2)",
       createConnectTransport(optionsHttp2),
     ],
     [
-      "@bufbuild/connect-node (Connect, http)",
+      "@apache/dubbo-node (Connect, http)",
       createConnectTransport(optionsHttp1),
     ],
-    ["@bufbuild/connect-node (gRPC, http2)", createGrpcTransport(optionsHttp2)],
-    ["@bufbuild/connect-node (gRPC, http)", createGrpcTransport(optionsHttp1)],
+    ["@apache/dubbo-node (gRPC, http2)", createGrpcTransport(optionsHttp2)],
+    ["@apache/dubbo-node (gRPC, http)", createGrpcTransport(optionsHttp1)],
   ] as const;
   for (const [name, transport] of transports) {
     describe(`${name} against unresolvable domain`, function () {
diff --git a/packages/connect-node-test/src/express-readme.spec.ts b/packages/connect-node-test/src/express-readme.spec.ts
index 674440bd..cc08b56b 100644
--- a/packages/connect-node-test/src/express-readme.spec.ts
+++ b/packages/connect-node-test/src/express-readme.spec.ts
@@ -14,10 +14,10 @@
 
 import * as http from "http";
 import { Message, MethodKind, proto3 } from "@bufbuild/protobuf";
-import { createPromiseClient } from "@bufbuild/connect";
-import type { ConnectRouter } from "@bufbuild/connect";
-import { expressConnectMiddleware } from "@bufbuild/connect-express";
-import { createGrpcWebTransport } from "@bufbuild/connect-node";
+import { createPromiseClient } from "@apache/dubbo";
+import type { ConnectRouter } from "@apache/dubbo";
+import { expressConnectMiddleware } from "@apache/dubbo-express";
+import { createGrpcWebTransport } from "@apache/dubbo-node";
 import { importExpress } from "./helpers/import-express.js";
 
 describe("express readme", function () {
diff --git a/packages/connect-node-test/src/extra/protocol-name.spec.ts b/packages/connect-node-test/src/extra/protocol-name.spec.ts
index a15629b0..907f87d0 100644
--- a/packages/connect-node-test/src/extra/protocol-name.spec.ts
+++ b/packages/connect-node-test/src/extra/protocol-name.spec.ts
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createCallbackClient, createPromiseClient } from "@bufbuild/connect";
-import type { Transport } from "@bufbuild/connect";
+import { createCallbackClient, createPromiseClient } from "@apache/dubbo";
+import type { Transport } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { SimpleRequest } from "../gen/grpc/testing/messages_pb.js";
 import { createTestServers } from "../helpers/testserver.js";
@@ -64,21 +64,21 @@ describe("protocolName", function () {
 
   servers.describeTransportsOnly(
     [
-      "@bufbuild/connect-node (gRPC, binary, http2) against @bufbuild/connect-node (h2)",
+      "@apache/dubbo-node (gRPC, binary, http2) against @apache/dubbo-node (h2)",
     ],
     testForProtocol("grpc")
   );
 
   servers.describeTransportsOnly(
     [
-      "@bufbuild/connect-node (gRPC-web, binary, http2) against @bufbuild/connect-node (h2c)",
+      "@apache/dubbo-node (gRPC-web, binary, http2) against @apache/dubbo-node (h2c)",
     ],
     testForProtocol("grpc-web")
   );
 
   servers.describeTransportsOnly(
     [
-      "@bufbuild/connect-node (Connect, binary, http2, gzip) against @bufbuild/connect-node (h2c)",
+      "@apache/dubbo-node (Connect, binary, http2, gzip) against @apache/dubbo-node (h2c)",
     ],
     testForProtocol("connect")
   );
diff --git a/packages/connect-node-test/src/helpers/test-routes.ts b/packages/connect-node-test/src/helpers/test-routes.ts
index 681b95d0..b3025ffc 100644
--- a/packages/connect-node-test/src/helpers/test-routes.ts
+++ b/packages/connect-node-test/src/helpers/test-routes.ts
@@ -18,8 +18,8 @@ import {
   ConnectError,
   decodeBinaryHeader,
   encodeBinaryHeader,
-} from "@bufbuild/connect";
-import type { ConnectRouter, ServiceImpl } from "@bufbuild/connect";
+} from "@apache/dubbo";
+import type { ConnectRouter, ServiceImpl } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import type { StreamingOutputCallRequest } from "../gen/grpc/testing/messages_pb.js";
 import {
diff --git a/packages/connect-node-test/src/helpers/testserver.ts b/packages/connect-node-test/src/helpers/testserver.ts
index aee5810a..fbbb2227 100644
--- a/packages/connect-node-test/src/helpers/testserver.ts
+++ b/packages/connect-node-test/src/helpers/testserver.ts
@@ -17,16 +17,16 @@ import * as http from "http";
 import * as https from "https";
 import * as fs from "fs";
 import * as path from "path";
-import { cors, createRouterTransport, type Transport } from "@bufbuild/connect";
+import { cors, createRouterTransport, type Transport } from "@apache/dubbo";
 import {
   compressionGzip,
   connectNodeAdapter,
   createConnectTransport,
   createGrpcTransport,
   createGrpcWebTransport,
-} from "@bufbuild/connect-node";
-import { fastifyConnectPlugin } from "@bufbuild/connect-fastify";
-import { expressConnectMiddleware } from "@bufbuild/connect-express";
+} from "@apache/dubbo-node";
+import { fastifyConnectPlugin } from "@apache/dubbo-fastify";
+import { expressConnectMiddleware } from "@apache/dubbo-express";
 import type {
   FastifyBaseLogger,
   FastifyInstance,
@@ -99,7 +99,7 @@ export function createTestServers() {
         return Promise.resolve();
       },
     },
-    "@bufbuild/connect-node (h2)": {
+    "@apache/dubbo-node (h2)": {
       getUrl() {
         const address = nodeH2SecureServer?.address();
         if (address == null || typeof address == "string") {
@@ -135,7 +135,7 @@ export function createTestServers() {
       },
     },
     // connect-node
-    "@bufbuild/connect-node (h2c)": {
+    "@apache/dubbo-node (h2c)": {
       getUrl() {
         const address = nodeH2cServer?.address();
         if (address == null || typeof address == "string") {
@@ -166,7 +166,7 @@ export function createTestServers() {
         });
       },
     },
-    "@bufbuild/connect-node (h1)": {
+    "@apache/dubbo-node (h1)": {
       getUrl() {
         const address = nodeHttpServer?.address();
         if (address == null || typeof address == "string") {
@@ -226,7 +226,7 @@ export function createTestServers() {
         });
       },
     },
-    "@bufbuild/connect-node (h1 + tls)": {
+    "@apache/dubbo-node (h1 + tls)": {
       getUrl() {
         const address = nodeHttpsServer?.address();
         if (address == null || typeof address == "string") {
@@ -262,7 +262,7 @@ export function createTestServers() {
       },
     },
     // connect-fastify
-    "@bufbuild/connect-fastify (h2c)": {
+    "@apache/dubbo-fastify (h2c)": {
       getUrl() {
         if (!fastifyH2cServer) {
           throw new Error("fastifyH2cServer not started");
@@ -294,7 +294,7 @@ export function createTestServers() {
       },
     },
     // connect-express
-    "@bufbuild/connect-express (h1)": {
+    "@apache/dubbo-express (h1)": {
       getUrl() {
         const address = expressServer?.address();
         if (address == null || typeof address == "string") {
@@ -331,11 +331,11 @@ export function createTestServers() {
 
   const transports = {
     // gRPC
-    "@bufbuild/connect-node (gRPC, binary, http2) against @bufbuild/connect-node (h2)":
+    "@apache/dubbo-node (gRPC, binary, http2) against @apache/dubbo-node (h2)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h2)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h2)"].getUrl(),
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
           nodeOptions: {
@@ -343,45 +343,45 @@ export function createTestServers() {
           },
           useBinaryFormat: true,
         }),
-    "@bufbuild/connect-node (gRPC, binary, http2) against @bufbuild/connect-node (h2c)":
+    "@apache/dubbo-node (gRPC, binary, http2) against @apache/dubbo-node (h2c)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h2c)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h2c)"].getUrl(),
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
           useBinaryFormat: true,
         }),
-    "@bufbuild/connect-node (gRPC, JSON, http2) against @bufbuild/connect-node (h2c)":
+    "@apache/dubbo-node (gRPC, JSON, http2) against @apache/dubbo-node (h2c)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h2c)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h2c)"].getUrl(),
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
           useBinaryFormat: false,
         }),
-    "@bufbuild/connect-node (gRPC, binary, http2, gzip) against @bufbuild/connect-node (h2c)":
+    "@apache/dubbo-node (gRPC, binary, http2, gzip) against @apache/dubbo-node (h2c)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h2c)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h2c)"].getUrl(),
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
           useBinaryFormat: true,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (gRPC, JSON, http2, gzip) against @bufbuild/connect-node (h2c)":
+    "@apache/dubbo-node (gRPC, JSON, http2, gzip) against @apache/dubbo-node (h2c)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h2c)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h2c)"].getUrl(),
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
           useBinaryFormat: false,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (gRPC, binary, http2) against connect-go (h1)": (
+    "@apache/dubbo-node (gRPC, binary, http2) against connect-go (h1)": (
       options?: Record<string, unknown>
     ) =>
       createGrpcTransport({
@@ -394,7 +394,7 @@ export function createTestServers() {
         },
         useBinaryFormat: true,
       }),
-    "@bufbuild/connect-node (gRPC, binary, http2, gzip) against connect-go (h1)":
+    "@apache/dubbo-node (gRPC, binary, http2, gzip) against connect-go (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
@@ -407,7 +407,7 @@ export function createTestServers() {
           useBinaryFormat: true,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (gRPC, JSON, http2, gzip) against connect-go (h1)":
+    "@apache/dubbo-node (gRPC, JSON, http2, gzip) against connect-go (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
@@ -420,7 +420,7 @@ export function createTestServers() {
           useBinaryFormat: false,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (gRPC, JSON, http2) against connect-go (h1)": (
+    "@apache/dubbo-node (gRPC, JSON, http2) against connect-go (h1)": (
       options?: Record<string, unknown>
     ) =>
       createGrpcTransport({
@@ -433,7 +433,7 @@ export function createTestServers() {
         },
         useBinaryFormat: false,
       }),
-    "@bufbuild/connect-node (gRPC, binary, http2) against grpc-go (h2)": (
+    "@apache/dubbo-node (gRPC, binary, http2) against grpc-go (h2)": (
       options?: Record<string, unknown>
     ) =>
       createGrpcTransport({
@@ -446,45 +446,45 @@ export function createTestServers() {
         },
         useBinaryFormat: true,
       }),
-    "@bufbuild/connect-node (gRPC, binary, http) against @bufbuild/connect-node (h1)":
+    "@apache/dubbo-node (gRPC, binary, http) against @apache/dubbo-node (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: true,
         }),
-    "@bufbuild/connect-node (gRPC, JSON, http) against @bufbuild/connect-node (h1)":
+    "@apache/dubbo-node (gRPC, JSON, http) against @apache/dubbo-node (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: false,
         }),
-    "@bufbuild/connect-node (gRPC, JSON, https) against @bufbuild/connect-node (h1 + tls)":
+    "@apache/dubbo-node (gRPC, JSON, https) against @apache/dubbo-node (h1 + tls)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1 + tls)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1 + tls)"].getUrl(),
           httpVersion: "1.1",
           nodeOptions: {
             rejectUnauthorized: false,
           },
           useBinaryFormat: false,
         }),
-    "@bufbuild/connect-node (gRPC, binary, https) against @bufbuild/connect-node (h1 + tls)":
+    "@apache/dubbo-node (gRPC, binary, https) against @apache/dubbo-node (h1 + tls)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1 + tls)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1 + tls)"].getUrl(),
           httpVersion: "1.1",
           nodeOptions: {
             rejectUnauthorized: false,
           },
           useBinaryFormat: true,
         }),
-    "@bufbuild/connect-node (gRPC, binary, https) against connect-go (h1)": (
+    "@apache/dubbo-node (gRPC, binary, https) against connect-go (h1)": (
       options?: Record<string, unknown>
     ) =>
       createGrpcTransport({
@@ -496,7 +496,7 @@ export function createTestServers() {
         },
         useBinaryFormat: true,
       }),
-    "@bufbuild/connect-node (gRPC, JSON, https) against connect-go (h1)": (
+    "@apache/dubbo-node (gRPC, JSON, https) against connect-go (h1)": (
       options?: Record<string, unknown>
     ) =>
       createGrpcTransport({
@@ -508,7 +508,7 @@ export function createTestServers() {
         },
         useBinaryFormat: false,
       }),
-    "@bufbuild/connect-node (gRPC, binary, http, gzip) against connect-go (h1)":
+    "@apache/dubbo-node (gRPC, binary, http, gzip) against connect-go (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
@@ -520,7 +520,7 @@ export function createTestServers() {
           useBinaryFormat: true,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (gRPC, JSON, http, gzip) against connect-go (h1)": (
+    "@apache/dubbo-node (gRPC, JSON, http, gzip) against connect-go (h1)": (
       options?: Record<string, unknown>
     ) =>
       createGrpcTransport({
@@ -533,76 +533,76 @@ export function createTestServers() {
           rejectUnauthorized: false,
         },
       }),
-    "@bufbuild/connect-node (gRPC, binary, http, gzip) against @bufbuild/connect-node (h1)":
+    "@apache/dubbo-node (gRPC, binary, http, gzip) against @apache/dubbo-node (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: true,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (gRPC, JSON, http, gzip) against @bufbuild/connect-node (h1)":
+    "@apache/dubbo-node (gRPC, JSON, http, gzip) against @apache/dubbo-node (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: false,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (gRPC, binary, http, gzip) against @bufbuild/connect-fastify (h2c)":
+    "@apache/dubbo-node (gRPC, binary, http, gzip) against @apache/dubbo-fastify (h2c)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-fastify (h2c)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-fastify (h2c)"].getUrl(),
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
           useBinaryFormat: true,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (gRPC, JSON, http, gzip) against @bufbuild/connect-fastify (h2c)":
+    "@apache/dubbo-node (gRPC, JSON, http, gzip) against @apache/dubbo-fastify (h2c)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-fastify (h2c)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-fastify (h2c)"].getUrl(),
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
           useBinaryFormat: false,
           sendCompression: compressionGzip,
         }),
 
-    "@bufbuild/connect-node (gRPC, binary, http, gzip) against @bufbuild/connect-express (h1)":
+    "@apache/dubbo-node (gRPC, binary, http, gzip) against @apache/dubbo-express (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-express (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-express (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: true,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (gRPC, JSON, http, gzip) against @bufbuild/connect-express (h1)":
+    "@apache/dubbo-node (gRPC, JSON, http, gzip) against @apache/dubbo-express (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-express (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-express (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: false,
           sendCompression: compressionGzip,
         }),
 
     // Connect
-    "@bufbuild/connect-node (Connect, binary, http2, gzip) against @bufbuild/connect-node (h2c)":
+    "@apache/dubbo-node (Connect, binary, http2, gzip) against @apache/dubbo-node (h2c)":
       (options?: Record<string, unknown>) =>
         createConnectTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h2c)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h2c)"].getUrl(),
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
           useBinaryFormat: true,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (Connect, binary, http2, gzip) against connect-go (h1)":
+    "@apache/dubbo-node (Connect, binary, http2, gzip) against connect-go (h1)":
       (options?: Record<string, unknown>) =>
         createConnectTransport({
           ...options,
@@ -615,17 +615,17 @@ export function createTestServers() {
           useBinaryFormat: true,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (Connect, JSON, http2, gzip) against @bufbuild/connect-node (h2c)":
+    "@apache/dubbo-node (Connect, JSON, http2, gzip) against @apache/dubbo-node (h2c)":
       (options?: Record<string, unknown>) =>
         createConnectTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h2c)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h2c)"].getUrl(),
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
           useBinaryFormat: false,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (Connect, JSON, http2, gzip) against connect-go (h1)":
+    "@apache/dubbo-node (Connect, JSON, http2, gzip) against connect-go (h1)":
       (options?: Record<string, unknown>) =>
         createConnectTransport({
           ...options,
@@ -638,45 +638,45 @@ export function createTestServers() {
           useBinaryFormat: false,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (Connect, JSON, http) against @bufbuild/connect-node (h1)":
+    "@apache/dubbo-node (Connect, JSON, http) against @apache/dubbo-node (h1)":
       (options?: Record<string, unknown>) =>
         createConnectTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: false,
         }),
-    "@bufbuild/connect-node (Connect, binary, http) against @bufbuild/connect-node (h1)":
+    "@apache/dubbo-node (Connect, binary, http) against @apache/dubbo-node (h1)":
       (options?: Record<string, unknown>) =>
         createConnectTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: true,
         }),
-    "@bufbuild/connect-node (Connect, binary, https) against @bufbuild/connect-node (h1 + tls)":
+    "@apache/dubbo-node (Connect, binary, https) against @apache/dubbo-node (h1 + tls)":
       (options?: Record<string, unknown>) =>
         createConnectTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1 + tls)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1 + tls)"].getUrl(),
           httpVersion: "1.1",
           nodeOptions: {
             rejectUnauthorized: false, // TODO set up cert for go server correctly
           },
           useBinaryFormat: true,
         }),
-    "@bufbuild/connect-node (Connect, JSON, https) against @bufbuild/connect-node (h1 + tls)":
+    "@apache/dubbo-node (Connect, JSON, https) against @apache/dubbo-node (h1 + tls)":
       (options?: Record<string, unknown>) =>
         createConnectTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1 + tls)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1 + tls)"].getUrl(),
           httpVersion: "1.1",
           nodeOptions: {
             rejectUnauthorized: false,
           },
           useBinaryFormat: false,
         }),
-    "@bufbuild/connect-node (Connect, binary, http) against connect-go (h1)": (
+    "@apache/dubbo-node (Connect, binary, http) against connect-go (h1)": (
       options?: Record<string, unknown>
     ) =>
       createConnectTransport({
@@ -688,7 +688,7 @@ export function createTestServers() {
         },
         useBinaryFormat: true,
       }),
-    "@bufbuild/connect-node (Connect, JSON, http) against connect-go (h1)": (
+    "@apache/dubbo-node (Connect, JSON, http) against connect-go (h1)": (
       options?: Record<string, unknown>
     ) =>
       createConnectTransport({
@@ -700,7 +700,7 @@ export function createTestServers() {
         },
         useBinaryFormat: false,
       }),
-    "@bufbuild/connect-node (Connect, binary, http, gzip) against connect-go (h1)":
+    "@apache/dubbo-node (Connect, binary, http, gzip) against connect-go (h1)":
       (options?: Record<string, unknown>) =>
         createConnectTransport({
           ...options,
@@ -712,7 +712,7 @@ export function createTestServers() {
           useBinaryFormat: true,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (Connect, JSON, http, gzip) against connect-go (h1)":
+    "@apache/dubbo-node (Connect, JSON, http, gzip) against connect-go (h1)":
       (options?: Record<string, unknown>) =>
         createConnectTransport({
           ...options,
@@ -724,11 +724,11 @@ export function createTestServers() {
           useBinaryFormat: false,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (Connect, JSON, http, gzip) against @bufbuild/connect-node (h1)":
+    "@apache/dubbo-node (Connect, JSON, http, gzip) against @apache/dubbo-node (h1)":
       (options?: Record<string, unknown>) =>
         createConnectTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1)"].getUrl(),
           httpVersion: "1.1",
           nodeOptions: {
             rejectUnauthorized: false,
@@ -736,11 +736,11 @@ export function createTestServers() {
           useBinaryFormat: false,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (Connect, binary, http, gzip) against @bufbuild/connect-node (h1)":
+    "@apache/dubbo-node (Connect, binary, http, gzip) against @apache/dubbo-node (h1)":
       (options?: Record<string, unknown>) =>
         createConnectTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1)"].getUrl(),
           httpVersion: "1.1",
           nodeOptions: {
             rejectUnauthorized: false, // TODO set up cert for go server correctly
@@ -748,66 +748,66 @@ export function createTestServers() {
           useBinaryFormat: true,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (Connect, JSON, http, gzip) against @bufbuild/connect-fastify (h2c)":
+    "@apache/dubbo-node (Connect, JSON, http, gzip) against @apache/dubbo-fastify (h2c)":
       (options?: Record<string, unknown>) =>
         createConnectTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-fastify (h2c)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-fastify (h2c)"].getUrl(),
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
           useBinaryFormat: false,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (Connect, binary, http, gzip) against @bufbuild/connect-fastify (h2c)":
+    "@apache/dubbo-node (Connect, binary, http, gzip) against @apache/dubbo-fastify (h2c)":
       (options?: Record<string, unknown>) =>
         createConnectTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-fastify (h2c)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-fastify (h2c)"].getUrl(),
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
           useBinaryFormat: true,
           sendCompression: compressionGzip,
         }),
 
-    "@bufbuild/connect-node (Connect, JSON, http, gzip) against @bufbuild/connect-express (h1)":
+    "@apache/dubbo-node (Connect, JSON, http, gzip) against @apache/dubbo-express (h1)":
       (options?: Record<string, unknown>) =>
         createConnectTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-express (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-express (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: false,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (Connect, binary, http, gzip) against @bufbuild/connect-express (h1)":
+    "@apache/dubbo-node (Connect, binary, http, gzip) against @apache/dubbo-express (h1)":
       (options?: Record<string, unknown>) =>
         createConnectTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-express (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-express (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: true,
           sendCompression: compressionGzip,
         }),
 
     // gRPC-web
-    "@bufbuild/connect-node (gRPC-web, binary, http2) against @bufbuild/connect-node (h2c)":
+    "@apache/dubbo-node (gRPC-web, binary, http2) against @apache/dubbo-node (h2c)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
-          baseUrl: servers["@bufbuild/connect-node (h2c)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h2c)"].getUrl(),
           useBinaryFormat: true,
         }),
-    "@bufbuild/connect-node (gRPC-web, JSON, http2) against @bufbuild/connect-node (h2c)":
+    "@apache/dubbo-node (gRPC-web, JSON, http2) against @apache/dubbo-node (h2c)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h2c)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h2c)"].getUrl(),
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
           useBinaryFormat: false,
         }),
-    "@bufbuild/connect-node (gRPC-web, binary, http2) against connect-go (h1)":
+    "@apache/dubbo-node (gRPC-web, binary, http2) against connect-go (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
@@ -819,7 +819,7 @@ export function createTestServers() {
           },
           useBinaryFormat: true,
         }),
-    "@bufbuild/connect-node (gRPC-web, binary, http2, gzip) against connect-go (h1)":
+    "@apache/dubbo-node (gRPC-web, binary, http2, gzip) against connect-go (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
@@ -832,7 +832,7 @@ export function createTestServers() {
           useBinaryFormat: true,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (gRPC-web, JSON, http2, gzip) against connect-go (h1)":
+    "@apache/dubbo-node (gRPC-web, JSON, http2, gzip) against connect-go (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
@@ -845,11 +845,11 @@ export function createTestServers() {
           useBinaryFormat: false,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (gRPC-web, binary, http2, gzip) against @bufbuild/connect-node (h2c)":
+    "@apache/dubbo-node (gRPC-web, binary, http2, gzip) against @apache/dubbo-node (h2c)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h2c)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h2c)"].getUrl(),
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
           nodeOptions: {
@@ -858,11 +858,11 @@ export function createTestServers() {
           useBinaryFormat: true,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (gRPC-web, JSON, http2, gzip) against @bufbuild/connect-node (h2c)":
+    "@apache/dubbo-node (gRPC-web, JSON, http2, gzip) against @apache/dubbo-node (h2c)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h2c)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h2c)"].getUrl(),
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
           nodeOptions: {
@@ -871,7 +871,7 @@ export function createTestServers() {
           useBinaryFormat: false,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (gRPC-web, JSON, http2) against connect-go (h1)": (
+    "@apache/dubbo-node (gRPC-web, JSON, http2) against connect-go (h1)": (
       options?: Record<string, unknown>
     ) =>
       createGrpcWebTransport({
@@ -884,45 +884,45 @@ export function createTestServers() {
         },
         useBinaryFormat: false,
       }),
-    "@bufbuild/connect-node (gRPC-web, binary, http) against @bufbuild/connect-node (h1)":
+    "@apache/dubbo-node (gRPC-web, binary, http) against @apache/dubbo-node (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: true,
         }),
-    "@bufbuild/connect-node (gRPC-web, JSON, http) against @bufbuild/connect-node (h1)":
+    "@apache/dubbo-node (gRPC-web, JSON, http) against @apache/dubbo-node (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: false,
         }),
-    "@bufbuild/connect-node (gRPC-web, JSON, https) against @bufbuild/connect-node (h1 + tls)":
+    "@apache/dubbo-node (gRPC-web, JSON, https) against @apache/dubbo-node (h1 + tls)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: false,
           nodeOptions: {
             rejectUnauthorized: false,
           },
         }),
-    "@bufbuild/connect-node (gRPC-web, binary, https) against @bufbuild/connect-node (h1 + tls)":
+    "@apache/dubbo-node (gRPC-web, binary, https) against @apache/dubbo-node (h1 + tls)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: true,
           nodeOptions: {
             rejectUnauthorized: false,
           },
         }),
-    "@bufbuild/connect-node (gRPC-web, binary, https) against connect-go (h1)":
+    "@apache/dubbo-node (gRPC-web, binary, https) against connect-go (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
@@ -933,7 +933,7 @@ export function createTestServers() {
             rejectUnauthorized: false,
           },
         }),
-    "@bufbuild/connect-node (gRPC-web, JSON, https) against connect-go (h1)": (
+    "@apache/dubbo-node (gRPC-web, JSON, https) against connect-go (h1)": (
       options?: Record<string, unknown>
     ) =>
       createGrpcWebTransport({
@@ -945,7 +945,7 @@ export function createTestServers() {
           rejectUnauthorized: false,
         },
       }),
-    "@bufbuild/connect-node (gRPC-web, JSON, http, gzip) against connect-go (h1)":
+    "@apache/dubbo-node (gRPC-web, JSON, http, gzip) against connect-go (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
@@ -957,11 +957,11 @@ export function createTestServers() {
             rejectUnauthorized: false,
           },
         }),
-    "@bufbuild/connect-node (gRPC-web, binary, http, gzip) against @bufbuild/connect-node (h1)":
+    "@apache/dubbo-node (gRPC-web, binary, http, gzip) against @apache/dubbo-node (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: true,
           sendCompression: compressionGzip,
@@ -969,11 +969,11 @@ export function createTestServers() {
             rejectUnauthorized: false,
           },
         }),
-    "@bufbuild/connect-node (gRPC-web, JSON, http, gzip) against @bufbuild/connect-node (h1)":
+    "@apache/dubbo-node (gRPC-web, JSON, http, gzip) against @apache/dubbo-node (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-node (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-node (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: false,
           sendCompression: compressionGzip,
@@ -981,47 +981,47 @@ export function createTestServers() {
             rejectUnauthorized: false,
           },
         }),
-    "@bufbuild/connect-node (gRPC-web, binary, http, gzip against @bufbuild/connect-fastify (h2c)":
+    "@apache/dubbo-node (gRPC-web, binary, http, gzip against @apache/dubbo-fastify (h2c)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-fastify (h2c)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-fastify (h2c)"].getUrl(),
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
           useBinaryFormat: true,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (gRPC-web, JSON, http, gzip) against @bufbuild/connect-fastify (h2c)":
+    "@apache/dubbo-node (gRPC-web, JSON, http, gzip) against @apache/dubbo-fastify (h2c)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-fastify (h2c)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-fastify (h2c)"].getUrl(),
           httpVersion: "2",
           idleConnectionTimeoutMs: 25, // automatically close connection without streams so the server shuts down quickly after tests
           useBinaryFormat: false,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (gRPC-web, JSON, http, gzip) against @bufbuild/connect-express (h1)":
+    "@apache/dubbo-node (gRPC-web, JSON, http, gzip) against @apache/dubbo-express (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-express (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-express (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: false,
           sendCompression: compressionGzip,
         }),
-    "@bufbuild/connect-node (gRPC-web, binary, http, gzip) against @bufbuild/connect-express (h1)":
+    "@apache/dubbo-node (gRPC-web, binary, http, gzip) against @apache/dubbo-express (h1)":
       (options?: Record<string, unknown>) =>
         createGrpcWebTransport({
           ...options,
-          baseUrl: servers["@bufbuild/connect-express (h1)"].getUrl(),
+          baseUrl: servers["@apache/dubbo-express (h1)"].getUrl(),
           httpVersion: "1.1",
           useBinaryFormat: true,
           sendCompression: compressionGzip,
         }),
 
     // ConnectRouter
-    "@bufbuild/connect (ConnectRouter, binary)": (
+    "@apache/dubbo (ConnectRouter, binary)": (
       options?: Record<string, unknown>
     ) =>
       createRouterTransport(testRoutes, {
@@ -1030,7 +1030,7 @@ export function createTestServers() {
           useBinaryFormat: true,
         },
       }),
-    "@bufbuild/connect (ConnectRouter, JSON)": (
+    "@apache/dubbo (ConnectRouter, JSON)": (
       options?: Record<string, unknown>
     ) =>
       createRouterTransport(testRoutes, {
diff --git a/packages/connect-node-test/src/node-readme.spec.ts b/packages/connect-node-test/src/node-readme.spec.ts
index ddba8013..d4c3aed9 100644
--- a/packages/connect-node-test/src/node-readme.spec.ts
+++ b/packages/connect-node-test/src/node-readme.spec.ts
@@ -14,14 +14,14 @@
 
 import * as http2 from "http2";
 import { Message, MethodKind, proto3 } from "@bufbuild/protobuf";
-import { createPromiseClient, createRouterTransport } from "@bufbuild/connect";
-import type { ConnectRouter } from "@bufbuild/connect";
+import { createPromiseClient, createRouterTransport } from "@apache/dubbo";
+import type { ConnectRouter } from "@apache/dubbo";
 import {
   connectNodeAdapter,
   createGrpcTransport,
   createGrpcWebTransport,
   createConnectTransport,
-} from "@bufbuild/connect-node";
+} from "@apache/dubbo-node";
 
 /* eslint-disable @typescript-eslint/require-await */
 
diff --git a/packages/connect-node-test/src/transports.spec.ts b/packages/connect-node-test/src/transports.spec.ts
index d67868e3..c43b1d3a 100644
--- a/packages/connect-node-test/src/transports.spec.ts
+++ b/packages/connect-node-test/src/transports.spec.ts
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Code, ConnectError } from "@bufbuild/connect";
+import { Code, ConnectError } from "@apache/dubbo";
 import {
   createConnectTransport,
   Http2SessionManager,
-} from "@bufbuild/connect-node";
+} from "@apache/dubbo-node";
 
 describe("createConnectTransport()", function () {
   it("should take just httpVersion and baseUrl", function () {
diff --git a/packages/connect-node/src/compression.ts b/packages/connect-node/src/compression.ts
index 1aed5d94..1287e944 100644
--- a/packages/connect-node/src/compression.ts
+++ b/packages/connect-node/src/compression.ts
@@ -14,8 +14,8 @@
 
 import * as zlib from "zlib";
 import { promisify } from "util";
-import type { Compression } from "@bufbuild/connect/protocol";
-import { Code, ConnectError } from "@bufbuild/connect";
+import type { Compression } from "@apache/dubbo/protocol";
+import { Code, ConnectError } from "@apache/dubbo";
 import { getNodeErrorProps } from "./node-error.js";
 
 const gzip = promisify(zlib.gzip);
@@ -27,7 +27,7 @@ const brotliDecompress = promisify(zlib.brotliDecompress);
  * The gzip compression algorithm, implemented with the Node.js built-in module
  * zlib. This value can be used for the `sendCompression` and `acceptCompression`
  * option of client transports, or for the `acceptCompression` option of server
- * plugins like `fastifyConnectPlugin` from @bufbuild/connect-fastify.
+ * plugins like `fastifyConnectPlugin` from @apache/dubbo-fastify.
  */
 export const compressionGzip: Compression = {
   name: "gzip",
@@ -48,7 +48,7 @@ export const compressionGzip: Compression = {
  * The brotli compression algorithm, implemented with the Node.js built-in module
  * zlib. This value can be used for the `sendCompression` and `acceptCompression`
  * option of client transports, or for the `acceptCompression` option of server
- * plugins like `fastifyConnectPlugin` from @bufbuild/connect-fastify.
+ * plugins like `fastifyConnectPlugin` from @apache/dubbo-fastify.
  */
 export const compressionBrotli: Compression = {
   name: "br",
diff --git a/packages/connect-node/src/connect-node-adapter.ts b/packages/connect-node/src/connect-node-adapter.ts
index d01e0acf..a9611082 100644
--- a/packages/connect-node/src/connect-node-adapter.ts
+++ b/packages/connect-node/src/connect-node-adapter.ts
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Code, ConnectError, createConnectRouter } from "@bufbuild/connect";
-import type { ConnectRouter, ConnectRouterOptions } from "@bufbuild/connect";
-import type { UniversalHandler } from "@bufbuild/connect/protocol";
-import { uResponseNotFound } from "@bufbuild/connect/protocol";
+import { Code, ConnectError, createConnectRouter } from "@apache/dubbo";
+import type { ConnectRouter, ConnectRouterOptions } from "@apache/dubbo";
+import type { UniversalHandler } from "@apache/dubbo/protocol";
+import { uResponseNotFound } from "@apache/dubbo/protocol";
 import {
   universalRequestFromNodeRequest,
   universalResponseToNodeResponse,
@@ -34,7 +34,7 @@ interface ConnectNodeAdapterOptions extends ConnectRouterOptions {
    * Create a file `connect.ts` with a default export such as this:
    *
    * ```ts
-   * import {ConnectRouter} from "@bufbuild/connect";
+   * import {ConnectRouter} from "@apache/dubbo";
    *
    * export default (router: ConnectRouter) => {
    *   router.service(ElizaService, {});
diff --git a/packages/connect-node/src/connect-transport.ts b/packages/connect-node/src/connect-transport.ts
index 3a9d21ed..9a9c7000 100644
--- a/packages/connect-node/src/connect-transport.ts
+++ b/packages/connect-node/src/connect-transport.ts
@@ -18,9 +18,9 @@ import type {
   JsonReadOptions,
   JsonWriteOptions,
 } from "@bufbuild/protobuf";
-import type { Interceptor, Transport } from "@bufbuild/connect";
-import type { Compression } from "@bufbuild/connect/protocol";
-import { createTransport } from "@bufbuild/connect/protocol-connect";
+import type { Interceptor, Transport } from "@apache/dubbo";
+import type { Compression } from "@apache/dubbo/protocol";
+import { createTransport } from "@apache/dubbo/protocol-connect";
 import {
   type DeprecatedNodeTransportOptions,
   type NodeTransportOptions,
diff --git a/packages/connect-node/src/grpc-transport.ts b/packages/connect-node/src/grpc-transport.ts
index e2a18243..48234d04 100644
--- a/packages/connect-node/src/grpc-transport.ts
+++ b/packages/connect-node/src/grpc-transport.ts
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import type { Interceptor, Transport } from "@bufbuild/connect";
-import type { Compression } from "@bufbuild/connect/protocol";
-import { createTransport } from "@bufbuild/connect/protocol-grpc";
+import type { Interceptor, Transport } from "@apache/dubbo";
+import type { Compression } from "@apache/dubbo/protocol";
+import { createTransport } from "@apache/dubbo/protocol-grpc";
 import type {
   BinaryReadOptions,
   BinaryWriteOptions,
diff --git a/packages/connect-node/src/grpc-web-transport.ts b/packages/connect-node/src/grpc-web-transport.ts
index 96299fd4..69b57168 100644
--- a/packages/connect-node/src/grpc-web-transport.ts
+++ b/packages/connect-node/src/grpc-web-transport.ts
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import type { Interceptor, Transport } from "@bufbuild/connect";
-import type { Compression } from "@bufbuild/connect/protocol";
-import { createTransport } from "@bufbuild/connect/protocol-grpc-web";
+import type { Interceptor, Transport } from "@apache/dubbo";
+import type { Compression } from "@apache/dubbo/protocol";
+import { createTransport } from "@apache/dubbo/protocol-grpc-web";
 import type {
   BinaryReadOptions,
   BinaryWriteOptions,
diff --git a/packages/connect-node/src/http2-session-manager.spec.ts b/packages/connect-node/src/http2-session-manager.spec.ts
index 5aba531c..bfe92215 100644
--- a/packages/connect-node/src/http2-session-manager.spec.ts
+++ b/packages/connect-node/src/http2-session-manager.spec.ts
@@ -15,7 +15,7 @@
 import { useNodeServer } from "./use-node-server-helper.spec.js";
 import * as http2 from "http2";
 import { Http2SessionManager } from "./http2-session-manager.js";
-import { ConnectError } from "@bufbuild/connect";
+import { ConnectError } from "@apache/dubbo";
 
 describe("Http2SessionManager", function () {
   const serverSessions: http2.ServerHttp2Session[] = [];
diff --git a/packages/connect-node/src/http2-session-manager.ts b/packages/connect-node/src/http2-session-manager.ts
index a9dd25ae..ea1e8f9e 100644
--- a/packages/connect-node/src/http2-session-manager.ts
+++ b/packages/connect-node/src/http2-session-manager.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import * as http2 from "http2";
-import { Code, ConnectError } from "@bufbuild/connect";
+import { Code, ConnectError } from "@apache/dubbo";
 import { connectErrorFromNodeReason } from "./node-error.js";
 
 export interface Http2SessionOptions {
diff --git a/packages/connect-node/src/node-error.ts b/packages/connect-node/src/node-error.ts
index 0dea379e..7ab94f12 100644
--- a/packages/connect-node/src/node-error.ts
+++ b/packages/connect-node/src/node-error.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Code, ConnectError } from "@bufbuild/connect";
+import { Code, ConnectError } from "@apache/dubbo";
 
 /**
  * Similar to ConnectError.from(), this function turns any value into
diff --git a/packages/connect-node/src/node-transport-options.ts b/packages/connect-node/src/node-transport-options.ts
index 7d6fa74e..9331d937 100644
--- a/packages/connect-node/src/node-transport-options.ts
+++ b/packages/connect-node/src/node-transport-options.ts
@@ -15,8 +15,8 @@
 import type {
   CommonTransportOptions,
   UniversalClientFn,
-} from "@bufbuild/connect/protocol";
-import { validateReadWriteMaxBytes } from "@bufbuild/connect/protocol";
+} from "@apache/dubbo/protocol";
+import { validateReadWriteMaxBytes } from "@apache/dubbo/protocol";
 import { compressionBrotli, compressionGzip } from "./compression.js";
 import {
   createNodeHttpClient,
diff --git a/packages/connect-node/src/node-universal-client.spec.ts b/packages/connect-node/src/node-universal-client.spec.ts
index a38e0fb5..421fc272 100644
--- a/packages/connect-node/src/node-universal-client.spec.ts
+++ b/packages/connect-node/src/node-universal-client.spec.ts
@@ -14,8 +14,8 @@
 
 import * as http2 from "http2";
 import * as http from "http";
-import { ConnectError } from "@bufbuild/connect";
-import { createAsyncIterable } from "@bufbuild/connect/protocol";
+import { ConnectError } from "@apache/dubbo";
+import { createAsyncIterable } from "@apache/dubbo/protocol";
 import { createNodeHttpClient } from "./node-universal-client.js";
 import { useNodeServer } from "./use-node-server-helper.spec.js";
 
diff --git a/packages/connect-node/src/node-universal-client.ts b/packages/connect-node/src/node-universal-client.ts
index 48e5b372..3b30a256 100644
--- a/packages/connect-node/src/node-universal-client.ts
+++ b/packages/connect-node/src/node-universal-client.ts
@@ -16,7 +16,7 @@ import * as http2 from "http2";
 import * as http from "http";
 import * as https from "https";
 import type * as net from "net";
-import { Code, ConnectError } from "@bufbuild/connect";
+import { Code, ConnectError } from "@apache/dubbo";
 import {
   nodeHeaderToWebHeader,
   webHeaderToNodeHeaders,
@@ -32,8 +32,8 @@ import type {
   UniversalClientFn,
   UniversalClientRequest,
   UniversalClientResponse,
-} from "@bufbuild/connect/protocol";
-import { getAbortSignalReason } from "@bufbuild/connect/protocol";
+} from "@apache/dubbo/protocol";
+import { getAbortSignalReason } from "@apache/dubbo/protocol";
 import { Http2SessionManager } from "./http2-session-manager.js";
 
 /**
diff --git a/packages/connect-node/src/node-universal-handler.spec.ts b/packages/connect-node/src/node-universal-handler.spec.ts
index 50a73f08..fce5975a 100644
--- a/packages/connect-node/src/node-universal-handler.spec.ts
+++ b/packages/connect-node/src/node-universal-handler.spec.ts
@@ -16,13 +16,13 @@ import { useNodeServer } from "./use-node-server-helper.spec.js";
 import * as http2 from "http2";
 import * as http from "http";
 import { universalRequestFromNodeRequest } from "./node-universal-handler.js";
-import { ConnectError } from "@bufbuild/connect";
+import { ConnectError } from "@apache/dubbo";
 import { getNodeErrorProps } from "./node-error.js";
 import {
   assertByteStreamRequest,
   readAllBytes,
   type UniversalServerRequest,
-} from "@bufbuild/connect/protocol";
+} from "@apache/dubbo/protocol";
 
 // Polyfill the Headers API for Node versions < 18
 import "./node-headers-polyfill.js";
diff --git a/packages/connect-node/src/node-universal-handler.ts b/packages/connect-node/src/node-universal-handler.ts
index efa8a7be..e9d715d9 100644
--- a/packages/connect-node/src/node-universal-handler.ts
+++ b/packages/connect-node/src/node-universal-handler.ts
@@ -16,11 +16,11 @@ import type * as http from "http";
 import type * as http2 from "http2";
 import type * as stream from "stream";
 import type { JsonValue } from "@bufbuild/protobuf";
-import { Code, ConnectError } from "@bufbuild/connect";
+import { Code, ConnectError } from "@apache/dubbo";
 import type {
   UniversalServerRequest,
   UniversalServerResponse,
-} from "@bufbuild/connect/protocol";
+} from "@apache/dubbo/protocol";
 import {
   nodeHeaderToWebHeader,
   webHeaderToNodeHeaders,
diff --git a/packages/connect-node/src/use-node-server-helper.spec.ts b/packages/connect-node/src/use-node-server-helper.spec.ts
index b5df649c..282b20bf 100644
--- a/packages/connect-node/src/use-node-server-helper.spec.ts
+++ b/packages/connect-node/src/use-node-server-helper.spec.ts
@@ -15,7 +15,7 @@
 import * as http2 from "http2";
 import * as http from "http";
 import * as https from "https";
-import type { UniversalClientFn } from "@bufbuild/connect/protocol";
+import type { UniversalClientFn } from "@apache/dubbo/protocol";
 import { Http2SessionManager } from "./http2-session-manager.js";
 import { createNodeHttpClient } from "./node-universal-client.js";
 
diff --git a/packages/connect-web-bench/src/entry-connect.ts b/packages/connect-web-bench/src/entry-connect.ts
index c1b99091..be775ec7 100644
--- a/packages/connect-web-bench/src/entry-connect.ts
+++ b/packages/connect-web-bench/src/entry-connect.ts
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createPromiseClient } from "@bufbuild/connect";
-import { createConnectTransport } from "@bufbuild/connect-web";
+import { createPromiseClient } from "@apache/dubbo";
+import { createConnectTransport } from "@apache/dubbo-web";
 import { ElizaService } from "./gen/connectweb/buf/connect/demo/eliza/v1/eliza_connect.js";
 
 const client = createPromiseClient(
diff --git a/packages/connect-web-test/src/browserstackonly/eliza.spec.ts b/packages/connect-web-test/src/browserstackonly/eliza.spec.ts
index af9c6e9b..d6896f54 100644
--- a/packages/connect-web-test/src/browserstackonly/eliza.spec.ts
+++ b/packages/connect-web-test/src/browserstackonly/eliza.spec.ts
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createPromiseClient } from "@bufbuild/connect";
-import { createConnectTransport } from "@bufbuild/connect-web";
+import { createPromiseClient } from "@apache/dubbo";
+import { createConnectTransport } from "@apache/dubbo-web";
 import { ElizaService } from "../gen/buf/connect/demo/eliza/v1/eliza_connect.js";
 import { IntroduceRequest } from "../gen/buf/connect/demo/eliza/v1/eliza_pb.js";
 
diff --git a/packages/connect-web-test/src/cancellation.spec.ts b/packages/connect-web-test/src/cancellation.spec.ts
index 93e1c458..0c0d4517 100644
--- a/packages/connect-web-test/src/cancellation.spec.ts
+++ b/packages/connect-web-test/src/cancellation.spec.ts
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import type { CallOptions } from "@bufbuild/connect";
+import type { CallOptions } from "@apache/dubbo";
 import {
   Code,
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { describeTransports } from "./helpers/crosstestserver.js";
 import { TestService } from "./gen/grpc/testing/test_connect.js";
 
diff --git a/packages/connect-web-test/src/crosstest/cacheable_unary.spec.ts b/packages/connect-web-test/src/crosstest/cacheable_unary.spec.ts
index b979837f..096d42c5 100644
--- a/packages/connect-web-test/src/crosstest/cacheable_unary.spec.ts
+++ b/packages/connect-web-test/src/crosstest/cacheable_unary.spec.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createCallbackClient, createPromiseClient } from "@bufbuild/connect";
+import { createCallbackClient, createPromiseClient } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 import { SimpleRequest } from "../gen/grpc/testing/messages_pb.js";
diff --git a/packages/connect-web-test/src/crosstest/custom_metadata.spec.ts b/packages/connect-web-test/src/crosstest/custom_metadata.spec.ts
index 750e7e5e..b0b9c09c 100644
--- a/packages/connect-web-test/src/crosstest/custom_metadata.spec.ts
+++ b/packages/connect-web-test/src/crosstest/custom_metadata.spec.ts
@@ -17,7 +17,7 @@ import {
   encodeBinaryHeader,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 import {
diff --git a/packages/connect-web-test/src/crosstest/custom_metadata_server_streaming.spec.ts b/packages/connect-web-test/src/crosstest/custom_metadata_server_streaming.spec.ts
index 401b9231..2a2faf27 100644
--- a/packages/connect-web-test/src/crosstest/custom_metadata_server_streaming.spec.ts
+++ b/packages/connect-web-test/src/crosstest/custom_metadata_server_streaming.spec.ts
@@ -17,7 +17,7 @@ import {
   encodeBinaryHeader,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 import {
diff --git a/packages/connect-web-test/src/crosstest/empty_stream.spec.ts b/packages/connect-web-test/src/crosstest/empty_stream.spec.ts
index 5f363461..52ac6b59 100644
--- a/packages/connect-web-test/src/crosstest/empty_stream.spec.ts
+++ b/packages/connect-web-test/src/crosstest/empty_stream.spec.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createCallbackClient, createPromiseClient } from "@bufbuild/connect";
+import { createCallbackClient, createPromiseClient } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 import { StreamingOutputCallRequest } from "../gen/grpc/testing/messages_pb.js";
diff --git a/packages/connect-web-test/src/crosstest/empty_unary.spec.ts b/packages/connect-web-test/src/crosstest/empty_unary.spec.ts
index 422aaba6..dcae4a6d 100644
--- a/packages/connect-web-test/src/crosstest/empty_unary.spec.ts
+++ b/packages/connect-web-test/src/crosstest/empty_unary.spec.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createCallbackClient, createPromiseClient } from "@bufbuild/connect";
+import { createCallbackClient, createPromiseClient } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 import { Empty } from "../gen/grpc/testing/empty_pb.js";
diff --git a/packages/connect-web-test/src/crosstest/empty_unary_with_timeout.spec.ts b/packages/connect-web-test/src/crosstest/empty_unary_with_timeout.spec.ts
index ea4272d1..d792e8b5 100644
--- a/packages/connect-web-test/src/crosstest/empty_unary_with_timeout.spec.ts
+++ b/packages/connect-web-test/src/crosstest/empty_unary_with_timeout.spec.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createCallbackClient, createPromiseClient } from "@bufbuild/connect";
+import { createCallbackClient, createPromiseClient } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 import { Empty } from "../gen/grpc/testing/empty_pb.js";
diff --git a/packages/connect-web-test/src/crosstest/fail_server_streaming.spec.ts b/packages/connect-web-test/src/crosstest/fail_server_streaming.spec.ts
index 236ab898..522b5e62 100644
--- a/packages/connect-web-test/src/crosstest/fail_server_streaming.spec.ts
+++ b/packages/connect-web-test/src/crosstest/fail_server_streaming.spec.ts
@@ -17,7 +17,7 @@ import {
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 import {
diff --git a/packages/connect-web-test/src/crosstest/fail_server_streaming_after_response.spec.ts b/packages/connect-web-test/src/crosstest/fail_server_streaming_after_response.spec.ts
index 97fe929f..e44dd57b 100644
--- a/packages/connect-web-test/src/crosstest/fail_server_streaming_after_response.spec.ts
+++ b/packages/connect-web-test/src/crosstest/fail_server_streaming_after_response.spec.ts
@@ -17,7 +17,7 @@ import {
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 import {
diff --git a/packages/connect-web-test/src/crosstest/fail_unary.spec.ts b/packages/connect-web-test/src/crosstest/fail_unary.spec.ts
index 52c9658f..d5bb0a05 100644
--- a/packages/connect-web-test/src/crosstest/fail_unary.spec.ts
+++ b/packages/connect-web-test/src/crosstest/fail_unary.spec.ts
@@ -17,7 +17,7 @@ import {
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 import { ErrorDetail } from "../gen/grpc/testing/messages_pb.js";
diff --git a/packages/connect-web-test/src/crosstest/large_unary.spec.ts b/packages/connect-web-test/src/crosstest/large_unary.spec.ts
index c1719ce7..6a9cd080 100644
--- a/packages/connect-web-test/src/crosstest/large_unary.spec.ts
+++ b/packages/connect-web-test/src/crosstest/large_unary.spec.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createCallbackClient, createPromiseClient } from "@bufbuild/connect";
+import { createCallbackClient, createPromiseClient } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 import { SimpleRequest } from "../gen/grpc/testing/messages_pb.js";
diff --git a/packages/connect-web-test/src/crosstest/server_streaming.spec.ts b/packages/connect-web-test/src/crosstest/server_streaming.spec.ts
index 4193aed5..cd29330d 100644
--- a/packages/connect-web-test/src/crosstest/server_streaming.spec.ts
+++ b/packages/connect-web-test/src/crosstest/server_streaming.spec.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createCallbackClient, createPromiseClient } from "@bufbuild/connect";
+import { createCallbackClient, createPromiseClient } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 import { StreamingOutputCallRequest } from "../gen/grpc/testing/messages_pb.js";
diff --git a/packages/connect-web-test/src/crosstest/special_status.spec.ts b/packages/connect-web-test/src/crosstest/special_status.spec.ts
index f176b9c8..658f9efc 100644
--- a/packages/connect-web-test/src/crosstest/special_status.spec.ts
+++ b/packages/connect-web-test/src/crosstest/special_status.spec.ts
@@ -17,7 +17,7 @@ import {
   createCallbackClient,
   createPromiseClient,
   Code,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 import { SimpleRequest } from "../gen/grpc/testing/messages_pb.js";
diff --git a/packages/connect-web-test/src/crosstest/status_code_and_message.spec.ts b/packages/connect-web-test/src/crosstest/status_code_and_message.spec.ts
index c03a9436..4ea060aa 100644
--- a/packages/connect-web-test/src/crosstest/status_code_and_message.spec.ts
+++ b/packages/connect-web-test/src/crosstest/status_code_and_message.spec.ts
@@ -17,7 +17,7 @@ import {
   createCallbackClient,
   createPromiseClient,
   Code,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 import { SimpleRequest } from "../gen/grpc/testing/messages_pb.js";
diff --git a/packages/connect-web-test/src/crosstest/timeout_on_sleeping_server.spec.ts b/packages/connect-web-test/src/crosstest/timeout_on_sleeping_server.spec.ts
index 257b46d9..e12fdad2 100644
--- a/packages/connect-web-test/src/crosstest/timeout_on_sleeping_server.spec.ts
+++ b/packages/connect-web-test/src/crosstest/timeout_on_sleeping_server.spec.ts
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import type { CallOptions } from "@bufbuild/connect";
+import type { CallOptions } from "@apache/dubbo";
 import {
   Code,
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 import { StreamingOutputCallRequest } from "../gen/grpc/testing/messages_pb.js";
diff --git a/packages/connect-web-test/src/crosstest/unimplemented_method.spec.ts b/packages/connect-web-test/src/crosstest/unimplemented_method.spec.ts
index 1f5997a0..f3b8a4f7 100644
--- a/packages/connect-web-test/src/crosstest/unimplemented_method.spec.ts
+++ b/packages/connect-web-test/src/crosstest/unimplemented_method.spec.ts
@@ -17,7 +17,7 @@ import {
   createCallbackClient,
   createPromiseClient,
   Code,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 
diff --git a/packages/connect-web-test/src/crosstest/unimplemented_server_streaming_method.spec.ts b/packages/connect-web-test/src/crosstest/unimplemented_server_streaming_method.spec.ts
index 702aa97c..b1546d5d 100644
--- a/packages/connect-web-test/src/crosstest/unimplemented_server_streaming_method.spec.ts
+++ b/packages/connect-web-test/src/crosstest/unimplemented_server_streaming_method.spec.ts
@@ -17,7 +17,7 @@ import {
   createCallbackClient,
   createPromiseClient,
   Code,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 import { Empty } from "../gen/grpc/testing/empty_pb.js";
diff --git a/packages/connect-web-test/src/crosstest/unimplemented_server_streaming_service.spec.ts b/packages/connect-web-test/src/crosstest/unimplemented_server_streaming_service.spec.ts
index 09102bcc..99e32f42 100644
--- a/packages/connect-web-test/src/crosstest/unimplemented_server_streaming_service.spec.ts
+++ b/packages/connect-web-test/src/crosstest/unimplemented_server_streaming_service.spec.ts
@@ -17,7 +17,7 @@ import {
   ConnectError,
   createCallbackClient,
   createPromiseClient,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { UnimplementedService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 import { Empty } from "../gen/grpc/testing/empty_pb.js";
diff --git a/packages/connect-web-test/src/crosstest/unimplemented_service.spec.ts b/packages/connect-web-test/src/crosstest/unimplemented_service.spec.ts
index feed6306..1c3dcd37 100644
--- a/packages/connect-web-test/src/crosstest/unimplemented_service.spec.ts
+++ b/packages/connect-web-test/src/crosstest/unimplemented_service.spec.ts
@@ -17,7 +17,7 @@ import {
   createCallbackClient,
   createPromiseClient,
   Code,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { UnimplementedService } from "../gen/grpc/testing/test_connect.js";
 import { describeTransports } from "../helpers/crosstestserver.js";
 
diff --git a/packages/connect-web-test/src/fetch.spec.ts b/packages/connect-web-test/src/fetch.spec.ts
index 6227b59a..92cf4b50 100644
--- a/packages/connect-web-test/src/fetch.spec.ts
+++ b/packages/connect-web-test/src/fetch.spec.ts
@@ -17,7 +17,7 @@ import {
   SimpleRequest,
   SimpleResponse,
 } from "./gen/grpc/testing/messages_pb.js";
-import { createConnectTransport } from "@bufbuild/connect-web";
+import { createConnectTransport } from "@apache/dubbo-web";
 
 describe("custom fetch", function () {
   describe("with Connect transport", () => {
diff --git a/packages/connect-web-test/src/helpers/crosstestserver.ts b/packages/connect-web-test/src/helpers/crosstestserver.ts
index 513ef8b7..7621ef22 100644
--- a/packages/connect-web-test/src/helpers/crosstestserver.ts
+++ b/packages/connect-web-test/src/helpers/crosstestserver.ts
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { type Transport, createRouterTransport } from "@bufbuild/connect";
+import { type Transport, createRouterTransport } from "@apache/dubbo";
 import {
   createConnectTransport,
   createGrpcWebTransport,
-} from "@bufbuild/connect-web";
+} from "@apache/dubbo-web";
 import { testRoutes } from "./test-routes.js";
 
 // The following servers are available through crosstests:
@@ -35,7 +35,7 @@ const connectNodeH1BaseUrl = "http://127.0.0.1:8085";
 
 const crosstestTransports = {
   // gRPC-web
-  "@bufbuild/connect-web (gRPC-web, binary) gRPC-web against connect-go (h1)": (
+  "@apache/dubbo-web (gRPC-web, binary) gRPC-web against connect-go (h1)": (
     options?: Record<string, unknown>
   ) =>
     createGrpcWebTransport({
@@ -43,7 +43,7 @@ const crosstestTransports = {
       baseUrl: crossTestConnectGoH1BaseUrl,
       useBinaryFormat: true,
     }),
-  "@bufbuild/connect-web (gRPC-web, JSON) gRPC-web against connect-go (h1)": (
+  "@apache/dubbo-web (gRPC-web, JSON) gRPC-web against connect-go (h1)": (
     options?: Record<string, unknown>
   ) =>
     createGrpcWebTransport({
@@ -51,14 +51,14 @@ const crosstestTransports = {
       baseUrl: crossTestConnectGoH1BaseUrl,
       useBinaryFormat: false,
     }),
-  "@bufbuild/connect-web (gRPC-web, binary) gRPC-web against @bufbuild/connect-node (h1)":
+  "@apache/dubbo-web (gRPC-web, binary) gRPC-web against @apache/dubbo-node (h1)":
     (options?: Record<string, unknown>) =>
       createGrpcWebTransport({
         ...options,
         baseUrl: connectNodeH1BaseUrl,
         useBinaryFormat: true,
       }),
-  "@bufbuild/connect-web (gRPC-web, JSON) gRPC-web against @bufbuild/connect-node (h1)":
+  "@apache/dubbo-web (gRPC-web, JSON) gRPC-web against @apache/dubbo-node (h1)":
     (options?: Record<string, unknown>) =>
       createGrpcWebTransport({
         ...options,
@@ -66,7 +66,7 @@ const crosstestTransports = {
         useBinaryFormat: false,
       }),
   // Connect
-  "@bufbuild/connect-web (Connect, binary) against connect-go (h1)": (
+  "@apache/dubbo-web (Connect, binary) against connect-go (h1)": (
     options?: Record<string, unknown>
   ) =>
     createConnectTransport({
@@ -74,7 +74,7 @@ const crosstestTransports = {
       baseUrl: crossTestConnectGoH1BaseUrl,
       useBinaryFormat: true,
     }),
-  "@bufbuild/connect-web (Connect, JSON) against connect-go (h1)": (
+  "@apache/dubbo-web (Connect, JSON) against connect-go (h1)": (
     options?: Record<string, unknown>
   ) =>
     createConnectTransport({
@@ -82,14 +82,14 @@ const crosstestTransports = {
       baseUrl: crossTestConnectGoH1BaseUrl,
       useBinaryFormat: false,
     }),
-  "@bufbuild/connect-web (Connect, binary) against @bufbuild/connect-node (h1)":
+  "@apache/dubbo-web (Connect, binary) against @apache/dubbo-node (h1)":
     (options?: Record<string, unknown>) =>
       createConnectTransport({
         ...options,
         baseUrl: connectNodeH1BaseUrl,
         useBinaryFormat: true,
       }),
-  "@bufbuild/connect-web (Connect, JSON) against @bufbuild/connect-node (h1)": (
+  "@apache/dubbo-web (Connect, JSON) against @apache/dubbo-node (h1)": (
     options?: Record<string, unknown>
   ) =>
     createConnectTransport({
@@ -99,7 +99,7 @@ const crosstestTransports = {
     }),
 
   // ConnectRouter
-  "@bufbuild/connect-web (ConnectRouter, binary)": (
+  "@apache/dubbo-web (ConnectRouter, binary)": (
     options?: Record<string, unknown>
   ) =>
     createRouterTransport(testRoutes, {
@@ -109,7 +109,7 @@ const crosstestTransports = {
       },
     }),
 
-  "@bufbuild/connect-web (ConnectRouter, JSON)": (
+  "@apache/dubbo-web (ConnectRouter, JSON)": (
     options?: Record<string, unknown>
   ) =>
     createRouterTransport(testRoutes, {
diff --git a/packages/connect-web-test/src/helpers/test-routes.ts b/packages/connect-web-test/src/helpers/test-routes.ts
index 9ce0d93b..788e382f 100644
--- a/packages/connect-web-test/src/helpers/test-routes.ts
+++ b/packages/connect-web-test/src/helpers/test-routes.ts
@@ -18,8 +18,8 @@ import {
   ConnectError,
   decodeBinaryHeader,
   encodeBinaryHeader,
-} from "@bufbuild/connect";
-import type { ConnectRouter, ServiceImpl } from "@bufbuild/connect";
+} from "@apache/dubbo";
+import type { ConnectRouter, ServiceImpl } from "@apache/dubbo";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import type { StreamingOutputCallRequest } from "../gen/grpc/testing/messages_pb.js";
 import {
diff --git a/packages/connect-web-test/src/interceptor.spec.ts b/packages/connect-web-test/src/interceptor.spec.ts
index c99b06bc..832efa78 100644
--- a/packages/connect-web-test/src/interceptor.spec.ts
+++ b/packages/connect-web-test/src/interceptor.spec.ts
@@ -16,12 +16,12 @@ import type {
   CallOptions,
   Interceptor,
   StreamResponse,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import {
   createCallbackClient,
   createPromiseClient,
   encodeBinaryHeader,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import { TestService } from "./gen/grpc/testing/test_connect.js";
 import { StreamingOutputCallRequest } from "./gen/grpc/testing/messages_pb.js";
 import { describeTransports } from "./helpers/crosstestserver.js";
diff --git a/packages/connect-web/src/connect-transport.ts b/packages/connect-web/src/connect-transport.ts
index e5ad90c4..61d419c1 100644
--- a/packages/connect-web/src/connect-transport.ts
+++ b/packages/connect-web/src/connect-transport.ts
@@ -30,8 +30,8 @@ import type {
   Transport,
   UnaryRequest,
   UnaryResponse,
-} from "@bufbuild/connect";
-import { appendHeaders } from "@bufbuild/connect";
+} from "@apache/dubbo";
+import { appendHeaders } from "@apache/dubbo";
 import {
   createClientMethodSerializers,
   createEnvelopeReadableStream,
@@ -40,7 +40,7 @@ import {
   encodeEnvelope,
   runStreamingCall,
   runUnaryCall,
-} from "@bufbuild/connect/protocol";
+} from "@apache/dubbo/protocol";
 import {
   endStreamFlag,
   endStreamFromJson,
@@ -49,7 +49,7 @@ import {
   trailerDemux,
   transformConnectPostToGetRequest,
   validateResponse,
-} from "@bufbuild/connect/protocol-connect";
+} from "@apache/dubbo/protocol-connect";
 import { assertFetchApi } from "./assert-fetch-api.js";
 
 /**
diff --git a/packages/connect-web/src/grpc-web-transport.ts b/packages/connect-web/src/grpc-web-transport.ts
index 7887c190..dbdd6075 100644
--- a/packages/connect-web/src/grpc-web-transport.ts
+++ b/packages/connect-web/src/grpc-web-transport.ts
@@ -29,7 +29,7 @@ import type {
   Transport,
   UnaryRequest,
   UnaryResponse,
-} from "@bufbuild/connect";
+} from "@apache/dubbo";
 import {
   createClientMethodSerializers,
   createEnvelopeReadableStream,
@@ -37,14 +37,14 @@ import {
   encodeEnvelope,
   runStreamingCall,
   runUnaryCall,
-} from "@bufbuild/connect/protocol";
+} from "@apache/dubbo/protocol";
 import {
   requestHeader,
   trailerFlag,
   trailerParse,
   validateResponse,
   validateTrailer,
-} from "@bufbuild/connect/protocol-grpc-web";
+} from "@apache/dubbo/protocol-grpc-web";
 import { assertFetchApi } from "./assert-fetch-api.js";
 
 /**
diff --git a/packages/connect/src/legacy-interceptor.ts b/packages/connect/src/legacy-interceptor.ts
index d34a7c35..e6e5e134 100644
--- a/packages/connect/src/legacy-interceptor.ts
+++ b/packages/connect/src/legacy-interceptor.ts
@@ -25,7 +25,7 @@ import type {
  * Runs a unary method with the given interceptors. Note that this function
  * is only used when implementing a Transport.
  *
- * @deprecated Use runUnaryCall from @bufbuild/connect/protocol instead.
+ * @deprecated Use runUnaryCall from @apache/dubbo/protocol instead.
  */
 export function runUnary<I extends Message<I>, O extends Message<O>>(
   req: UnaryRequest<I, O>,
@@ -42,7 +42,7 @@ export function runUnary<I extends Message<I>, O extends Message<O>>(
  * Runs a server-streaming method with the given interceptors. Note that this
  * function is only used when implementing a Transport.
  *
- * @deprecated Use runStreamingCall from @bufbuild/connect/protocol instead.
+ * @deprecated Use runStreamingCall from @apache/dubbo/protocol instead.
  */
 export function runStreaming<I extends Message<I>, O extends Message<O>>(
   req: StreamRequest<I, O>,
diff --git a/packages/example/src/client.ts b/packages/example/src/client.ts
index 1f2d6671..1acad67f 100644
--- a/packages/example/src/client.ts
+++ b/packages/example/src/client.ts
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createPromiseClient } from "@bufbuild/connect";
-import { createConnectTransport } from "@bufbuild/connect-node";
+import { createPromiseClient } from "@apache/dubbo";
+import { createConnectTransport } from "@apache/dubbo-node";
 import { ElizaService } from "./gen/eliza_connect.js";
 import { stdin, stdout, env } from "process";
 import * as readline from "node:readline/promises";
diff --git a/packages/example/src/server.ts b/packages/example/src/server.ts
index d32cfc5d..f2f06774 100644
--- a/packages/example/src/server.ts
+++ b/packages/example/src/server.ts
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import type { ConnectRouter } from "@bufbuild/connect";
-import { connectNodeAdapter } from "@bufbuild/connect-node";
+import type { ConnectRouter } from "@apache/dubbo";
+import { connectNodeAdapter } from "@apache/dubbo-node";
 import { ElizaService } from "./gen/eliza_connect.js";
 import type {
   SayRequest,
diff --git a/packages/example/src/webclient.ts b/packages/example/src/webclient.ts
index 694ce467..755d8227 100644
--- a/packages/example/src/webclient.ts
+++ b/packages/example/src/webclient.ts
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createPromiseClient } from "@bufbuild/connect";
-import { createConnectTransport } from "@bufbuild/connect-web";
+import { createPromiseClient } from "@apache/dubbo";
+import { createConnectTransport } from "@apache/dubbo-web";
 import { ElizaService } from "./gen/eliza_connect.js";
 
 // Alternatively, use createGrpcWebTransport here for the gRPC-web