diff --git a/google/cloud/datastream_v1/services/datastream/async_client.py b/google/cloud/datastream_v1/services/datastream/async_client.py
index 4807b2a..df758e2 100644
--- a/google/cloud/datastream_v1/services/datastream/async_client.py
+++ b/google/cloud/datastream_v1/services/datastream/async_client.py
@@ -229,7 +229,7 @@ async def list_connection_profiles(
         in a project and location.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -331,7 +331,7 @@ async def get_connection_profile(
         profile.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -426,7 +426,7 @@ async def create_connection_profile(
         project and location.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -560,7 +560,7 @@ async def update_connection_profile(
         connection profile.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -686,7 +686,7 @@ async def delete_connection_profile(
     ) -> operation_async.AsyncOperation:
         r"""Use this method to delete a connection profile.
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -805,7 +805,7 @@ async def discover_connection_profile(
         that's optionally supplied in the request.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -883,7 +883,7 @@ async def list_streams(
         location.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -981,7 +981,7 @@ async def get_stream(
     ) -> datastream_resources.Stream:
         r"""Use this method to get details about a stream.
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1073,7 +1073,7 @@ async def create_stream(
     ) -> operation_async.AsyncOperation:
         r"""Use this method to create a stream.
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1205,7 +1205,7 @@ async def update_stream(
         stream.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1331,7 +1331,7 @@ async def delete_stream(
     ) -> operation_async.AsyncOperation:
         r"""Use this method to delete a stream.
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1446,7 +1446,7 @@ async def get_stream_object(
     ) -> datastream_resources.StreamObject:
         r"""Use this method to get details about a stream object.
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1537,7 +1537,7 @@ async def lookup_stream_object(
         source object identifier.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1613,7 +1613,7 @@ async def list_stream_objects(
         stream.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1715,7 +1715,7 @@ async def start_backfill_job(
         specified stream object.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1809,7 +1809,7 @@ async def stop_backfill_job(
         specified stream object.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1902,7 +1902,7 @@ async def fetch_static_ips(
         addresses used by Datastream.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2007,7 +2007,7 @@ async def create_private_connection(
         configuration.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2136,7 +2136,7 @@ async def get_private_connection(
         connectivity configuration.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2230,7 +2230,7 @@ async def list_private_connections(
         configurations in a project and location.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2333,7 +2333,7 @@ async def delete_private_connection(
         configuration.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2452,7 +2452,7 @@ async def create_route(
         connectivity configuration in a project and location.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2577,7 +2577,7 @@ async def get_route(
     ) -> datastream_resources.Route:
         r"""Use this method to get details about a route.
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2670,7 +2670,7 @@ async def list_routes(
         connectivity configuration in a project and location.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2768,7 +2768,7 @@ async def delete_route(
     ) -> operation_async.AsyncOperation:
         r"""Use this method to delete a route.
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
diff --git a/google/cloud/datastream_v1/services/datastream/client.py b/google/cloud/datastream_v1/services/datastream/client.py
index c1dae67..66f547b 100644
--- a/google/cloud/datastream_v1/services/datastream/client.py
+++ b/google/cloud/datastream_v1/services/datastream/client.py
@@ -506,8 +506,7 @@ def list_connection_profiles(
         in a project and location.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -609,8 +608,7 @@ def get_connection_profile(
         profile.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -705,8 +703,7 @@ def create_connection_profile(
         project and location.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -842,8 +839,7 @@ def update_connection_profile(
         connection profile.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -971,8 +967,7 @@ def delete_connection_profile(
     ) -> operation.Operation:
         r"""Use this method to delete a connection profile.
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1093,8 +1088,7 @@ def discover_connection_profile(
         that's optionally supplied in the request.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1175,8 +1169,7 @@ def list_streams(
         location.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1274,8 +1267,7 @@ def get_stream(
     ) -> datastream_resources.Stream:
         r"""Use this method to get details about a stream.
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1367,8 +1359,7 @@ def create_stream(
     ) -> operation.Operation:
         r"""Use this method to create a stream.
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1500,8 +1491,7 @@ def update_stream(
         stream.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1627,8 +1617,7 @@ def delete_stream(
     ) -> operation.Operation:
         r"""Use this method to delete a stream.
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1743,8 +1732,7 @@ def get_stream_object(
     ) -> datastream_resources.StreamObject:
         r"""Use this method to get details about a stream object.
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1835,8 +1823,7 @@ def lookup_stream_object(
         source object identifier.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -1913,8 +1900,7 @@ def list_stream_objects(
         stream.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2016,8 +2002,7 @@ def start_backfill_job(
         specified stream object.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2111,8 +2096,7 @@ def stop_backfill_job(
         specified stream object.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2205,8 +2189,7 @@ def fetch_static_ips(
         addresses used by Datastream.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2311,8 +2294,7 @@ def create_private_connection(
         configuration.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2443,8 +2425,7 @@ def get_private_connection(
         connectivity configuration.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2538,8 +2519,7 @@ def list_private_connections(
         configurations in a project and location.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2642,8 +2622,7 @@ def delete_private_connection(
         configuration.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2764,8 +2743,7 @@ def create_route(
         connectivity configuration in a project and location.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2890,8 +2868,7 @@ def get_route(
     ) -> datastream_resources.Route:
         r"""Use this method to get details about a route.
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -2984,8 +2961,7 @@ def list_routes(
         connectivity configuration in a project and location.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
@@ -3083,8 +3059,7 @@ def delete_route(
     ) -> operation.Operation:
         r"""Use this method to delete a route.
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1
 
diff --git a/google/cloud/datastream_v1alpha1/services/datastream/async_client.py b/google/cloud/datastream_v1alpha1/services/datastream/async_client.py
index 11eb3df..21f7a16 100644
--- a/google/cloud/datastream_v1alpha1/services/datastream/async_client.py
+++ b/google/cloud/datastream_v1alpha1/services/datastream/async_client.py
@@ -225,7 +225,7 @@ async def list_connection_profiles(
         in a project and location.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -324,7 +324,7 @@ async def get_connection_profile(
         profile.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -415,7 +415,7 @@ async def create_connection_profile(
         project and location.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -548,7 +548,7 @@ async def update_connection_profile(
         connection profile.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -674,7 +674,7 @@ async def delete_connection_profile(
     ) -> operation_async.AsyncOperation:
         r"""Use this method to delete a connection profile..
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -792,7 +792,7 @@ async def discover_connection_profile(
         that's optionally supplied in the request.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -870,7 +870,7 @@ async def list_streams(
         location.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -967,7 +967,7 @@ async def get_stream(
     ) -> datastream_resources.Stream:
         r"""Use this method to get details about a stream.
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1056,7 +1056,7 @@ async def create_stream(
     ) -> operation_async.AsyncOperation:
         r"""Use this method to create a stream.
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1185,7 +1185,7 @@ async def update_stream(
         stream.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1308,7 +1308,7 @@ async def delete_stream(
     ) -> operation_async.AsyncOperation:
         r"""Use this method to delete a stream.
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1423,7 +1423,7 @@ async def fetch_errors(
         stream.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1510,7 +1510,7 @@ async def fetch_static_ips(
         optionally supplied in the request.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1614,7 +1614,7 @@ async def create_private_connection(
         configuration.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1742,7 +1742,7 @@ async def get_private_connection(
         connectivity configuration.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1835,7 +1835,7 @@ async def list_private_connections(
         configurations in a project and location.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1935,7 +1935,7 @@ async def delete_private_connection(
         configuration.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -2053,7 +2053,7 @@ async def create_route(
         connectivity in a project and location.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -2179,7 +2179,7 @@ async def get_route(
     ) -> datastream_resources.Route:
         r"""Use this method to get details about a route.
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -2272,7 +2272,7 @@ async def list_routes(
         connectivity in a project and location.
 
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -2370,7 +2370,7 @@ async def delete_route(
     ) -> operation_async.AsyncOperation:
         r"""Use this method to delete a route.
 
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
diff --git a/google/cloud/datastream_v1alpha1/services/datastream/client.py b/google/cloud/datastream_v1alpha1/services/datastream/client.py
index b2455c5..84978c5 100644
--- a/google/cloud/datastream_v1alpha1/services/datastream/client.py
+++ b/google/cloud/datastream_v1alpha1/services/datastream/client.py
@@ -473,8 +473,7 @@ def list_connection_profiles(
         in a project and location.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -573,8 +572,7 @@ def get_connection_profile(
         profile.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -665,8 +663,7 @@ def create_connection_profile(
         project and location.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -801,8 +798,7 @@ def update_connection_profile(
         connection profile.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -930,8 +926,7 @@ def delete_connection_profile(
     ) -> operation.Operation:
         r"""Use this method to delete a connection profile..
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1051,8 +1046,7 @@ def discover_connection_profile(
         that's optionally supplied in the request.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1133,8 +1127,7 @@ def list_streams(
         location.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1231,8 +1224,7 @@ def get_stream(
     ) -> datastream_resources.Stream:
         r"""Use this method to get details about a stream.
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1321,8 +1313,7 @@ def create_stream(
     ) -> operation.Operation:
         r"""Use this method to create a stream.
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1451,8 +1442,7 @@ def update_stream(
         stream.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1575,8 +1565,7 @@ def delete_stream(
     ) -> operation.Operation:
         r"""Use this method to delete a stream.
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1691,8 +1680,7 @@ def fetch_errors(
         stream.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1780,8 +1768,7 @@ def fetch_static_ips(
         optionally supplied in the request.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -1885,8 +1872,7 @@ def create_private_connection(
         configuration.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -2016,8 +2002,7 @@ def get_private_connection(
         connectivity configuration.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -2110,8 +2095,7 @@ def list_private_connections(
         configurations in a project and location.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -2211,8 +2195,7 @@ def delete_private_connection(
         configuration.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -2332,8 +2315,7 @@ def create_route(
         connectivity in a project and location.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -2459,8 +2441,7 @@ def get_route(
     ) -> datastream_resources.Route:
         r"""Use this method to get details about a route.
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -2553,8 +2534,7 @@ def list_routes(
         connectivity in a project and location.
 
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
@@ -2652,8 +2632,7 @@ def delete_route(
     ) -> operation.Operation:
         r"""Use this method to delete a route.
 
-
-        .. code-block::
+        .. code-block:: python
 
             from google.cloud import datastream_v1alpha1
 
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_create_connection_profile_async.py b/samples/generated_samples/datastream_v1_generated_datastream_create_connection_profile_async.py
similarity index 92%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_create_connection_profile_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_create_connection_profile_async.py
index b0c1c08..95b5392 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_create_connection_profile_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_create_connection_profile_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_CreateConnectionProfile_async]
+# [START datastream_v1_generated_Datastream_CreateConnectionProfile_async]
 from google.cloud import datastream_v1
 
 
@@ -55,4 +55,4 @@ async def sample_create_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_CreateConnectionProfile_async]
+# [END datastream_v1_generated_Datastream_CreateConnectionProfile_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_create_connection_profile_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_create_connection_profile_sync.py
similarity index 92%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_create_connection_profile_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_create_connection_profile_sync.py
index 1fdcf33..e48bd6b 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_create_connection_profile_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_create_connection_profile_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_CreateConnectionProfile_sync]
+# [START datastream_v1_generated_Datastream_CreateConnectionProfile_sync]
 from google.cloud import datastream_v1
 
 
@@ -55,4 +55,4 @@ def sample_create_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_CreateConnectionProfile_sync]
+# [END datastream_v1_generated_Datastream_CreateConnectionProfile_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_create_private_connection_async.py b/samples/generated_samples/datastream_v1_generated_datastream_create_private_connection_async.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_create_private_connection_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_create_private_connection_async.py
index 4daad35..b614391 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_create_private_connection_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_create_private_connection_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_CreatePrivateConnection_async]
+# [START datastream_v1_generated_Datastream_CreatePrivateConnection_async]
 from google.cloud import datastream_v1
 
 
@@ -51,4 +51,4 @@ async def sample_create_private_connection():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_CreatePrivateConnection_async]
+# [END datastream_v1_generated_Datastream_CreatePrivateConnection_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_create_private_connection_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_create_private_connection_sync.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_create_private_connection_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_create_private_connection_sync.py
index 5f55360..2613db5 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_create_private_connection_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_create_private_connection_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_CreatePrivateConnection_sync]
+# [START datastream_v1_generated_Datastream_CreatePrivateConnection_sync]
 from google.cloud import datastream_v1
 
 
@@ -51,4 +51,4 @@ def sample_create_private_connection():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_CreatePrivateConnection_sync]
+# [END datastream_v1_generated_Datastream_CreatePrivateConnection_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_create_route_async.py b/samples/generated_samples/datastream_v1_generated_datastream_create_route_async.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_create_route_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_create_route_async.py
index 759222f..45d5137 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_create_route_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_create_route_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_CreateRoute_async]
+# [START datastream_v1_generated_Datastream_CreateRoute_async]
 from google.cloud import datastream_v1
 
 
@@ -52,4 +52,4 @@ async def sample_create_route():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_CreateRoute_async]
+# [END datastream_v1_generated_Datastream_CreateRoute_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_create_route_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_create_route_sync.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_create_route_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_create_route_sync.py
index d0044ff..71ea25f 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_create_route_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_create_route_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_CreateRoute_sync]
+# [START datastream_v1_generated_Datastream_CreateRoute_sync]
 from google.cloud import datastream_v1
 
 
@@ -52,4 +52,4 @@ def sample_create_route():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_CreateRoute_sync]
+# [END datastream_v1_generated_Datastream_CreateRoute_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_create_stream_async.py b/samples/generated_samples/datastream_v1_generated_datastream_create_stream_async.py
similarity index 92%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_create_stream_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_create_stream_async.py
index 81845fb..98005ef 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_create_stream_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_create_stream_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_CreateStream_async]
+# [START datastream_v1_generated_Datastream_CreateStream_async]
 from google.cloud import datastream_v1
 
 
@@ -53,4 +53,4 @@ async def sample_create_stream():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_CreateStream_async]
+# [END datastream_v1_generated_Datastream_CreateStream_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_create_stream_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_create_stream_sync.py
similarity index 92%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_create_stream_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_create_stream_sync.py
index 81ad5b8..01e1c70 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_create_stream_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_create_stream_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_CreateStream_sync]
+# [START datastream_v1_generated_Datastream_CreateStream_sync]
 from google.cloud import datastream_v1
 
 
@@ -53,4 +53,4 @@ def sample_create_stream():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_CreateStream_sync]
+# [END datastream_v1_generated_Datastream_CreateStream_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_connection_profile_async.py b/samples/generated_samples/datastream_v1_generated_datastream_delete_connection_profile_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_connection_profile_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_delete_connection_profile_async.py
index 6598134..f62d257 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_connection_profile_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_delete_connection_profile_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_DeleteConnectionProfile_async]
+# [START datastream_v1_generated_Datastream_DeleteConnectionProfile_async]
 from google.cloud import datastream_v1
 
 
@@ -46,4 +46,4 @@ async def sample_delete_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_DeleteConnectionProfile_async]
+# [END datastream_v1_generated_Datastream_DeleteConnectionProfile_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_connection_profile_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_delete_connection_profile_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_connection_profile_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_delete_connection_profile_sync.py
index 0450450..f6d3f1f 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_connection_profile_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_delete_connection_profile_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_DeleteConnectionProfile_sync]
+# [START datastream_v1_generated_Datastream_DeleteConnectionProfile_sync]
 from google.cloud import datastream_v1
 
 
@@ -46,4 +46,4 @@ def sample_delete_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_DeleteConnectionProfile_sync]
+# [END datastream_v1_generated_Datastream_DeleteConnectionProfile_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_private_connection_async.py b/samples/generated_samples/datastream_v1_generated_datastream_delete_private_connection_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_private_connection_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_delete_private_connection_async.py
index 5b8420d..ba8e816 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_private_connection_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_delete_private_connection_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_DeletePrivateConnection_async]
+# [START datastream_v1_generated_Datastream_DeletePrivateConnection_async]
 from google.cloud import datastream_v1
 
 
@@ -46,4 +46,4 @@ async def sample_delete_private_connection():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_DeletePrivateConnection_async]
+# [END datastream_v1_generated_Datastream_DeletePrivateConnection_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_private_connection_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_delete_private_connection_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_private_connection_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_delete_private_connection_sync.py
index 52d32b9..b02cb6f 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_private_connection_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_delete_private_connection_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_DeletePrivateConnection_sync]
+# [START datastream_v1_generated_Datastream_DeletePrivateConnection_sync]
 from google.cloud import datastream_v1
 
 
@@ -46,4 +46,4 @@ def sample_delete_private_connection():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_DeletePrivateConnection_sync]
+# [END datastream_v1_generated_Datastream_DeletePrivateConnection_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_route_async.py b/samples/generated_samples/datastream_v1_generated_datastream_delete_route_async.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_route_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_delete_route_async.py
index 1341681..e7bcfd6 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_route_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_delete_route_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_DeleteRoute_async]
+# [START datastream_v1_generated_Datastream_DeleteRoute_async]
 from google.cloud import datastream_v1
 
 
@@ -46,4 +46,4 @@ async def sample_delete_route():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_DeleteRoute_async]
+# [END datastream_v1_generated_Datastream_DeleteRoute_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_route_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_delete_route_sync.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_route_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_delete_route_sync.py
index ab73fd8..c64834e 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_route_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_delete_route_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_DeleteRoute_sync]
+# [START datastream_v1_generated_Datastream_DeleteRoute_sync]
 from google.cloud import datastream_v1
 
 
@@ -46,4 +46,4 @@ def sample_delete_route():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_DeleteRoute_sync]
+# [END datastream_v1_generated_Datastream_DeleteRoute_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_stream_async.py b/samples/generated_samples/datastream_v1_generated_datastream_delete_stream_async.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_stream_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_delete_stream_async.py
index 8205581..c092db2 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_stream_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_delete_stream_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_DeleteStream_async]
+# [START datastream_v1_generated_Datastream_DeleteStream_async]
 from google.cloud import datastream_v1
 
 
@@ -46,4 +46,4 @@ async def sample_delete_stream():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_DeleteStream_async]
+# [END datastream_v1_generated_Datastream_DeleteStream_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_stream_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_delete_stream_sync.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_stream_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_delete_stream_sync.py
index 3beb9fb..3b8d3d8 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_delete_stream_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_delete_stream_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_DeleteStream_sync]
+# [START datastream_v1_generated_Datastream_DeleteStream_sync]
 from google.cloud import datastream_v1
 
 
@@ -46,4 +46,4 @@ def sample_delete_stream():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_DeleteStream_sync]
+# [END datastream_v1_generated_Datastream_DeleteStream_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_discover_connection_profile_async.py b/samples/generated_samples/datastream_v1_generated_datastream_discover_connection_profile_async.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_discover_connection_profile_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_discover_connection_profile_async.py
index b9135bf..22903b7 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_discover_connection_profile_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_discover_connection_profile_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_DiscoverConnectionProfile_async]
+# [START datastream_v1_generated_Datastream_DiscoverConnectionProfile_async]
 from google.cloud import datastream_v1
 
 
@@ -51,4 +51,4 @@ async def sample_discover_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_DiscoverConnectionProfile_async]
+# [END datastream_v1_generated_Datastream_DiscoverConnectionProfile_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_discover_connection_profile_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_discover_connection_profile_sync.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_discover_connection_profile_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_discover_connection_profile_sync.py
index d5f3053..ddf1c22 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_discover_connection_profile_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_discover_connection_profile_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_DiscoverConnectionProfile_sync]
+# [START datastream_v1_generated_Datastream_DiscoverConnectionProfile_sync]
 from google.cloud import datastream_v1
 
 
@@ -51,4 +51,4 @@ def sample_discover_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_DiscoverConnectionProfile_sync]
+# [END datastream_v1_generated_Datastream_DiscoverConnectionProfile_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_fetch_static_ips_async.py b/samples/generated_samples/datastream_v1_generated_datastream_fetch_static_ips_async.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_fetch_static_ips_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_fetch_static_ips_async.py
index b0b5166..56a6313 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_fetch_static_ips_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_fetch_static_ips_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_FetchStaticIps_async]
+# [START datastream_v1_generated_Datastream_FetchStaticIps_async]
 from google.cloud import datastream_v1
 
 
@@ -43,4 +43,4 @@ async def sample_fetch_static_ips():
     async for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_FetchStaticIps_async]
+# [END datastream_v1_generated_Datastream_FetchStaticIps_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_fetch_static_ips_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_fetch_static_ips_sync.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_fetch_static_ips_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_fetch_static_ips_sync.py
index a551558..9319a19 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_fetch_static_ips_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_fetch_static_ips_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_FetchStaticIps_sync]
+# [START datastream_v1_generated_Datastream_FetchStaticIps_sync]
 from google.cloud import datastream_v1
 
 
