diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 701064032d1..af827785424 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,5 +4,5 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/api-spanner-java is the default owner for changes in this repo
+# The @googleapis/spanner-client-libraries-java is the default owner for changes in this repo
 *                       @googleapis/yoshi-java @googleapis/spanner-client-libraries-java
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 670b37d595a..03835744989 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -13,7 +13,7 @@
   "api_id": "spanner.googleapis.com",
   "library_type": "GAPIC_COMBO",
   "requires_billing": true,
-  "codeowner_team": "@googleapis/api-spanner-java",
+  "codeowner_team": "@googleapis/spanner-client-libraries-java",
   "excluded_poms": "google-cloud-spanner-bom",
   "issue_tracker": "https://issuetracker.google.com/issues?q=componentid:190851%2B%20status:open",
   "recommended_package": "com.google.cloud.spanner",
diff --git a/generation_config.yaml b/generation_config.yaml
index 27a5edc83af..0c02ec882aa 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -17,7 +17,7 @@ libraries:
     api_id: spanner.googleapis.com
     transport: grpc
     requires_billing: true
-    codeowner_team: '@googleapis/api-spanner-java'
+    codeowner_team: '@googleapis/spanner-client-libraries-java'
     library_type: GAPIC_COMBO
     excluded_poms: google-cloud-spanner-bom
     recommended_package: com.google.cloud.spanner