diff --git a/google/cloud/bigquery/datatransfer/v1/datatransfer.proto b/google/cloud/bigquery/datatransfer/v1/datatransfer.proto
index d92b8f42..f90b275a 100644
--- a/google/cloud/bigquery/datatransfer/v1/datatransfer.proto
+++ b/google/cloud/bigquery/datatransfer/v1/datatransfer.proto
@@ -24,11 +24,11 @@ import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
 
+option csharp_namespace = "Google.Cloud.BigQuery.DataTransfer.V1";
 option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1;datatransfer";
 option java_multiple_files = true;
 option java_outer_classname = "DataTransferProto";
 option java_package = "com.google.cloud.bigquery.datatransfer.v1";
-option csharp_namespace = "Google.Cloud.BigQuery.DataTransfer.V1";
 option php_namespace = "Google\\Cloud\\BigQuery\\DataTransfer\\V1";
 
 // The Google BigQuery Data Transfer Service API enables BigQuery users to
diff --git a/google/cloud/bigquery/datatransfer/v1/transfer.proto b/google/cloud/bigquery/datatransfer/v1/transfer.proto
index 488a29e6..f8ebf635 100644
--- a/google/cloud/bigquery/datatransfer/v1/transfer.proto
+++ b/google/cloud/bigquery/datatransfer/v1/transfer.proto
@@ -22,12 +22,12 @@ import "google/protobuf/timestamp.proto";
 import "google/rpc/status.proto";
 
 option csharp_namespace = "Google.Cloud.BigQuery.DataTransfer.V1";
-option php_namespace = "Google\\Cloud\\BigQuery\\DataTransfer\\V1";
 option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1;datatransfer";
 option java_multiple_files = true;
 option java_outer_classname = "TransferProto";
 option java_package = "com.google.cloud.bigquery.datatransfer.v1";
 option objc_class_prefix = "GCBDT";
+option php_namespace = "Google\\Cloud\\BigQuery\\DataTransfer\\V1";
 
 // Represents a data transfer configuration. A transfer configuration
 // contains all metadata needed to perform a data transfer. For example,
diff --git a/google/privacy/dlp/v2beta1/dlp.proto b/google/privacy/dlp/v2beta1/dlp.proto
index 2ab19bfd..1b978eb6 100644
--- a/google/privacy/dlp/v2beta1/dlp.proto
+++ b/google/privacy/dlp/v2beta1/dlp.proto
@@ -29,6 +29,7 @@ option go_package = "google.golang.org/genproto/googleapis/privacy/dlp/v2beta1;d
 option java_multiple_files = true;
 option java_outer_classname = "DlpProto";
 option java_package = "com.google.privacy.dlp.v2beta1";
+option php_namespace = "Google\\Cloud\\Dlp\\V2beta1";
 
 
 // The DLP API is a service that allows clients
diff --git a/google/privacy/dlp/v2beta1/dlp_gapic.yaml b/google/privacy/dlp/v2beta1/dlp_gapic.yaml
index 92acb1ab..c9b43897 100644
--- a/google/privacy/dlp/v2beta1/dlp_gapic.yaml
+++ b/google/privacy/dlp/v2beta1/dlp_gapic.yaml
@@ -47,41 +47,6 @@ interfaces:
     max_rpc_timeout_millis: 20000
     total_timeout_millis: 600000
   methods:
-  - name: DeidentifyContent
-    flattening:
-      groups:
-      - parameters:
-        - deidentify_config
-        - inspect_config
-        - items
-    required_fields:
-    - deidentify_config
-    - inspect_config
-    - items
-    request_object_method: true
-    retry_codes_name: idempotent
-    retry_params_name: default
-    timeout_millis: 60000
-  - name: AnalyzeDataSourceRisk
-    flattening:
-      groups:
-      - parameters:
-        - privacy_metric
-        - source_table
-    required_fields:
-    - privacy_metric
-    - source_table
-    request_object_method: true
-    retry_codes_name: idempotent
-    retry_params_name: default
-    timeout_millis: 60000
-    long_running:
-      return_type: google.privacy.dlp.v2beta1.RiskAnalysisOperationResult
-      metadata_type: google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata
-      initial_poll_delay_millis: 20000
-      poll_delay_multiplier: 1.5
-      max_poll_delay_millis: 45000
-      total_poll_timeout_millis: 86400000
   - name: InspectContent
     flattening:
       groups:
@@ -120,6 +85,41 @@ interfaces:
     - items[0].value="My email is example@example.com."
     - replace_configs[0].info_type.name="EMAIL_ADDRESS"
     - replace_configs[0].replace_with="REDACTED"
+  - name: DeidentifyContent
+    flattening:
+      groups:
+      - parameters:
+        - deidentify_config
+        - inspect_config
+        - items
+    required_fields:
+    - deidentify_config
+    - inspect_config
+    - items
+    request_object_method: true
+    retry_codes_name: idempotent
+    retry_params_name: default
+    timeout_millis: 60000
+  - name: AnalyzeDataSourceRisk
+    flattening:
+      groups:
+      - parameters:
+        - privacy_metric
+        - source_table
+    required_fields:
+    - privacy_metric
+    - source_table
+    request_object_method: true
+    retry_codes_name: idempotent
+    retry_params_name: default
+    timeout_millis: 60000
+    long_running:
+      return_type: google.privacy.dlp.v2beta1.RiskAnalysisOperationResult
+      metadata_type: google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata
+      initial_poll_delay_millis: 20000
+      poll_delay_multiplier: 1.5
+      max_poll_delay_millis: 45000
+      total_poll_timeout_millis: 86400000
   - name: CreateInspectOperation
     flattening:
       groups:
diff --git a/google/privacy/dlp/v2beta1/storage.proto b/google/privacy/dlp/v2beta1/storage.proto
index d3d29f88..d44724c4 100644
--- a/google/privacy/dlp/v2beta1/storage.proto
+++ b/google/privacy/dlp/v2beta1/storage.proto
@@ -24,6 +24,7 @@ option go_package = "google.golang.org/genproto/googleapis/privacy/dlp/v2beta1;d
 option java_multiple_files = true;
 option java_outer_classname = "DlpStorage";
 option java_package = "com.google.privacy.dlp.v2beta1";
+option php_namespace = "Google\\Cloud\\Dlp\\V2beta1";
 
 
 // Type of information detected by the API.