@@ -43,4 +43,4 @@ def sample_fetch_static_ips():
     for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_FetchStaticIps_sync]
+# [END datastream_v1_generated_Datastream_FetchStaticIps_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_connection_profile_async.py b/samples/generated_samples/datastream_v1_generated_datastream_get_connection_profile_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_get_connection_profile_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_get_connection_profile_async.py
index 8abace7..9e26b56 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_connection_profile_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_get_connection_profile_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_GetConnectionProfile_async]
+# [START datastream_v1_generated_Datastream_GetConnectionProfile_async]
 from google.cloud import datastream_v1
 
 
@@ -42,4 +42,4 @@ async def sample_get_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_GetConnectionProfile_async]
+# [END datastream_v1_generated_Datastream_GetConnectionProfile_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_connection_profile_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_get_connection_profile_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_get_connection_profile_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_get_connection_profile_sync.py
index 77dd7b7..d84c8f7 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_connection_profile_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_get_connection_profile_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_GetConnectionProfile_sync]
+# [START datastream_v1_generated_Datastream_GetConnectionProfile_sync]
 from google.cloud import datastream_v1
 
 
@@ -42,4 +42,4 @@ def sample_get_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_GetConnectionProfile_sync]
+# [END datastream_v1_generated_Datastream_GetConnectionProfile_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_private_connection_async.py b/samples/generated_samples/datastream_v1_generated_datastream_get_private_connection_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_get_private_connection_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_get_private_connection_async.py
index 1844b08..c10d5f5 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_private_connection_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_get_private_connection_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_GetPrivateConnection_async]
+# [START datastream_v1_generated_Datastream_GetPrivateConnection_async]
 from google.cloud import datastream_v1
 
 
