diff --git a/packages/google-cloud-bigquery-analyticshub/README.md b/packages/google-cloud-bigquery-analyticshub/README.md
index 7914243d579..f581f346a28 100644
--- a/packages/google-cloud-bigquery-analyticshub/README.md
+++ b/packages/google-cloud-bigquery-analyticshub/README.md
@@ -5,7 +5,7 @@
 # [Analytics Hub API: Node.js Client](https://github.com/googleapis/google-cloud-node)
 
 [![release level](https://img.shields.io/badge/release%20level-beta-yellow.svg?style=flat)](https://cloud.google.com/terms/launch-stages)
-[![npm version](https://img.shields.io/npm/v/@google-cloud/analyticshub.svg)](https://www.npmjs.org/package/@google-cloud/analyticshub)
+[![npm version](https://img.shields.io/npm/v/@google-cloud/bigquery-analyticshub.svg)](https://www.npmjs.org/package/@google-cloud/bigquery-analyticshub)
 
 
 
@@ -50,7 +50,7 @@ Google APIs Client Libraries, in [Client Libraries Explained][explained].
 ### Installing the client library
 
 ```bash
-npm install @google-cloud/analyticshub
+npm install @google-cloud/bigquery-analyticshub
 ```
 
 
@@ -80,7 +80,8 @@ npm install @google-cloud/analyticshub
 // const pageToken = 'abc123'
 
 // Imports the Analyticshub library
-const {AnalyticsHubServiceClient} = require('@google-cloud/analyticshub').v1;
+const {AnalyticsHubServiceClient} =
+  require('@google-cloud/bigquery-analyticshub').v1;
 
 // Instantiates a client
 const analyticshubClient = new AnalyticsHubServiceClient();
@@ -151,7 +152,7 @@ best-efforts basis with the following warnings:
 Client libraries targeting some end-of-life versions of Node.js are available, and
 can be installed through npm [dist-tags](https://docs.npmjs.com/cli/dist-tag).
 The dist-tags follow the naming convention `legacy-(version)`.
-For example, `npm install @google-cloud/analyticshub@legacy-8` installs client libraries
+For example, `npm install @google-cloud/bigquery-analyticshub@legacy-8` installs client libraries
 for versions compatible with Node.js 8.
 
 ## Versioning
diff --git a/packages/google-cloud-bigquery-analyticshub/package.json b/packages/google-cloud-bigquery-analyticshub/package.json
index 5e3d0808830..abc7d1cd04a 100644
--- a/packages/google-cloud-bigquery-analyticshub/package.json
+++ b/packages/google-cloud-bigquery-analyticshub/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@google-cloud/analyticshub",
+  "name": "@google-cloud/bigquery-analyticshub",
   "version": "0.0.0",
   "description": "Analytics Hub API client for Node.js",
   "repository": "googleapis/google-cloud-node",
diff --git a/packages/google-cloud-bigquery-analyticshub/protos/protos.js b/packages/google-cloud-bigquery-analyticshub/protos/protos.js
index 3ded8cb1f2d..804383505e7 100644
--- a/packages/google-cloud-bigquery-analyticshub/protos/protos.js
+++ b/packages/google-cloud-bigquery-analyticshub/protos/protos.js
@@ -28,7 +28,7 @@
     var $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util;
     
     // Exported root namespace
-    var $root = $protobuf.roots._google_cloud_analyticshub_protos || ($protobuf.roots._google_cloud_analyticshub_protos = {});
+    var $root = $protobuf.roots._google_cloud_bigquery_analyticshub_protos || ($protobuf.roots._google_cloud_bigquery_analyticshub_protos = {});
     
     $root.google = (function() {
     
diff --git a/packages/google-cloud-bigquery-analyticshub/samples/package.json b/packages/google-cloud-bigquery-analyticshub/samples/package.json
index 34de3c052d3..a948503fcf5 100644
--- a/packages/google-cloud-bigquery-analyticshub/samples/package.json
+++ b/packages/google-cloud-bigquery-analyticshub/samples/package.json
@@ -14,7 +14,7 @@
     "publish": "echo 'sample test; do not publish'"
   },
   "dependencies": {
-    "@google-cloud/analyticshub": "0.0.0"
+    "@google-cloud/bigquery-analyticshub": "0.0.0"
   },
   "devDependencies": {
     "c8": "^7.1.0",
diff --git a/packages/google-cloud-bigquery-analyticshub/samples/quickstart.js b/packages/google-cloud-bigquery-analyticshub/samples/quickstart.js
index 751b2f817e8..675447df598 100644
--- a/packages/google-cloud-bigquery-analyticshub/samples/quickstart.js
+++ b/packages/google-cloud-bigquery-analyticshub/samples/quickstart.js
@@ -43,7 +43,8 @@ function main(parent) {
   // const pageToken = 'abc123'
 
   // Imports the Analyticshub library
-  const {AnalyticsHubServiceClient} = require('@google-cloud/analyticshub').v1;
+  const {AnalyticsHubServiceClient} =
+    require('@google-cloud/bigquery-analyticshub').v1;
 
   // Instantiates a client
   const analyticshubClient = new AnalyticsHubServiceClient();
diff --git a/packages/google-cloud-bigquery-analyticshub/samples/test/quickstart.js b/packages/google-cloud-bigquery-analyticshub/samples/test/quickstart.js
index 886b6dced62..e363fab6e40 100644
--- a/packages/google-cloud-bigquery-analyticshub/samples/test/quickstart.js
+++ b/packages/google-cloud-bigquery-analyticshub/samples/test/quickstart.js
@@ -18,7 +18,8 @@ const assert = require('assert');
 const path = require('path');
 const cp = require('child_process');
 const {describe, it, before} = require('mocha');
-const {AnalyticsHubServiceClient} = require('@google-cloud/analyticshub').v1;
+const {AnalyticsHubServiceClient} =
+  require('@google-cloud/bigquery-analyticshub').v1;
 const analyticshubClient = new AnalyticsHubServiceClient();
 
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
diff --git a/packages/google-cloud-bigquery-analyticshub/system-test/fixtures/sample/src/index.js b/packages/google-cloud-bigquery-analyticshub/system-test/fixtures/sample/src/index.js
index 1fd2603e64d..2adfec64dc6 100644
--- a/packages/google-cloud-bigquery-analyticshub/system-test/fixtures/sample/src/index.js
+++ b/packages/google-cloud-bigquery-analyticshub/system-test/fixtures/sample/src/index.js
@@ -17,7 +17,7 @@
 // ** All changes to this file may be overwritten. **
 
 /* eslint-disable node/no-missing-require, no-unused-vars */
-const analyticshub = require('@google-cloud/analyticshub');
+const analyticshub = require('@google-cloud/bigquery-analyticshub');
 
 function main() {
   const analyticsHubServiceClient =
diff --git a/packages/google-cloud-bigquery-analyticshub/system-test/fixtures/sample/src/index.ts b/packages/google-cloud-bigquery-analyticshub/system-test/fixtures/sample/src/index.ts
index 9919896cbe9..df3ddd6ebe9 100644
--- a/packages/google-cloud-bigquery-analyticshub/system-test/fixtures/sample/src/index.ts
+++ b/packages/google-cloud-bigquery-analyticshub/system-test/fixtures/sample/src/index.ts
@@ -16,7 +16,7 @@
 // ** https://github.com/googleapis/gapic-generator-typescript **
 // ** All changes to this file may be overwritten. **
 
-import {AnalyticsHubServiceClient} from '@google-cloud/analyticshub';
+import {AnalyticsHubServiceClient} from '@google-cloud/bigquery-analyticshub';
 
 // check that the client class type name can be used
 function doStuffWithAnalyticsHubServiceClient(