diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index b668c04..44c78f7 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:ed1f9983d5a935a89fe8085e8bb97d94e41015252c5b6c9771257cf8624367e6
- 
+  digest: sha256:4e1991042fe54b991db9ca17c8fb386e61b22fe4d1472a568bf0fcac85dcf5d3
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index f7b8344..b46d730 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -8,9 +8,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: "3.10"
     - name: Install nox
@@ -24,9 +24,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: "3.10"
     - name: Install nox
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 1e8b05c..f512a49 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -8,9 +8,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: "3.10"
     - name: Install nox
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 074ee25..e5be6ed 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -11,9 +11,9 @@ jobs:
         python: ['3.6', '3.7', '3.8', '3.9', '3.10']
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python }}
     - name: Install nox
@@ -26,7 +26,7 @@ jobs:
       run: |
         nox -s unit-${{ matrix.python }}
     - name: Upload coverage results
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: coverage-artifacts
         path: .coverage-${{ matrix.python }}
@@ -37,9 +37,9 @@ jobs:
         - unit
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: "3.10"
     - name: Install coverage
@@ -47,7 +47,7 @@ jobs:
         python -m pip install --upgrade setuptools pip wheel
         python -m pip install coverage
     - name: Download coverage results
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: coverage-artifacts
         path: .coverage-results/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0931124..1c64f25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@
 [PyPI History][1]
 
 [1]: https://pypi.org/project/google-cloud-webrisk/#history