@@ -42,4 +42,4 @@ async def sample_get_private_connection():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_GetPrivateConnection_async]
+# [END datastream_v1_generated_Datastream_GetPrivateConnection_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_private_connection_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_get_private_connection_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_get_private_connection_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_get_private_connection_sync.py
index 2cdd056..b1446a5 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_private_connection_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_get_private_connection_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_GetPrivateConnection_sync]
+# [START datastream_v1_generated_Datastream_GetPrivateConnection_sync]
 from google.cloud import datastream_v1
 
 
@@ -42,4 +42,4 @@ def sample_get_private_connection():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_GetPrivateConnection_sync]
+# [END datastream_v1_generated_Datastream_GetPrivateConnection_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_route_async.py b/samples/generated_samples/datastream_v1_generated_datastream_get_route_async.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_get_route_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_get_route_async.py
index a7b8970..c340788 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_route_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_get_route_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_GetRoute_async]
+# [START datastream_v1_generated_Datastream_GetRoute_async]
 from google.cloud import datastream_v1
 
 
@@ -42,4 +42,4 @@ async def sample_get_route():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_GetRoute_async]
+# [END datastream_v1_generated_Datastream_GetRoute_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_route_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_get_route_sync.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_get_route_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_get_route_sync.py
index 933b37b..331d691 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_route_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_get_route_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_GetRoute_sync]
+# [START datastream_v1_generated_Datastream_GetRoute_sync]
 from google.cloud import datastream_v1
 
 
@@ -42,4 +42,4 @@ def sample_get_route():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_GetRoute_sync]
+# [END datastream_v1_generated_Datastream_GetRoute_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_stream_async.py b/samples/generated_samples/datastream_v1_generated_datastream_get_stream_async.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_get_stream_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_get_stream_async.py
index 9285b1a..e45ded2 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_stream_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_get_stream_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_GetStream_async]
+# [START datastream_v1_generated_Datastream_GetStream_async]
 from google.cloud import datastream_v1
 
 
@@ -42,4 +42,4 @@ async def sample_get_stream():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_GetStream_async]
+# [END datastream_v1_generated_Datastream_GetStream_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_stream_object_async.py b/samples/generated_samples/datastream_v1_generated_datastream_get_stream_object_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_get_stream_object_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_get_stream_object_async.py
index 66a3c1e..7eb9be6 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_stream_object_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_get_stream_object_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_GetStreamObject_async]
+# [START datastream_v1_generated_Datastream_GetStreamObject_async]
 from google.cloud import datastream_v1
 
 
@@ -42,4 +42,4 @@ async def sample_get_stream_object():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_GetStreamObject_async]
+# [END datastream_v1_generated_Datastream_GetStreamObject_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_stream_object_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_get_stream_object_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_get_stream_object_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_get_stream_object_sync.py
index 2696872..c244a8d 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_stream_object_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_get_stream_object_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_GetStreamObject_sync]
+# [START datastream_v1_generated_Datastream_GetStreamObject_sync]
 from google.cloud import datastream_v1
 
 
@@ -42,4 +42,4 @@ def sample_get_stream_object():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_GetStreamObject_sync]
+# [END datastream_v1_generated_Datastream_GetStreamObject_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_stream_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_get_stream_sync.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_get_stream_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_get_stream_sync.py
index 1da1e45..dca8bc8 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_get_stream_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_get_stream_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_GetStream_sync]
+# [START datastream_v1_generated_Datastream_GetStream_sync]
 from google.cloud import datastream_v1
 
 
@@ -42,4 +42,4 @@ def sample_get_stream():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_GetStream_sync]
+# [END datastream_v1_generated_Datastream_GetStream_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_connection_profiles_async.py b/samples/generated_samples/datastream_v1_generated_datastream_list_connection_profiles_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_list_connection_profiles_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_list_connection_profiles_async.py
index 2f0b579..0403c43 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_connection_profiles_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_list_connection_profiles_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_ListConnectionProfiles_async]
+# [START datastream_v1_generated_Datastream_ListConnectionProfiles_async]
 from google.cloud import datastream_v1
 
 
@@ -43,4 +43,4 @@ async def sample_list_connection_profiles():
     async for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_ListConnectionProfiles_async]
+# [END datastream_v1_generated_Datastream_ListConnectionProfiles_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_connection_profiles_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_list_connection_profiles_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_list_connection_profiles_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_list_connection_profiles_sync.py
index 5b398f0..badd7ea 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_connection_profiles_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_list_connection_profiles_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_ListConnectionProfiles_sync]
+# [START datastream_v1_generated_Datastream_ListConnectionProfiles_sync]
 from google.cloud import datastream_v1
 
 
@@ -43,4 +43,4 @@ def sample_list_connection_profiles():
     for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_ListConnectionProfiles_sync]
+# [END datastream_v1_generated_Datastream_ListConnectionProfiles_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_private_connections_async.py b/samples/generated_samples/datastream_v1_generated_datastream_list_private_connections_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_list_private_connections_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_list_private_connections_async.py
index 5a59734..ceebc21 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_private_connections_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_list_private_connections_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_ListPrivateConnections_async]
+# [START datastream_v1_generated_Datastream_ListPrivateConnections_async]
 from google.cloud import datastream_v1
 
 
@@ -43,4 +43,4 @@ async def sample_list_private_connections():
     async for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_ListPrivateConnections_async]
+# [END datastream_v1_generated_Datastream_ListPrivateConnections_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_private_connections_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_list_private_connections_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_list_private_connections_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_list_private_connections_sync.py
index c1657dc..29222bd 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_private_connections_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_list_private_connections_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_ListPrivateConnections_sync]
+# [START datastream_v1_generated_Datastream_ListPrivateConnections_sync]
 from google.cloud import datastream_v1
 
 
@@ -43,4 +43,4 @@ def sample_list_private_connections():
     for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_ListPrivateConnections_sync]
+# [END datastream_v1_generated_Datastream_ListPrivateConnections_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_routes_async.py b/samples/generated_samples/datastream_v1_generated_datastream_list_routes_async.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_list_routes_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_list_routes_async.py
index be5b53c..d152696 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_routes_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_list_routes_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_ListRoutes_async]
+# [START datastream_v1_generated_Datastream_ListRoutes_async]
 from google.cloud import datastream_v1
 
 
@@ -43,4 +43,4 @@ async def sample_list_routes():
     async for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_ListRoutes_async]
+# [END datastream_v1_generated_Datastream_ListRoutes_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_routes_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_list_routes_sync.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_list_routes_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_list_routes_sync.py
index 5c0d84f..2e56395 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_routes_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_list_routes_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_ListRoutes_sync]
+# [START datastream_v1_generated_Datastream_ListRoutes_sync]
 from google.cloud import datastream_v1
 
 
@@ -43,4 +43,4 @@ def sample_list_routes():
     for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_ListRoutes_sync]
+# [END datastream_v1_generated_Datastream_ListRoutes_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_stream_objects_async.py b/samples/generated_samples/datastream_v1_generated_datastream_list_stream_objects_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_list_stream_objects_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_list_stream_objects_async.py
index 76fec3b..9ff7453 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_stream_objects_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_list_stream_objects_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_ListStreamObjects_async]
+# [START datastream_v1_generated_Datastream_ListStreamObjects_async]
 from google.cloud import datastream_v1
 
 
@@ -43,4 +43,4 @@ async def sample_list_stream_objects():
     async for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_ListStreamObjects_async]
+# [END datastream_v1_generated_Datastream_ListStreamObjects_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_stream_objects_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_list_stream_objects_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_list_stream_objects_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_list_stream_objects_sync.py
index 293fea2..2378cc9 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_stream_objects_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_list_stream_objects_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_ListStreamObjects_sync]
+# [START datastream_v1_generated_Datastream_ListStreamObjects_sync]
 from google.cloud import datastream_v1
 
 
@@ -43,4 +43,4 @@ def sample_list_stream_objects():
     for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_ListStreamObjects_sync]
+# [END datastream_v1_generated_Datastream_ListStreamObjects_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_streams_async.py b/samples/generated_samples/datastream_v1_generated_datastream_list_streams_async.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_list_streams_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_list_streams_async.py
index c9a58d3..7eed340 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_streams_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_list_streams_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_ListStreams_async]
+# [START datastream_v1_generated_Datastream_ListStreams_async]
 from google.cloud import datastream_v1
 
 
@@ -43,4 +43,4 @@ async def sample_list_streams():
     async for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_ListStreams_async]
+# [END datastream_v1_generated_Datastream_ListStreams_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_streams_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_list_streams_sync.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_list_streams_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_list_streams_sync.py
index 5b4b832..aefdd1f 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_list_streams_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_list_streams_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_ListStreams_sync]
+# [START datastream_v1_generated_Datastream_ListStreams_sync]
 from google.cloud import datastream_v1
 
 
@@ -43,4 +43,4 @@ def sample_list_streams():
     for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_ListStreams_sync]
+# [END datastream_v1_generated_Datastream_ListStreams_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_lookup_stream_object_async.py b/samples/generated_samples/datastream_v1_generated_datastream_lookup_stream_object_async.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_lookup_stream_object_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_lookup_stream_object_async.py
index 767819d..6c64482 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_lookup_stream_object_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_lookup_stream_object_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_LookupStreamObject_async]
+# [START datastream_v1_generated_Datastream_LookupStreamObject_async]
 from google.cloud import datastream_v1
 
 
