diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6763f258c..c7478150e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,8 +4,8 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/api-bigquery is the default owner for changes in this repo
-*               @googleapis/api-bigquery @googleapis/yoshi-python
+# The @googleapis/python-core-client-libraries is the default owner for changes in this repo
+*               @googleapis/python-core-client-libraries @googleapis/yoshi-python
 
 # The python-samples-reviewers team is the default owner for samples changes
-/samples/   @googleapis/api-bigquery @googleapis/python-samples-owners @googleapis/yoshi-python
+/samples/   @googleapis/python-core-client-libraries @googleapis/python-samples-owners @googleapis/yoshi-python
diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index 5b7383dc7..ff168399d 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -4,14 +4,14 @@
 # Note: This file is autogenerated. To make changes to the assignee
 # team, please update `codeowner_team` in `.repo-metadata.json`.
 assign_issues:
-  - googleapis/api-bigquery
+  - googleapis/python-core-client-libraries
 
 assign_issues_by:
   - labels:
       - "samples"
     to:
       - googleapis/python-samples-reviewers
-      - googleapis/api-bigquery
+      - googleapis/python-core-client-libraries
 
 assign_prs:
-  - googleapis/api-bigquery
+  - googleapis/python-core-client-libraries
diff --git a/.repo-metadata.json b/.repo-metadata.json
index d1be7ec4d..82a1684ca 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -12,7 +12,7 @@
     "api_id": "bigquery.googleapis.com",
     "requires_billing": false,
     "default_version": "v2",
-    "codeowner_team": "@googleapis/api-bigquery",
+    "codeowner_team": "@googleapis/python-core-client-libraries",
     "api_shortname": "bigquery",
     "api_description": "is a fully managed, NoOps, low cost data analytics service.\nData can be streamed into BigQuery at millions of rows per second to enable real-time analysis.\nWith BigQuery you can easily deploy Petabyte-scale Databases."
 }