diff --git a/dlp/pom.xml b/dlp/pom.xml
index 3a78ca3846e..7f89ff03d6c 100644
--- a/dlp/pom.xml
+++ b/dlp/pom.xml
@@ -14,7 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<!-- [START pom] -->
+<!-- [START dlp_pom] -->
 <project>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
@@ -83,4 +83,4 @@
   </plugins>
 </build>
 </project>
-<!-- [END pom] -->
+<!-- [END dlp_pom] -->
diff --git a/dlp/src/main/java/com/example/dlp/DeIdentification.java b/dlp/src/main/java/com/example/dlp/DeIdentification.java
index 7ee877660c3..0e98bbf2041 100644
--- a/dlp/src/main/java/com/example/dlp/DeIdentification.java
+++ b/dlp/src/main/java/com/example/dlp/DeIdentification.java
@@ -46,7 +46,7 @@ private static void deIdentifyWithMask(
       String string,
       Character maskingCharacter,
       int numberToMask) {
-    // [START dlp_deidentify_mask]
+    // [START dlp_deidentify_masking]
     /**
      * Deidentify a string by masking sensitive information with a character using the DLP API.
      * @param string The string to deidentify.
@@ -113,7 +113,7 @@ private static void deIdentifyWithMask(
     } catch (Exception e) {
       System.out.println("Error in deidentifyWithMask: " + e.getMessage());
     }
-    // [END dlp_deidentify_mask]
+    // [END dlp_deidentify_masking]
   }
 
   private static void deIdentifyWithFpe(
diff --git a/dlp/src/main/java/com/example/dlp/Metadata.java b/dlp/src/main/java/com/example/dlp/Metadata.java
index 7a494d01176..12702284108 100644
--- a/dlp/src/main/java/com/example/dlp/Metadata.java
+++ b/dlp/src/main/java/com/example/dlp/Metadata.java
@@ -49,7 +49,7 @@ private static void listInfoTypes(String category, String languageCode) throws E
   }
 
   private static void listRootCategories(String languageCode) throws Exception {
-    // [START dlp_list_root_categories]
+    // [START dlp_list_categories]
     // Instantiate a DLP client
     try (DlpServiceClient dlpClient = DlpServiceClient.create()) {
       // The BCP-47 language code to use, e.g. 'en-US'
@@ -61,7 +61,7 @@ private static void listRootCategories(String languageCode) throws Exception {
         System.out.println("Display name : " + categoryDescription.getDisplayName());
       }
     }
-    // [END dlp_list_root_categories]
+    // [END dlp_list_categories]
   }
 
   /** Retrieve infoTypes. */
diff --git a/dlp/src/main/java/com/example/dlp/RiskAnalysis.java b/dlp/src/main/java/com/example/dlp/RiskAnalysis.java
index 8ba83684682..853b902c555 100644
--- a/dlp/src/main/java/com/example/dlp/RiskAnalysis.java
+++ b/dlp/src/main/java/com/example/dlp/RiskAnalysis.java
@@ -55,7 +55,7 @@ public class RiskAnalysis {
   private static void calculateNumericalStats(
       String projectId, String datasetId, String tableId, String columnName)
       throws Exception {
-    // [START dlp_numerical_stats_analysis]
+    // [START dlp_numerical_stats]
 
     /**
      * Calculate numerical statistics for a column in a BigQuery table using the DLP API.
@@ -128,13 +128,13 @@ private static void calculateNumericalStats(
     } catch (Exception e) {
       System.out.println("Error in numericalStatsAnalysis: " + e.getMessage());
     }
-    // [END dlp_numerical_stats_analysis]
+    // [END dlp_numerical_stats]
   }
 
   private static void calculateCategoricalStats(
       String projectId, String datasetId, String tableId, String columnName)
       throws Exception {
-    // [START dlp_categorical_stats_analysis]
+    // [START dlp_categorical_stats]
     /**
      * Calculate categorical statistics for a column in a BigQuery table using the DLP API.
      * @param projectId The Google Cloud Platform project ID to run the API call under.
@@ -206,7 +206,7 @@ private static void calculateCategoricalStats(
     } catch (Exception e) {
       System.out.println("Error in categoricalStatsAnalysis: " + e.getMessage());
     }
-    // [END dlp_categorical_stats_analysis]
+    // [END dlp_categorical_stats]
   }
 
   private static void calculateKAnonymity(