@@ -47,4 +47,4 @@ async def sample_lookup_stream_object():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_LookupStreamObject_async]
+# [END datastream_v1_generated_Datastream_LookupStreamObject_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_lookup_stream_object_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_lookup_stream_object_sync.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_lookup_stream_object_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_lookup_stream_object_sync.py
index 5c7a5af..1b7d4b2 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_lookup_stream_object_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_lookup_stream_object_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_LookupStreamObject_sync]
+# [START datastream_v1_generated_Datastream_LookupStreamObject_sync]
 from google.cloud import datastream_v1
 
 
@@ -47,4 +47,4 @@ def sample_lookup_stream_object():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_LookupStreamObject_sync]
+# [END datastream_v1_generated_Datastream_LookupStreamObject_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_start_backfill_job_async.py b/samples/generated_samples/datastream_v1_generated_datastream_start_backfill_job_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_start_backfill_job_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_start_backfill_job_async.py
index f8617ec..318f6af 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_start_backfill_job_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_start_backfill_job_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_StartBackfillJob_async]
+# [START datastream_v1_generated_Datastream_StartBackfillJob_async]
 from google.cloud import datastream_v1
 
 
@@ -42,4 +42,4 @@ async def sample_start_backfill_job():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_StartBackfillJob_async]
+# [END datastream_v1_generated_Datastream_StartBackfillJob_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_start_backfill_job_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_start_backfill_job_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_start_backfill_job_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_start_backfill_job_sync.py
index 538d1d4..04c3029 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_start_backfill_job_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_start_backfill_job_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_StartBackfillJob_sync]
+# [START datastream_v1_generated_Datastream_StartBackfillJob_sync]
 from google.cloud import datastream_v1
 
 
@@ -42,4 +42,4 @@ def sample_start_backfill_job():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_StartBackfillJob_sync]
+# [END datastream_v1_generated_Datastream_StartBackfillJob_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_stop_backfill_job_async.py b/samples/generated_samples/datastream_v1_generated_datastream_stop_backfill_job_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_stop_backfill_job_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_stop_backfill_job_async.py
index 10107b1..355c1cb 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_stop_backfill_job_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_stop_backfill_job_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_StopBackfillJob_async]
+# [START datastream_v1_generated_Datastream_StopBackfillJob_async]
 from google.cloud import datastream_v1
 
 
@@ -42,4 +42,4 @@ async def sample_stop_backfill_job():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_StopBackfillJob_async]
+# [END datastream_v1_generated_Datastream_StopBackfillJob_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_stop_backfill_job_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_stop_backfill_job_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_stop_backfill_job_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_stop_backfill_job_sync.py
index ee770e0..00a3a24 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_stop_backfill_job_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_stop_backfill_job_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_StopBackfillJob_sync]
+# [START datastream_v1_generated_Datastream_StopBackfillJob_sync]
 from google.cloud import datastream_v1
 
 
@@ -42,4 +42,4 @@ def sample_stop_backfill_job():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_StopBackfillJob_sync]
+# [END datastream_v1_generated_Datastream_StopBackfillJob_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_update_connection_profile_async.py b/samples/generated_samples/datastream_v1_generated_datastream_update_connection_profile_async.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_update_connection_profile_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_update_connection_profile_async.py
index 879698f..0aa293a 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_update_connection_profile_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_update_connection_profile_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_UpdateConnectionProfile_async]
+# [START datastream_v1_generated_Datastream_UpdateConnectionProfile_async]
 from google.cloud import datastream_v1
 
 
@@ -53,4 +53,4 @@ async def sample_update_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_UpdateConnectionProfile_async]
+# [END datastream_v1_generated_Datastream_UpdateConnectionProfile_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_update_connection_profile_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_update_connection_profile_sync.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_update_connection_profile_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_update_connection_profile_sync.py
index 4d075f1..7201f02 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_update_connection_profile_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_update_connection_profile_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_UpdateConnectionProfile_sync]
+# [START datastream_v1_generated_Datastream_UpdateConnectionProfile_sync]
 from google.cloud import datastream_v1
 
 
@@ -53,4 +53,4 @@ def sample_update_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_UpdateConnectionProfile_sync]
+# [END datastream_v1_generated_Datastream_UpdateConnectionProfile_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_update_stream_async.py b/samples/generated_samples/datastream_v1_generated_datastream_update_stream_async.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_update_stream_async.py
rename to samples/generated_samples/datastream_v1_generated_datastream_update_stream_async.py
index a4b2b09..63a7448 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_update_stream_async.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_update_stream_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_UpdateStream_async]
+# [START datastream_v1_generated_Datastream_UpdateStream_async]
 from google.cloud import datastream_v1
 
 
@@ -51,4 +51,4 @@ async def sample_update_stream():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_UpdateStream_async]
+# [END datastream_v1_generated_Datastream_UpdateStream_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1_datastream_update_stream_sync.py b/samples/generated_samples/datastream_v1_generated_datastream_update_stream_sync.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1_datastream_update_stream_sync.py
rename to samples/generated_samples/datastream_v1_generated_datastream_update_stream_sync.py
index 33ac5bd..1d1ed2c 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1_datastream_update_stream_sync.py
+++ b/samples/generated_samples/datastream_v1_generated_datastream_update_stream_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1_Datastream_UpdateStream_sync]
+# [START datastream_v1_generated_Datastream_UpdateStream_sync]
 from google.cloud import datastream_v1
 
 
@@ -51,4 +51,4 @@ def sample_update_stream():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1_Datastream_UpdateStream_sync]
+# [END datastream_v1_generated_Datastream_UpdateStream_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_connection_profile_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_create_connection_profile_async.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_connection_profile_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_create_connection_profile_async.py
index 2740679..5ecf5e8 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_connection_profile_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_create_connection_profile_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_CreateConnectionProfile_async]
+# [START datastream_v1alpha1_generated_Datastream_CreateConnectionProfile_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -55,4 +55,4 @@ async def sample_create_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_CreateConnectionProfile_async]
+# [END datastream_v1alpha1_generated_Datastream_CreateConnectionProfile_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_connection_profile_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_create_connection_profile_sync.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_connection_profile_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_create_connection_profile_sync.py
index bb1f369..ef4eccc 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_connection_profile_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_create_connection_profile_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_CreateConnectionProfile_sync]
+# [START datastream_v1alpha1_generated_Datastream_CreateConnectionProfile_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -55,4 +55,4 @@ def sample_create_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_CreateConnectionProfile_sync]
+# [END datastream_v1alpha1_generated_Datastream_CreateConnectionProfile_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_private_connection_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_create_private_connection_async.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_private_connection_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_create_private_connection_async.py
index 06efebb..4fa7a5b 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_private_connection_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_create_private_connection_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_CreatePrivateConnection_async]
+# [START datastream_v1alpha1_generated_Datastream_CreatePrivateConnection_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -51,4 +51,4 @@ async def sample_create_private_connection():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_CreatePrivateConnection_async]
+# [END datastream_v1alpha1_generated_Datastream_CreatePrivateConnection_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_private_connection_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_create_private_connection_sync.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_private_connection_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_create_private_connection_sync.py
index 0bc366f..760d35f 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_private_connection_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_create_private_connection_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_CreatePrivateConnection_sync]
+# [START datastream_v1alpha1_generated_Datastream_CreatePrivateConnection_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -51,4 +51,4 @@ def sample_create_private_connection():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_CreatePrivateConnection_sync]
+# [END datastream_v1alpha1_generated_Datastream_CreatePrivateConnection_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_route_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_create_route_async.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_route_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_create_route_async.py
index 45e1a93..afa89fe 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_route_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_create_route_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_CreateRoute_async]
+# [START datastream_v1alpha1_generated_Datastream_CreateRoute_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -52,4 +52,4 @@ async def sample_create_route():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_CreateRoute_async]
+# [END datastream_v1alpha1_generated_Datastream_CreateRoute_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_route_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_create_route_sync.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_route_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_create_route_sync.py
index 6e72888..d848d05 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_route_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_create_route_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_CreateRoute_sync]
+# [START datastream_v1alpha1_generated_Datastream_CreateRoute_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -52,4 +52,4 @@ def sample_create_route():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_CreateRoute_sync]
+# [END datastream_v1alpha1_generated_Datastream_CreateRoute_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_stream_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_create_stream_async.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_stream_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_create_stream_async.py
index 93d8a7a..dd8a188 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_stream_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_create_stream_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_CreateStream_async]
+# [START datastream_v1alpha1_generated_Datastream_CreateStream_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -53,4 +53,4 @@ async def sample_create_stream():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_CreateStream_async]
+# [END datastream_v1alpha1_generated_Datastream_CreateStream_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_stream_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_create_stream_sync.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_stream_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_create_stream_sync.py
index 60f9e55..bd3c33c 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_create_stream_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_create_stream_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_CreateStream_sync]
+# [START datastream_v1alpha1_generated_Datastream_CreateStream_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -53,4 +53,4 @@ def sample_create_stream():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_CreateStream_sync]
+# [END datastream_v1alpha1_generated_Datastream_CreateStream_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_connection_profile_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_connection_profile_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_connection_profile_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_connection_profile_async.py
index c07a0a6..6b1687b 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_connection_profile_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_connection_profile_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_DeleteConnectionProfile_async]
+# [START datastream_v1alpha1_generated_Datastream_DeleteConnectionProfile_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -46,4 +46,4 @@ async def sample_delete_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_DeleteConnectionProfile_async]
+# [END datastream_v1alpha1_generated_Datastream_DeleteConnectionProfile_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_connection_profile_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_connection_profile_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_connection_profile_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_connection_profile_sync.py
index c367b85..1dd79dc 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_connection_profile_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_connection_profile_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_DeleteConnectionProfile_sync]
+# [START datastream_v1alpha1_generated_Datastream_DeleteConnectionProfile_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -46,4 +46,4 @@ def sample_delete_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_DeleteConnectionProfile_sync]
+# [END datastream_v1alpha1_generated_Datastream_DeleteConnectionProfile_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_private_connection_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_private_connection_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_private_connection_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_private_connection_async.py
index c6103ee..de2b72b 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_private_connection_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_private_connection_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_DeletePrivateConnection_async]
+# [START datastream_v1alpha1_generated_Datastream_DeletePrivateConnection_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -46,4 +46,4 @@ async def sample_delete_private_connection():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_DeletePrivateConnection_async]
+# [END datastream_v1alpha1_generated_Datastream_DeletePrivateConnection_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_private_connection_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_private_connection_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_private_connection_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_private_connection_sync.py
index 93d0a0d..03ad8fa 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_private_connection_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_private_connection_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_DeletePrivateConnection_sync]
+# [START datastream_v1alpha1_generated_Datastream_DeletePrivateConnection_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -46,4 +46,4 @@ def sample_delete_private_connection():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_DeletePrivateConnection_sync]
+# [END datastream_v1alpha1_generated_Datastream_DeletePrivateConnection_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_route_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_route_async.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_route_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_route_async.py
index 169b54e..6b610a9 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_route_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_route_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_DeleteRoute_async]
+# [START datastream_v1alpha1_generated_Datastream_DeleteRoute_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -46,4 +46,4 @@ async def sample_delete_route():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_DeleteRoute_async]
+# [END datastream_v1alpha1_generated_Datastream_DeleteRoute_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_route_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_route_sync.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_route_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_route_sync.py
index da2b14f..27efe88 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_route_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_route_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_DeleteRoute_sync]
+# [START datastream_v1alpha1_generated_Datastream_DeleteRoute_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -46,4 +46,4 @@ def sample_delete_route():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_DeleteRoute_sync]
+# [END datastream_v1alpha1_generated_Datastream_DeleteRoute_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_stream_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_stream_async.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_stream_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_stream_async.py
index 33b625f..35fb233 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_stream_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_stream_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_DeleteStream_async]
+# [START datastream_v1alpha1_generated_Datastream_DeleteStream_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -46,4 +46,4 @@ async def sample_delete_stream():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_DeleteStream_async]
+# [END datastream_v1alpha1_generated_Datastream_DeleteStream_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_stream_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_stream_sync.py
similarity index 90%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_stream_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_stream_sync.py
index 5e37a7a..8a5f824 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_delete_stream_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_delete_stream_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_DeleteStream_sync]
+# [START datastream_v1alpha1_generated_Datastream_DeleteStream_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -46,4 +46,4 @@ def sample_delete_stream():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_DeleteStream_sync]
+# [END datastream_v1alpha1_generated_Datastream_DeleteStream_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_discover_connection_profile_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_discover_connection_profile_async.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_discover_connection_profile_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_discover_connection_profile_async.py
index ca37dd5..98f10b9 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_discover_connection_profile_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_discover_connection_profile_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_DiscoverConnectionProfile_async]
+# [START datastream_v1alpha1_generated_Datastream_DiscoverConnectionProfile_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -51,4 +51,4 @@ async def sample_discover_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_DiscoverConnectionProfile_async]
+# [END datastream_v1alpha1_generated_Datastream_DiscoverConnectionProfile_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_discover_connection_profile_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_discover_connection_profile_sync.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_discover_connection_profile_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_discover_connection_profile_sync.py
index d9002fb..7486c81 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_discover_connection_profile_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_discover_connection_profile_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_DiscoverConnectionProfile_sync]
+# [START datastream_v1alpha1_generated_Datastream_DiscoverConnectionProfile_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -51,4 +51,4 @@ def sample_discover_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_DiscoverConnectionProfile_sync]
+# [END datastream_v1alpha1_generated_Datastream_DiscoverConnectionProfile_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_fetch_errors_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_fetch_errors_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_fetch_errors_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_fetch_errors_async.py
index a927751..b284f54 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_fetch_errors_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_fetch_errors_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_FetchErrors_async]
+# [START datastream_v1alpha1_generated_Datastream_FetchErrors_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -45,4 +45,4 @@ async def sample_fetch_errors():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_FetchErrors_async]
+# [END datastream_v1alpha1_generated_Datastream_FetchErrors_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_fetch_errors_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_fetch_errors_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_fetch_errors_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_fetch_errors_sync.py
index 596168f..3ddb770 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_fetch_errors_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_fetch_errors_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_FetchErrors_sync]
+# [START datastream_v1alpha1_generated_Datastream_FetchErrors_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -45,4 +45,4 @@ def sample_fetch_errors():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_FetchErrors_sync]
+# [END datastream_v1alpha1_generated_Datastream_FetchErrors_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_fetch_static_ips_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_fetch_static_ips_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_fetch_static_ips_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_fetch_static_ips_async.py
index f89034e..c2b3540 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_fetch_static_ips_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_fetch_static_ips_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_FetchStaticIps_async]
+# [START datastream_v1alpha1_generated_Datastream_FetchStaticIps_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -43,4 +43,4 @@ async def sample_fetch_static_ips():
     async for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_FetchStaticIps_async]