+### [1.7.1](https://github.com/googleapis/python-webrisk/compare/v1.7.0...v1.7.1) (2022-03-05)
+
+
+### Bug Fixes
+
+* **deps:** require google-api-core>=1.31.5, >=2.3.2 ([#171](https://github.com/googleapis/python-webrisk/issues/171)) ([a9ff394](https://github.com/googleapis/python-webrisk/commit/a9ff394f8cd6d8bc909c2922448e37337b090ca2))
+* **deps:** require proto-plus>=1.15.0 ([a9ff394](https://github.com/googleapis/python-webrisk/commit/a9ff394f8cd6d8bc909c2922448e37337b090ca2))
+
 ## [1.7.0](https://github.com/googleapis/python-webrisk/compare/v1.6.1...v1.7.0) (2022-02-11)
 
 
diff --git a/google/cloud/webrisk/__init__.py b/google/cloud/webrisk/__init__.py
index 15ccb36..a027862 100644
--- a/google/cloud/webrisk/__init__.py
+++ b/google/cloud/webrisk/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1/__init__.py b/google/cloud/webrisk_v1/__init__.py
index 59bfad9..38fc41e 100644
--- a/google/cloud/webrisk_v1/__init__.py
+++ b/google/cloud/webrisk_v1/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1/services/__init__.py b/google/cloud/webrisk_v1/services/__init__.py
index 4de6597..e8e1c38 100644
--- a/google/cloud/webrisk_v1/services/__init__.py
+++ b/google/cloud/webrisk_v1/services/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1/services/web_risk_service/__init__.py b/google/cloud/webrisk_v1/services/web_risk_service/__init__.py
index e5161ab..132ccd9 100644
--- a/google/cloud/webrisk_v1/services/web_risk_service/__init__.py
+++ b/google/cloud/webrisk_v1/services/web_risk_service/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1/services/web_risk_service/async_client.py b/google/cloud/webrisk_v1/services/web_risk_service/async_client.py
index 0cafa27..188a737 100644
--- a/google/cloud/webrisk_v1/services/web_risk_service/async_client.py
+++ b/google/cloud/webrisk_v1/services/web_risk_service/async_client.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -223,7 +223,7 @@ async def compute_threat_list_diff(
         once for each list.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import webrisk_v1
 
@@ -347,7 +347,7 @@ async def search_uris(
         response will be returned.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import webrisk_v1
 
@@ -457,7 +457,7 @@ async def search_hashes(
         match of a threat.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import webrisk_v1
 
@@ -570,7 +570,7 @@ async def create_submission(
         visibility can use this method.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import webrisk_v1
 
diff --git a/google/cloud/webrisk_v1/services/web_risk_service/client.py b/google/cloud/webrisk_v1/services/web_risk_service/client.py
index b2d4667..2169cbd 100644
--- a/google/cloud/webrisk_v1/services/web_risk_service/client.py
+++ b/google/cloud/webrisk_v1/services/web_risk_service/client.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -406,8 +406,7 @@ def compute_threat_list_diff(
         once for each list.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import webrisk_v1
 
@@ -521,8 +520,7 @@ def search_uris(
         response will be returned.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import webrisk_v1
 
@@ -622,8 +620,7 @@ def search_hashes(
         match of a threat.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import webrisk_v1
 
@@ -726,8 +723,7 @@ def create_submission(
         visibility can use this method.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import webrisk_v1
 
diff --git a/google/cloud/webrisk_v1/services/web_risk_service/transports/__init__.py b/google/cloud/webrisk_v1/services/web_risk_service/transports/__init__.py
index f9f94ff..209aaaa 100644
--- a/google/cloud/webrisk_v1/services/web_risk_service/transports/__init__.py
+++ b/google/cloud/webrisk_v1/services/web_risk_service/transports/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1/services/web_risk_service/transports/base.py b/google/cloud/webrisk_v1/services/web_risk_service/transports/base.py
index a1dc7bc..120d5cc 100644
--- a/google/cloud/webrisk_v1/services/web_risk_service/transports/base.py
+++ b/google/cloud/webrisk_v1/services/web_risk_service/transports/base.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1/services/web_risk_service/transports/grpc.py b/google/cloud/webrisk_v1/services/web_risk_service/transports/grpc.py
index 872279e..7a04417 100644
--- a/google/cloud/webrisk_v1/services/web_risk_service/transports/grpc.py
+++ b/google/cloud/webrisk_v1/services/web_risk_service/transports/grpc.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1/services/web_risk_service/transports/grpc_asyncio.py b/google/cloud/webrisk_v1/services/web_risk_service/transports/grpc_asyncio.py
index d2e4d4c..5f542f5 100644
--- a/google/cloud/webrisk_v1/services/web_risk_service/transports/grpc_asyncio.py
+++ b/google/cloud/webrisk_v1/services/web_risk_service/transports/grpc_asyncio.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1/types/__init__.py b/google/cloud/webrisk_v1/types/__init__.py
index 09cb09c..3a83911 100644
--- a/google/cloud/webrisk_v1/types/__init__.py
+++ b/google/cloud/webrisk_v1/types/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1/types/webrisk.py b/google/cloud/webrisk_v1/types/webrisk.py
index 6196e15..24af9d2 100644
--- a/google/cloud/webrisk_v1/types/webrisk.py
+++ b/google/cloud/webrisk_v1/types/webrisk.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1beta1/__init__.py b/google/cloud/webrisk_v1beta1/__init__.py
index 44e8c21..7f55b57 100644
--- a/google/cloud/webrisk_v1beta1/__init__.py
+++ b/google/cloud/webrisk_v1beta1/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1beta1/services/__init__.py b/google/cloud/webrisk_v1beta1/services/__init__.py
index 4de6597..e8e1c38 100644
--- a/google/cloud/webrisk_v1beta1/services/__init__.py
+++ b/google/cloud/webrisk_v1beta1/services/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/__init__.py b/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/__init__.py
index e88b77e..ac29e4c 100644
--- a/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/__init__.py
+++ b/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/async_client.py b/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/async_client.py
index 4e96ebc..dc41cf4 100644
--- a/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/async_client.py
+++ b/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/async_client.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -218,7 +218,7 @@ async def compute_threat_list_diff(
     ) -> webrisk.ComputeThreatListDiffResponse:
         r"""Gets the most recent threat list diffs.
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import webrisk_v1beta1
 
@@ -330,7 +330,7 @@ async def search_uris(
         given threatList.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import webrisk_v1beta1
 
@@ -439,7 +439,7 @@ async def search_hashes(
         match of a threat.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import webrisk_v1beta1
 
diff --git a/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/client.py b/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/client.py
index 5b0a851..d07ffeb 100644
--- a/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/client.py
+++ b/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/client.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -400,8 +400,7 @@ def compute_threat_list_diff(
     ) -> webrisk.ComputeThreatListDiffResponse:
         r"""Gets the most recent threat list diffs.
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import webrisk_v1beta1
 
@@ -503,8 +502,7 @@ def search_uris(
         given threatList.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import webrisk_v1beta1
 
@@ -603,8 +601,7 @@ def search_hashes(
         match of a threat.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import webrisk_v1beta1
 
diff --git a/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/__init__.py b/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/__init__.py
index 2c23497..72bce55 100644
--- a/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/__init__.py
+++ b/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/base.py b/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/base.py
index 27bd439..95be280 100644
--- a/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/base.py
+++ b/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/base.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/grpc.py b/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/grpc.py
index 147dd1a..f8dbdd2 100644
--- a/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/grpc.py
+++ b/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/grpc.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/grpc_asyncio.py b/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/grpc_asyncio.py
index 1ba81f9..c0fb25b 100644
--- a/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/grpc_asyncio.py
+++ b/google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/grpc_asyncio.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1beta1/types/__init__.py b/google/cloud/webrisk_v1beta1/types/__init__.py
index 0f161e5..a7b303f 100644
--- a/google/cloud/webrisk_v1beta1/types/__init__.py
+++ b/google/cloud/webrisk_v1beta1/types/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/google/cloud/webrisk_v1beta1/types/webrisk.py b/google/cloud/webrisk_v1beta1/types/webrisk.py
index 66c0fe4..a9e3193 100644
--- a/google/cloud/webrisk_v1beta1/types/webrisk.py
+++ b/google/cloud/webrisk_v1beta1/types/webrisk.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/samples/generated_samples/snippet_metadata_webrisk_v1.json b/samples/generated_samples/snippet_metadata_webrisk_v1.json
index 7568f36..37fa882 100644
--- a/samples/generated_samples/snippet_metadata_webrisk_v1.json
+++ b/samples/generated_samples/snippet_metadata_webrisk_v1.json
@@ -10,8 +10,8 @@
           "shortName": "ComputeThreatListDiff"
         }
       },
-      "file": "webrisk_generated_webrisk_v1_web_risk_service_compute_threat_list_diff_async.py",
-      "regionTag": "webrisk_generated_webrisk_v1_WebRiskService_ComputeThreatListDiff_async",
+      "file": "webrisk_v1_generated_web_risk_service_compute_threat_list_diff_async.py",
+      "regionTag": "webrisk_v1_generated_WebRiskService_ComputeThreatListDiff_async",
       "segments": [
         {
           "end": 44,
@@ -54,8 +54,8 @@
           "shortName": "ComputeThreatListDiff"
         }
       },
-      "file": "webrisk_generated_webrisk_v1_web_risk_service_compute_threat_list_diff_sync.py",
-      "regionTag": "webrisk_generated_webrisk_v1_WebRiskService_ComputeThreatListDiff_sync",
+      "file": "webrisk_v1_generated_web_risk_service_compute_threat_list_diff_sync.py",
+      "regionTag": "webrisk_v1_generated_WebRiskService_ComputeThreatListDiff_sync",
       "segments": [
         {
           "end": 44,
@@ -99,8 +99,8 @@
           "shortName": "CreateSubmission"
         }
       },
-      "file": "webrisk_generated_webrisk_v1_web_risk_service_create_submission_async.py",
-      "regionTag": "webrisk_generated_webrisk_v1_WebRiskService_CreateSubmission_async",
+      "file": "webrisk_v1_generated_web_risk_service_create_submission_async.py",
+      "regionTag": "webrisk_v1_generated_WebRiskService_CreateSubmission_async",
       "segments": [
         {
           "end": 48,
@@ -143,8 +143,8 @@
           "shortName": "CreateSubmission"
         }
       },
-      "file": "webrisk_generated_webrisk_v1_web_risk_service_create_submission_sync.py",
-      "regionTag": "webrisk_generated_webrisk_v1_WebRiskService_CreateSubmission_sync",
+      "file": "webrisk_v1_generated_web_risk_service_create_submission_sync.py",
+      "regionTag": "webrisk_v1_generated_WebRiskService_CreateSubmission_sync",
       "segments": [
         {
           "end": 48,
@@ -188,8 +188,8 @@
           "shortName": "SearchHashes"
         }
       },
-      "file": "webrisk_generated_webrisk_v1_web_risk_service_search_hashes_async.py",
-      "regionTag": "webrisk_generated_webrisk_v1_WebRiskService_SearchHashes_async",
+      "file": "webrisk_v1_generated_web_risk_service_search_hashes_async.py",
+      "regionTag": "webrisk_v1_generated_WebRiskService_SearchHashes_async",
       "segments": [
         {
           "end": 44,
@@ -232,8 +232,8 @@
           "shortName": "SearchHashes"
         }
       },
-      "file": "webrisk_generated_webrisk_v1_web_risk_service_search_hashes_sync.py",
-      "regionTag": "webrisk_generated_webrisk_v1_WebRiskService_SearchHashes_sync",
+      "file": "webrisk_v1_generated_web_risk_service_search_hashes_sync.py",
+      "regionTag": "webrisk_v1_generated_WebRiskService_SearchHashes_sync",
       "segments": [
         {
           "end": 44,
@@ -277,8 +277,8 @@
           "shortName": "SearchUris"
         }
       },
-      "file": "webrisk_generated_webrisk_v1_web_risk_service_search_uris_async.py",
-      "regionTag": "webrisk_generated_webrisk_v1_WebRiskService_SearchUris_async",
+      "file": "webrisk_v1_generated_web_risk_service_search_uris_async.py",
+      "regionTag": "webrisk_v1_generated_WebRiskService_SearchUris_async",
       "segments": [
         {
           "end": 45,
@@ -321,8 +321,8 @@
           "shortName": "SearchUris"
         }
       },
-      "file": "webrisk_generated_webrisk_v1_web_risk_service_search_uris_sync.py",
-      "regionTag": "webrisk_generated_webrisk_v1_WebRiskService_SearchUris_sync",
+      "file": "webrisk_v1_generated_web_risk_service_search_uris_sync.py",
+      "regionTag": "webrisk_v1_generated_WebRiskService_SearchUris_sync",
       "segments": [
         {
           "end": 45,
diff --git a/samples/generated_samples/snippet_metadata_webrisk_v1beta1.json b/samples/generated_samples/snippet_metadata_webrisk_v1beta1.json
index 240dde4..e17efd1 100644
--- a/samples/generated_samples/snippet_metadata_webrisk_v1beta1.json
+++ b/samples/generated_samples/snippet_metadata_webrisk_v1beta1.json
@@ -10,8 +10,8 @@
           "shortName": "ComputeThreatListDiff"
         }
       },
-      "file": "webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_compute_threat_list_diff_async.py",
-      "regionTag": "webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_ComputeThreatListDiff_async",
+      "file": "webrisk_v1beta1_generated_web_risk_service_v1_beta1_compute_threat_list_diff_async.py",
+      "regionTag": "webrisk_v1beta1_generated_WebRiskServiceV1Beta1_ComputeThreatListDiff_async",
       "segments": [
         {
           "end": 44,
@@ -54,8 +54,8 @@
           "shortName": "ComputeThreatListDiff"
         }
       },
-      "file": "webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_compute_threat_list_diff_sync.py",
-      "regionTag": "webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_ComputeThreatListDiff_sync",
+      "file": "webrisk_v1beta1_generated_web_risk_service_v1_beta1_compute_threat_list_diff_sync.py",
+      "regionTag": "webrisk_v1beta1_generated_WebRiskServiceV1Beta1_ComputeThreatListDiff_sync",
       "segments": [
         {
           "end": 44,
@@ -99,8 +99,8 @@
           "shortName": "SearchHashes"
         }
       },
-      "file": "webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_search_hashes_async.py",
-      "regionTag": "webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_SearchHashes_async",
+      "file": "webrisk_v1beta1_generated_web_risk_service_v1_beta1_search_hashes_async.py",
+      "regionTag": "webrisk_v1beta1_generated_WebRiskServiceV1Beta1_SearchHashes_async",
       "segments": [
         {
           "end": 44,
@@ -143,8 +143,8 @@
           "shortName": "SearchHashes"
         }
       },
-      "file": "webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_search_hashes_sync.py",
-      "regionTag": "webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_SearchHashes_sync",
+      "file": "webrisk_v1beta1_generated_web_risk_service_v1_beta1_search_hashes_sync.py",
+      "regionTag": "webrisk_v1beta1_generated_WebRiskServiceV1Beta1_SearchHashes_sync",
       "segments": [
         {
           "end": 44,
@@ -188,8 +188,8 @@
           "shortName": "SearchUris"
         }
       },
-      "file": "webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_search_uris_async.py",
-      "regionTag": "webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_SearchUris_async",
+      "file": "webrisk_v1beta1_generated_web_risk_service_v1_beta1_search_uris_async.py",
+      "regionTag": "webrisk_v1beta1_generated_WebRiskServiceV1Beta1_SearchUris_async",
       "segments": [
         {
           "end": 45,
@@ -232,8 +232,8 @@
           "shortName": "SearchUris"
         }
       },
-      "file": "webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_search_uris_sync.py",
-      "regionTag": "webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_SearchUris_sync",
+      "file": "webrisk_v1beta1_generated_web_risk_service_v1_beta1_search_uris_sync.py",
+      "regionTag": "webrisk_v1beta1_generated_WebRiskServiceV1Beta1_SearchUris_sync",
       "segments": [
         {
           "end": 45,
diff --git a/samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_compute_threat_list_diff_async.py b/samples/generated_samples/webrisk_v1_generated_web_risk_service_compute_threat_list_diff_async.py
similarity index 87%
rename from samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_compute_threat_list_diff_async.py
rename to samples/generated_samples/webrisk_v1_generated_web_risk_service_compute_threat_list_diff_async.py
index 3f29f85..b8532bc 100644
--- a/samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_compute_threat_list_diff_async.py
+++ b/samples/generated_samples/webrisk_v1_generated_web_risk_service_compute_threat_list_diff_async.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-webrisk
 
 
-# [START webrisk_generated_webrisk_v1_WebRiskService_ComputeThreatListDiff_async]
+# [START webrisk_v1_generated_WebRiskService_ComputeThreatListDiff_async]
 from google.cloud import webrisk_v1
 
 
@@ -42,4 +42,4 @@ async def sample_compute_threat_list_diff():
     # Handle the response
     print(response)
 
-# [END webrisk_generated_webrisk_v1_WebRiskService_ComputeThreatListDiff_async]
+# [END webrisk_v1_generated_WebRiskService_ComputeThreatListDiff_async]
diff --git a/samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_compute_threat_list_diff_sync.py b/samples/generated_samples/webrisk_v1_generated_web_risk_service_compute_threat_list_diff_sync.py
similarity index 87%
rename from samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_compute_threat_list_diff_sync.py
rename to samples/generated_samples/webrisk_v1_generated_web_risk_service_compute_threat_list_diff_sync.py
index 74b6057..d2dc66e 100644
--- a/samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_compute_threat_list_diff_sync.py
+++ b/samples/generated_samples/webrisk_v1_generated_web_risk_service_compute_threat_list_diff_sync.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-webrisk
 
 
-# [START webrisk_generated_webrisk_v1_WebRiskService_ComputeThreatListDiff_sync]
+# [START webrisk_v1_generated_WebRiskService_ComputeThreatListDiff_sync]
 from google.cloud import webrisk_v1
 
 
@@ -42,4 +42,4 @@ def sample_compute_threat_list_diff():
     # Handle the response
     print(response)
 
-# [END webrisk_generated_webrisk_v1_WebRiskService_ComputeThreatListDiff_sync]
+# [END webrisk_v1_generated_WebRiskService_ComputeThreatListDiff_sync]
diff --git a/samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_create_submission_async.py b/samples/generated_samples/webrisk_v1_generated_web_risk_service_create_submission_async.py
similarity index 88%
rename from samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_create_submission_async.py
rename to samples/generated_samples/webrisk_v1_generated_web_risk_service_create_submission_async.py
index ef89b64..97e0d1f 100644
--- a/samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_create_submission_async.py
+++ b/samples/generated_samples/webrisk_v1_generated_web_risk_service_create_submission_async.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-webrisk
 
 
-# [START webrisk_generated_webrisk_v1_WebRiskService_CreateSubmission_async]
+# [START webrisk_v1_generated_WebRiskService_CreateSubmission_async]
 from google.cloud import webrisk_v1
 
 
@@ -46,4 +46,4 @@ async def sample_create_submission():
     # Handle the response
     print(response)
 
-# [END webrisk_generated_webrisk_v1_WebRiskService_CreateSubmission_async]
+# [END webrisk_v1_generated_WebRiskService_CreateSubmission_async]
diff --git a/samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_create_submission_sync.py b/samples/generated_samples/webrisk_v1_generated_web_risk_service_create_submission_sync.py
similarity index 88%
rename from samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_create_submission_sync.py
rename to samples/generated_samples/webrisk_v1_generated_web_risk_service_create_submission_sync.py
index 3cc1d59..3c95b85 100644
--- a/samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_create_submission_sync.py
+++ b/samples/generated_samples/webrisk_v1_generated_web_risk_service_create_submission_sync.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-webrisk
 
 
-# [START webrisk_generated_webrisk_v1_WebRiskService_CreateSubmission_sync]
+# [START webrisk_v1_generated_WebRiskService_CreateSubmission_sync]
 from google.cloud import webrisk_v1
 
 
@@ -46,4 +46,4 @@ def sample_create_submission():
     # Handle the response
     print(response)
 
-# [END webrisk_generated_webrisk_v1_WebRiskService_CreateSubmission_sync]
+# [END webrisk_v1_generated_WebRiskService_CreateSubmission_sync]
diff --git a/samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_search_hashes_async.py b/samples/generated_samples/webrisk_v1_generated_web_risk_service_search_hashes_async.py
similarity index 88%
rename from samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_search_hashes_async.py
rename to samples/generated_samples/webrisk_v1_generated_web_risk_service_search_hashes_async.py
index 99b5ff2..c03414c 100644
--- a/samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_search_hashes_async.py
+++ b/samples/generated_samples/webrisk_v1_generated_web_risk_service_search_hashes_async.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-webrisk
 
 
-# [START webrisk_generated_webrisk_v1_WebRiskService_SearchHashes_async]
+# [START webrisk_v1_generated_WebRiskService_SearchHashes_async]
 from google.cloud import webrisk_v1
 
 
@@ -42,4 +42,4 @@ async def sample_search_hashes():
     # Handle the response
     print(response)
 
-# [END webrisk_generated_webrisk_v1_WebRiskService_SearchHashes_async]
+# [END webrisk_v1_generated_WebRiskService_SearchHashes_async]
diff --git a/samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_search_hashes_sync.py b/samples/generated_samples/webrisk_v1_generated_web_risk_service_search_hashes_sync.py
similarity index 88%
rename from samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_search_hashes_sync.py
rename to samples/generated_samples/webrisk_v1_generated_web_risk_service_search_hashes_sync.py
index afe4913..401ae52 100644
--- a/samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_search_hashes_sync.py
+++ b/samples/generated_samples/webrisk_v1_generated_web_risk_service_search_hashes_sync.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-webrisk
 
 
-# [START webrisk_generated_webrisk_v1_WebRiskService_SearchHashes_sync]
+# [START webrisk_v1_generated_WebRiskService_SearchHashes_sync]
 from google.cloud import webrisk_v1
 
 
@@ -42,4 +42,4 @@ def sample_search_hashes():
     # Handle the response
     print(response)
 
-# [END webrisk_generated_webrisk_v1_WebRiskService_SearchHashes_sync]
+# [END webrisk_v1_generated_WebRiskService_SearchHashes_sync]
diff --git a/samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_search_uris_async.py b/samples/generated_samples/webrisk_v1_generated_web_risk_service_search_uris_async.py
similarity index 88%
rename from samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_search_uris_async.py
rename to samples/generated_samples/webrisk_v1_generated_web_risk_service_search_uris_async.py
index 562fdd1..f7e5987 100644
--- a/samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_search_uris_async.py
+++ b/samples/generated_samples/webrisk_v1_generated_web_risk_service_search_uris_async.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-webrisk
 
 
-# [START webrisk_generated_webrisk_v1_WebRiskService_SearchUris_async]
+# [START webrisk_v1_generated_WebRiskService_SearchUris_async]
 from google.cloud import webrisk_v1
 
 
@@ -43,4 +43,4 @@ async def sample_search_uris():
     # Handle the response
     print(response)
 
-# [END webrisk_generated_webrisk_v1_WebRiskService_SearchUris_async]
+# [END webrisk_v1_generated_WebRiskService_SearchUris_async]
diff --git a/samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_search_uris_sync.py b/samples/generated_samples/webrisk_v1_generated_web_risk_service_search_uris_sync.py
similarity index 88%
rename from samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_search_uris_sync.py
rename to samples/generated_samples/webrisk_v1_generated_web_risk_service_search_uris_sync.py
index 4f2df97..3bec890 100644
--- a/samples/generated_samples/webrisk_generated_webrisk_v1_web_risk_service_search_uris_sync.py
+++ b/samples/generated_samples/webrisk_v1_generated_web_risk_service_search_uris_sync.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-webrisk
 
 
-# [START webrisk_generated_webrisk_v1_WebRiskService_SearchUris_sync]
+# [START webrisk_v1_generated_WebRiskService_SearchUris_sync]
 from google.cloud import webrisk_v1
 
 
@@ -43,4 +43,4 @@ def sample_search_uris():
     # Handle the response
     print(response)
 
-# [END webrisk_generated_webrisk_v1_WebRiskService_SearchUris_sync]
+# [END webrisk_v1_generated_WebRiskService_SearchUris_sync]
diff --git a/samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_compute_threat_list_diff_async.py b/samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_compute_threat_list_diff_async.py
similarity index 86%
rename from samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_compute_threat_list_diff_async.py
rename to samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_compute_threat_list_diff_async.py
index 8c50092..b955bd6 100644
--- a/samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_compute_threat_list_diff_async.py
+++ b/samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_compute_threat_list_diff_async.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-webrisk
 
 
-# [START webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_ComputeThreatListDiff_async]
+# [START webrisk_v1beta1_generated_WebRiskServiceV1Beta1_ComputeThreatListDiff_async]
 from google.cloud import webrisk_v1beta1
 
 
@@ -42,4 +42,4 @@ async def sample_compute_threat_list_diff():
     # Handle the response
     print(response)
 
-# [END webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_ComputeThreatListDiff_async]
+# [END webrisk_v1beta1_generated_WebRiskServiceV1Beta1_ComputeThreatListDiff_async]
diff --git a/samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_compute_threat_list_diff_sync.py b/samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_compute_threat_list_diff_sync.py
similarity index 86%
rename from samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_compute_threat_list_diff_sync.py
rename to samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_compute_threat_list_diff_sync.py
index 58a542b..356931f 100644
--- a/samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_compute_threat_list_diff_sync.py
+++ b/samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_compute_threat_list_diff_sync.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-webrisk
 
 
-# [START webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_ComputeThreatListDiff_sync]
+# [START webrisk_v1beta1_generated_WebRiskServiceV1Beta1_ComputeThreatListDiff_sync]
 from google.cloud import webrisk_v1beta1
 
 
@@ -42,4 +42,4 @@ def sample_compute_threat_list_diff():
     # Handle the response
     print(response)
 
-# [END webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_ComputeThreatListDiff_sync]
+# [END webrisk_v1beta1_generated_WebRiskServiceV1Beta1_ComputeThreatListDiff_sync]
diff --git a/samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_search_hashes_async.py b/samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_search_hashes_async.py
similarity index 87%
rename from samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_search_hashes_async.py
rename to samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_search_hashes_async.py
index 2e0e908..f351261 100644
--- a/samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_search_hashes_async.py
+++ b/samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_search_hashes_async.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-webrisk
 
 
-# [START webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_SearchHashes_async]
+# [START webrisk_v1beta1_generated_WebRiskServiceV1Beta1_SearchHashes_async]
 from google.cloud import webrisk_v1beta1
 
 
@@ -42,4 +42,4 @@ async def sample_search_hashes():
     # Handle the response
     print(response)
 
-# [END webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_SearchHashes_async]
+# [END webrisk_v1beta1_generated_WebRiskServiceV1Beta1_SearchHashes_async]
diff --git a/samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_search_hashes_sync.py b/samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_search_hashes_sync.py
similarity index 87%
rename from samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_search_hashes_sync.py
rename to samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_search_hashes_sync.py
index 66b5666..c5d931e 100644
--- a/samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_search_hashes_sync.py
+++ b/samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_search_hashes_sync.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-webrisk
 
 
-# [START webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_SearchHashes_sync]
+# [START webrisk_v1beta1_generated_WebRiskServiceV1Beta1_SearchHashes_sync]
 from google.cloud import webrisk_v1beta1
 
 
@@ -42,4 +42,4 @@ def sample_search_hashes():
     # Handle the response
     print(response)
 
-# [END webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_SearchHashes_sync]
+# [END webrisk_v1beta1_generated_WebRiskServiceV1Beta1_SearchHashes_sync]
diff --git a/samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_search_uris_async.py b/samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_search_uris_async.py
similarity index 87%
rename from samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_search_uris_async.py
rename to samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_search_uris_async.py
index 4d640ad..ba04a71 100644
--- a/samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_search_uris_async.py
+++ b/samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_search_uris_async.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-webrisk
 
 
-# [START webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_SearchUris_async]
+# [START webrisk_v1beta1_generated_WebRiskServiceV1Beta1_SearchUris_async]
 from google.cloud import webrisk_v1beta1
 
 
@@ -43,4 +43,4 @@ async def sample_search_uris():
     # Handle the response
     print(response)
 
-# [END webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_SearchUris_async]
+# [END webrisk_v1beta1_generated_WebRiskServiceV1Beta1_SearchUris_async]
diff --git a/samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_search_uris_sync.py b/samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_search_uris_sync.py
similarity index 87%
rename from samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_search_uris_sync.py
rename to samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_search_uris_sync.py
index 37c523f..fd9399a 100644
--- a/samples/generated_samples/webrisk_generated_webrisk_v1beta1_web_risk_service_v1_beta1_search_uris_sync.py
+++ b/samples/generated_samples/webrisk_v1beta1_generated_web_risk_service_v1_beta1_search_uris_sync.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-webrisk
 
 
-# [START webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_SearchUris_sync]
+# [START webrisk_v1beta1_generated_WebRiskServiceV1Beta1_SearchUris_sync]
 from google.cloud import webrisk_v1beta1
 
 
@@ -43,4 +43,4 @@ def sample_search_uris():
     # Handle the response
     print(response)
 
-# [END webrisk_generated_webrisk_v1beta1_WebRiskServiceV1Beta1_SearchUris_sync]
+# [END webrisk_v1beta1_generated_WebRiskServiceV1Beta1_SearchUris_sync]
diff --git a/scripts/fixup_webrisk_v1_keywords.py b/scripts/fixup_webrisk_v1_keywords.py
index 81213ab..564b3ee 100644
--- a/scripts/fixup_webrisk_v1_keywords.py
+++ b/scripts/fixup_webrisk_v1_keywords.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/scripts/fixup_webrisk_v1beta1_keywords.py b/scripts/fixup_webrisk_v1beta1_keywords.py
index 421426d..8c07682 100644
--- a/scripts/fixup_webrisk_v1beta1_keywords.py
+++ b/scripts/fixup_webrisk_v1beta1_keywords.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/setup.py b/setup.py
index e17e575..38c1846 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@
 
 name = "google-cloud-webrisk"
 description = "Google Cloud Web Risk API client library"
-version = "1.7.0"
+version = "1.7.1"
 # Should be one of:
 # 'Development Status :: 3 - Alpha'
 # 'Development Status :: 4 - Beta'
@@ -32,8 +32,8 @@
     # NOTE: Maintainers, please do not require google-api-core>=2.x.x
     # Until this issue is closed
     # https://github.com/googleapis/google-cloud-python/issues/10566
-    "google-api-core[grpc] >= 1.28.0, <3.0.0dev",
-    "proto-plus >= 1.10.0",
+    "google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0",
+    "proto-plus >= 1.15.0",
 ]
 extras = {}
 
diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt
index da8c573..b666ca6 100644
--- a/testing/constraints-3.6.txt
+++ b/testing/constraints-3.6.txt
@@ -5,5 +5,5 @@
 #
 # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
 # Then this file should have foo==1.14.0
-google-api-core==1.28.0
-proto-plus==1.10.0
+google-api-core==1.31.5
+proto-plus==1.15.0
diff --git a/tests/__init__.py b/tests/__init__.py
index 4de6597..e8e1c38 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
index 4de6597..e8e1c38 100644
--- a/tests/unit/__init__.py
+++ b/tests/unit/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/unit/gapic/__init__.py b/tests/unit/gapic/__init__.py
index 4de6597..e8e1c38 100644
--- a/tests/unit/gapic/__init__.py
+++ b/tests/unit/gapic/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/unit/gapic/webrisk_v1/__init__.py b/tests/unit/gapic/webrisk_v1/__init__.py
index 4de6597..e8e1c38 100644
--- a/tests/unit/gapic/webrisk_v1/__init__.py
+++ b/tests/unit/gapic/webrisk_v1/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/unit/gapic/webrisk_v1/test_web_risk_service.py b/tests/unit/gapic/webrisk_v1/test_web_risk_service.py
index e938a90..4c179c2 100644
--- a/tests/unit/gapic/webrisk_v1/test_web_risk_service.py
+++ b/tests/unit/gapic/webrisk_v1/test_web_risk_service.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/unit/gapic/webrisk_v1beta1/__init__.py b/tests/unit/gapic/webrisk_v1beta1/__init__.py
index 4de6597..e8e1c38 100644
--- a/tests/unit/gapic/webrisk_v1beta1/__init__.py
+++ b/tests/unit/gapic/webrisk_v1beta1/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/unit/gapic/webrisk_v1beta1/test_web_risk_service_v1_beta1.py b/tests/unit/gapic/webrisk_v1beta1/test_web_risk_service_v1_beta1.py
index 0527b6e..3c71ca4 100644
--- a/tests/unit/gapic/webrisk_v1beta1/test_web_risk_service_v1_beta1.py
+++ b/tests/unit/gapic/webrisk_v1beta1/test_web_risk_service_v1_beta1.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2020 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.