+# [END datastream_v1alpha1_generated_Datastream_FetchStaticIps_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_fetch_static_ips_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_fetch_static_ips_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_fetch_static_ips_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_fetch_static_ips_sync.py
index 577e8de..296e183 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_fetch_static_ips_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_fetch_static_ips_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_FetchStaticIps_sync]
+# [START datastream_v1alpha1_generated_Datastream_FetchStaticIps_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -43,4 +43,4 @@ def sample_fetch_static_ips():
     for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_FetchStaticIps_sync]
+# [END datastream_v1alpha1_generated_Datastream_FetchStaticIps_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_connection_profile_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_get_connection_profile_async.py
similarity index 88%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_connection_profile_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_get_connection_profile_async.py
index abbcf29..1c34dfe 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_connection_profile_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_get_connection_profile_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_GetConnectionProfile_async]
+# [START datastream_v1alpha1_generated_Datastream_GetConnectionProfile_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -42,4 +42,4 @@ async def sample_get_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_GetConnectionProfile_async]
+# [END datastream_v1alpha1_generated_Datastream_GetConnectionProfile_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_connection_profile_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_get_connection_profile_sync.py
similarity index 88%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_connection_profile_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_get_connection_profile_sync.py
index 71e21d2..2c8ddf6 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_connection_profile_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_get_connection_profile_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_GetConnectionProfile_sync]
+# [START datastream_v1alpha1_generated_Datastream_GetConnectionProfile_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -42,4 +42,4 @@ def sample_get_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_GetConnectionProfile_sync]
+# [END datastream_v1alpha1_generated_Datastream_GetConnectionProfile_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_private_connection_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_get_private_connection_async.py
similarity index 88%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_private_connection_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_get_private_connection_async.py
index 156409e..e856add 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_private_connection_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_get_private_connection_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_GetPrivateConnection_async]
+# [START datastream_v1alpha1_generated_Datastream_GetPrivateConnection_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -42,4 +42,4 @@ async def sample_get_private_connection():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_GetPrivateConnection_async]
+# [END datastream_v1alpha1_generated_Datastream_GetPrivateConnection_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_private_connection_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_get_private_connection_sync.py
similarity index 88%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_private_connection_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_get_private_connection_sync.py
index a657fe5..f896c2f 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_private_connection_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_get_private_connection_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_GetPrivateConnection_sync]
+# [START datastream_v1alpha1_generated_Datastream_GetPrivateConnection_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -42,4 +42,4 @@ def sample_get_private_connection():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_GetPrivateConnection_sync]
+# [END datastream_v1alpha1_generated_Datastream_GetPrivateConnection_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_route_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_get_route_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_route_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_get_route_async.py
index f882cbe..62a5d13 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_route_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_get_route_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_GetRoute_async]
+# [START datastream_v1alpha1_generated_Datastream_GetRoute_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -42,4 +42,4 @@ async def sample_get_route():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_GetRoute_async]
+# [END datastream_v1alpha1_generated_Datastream_GetRoute_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_route_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_get_route_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_route_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_get_route_sync.py
index d522bb3..2af1d80 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_route_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_get_route_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_GetRoute_sync]
+# [START datastream_v1alpha1_generated_Datastream_GetRoute_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -42,4 +42,4 @@ def sample_get_route():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_GetRoute_sync]
+# [END datastream_v1alpha1_generated_Datastream_GetRoute_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_stream_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_get_stream_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_stream_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_get_stream_async.py
index 4c5c4f9..e3fa37a 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_stream_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_get_stream_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_GetStream_async]
+# [START datastream_v1alpha1_generated_Datastream_GetStream_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -42,4 +42,4 @@ async def sample_get_stream():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_GetStream_async]
+# [END datastream_v1alpha1_generated_Datastream_GetStream_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_stream_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_get_stream_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_stream_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_get_stream_sync.py
index fbfcfa9..f1a4119 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_get_stream_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_get_stream_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_GetStream_sync]
+# [START datastream_v1alpha1_generated_Datastream_GetStream_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -42,4 +42,4 @@ def sample_get_stream():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_GetStream_sync]
+# [END datastream_v1alpha1_generated_Datastream_GetStream_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_connection_profiles_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_list_connection_profiles_async.py
similarity index 88%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_connection_profiles_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_list_connection_profiles_async.py
index 90a8511..0b190c7 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_connection_profiles_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_list_connection_profiles_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_ListConnectionProfiles_async]
+# [START datastream_v1alpha1_generated_Datastream_ListConnectionProfiles_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -43,4 +43,4 @@ async def sample_list_connection_profiles():
     async for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_ListConnectionProfiles_async]
+# [END datastream_v1alpha1_generated_Datastream_ListConnectionProfiles_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_connection_profiles_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_list_connection_profiles_sync.py
similarity index 88%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_connection_profiles_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_list_connection_profiles_sync.py
index 59ca172..4ef1127 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_connection_profiles_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_list_connection_profiles_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_ListConnectionProfiles_sync]
+# [START datastream_v1alpha1_generated_Datastream_ListConnectionProfiles_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -43,4 +43,4 @@ def sample_list_connection_profiles():
     for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_ListConnectionProfiles_sync]
+# [END datastream_v1alpha1_generated_Datastream_ListConnectionProfiles_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_private_connections_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_list_private_connections_async.py
similarity index 88%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_private_connections_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_list_private_connections_async.py
index a276107..4f0894a 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_private_connections_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_list_private_connections_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_ListPrivateConnections_async]
+# [START datastream_v1alpha1_generated_Datastream_ListPrivateConnections_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -43,4 +43,4 @@ async def sample_list_private_connections():
     async for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_ListPrivateConnections_async]
+# [END datastream_v1alpha1_generated_Datastream_ListPrivateConnections_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_private_connections_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_list_private_connections_sync.py
similarity index 88%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_private_connections_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_list_private_connections_sync.py
index 3bc6db5..5f45675 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_private_connections_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_list_private_connections_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_ListPrivateConnections_sync]
+# [START datastream_v1alpha1_generated_Datastream_ListPrivateConnections_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -43,4 +43,4 @@ def sample_list_private_connections():
     for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_ListPrivateConnections_sync]
+# [END datastream_v1alpha1_generated_Datastream_ListPrivateConnections_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_routes_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_list_routes_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_routes_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_list_routes_async.py
index 59eb945..adefcca 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_routes_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_list_routes_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_ListRoutes_async]
+# [START datastream_v1alpha1_generated_Datastream_ListRoutes_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -43,4 +43,4 @@ async def sample_list_routes():
     async for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_ListRoutes_async]
+# [END datastream_v1alpha1_generated_Datastream_ListRoutes_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_routes_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_list_routes_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_routes_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_list_routes_sync.py
index bdec495..86f1045 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_routes_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_list_routes_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_ListRoutes_sync]
+# [START datastream_v1alpha1_generated_Datastream_ListRoutes_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -43,4 +43,4 @@ def sample_list_routes():
     for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_ListRoutes_sync]
+# [END datastream_v1alpha1_generated_Datastream_ListRoutes_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_streams_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_list_streams_async.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_streams_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_list_streams_async.py
index dcea80c..35ae58a 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_streams_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_list_streams_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_ListStreams_async]
+# [START datastream_v1alpha1_generated_Datastream_ListStreams_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -43,4 +43,4 @@ async def sample_list_streams():
     async for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_ListStreams_async]
+# [END datastream_v1alpha1_generated_Datastream_ListStreams_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_streams_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_list_streams_sync.py
similarity index 89%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_streams_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_list_streams_sync.py
index 2997158..328d077 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_list_streams_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_list_streams_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_ListStreams_sync]
+# [START datastream_v1alpha1_generated_Datastream_ListStreams_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -43,4 +43,4 @@ def sample_list_streams():
     for response in page_result:
         print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_ListStreams_sync]
+# [END datastream_v1alpha1_generated_Datastream_ListStreams_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_update_connection_profile_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_update_connection_profile_async.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_update_connection_profile_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_update_connection_profile_async.py
index 8368631..2bcc63b 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_update_connection_profile_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_update_connection_profile_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_UpdateConnectionProfile_async]
+# [START datastream_v1alpha1_generated_Datastream_UpdateConnectionProfile_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -53,4 +53,4 @@ async def sample_update_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_UpdateConnectionProfile_async]
+# [END datastream_v1alpha1_generated_Datastream_UpdateConnectionProfile_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_update_connection_profile_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_update_connection_profile_sync.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_update_connection_profile_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_update_connection_profile_sync.py
index a3de16d..4034592 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_update_connection_profile_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_update_connection_profile_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_UpdateConnectionProfile_sync]
+# [START datastream_v1alpha1_generated_Datastream_UpdateConnectionProfile_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -53,4 +53,4 @@ def sample_update_connection_profile():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_UpdateConnectionProfile_sync]
+# [END datastream_v1alpha1_generated_Datastream_UpdateConnectionProfile_sync]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_update_stream_async.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_update_stream_async.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_update_stream_async.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_update_stream_async.py
index bcd7d85..47db18d 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_update_stream_async.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_update_stream_async.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_UpdateStream_async]
+# [START datastream_v1alpha1_generated_Datastream_UpdateStream_async]
 from google.cloud import datastream_v1alpha1
 
 
@@ -51,4 +51,4 @@ async def sample_update_stream():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_UpdateStream_async]
+# [END datastream_v1alpha1_generated_Datastream_UpdateStream_async]
diff --git a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_update_stream_sync.py b/samples/generated_samples/datastream_v1alpha1_generated_datastream_update_stream_sync.py
similarity index 91%
rename from samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_update_stream_sync.py
rename to samples/generated_samples/datastream_v1alpha1_generated_datastream_update_stream_sync.py
index ea9763f..147501c 100644
--- a/samples/generated_samples/datastream_generated_datastream_v1alpha1_datastream_update_stream_sync.py
+++ b/samples/generated_samples/datastream_v1alpha1_generated_datastream_update_stream_sync.py
@@ -23,7 +23,7 @@
 #   python3 -m pip install google-cloud-datastream
 
 
-# [START datastream_generated_datastream_v1alpha1_Datastream_UpdateStream_sync]
+# [START datastream_v1alpha1_generated_Datastream_UpdateStream_sync]
 from google.cloud import datastream_v1alpha1
 
 
@@ -51,4 +51,4 @@ def sample_update_stream():
     # Handle the response
     print(response)
 
-# [END datastream_generated_datastream_v1alpha1_Datastream_UpdateStream_sync]
+# [END datastream_v1alpha1_generated_Datastream_UpdateStream_sync]
diff --git a/samples/generated_samples/snippet_metadata_datastream_v1.json b/samples/generated_samples/snippet_metadata_datastream_v1.json
index 6c8b306..41ce403 100644
--- a/samples/generated_samples/snippet_metadata_datastream_v1.json
+++ b/samples/generated_samples/snippet_metadata_datastream_v1.json
@@ -10,8 +10,8 @@
           "shortName": "CreateConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_create_connection_profile_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_CreateConnectionProfile_async",
+      "file": "datastream_v1_generated_datastream_create_connection_profile_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_CreateConnectionProfile_async",
       "segments": [
         {
           "end": 57,
@@ -54,8 +54,8 @@
           "shortName": "CreateConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_create_connection_profile_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_CreateConnectionProfile_sync",
+      "file": "datastream_v1_generated_datastream_create_connection_profile_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_CreateConnectionProfile_sync",
       "segments": [
         {
           "end": 57,
@@ -99,8 +99,8 @@
           "shortName": "CreatePrivateConnection"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_create_private_connection_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_CreatePrivateConnection_async",
+      "file": "datastream_v1_generated_datastream_create_private_connection_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_CreatePrivateConnection_async",
       "segments": [
         {
           "end": 53,
@@ -143,8 +143,8 @@
           "shortName": "CreatePrivateConnection"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_create_private_connection_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_CreatePrivateConnection_sync",
+      "file": "datastream_v1_generated_datastream_create_private_connection_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_CreatePrivateConnection_sync",
       "segments": [
         {
           "end": 53,
@@ -188,8 +188,8 @@
           "shortName": "CreateRoute"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_create_route_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_CreateRoute_async",
+      "file": "datastream_v1_generated_datastream_create_route_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_CreateRoute_async",
       "segments": [
         {
           "end": 54,
@@ -232,8 +232,8 @@
           "shortName": "CreateRoute"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_create_route_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_CreateRoute_sync",
+      "file": "datastream_v1_generated_datastream_create_route_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_CreateRoute_sync",
       "segments": [
         {
           "end": 54,
@@ -277,8 +277,8 @@
           "shortName": "CreateStream"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_create_stream_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_CreateStream_async",
+      "file": "datastream_v1_generated_datastream_create_stream_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_CreateStream_async",
       "segments": [
         {
           "end": 55,
@@ -321,8 +321,8 @@
           "shortName": "CreateStream"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_create_stream_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_CreateStream_sync",
+      "file": "datastream_v1_generated_datastream_create_stream_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_CreateStream_sync",
       "segments": [
         {
           "end": 55,
@@ -366,8 +366,8 @@
           "shortName": "DeleteConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_delete_connection_profile_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_DeleteConnectionProfile_async",
+      "file": "datastream_v1_generated_datastream_delete_connection_profile_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_DeleteConnectionProfile_async",
       "segments": [
         {
           "end": 48,
@@ -410,8 +410,8 @@
           "shortName": "DeleteConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_delete_connection_profile_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_DeleteConnectionProfile_sync",
+      "file": "datastream_v1_generated_datastream_delete_connection_profile_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_DeleteConnectionProfile_sync",
       "segments": [
         {
           "end": 48,
@@ -455,8 +455,8 @@
           "shortName": "DeletePrivateConnection"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_delete_private_connection_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_DeletePrivateConnection_async",
+      "file": "datastream_v1_generated_datastream_delete_private_connection_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_DeletePrivateConnection_async",
       "segments": [
         {
           "end": 48,
@@ -499,8 +499,8 @@
           "shortName": "DeletePrivateConnection"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_delete_private_connection_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_DeletePrivateConnection_sync",
+      "file": "datastream_v1_generated_datastream_delete_private_connection_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_DeletePrivateConnection_sync",
       "segments": [
         {
           "end": 48,
@@ -544,8 +544,8 @@
           "shortName": "DeleteRoute"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_delete_route_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_DeleteRoute_async",
+      "file": "datastream_v1_generated_datastream_delete_route_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_DeleteRoute_async",
       "segments": [
         {
           "end": 48,
@@ -588,8 +588,8 @@
           "shortName": "DeleteRoute"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_delete_route_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_DeleteRoute_sync",
+      "file": "datastream_v1_generated_datastream_delete_route_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_DeleteRoute_sync",
       "segments": [
         {
           "end": 48,
@@ -633,8 +633,8 @@
           "shortName": "DeleteStream"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_delete_stream_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_DeleteStream_async",
+      "file": "datastream_v1_generated_datastream_delete_stream_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_DeleteStream_async",
       "segments": [
         {
           "end": 48,
@@ -677,8 +677,8 @@
           "shortName": "DeleteStream"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_delete_stream_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_DeleteStream_sync",
+      "file": "datastream_v1_generated_datastream_delete_stream_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_DeleteStream_sync",
       "segments": [
         {
           "end": 48,
@@ -722,8 +722,8 @@
           "shortName": "DiscoverConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_discover_connection_profile_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_DiscoverConnectionProfile_async",
+      "file": "datastream_v1_generated_datastream_discover_connection_profile_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_DiscoverConnectionProfile_async",
       "segments": [
         {
           "end": 53,
@@ -766,8 +766,8 @@
           "shortName": "DiscoverConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_discover_connection_profile_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_DiscoverConnectionProfile_sync",
+      "file": "datastream_v1_generated_datastream_discover_connection_profile_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_DiscoverConnectionProfile_sync",
       "segments": [
         {
           "end": 53,
@@ -811,8 +811,8 @@
           "shortName": "FetchStaticIps"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_fetch_static_ips_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_FetchStaticIps_async",
+      "file": "datastream_v1_generated_datastream_fetch_static_ips_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_FetchStaticIps_async",
       "segments": [
         {
           "end": 45,
@@ -855,8 +855,8 @@
           "shortName": "FetchStaticIps"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_fetch_static_ips_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_FetchStaticIps_sync",
+      "file": "datastream_v1_generated_datastream_fetch_static_ips_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_FetchStaticIps_sync",
       "segments": [
         {
           "end": 45,
@@ -900,8 +900,8 @@
           "shortName": "GetConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_get_connection_profile_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_GetConnectionProfile_async",
+      "file": "datastream_v1_generated_datastream_get_connection_profile_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_GetConnectionProfile_async",
       "segments": [
         {
           "end": 44,
@@ -944,8 +944,8 @@
           "shortName": "GetConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_get_connection_profile_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_GetConnectionProfile_sync",
+      "file": "datastream_v1_generated_datastream_get_connection_profile_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_GetConnectionProfile_sync",
       "segments": [
         {
           "end": 44,
@@ -989,8 +989,8 @@
           "shortName": "GetPrivateConnection"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_get_private_connection_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_GetPrivateConnection_async",
+      "file": "datastream_v1_generated_datastream_get_private_connection_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_GetPrivateConnection_async",
       "segments": [
         {
           "end": 44,
@@ -1033,8 +1033,8 @@
           "shortName": "GetPrivateConnection"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_get_private_connection_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_GetPrivateConnection_sync",
+      "file": "datastream_v1_generated_datastream_get_private_connection_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_GetPrivateConnection_sync",
       "segments": [
         {
           "end": 44,
@@ -1078,8 +1078,8 @@
           "shortName": "GetRoute"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_get_route_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_GetRoute_async",
+      "file": "datastream_v1_generated_datastream_get_route_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_GetRoute_async",
       "segments": [
         {
           "end": 44,
@@ -1122,8 +1122,8 @@
           "shortName": "GetRoute"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_get_route_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_GetRoute_sync",
+      "file": "datastream_v1_generated_datastream_get_route_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_GetRoute_sync",
       "segments": [
         {
           "end": 44,
@@ -1167,8 +1167,8 @@
           "shortName": "GetStreamObject"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_get_stream_object_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_GetStreamObject_async",
+      "file": "datastream_v1_generated_datastream_get_stream_object_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_GetStreamObject_async",
       "segments": [
         {
           "end": 44,
@@ -1211,8 +1211,8 @@
           "shortName": "GetStreamObject"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_get_stream_object_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_GetStreamObject_sync",
+      "file": "datastream_v1_generated_datastream_get_stream_object_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_GetStreamObject_sync",
       "segments": [
         {
           "end": 44,
@@ -1256,8 +1256,8 @@
           "shortName": "GetStream"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_get_stream_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_GetStream_async",
+      "file": "datastream_v1_generated_datastream_get_stream_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_GetStream_async",
       "segments": [
         {
           "end": 44,
@@ -1300,8 +1300,8 @@
           "shortName": "GetStream"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_get_stream_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_GetStream_sync",
+      "file": "datastream_v1_generated_datastream_get_stream_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_GetStream_sync",
       "segments": [
         {
           "end": 44,
@@ -1345,8 +1345,8 @@
           "shortName": "ListConnectionProfiles"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_list_connection_profiles_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_ListConnectionProfiles_async",
+      "file": "datastream_v1_generated_datastream_list_connection_profiles_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_ListConnectionProfiles_async",
       "segments": [
         {
           "end": 45,
@@ -1389,8 +1389,8 @@
           "shortName": "ListConnectionProfiles"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_list_connection_profiles_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_ListConnectionProfiles_sync",
+      "file": "datastream_v1_generated_datastream_list_connection_profiles_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_ListConnectionProfiles_sync",
       "segments": [
         {
           "end": 45,
@@ -1434,8 +1434,8 @@
           "shortName": "ListPrivateConnections"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_list_private_connections_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_ListPrivateConnections_async",
+      "file": "datastream_v1_generated_datastream_list_private_connections_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_ListPrivateConnections_async",
       "segments": [
         {
           "end": 45,
@@ -1478,8 +1478,8 @@
           "shortName": "ListPrivateConnections"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_list_private_connections_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_ListPrivateConnections_sync",
+      "file": "datastream_v1_generated_datastream_list_private_connections_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_ListPrivateConnections_sync",
       "segments": [
         {
           "end": 45,
@@ -1523,8 +1523,8 @@
           "shortName": "ListRoutes"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_list_routes_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_ListRoutes_async",
+      "file": "datastream_v1_generated_datastream_list_routes_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_ListRoutes_async",
       "segments": [
         {
           "end": 45,
@@ -1567,8 +1567,8 @@
           "shortName": "ListRoutes"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_list_routes_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_ListRoutes_sync",
+      "file": "datastream_v1_generated_datastream_list_routes_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_ListRoutes_sync",
       "segments": [
         {
           "end": 45,
@@ -1612,8 +1612,8 @@
           "shortName": "ListStreamObjects"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_list_stream_objects_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_ListStreamObjects_async",
+      "file": "datastream_v1_generated_datastream_list_stream_objects_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_ListStreamObjects_async",
       "segments": [
         {
           "end": 45,
@@ -1656,8 +1656,8 @@
           "shortName": "ListStreamObjects"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_list_stream_objects_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_ListStreamObjects_sync",
+      "file": "datastream_v1_generated_datastream_list_stream_objects_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_ListStreamObjects_sync",
       "segments": [
         {
           "end": 45,
@@ -1701,8 +1701,8 @@
           "shortName": "ListStreams"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_list_streams_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_ListStreams_async",
+      "file": "datastream_v1_generated_datastream_list_streams_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_ListStreams_async",
       "segments": [
         {
           "end": 45,
@@ -1745,8 +1745,8 @@
           "shortName": "ListStreams"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_list_streams_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_ListStreams_sync",
+      "file": "datastream_v1_generated_datastream_list_streams_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_ListStreams_sync",
       "segments": [
         {
           "end": 45,
@@ -1790,8 +1790,8 @@
           "shortName": "LookupStreamObject"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_lookup_stream_object_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_LookupStreamObject_async",
+      "file": "datastream_v1_generated_datastream_lookup_stream_object_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_LookupStreamObject_async",
       "segments": [
         {
           "end": 49,
@@ -1834,8 +1834,8 @@
           "shortName": "LookupStreamObject"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_lookup_stream_object_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_LookupStreamObject_sync",
+      "file": "datastream_v1_generated_datastream_lookup_stream_object_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_LookupStreamObject_sync",
       "segments": [
         {
           "end": 49,
@@ -1879,8 +1879,8 @@
           "shortName": "StartBackfillJob"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_start_backfill_job_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_StartBackfillJob_async",
+      "file": "datastream_v1_generated_datastream_start_backfill_job_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_StartBackfillJob_async",
       "segments": [
         {
           "end": 44,
@@ -1923,8 +1923,8 @@
           "shortName": "StartBackfillJob"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_start_backfill_job_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_StartBackfillJob_sync",
+      "file": "datastream_v1_generated_datastream_start_backfill_job_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_StartBackfillJob_sync",
       "segments": [
         {
           "end": 44,
@@ -1968,8 +1968,8 @@
           "shortName": "StopBackfillJob"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_stop_backfill_job_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_StopBackfillJob_async",
+      "file": "datastream_v1_generated_datastream_stop_backfill_job_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_StopBackfillJob_async",
       "segments": [
         {
           "end": 44,
@@ -2012,8 +2012,8 @@
           "shortName": "StopBackfillJob"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_stop_backfill_job_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_StopBackfillJob_sync",
+      "file": "datastream_v1_generated_datastream_stop_backfill_job_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_StopBackfillJob_sync",
       "segments": [
         {
           "end": 44,
@@ -2057,8 +2057,8 @@
           "shortName": "UpdateConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_update_connection_profile_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_UpdateConnectionProfile_async",
+      "file": "datastream_v1_generated_datastream_update_connection_profile_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_UpdateConnectionProfile_async",
       "segments": [
         {
           "end": 55,
@@ -2101,8 +2101,8 @@
           "shortName": "UpdateConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_update_connection_profile_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_UpdateConnectionProfile_sync",
+      "file": "datastream_v1_generated_datastream_update_connection_profile_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_UpdateConnectionProfile_sync",
       "segments": [
         {
           "end": 55,
@@ -2146,8 +2146,8 @@
           "shortName": "UpdateStream"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_update_stream_async.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_UpdateStream_async",
+      "file": "datastream_v1_generated_datastream_update_stream_async.py",
+      "regionTag": "datastream_v1_generated_Datastream_UpdateStream_async",
       "segments": [
         {
           "end": 53,
@@ -2190,8 +2190,8 @@
           "shortName": "UpdateStream"
         }
       },
-      "file": "datastream_generated_datastream_v1_datastream_update_stream_sync.py",
-      "regionTag": "datastream_generated_datastream_v1_Datastream_UpdateStream_sync",
+      "file": "datastream_v1_generated_datastream_update_stream_sync.py",
+      "regionTag": "datastream_v1_generated_Datastream_UpdateStream_sync",
       "segments": [
         {
           "end": 53,
diff --git a/samples/generated_samples/snippet_metadata_datastream_v1alpha1.json b/samples/generated_samples/snippet_metadata_datastream_v1alpha1.json
index bdb6d6c..c68d11b 100644
--- a/samples/generated_samples/snippet_metadata_datastream_v1alpha1.json
+++ b/samples/generated_samples/snippet_metadata_datastream_v1alpha1.json
@@ -10,8 +10,8 @@
           "shortName": "CreateConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_create_connection_profile_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_CreateConnectionProfile_async",
+      "file": "datastream_v1alpha1_generated_datastream_create_connection_profile_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_CreateConnectionProfile_async",
       "segments": [
         {
           "end": 57,
@@ -54,8 +54,8 @@
           "shortName": "CreateConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_create_connection_profile_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_CreateConnectionProfile_sync",
+      "file": "datastream_v1alpha1_generated_datastream_create_connection_profile_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_CreateConnectionProfile_sync",
       "segments": [
         {
           "end": 57,
@@ -99,8 +99,8 @@
           "shortName": "CreatePrivateConnection"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_create_private_connection_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_CreatePrivateConnection_async",
+      "file": "datastream_v1alpha1_generated_datastream_create_private_connection_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_CreatePrivateConnection_async",
       "segments": [
         {
           "end": 53,
@@ -143,8 +143,8 @@
           "shortName": "CreatePrivateConnection"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_create_private_connection_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_CreatePrivateConnection_sync",
+      "file": "datastream_v1alpha1_generated_datastream_create_private_connection_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_CreatePrivateConnection_sync",
       "segments": [
         {
           "end": 53,
@@ -188,8 +188,8 @@
           "shortName": "CreateRoute"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_create_route_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_CreateRoute_async",
+      "file": "datastream_v1alpha1_generated_datastream_create_route_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_CreateRoute_async",
       "segments": [
         {
           "end": 54,
@@ -232,8 +232,8 @@
           "shortName": "CreateRoute"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_create_route_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_CreateRoute_sync",
+      "file": "datastream_v1alpha1_generated_datastream_create_route_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_CreateRoute_sync",
       "segments": [
         {
           "end": 54,
@@ -277,8 +277,8 @@
           "shortName": "CreateStream"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_create_stream_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_CreateStream_async",
+      "file": "datastream_v1alpha1_generated_datastream_create_stream_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_CreateStream_async",
       "segments": [
         {
           "end": 55,
@@ -321,8 +321,8 @@
           "shortName": "CreateStream"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_create_stream_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_CreateStream_sync",
+      "file": "datastream_v1alpha1_generated_datastream_create_stream_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_CreateStream_sync",
       "segments": [
         {
           "end": 55,
@@ -366,8 +366,8 @@
           "shortName": "DeleteConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_delete_connection_profile_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_DeleteConnectionProfile_async",
+      "file": "datastream_v1alpha1_generated_datastream_delete_connection_profile_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_DeleteConnectionProfile_async",
       "segments": [
         {
           "end": 48,
@@ -410,8 +410,8 @@
           "shortName": "DeleteConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_delete_connection_profile_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_DeleteConnectionProfile_sync",
+      "file": "datastream_v1alpha1_generated_datastream_delete_connection_profile_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_DeleteConnectionProfile_sync",
       "segments": [
         {
           "end": 48,
@@ -455,8 +455,8 @@
           "shortName": "DeletePrivateConnection"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_delete_private_connection_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_DeletePrivateConnection_async",
+      "file": "datastream_v1alpha1_generated_datastream_delete_private_connection_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_DeletePrivateConnection_async",
       "segments": [
         {
           "end": 48,
@@ -499,8 +499,8 @@
           "shortName": "DeletePrivateConnection"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_delete_private_connection_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_DeletePrivateConnection_sync",
+      "file": "datastream_v1alpha1_generated_datastream_delete_private_connection_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_DeletePrivateConnection_sync",
       "segments": [
         {
           "end": 48,
@@ -544,8 +544,8 @@
           "shortName": "DeleteRoute"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_delete_route_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_DeleteRoute_async",
+      "file": "datastream_v1alpha1_generated_datastream_delete_route_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_DeleteRoute_async",
       "segments": [
         {
           "end": 48,
@@ -588,8 +588,8 @@
           "shortName": "DeleteRoute"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_delete_route_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_DeleteRoute_sync",
+      "file": "datastream_v1alpha1_generated_datastream_delete_route_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_DeleteRoute_sync",
       "segments": [
         {
           "end": 48,
@@ -633,8 +633,8 @@
           "shortName": "DeleteStream"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_delete_stream_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_DeleteStream_async",
+      "file": "datastream_v1alpha1_generated_datastream_delete_stream_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_DeleteStream_async",
       "segments": [
         {
           "end": 48,
@@ -677,8 +677,8 @@
           "shortName": "DeleteStream"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_delete_stream_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_DeleteStream_sync",
+      "file": "datastream_v1alpha1_generated_datastream_delete_stream_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_DeleteStream_sync",
       "segments": [
         {
           "end": 48,
@@ -722,8 +722,8 @@
           "shortName": "DiscoverConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_discover_connection_profile_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_DiscoverConnectionProfile_async",
+      "file": "datastream_v1alpha1_generated_datastream_discover_connection_profile_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_DiscoverConnectionProfile_async",
       "segments": [
         {
           "end": 53,
@@ -766,8 +766,8 @@
           "shortName": "DiscoverConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_discover_connection_profile_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_DiscoverConnectionProfile_sync",
+      "file": "datastream_v1alpha1_generated_datastream_discover_connection_profile_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_DiscoverConnectionProfile_sync",
       "segments": [
         {
           "end": 53,
@@ -811,8 +811,8 @@
           "shortName": "FetchErrors"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_fetch_errors_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_FetchErrors_async",
+      "file": "datastream_v1alpha1_generated_datastream_fetch_errors_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_FetchErrors_async",
       "segments": [
         {
           "end": 47,
@@ -855,8 +855,8 @@
           "shortName": "FetchErrors"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_fetch_errors_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_FetchErrors_sync",
+      "file": "datastream_v1alpha1_generated_datastream_fetch_errors_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_FetchErrors_sync",
       "segments": [
         {
           "end": 47,
@@ -900,8 +900,8 @@
           "shortName": "FetchStaticIps"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_fetch_static_ips_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_FetchStaticIps_async",
+      "file": "datastream_v1alpha1_generated_datastream_fetch_static_ips_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_FetchStaticIps_async",
       "segments": [
         {
           "end": 45,
@@ -944,8 +944,8 @@
           "shortName": "FetchStaticIps"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_fetch_static_ips_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_FetchStaticIps_sync",
+      "file": "datastream_v1alpha1_generated_datastream_fetch_static_ips_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_FetchStaticIps_sync",
       "segments": [
         {
           "end": 45,
@@ -989,8 +989,8 @@
           "shortName": "GetConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_get_connection_profile_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_GetConnectionProfile_async",
+      "file": "datastream_v1alpha1_generated_datastream_get_connection_profile_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_GetConnectionProfile_async",
       "segments": [
         {
           "end": 44,
@@ -1033,8 +1033,8 @@
           "shortName": "GetConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_get_connection_profile_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_GetConnectionProfile_sync",
+      "file": "datastream_v1alpha1_generated_datastream_get_connection_profile_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_GetConnectionProfile_sync",
       "segments": [
         {
           "end": 44,
@@ -1078,8 +1078,8 @@
           "shortName": "GetPrivateConnection"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_get_private_connection_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_GetPrivateConnection_async",
+      "file": "datastream_v1alpha1_generated_datastream_get_private_connection_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_GetPrivateConnection_async",
       "segments": [
         {
           "end": 44,
@@ -1122,8 +1122,8 @@
           "shortName": "GetPrivateConnection"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_get_private_connection_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_GetPrivateConnection_sync",
+      "file": "datastream_v1alpha1_generated_datastream_get_private_connection_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_GetPrivateConnection_sync",
       "segments": [
         {
           "end": 44,
@@ -1167,8 +1167,8 @@
           "shortName": "GetRoute"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_get_route_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_GetRoute_async",
+      "file": "datastream_v1alpha1_generated_datastream_get_route_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_GetRoute_async",
       "segments": [
         {
           "end": 44,
@@ -1211,8 +1211,8 @@
           "shortName": "GetRoute"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_get_route_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_GetRoute_sync",
+      "file": "datastream_v1alpha1_generated_datastream_get_route_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_GetRoute_sync",
       "segments": [
         {
           "end": 44,
@@ -1256,8 +1256,8 @@
           "shortName": "GetStream"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_get_stream_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_GetStream_async",
+      "file": "datastream_v1alpha1_generated_datastream_get_stream_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_GetStream_async",
       "segments": [
         {
           "end": 44,
@@ -1300,8 +1300,8 @@
           "shortName": "GetStream"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_get_stream_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_GetStream_sync",
+      "file": "datastream_v1alpha1_generated_datastream_get_stream_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_GetStream_sync",
       "segments": [
         {
           "end": 44,
@@ -1345,8 +1345,8 @@
           "shortName": "ListConnectionProfiles"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_list_connection_profiles_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_ListConnectionProfiles_async",
+      "file": "datastream_v1alpha1_generated_datastream_list_connection_profiles_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_ListConnectionProfiles_async",
       "segments": [
         {
           "end": 45,
@@ -1389,8 +1389,8 @@
           "shortName": "ListConnectionProfiles"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_list_connection_profiles_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_ListConnectionProfiles_sync",
+      "file": "datastream_v1alpha1_generated_datastream_list_connection_profiles_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_ListConnectionProfiles_sync",
       "segments": [
         {
           "end": 45,
@@ -1434,8 +1434,8 @@
           "shortName": "ListPrivateConnections"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_list_private_connections_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_ListPrivateConnections_async",
+      "file": "datastream_v1alpha1_generated_datastream_list_private_connections_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_ListPrivateConnections_async",
       "segments": [
         {
           "end": 45,
@@ -1478,8 +1478,8 @@
           "shortName": "ListPrivateConnections"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_list_private_connections_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_ListPrivateConnections_sync",
+      "file": "datastream_v1alpha1_generated_datastream_list_private_connections_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_ListPrivateConnections_sync",
       "segments": [
         {
           "end": 45,
@@ -1523,8 +1523,8 @@
           "shortName": "ListRoutes"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_list_routes_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_ListRoutes_async",
+      "file": "datastream_v1alpha1_generated_datastream_list_routes_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_ListRoutes_async",
       "segments": [
         {
           "end": 45,
@@ -1567,8 +1567,8 @@
           "shortName": "ListRoutes"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_list_routes_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_ListRoutes_sync",
+      "file": "datastream_v1alpha1_generated_datastream_list_routes_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_ListRoutes_sync",
       "segments": [
         {
           "end": 45,
@@ -1612,8 +1612,8 @@
           "shortName": "ListStreams"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_list_streams_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_ListStreams_async",
+      "file": "datastream_v1alpha1_generated_datastream_list_streams_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_ListStreams_async",
       "segments": [
         {
           "end": 45,
@@ -1656,8 +1656,8 @@
           "shortName": "ListStreams"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_list_streams_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_ListStreams_sync",
+      "file": "datastream_v1alpha1_generated_datastream_list_streams_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_ListStreams_sync",
       "segments": [
         {
           "end": 45,
@@ -1701,8 +1701,8 @@
           "shortName": "UpdateConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_update_connection_profile_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_UpdateConnectionProfile_async",
+      "file": "datastream_v1alpha1_generated_datastream_update_connection_profile_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_UpdateConnectionProfile_async",
       "segments": [
         {
           "end": 55,
@@ -1745,8 +1745,8 @@
           "shortName": "UpdateConnectionProfile"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_update_connection_profile_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_UpdateConnectionProfile_sync",
+      "file": "datastream_v1alpha1_generated_datastream_update_connection_profile_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_UpdateConnectionProfile_sync",
       "segments": [
         {
           "end": 55,
@@ -1790,8 +1790,8 @@
           "shortName": "UpdateStream"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_update_stream_async.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_UpdateStream_async",
+      "file": "datastream_v1alpha1_generated_datastream_update_stream_async.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_UpdateStream_async",
       "segments": [
         {
           "end": 53,
@@ -1834,8 +1834,8 @@
           "shortName": "UpdateStream"
         }
       },
-      "file": "datastream_generated_datastream_v1alpha1_datastream_update_stream_sync.py",
-      "regionTag": "datastream_generated_datastream_v1alpha1_Datastream_UpdateStream_sync",
+      "file": "datastream_v1alpha1_generated_datastream_update_stream_sync.py",
+      "regionTag": "datastream_v1alpha1_generated_Datastream_UpdateStream_sync",
       "segments": [
         {
           "end": 53,