diff --git a/automl/snippets/src/main/java/com/beta/automl/BatchPredict.java b/automl/snippets/src/main/java/com/beta/automl/BatchPredict.java
index 5b88a03139c..3bafd28c433 100644
--- a/automl/snippets/src/main/java/com/beta/automl/BatchPredict.java
+++ b/automl/snippets/src/main/java/com/beta/automl/BatchPredict.java
@@ -16,6 +16,7 @@
 
 package com.beta.automl;
 
+// [START automl_tables_batch_predict]
 // [START automl_batch_predict_beta]
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.automl.v1beta1.BatchPredictInputConfig;
@@ -80,3 +81,4 @@ static void batchPredict(String projectId, String modelId, String inputUri, Stri
   }
 }
 // [END automl_batch_predict_beta]
+// [END automl_tables_batch_predict]
diff --git a/automl/snippets/src/main/java/com/beta/automl/DeleteDataset.java b/automl/snippets/src/main/java/com/beta/automl/DeleteDataset.java
index 1c902df2cfe..d20ffe757da 100644
--- a/automl/snippets/src/main/java/com/beta/automl/DeleteDataset.java
+++ b/automl/snippets/src/main/java/com/beta/automl/DeleteDataset.java
@@ -17,6 +17,7 @@
 package com.beta.automl;
 
 // [START automl_delete_dataset_beta]
+// [START automl_tables_delete_dataset]
 import com.google.cloud.automl.v1beta1.AutoMlClient;
 import com.google.cloud.automl.v1beta1.DatasetName;
 import com.google.protobuf.Empty;
@@ -46,4 +47,5 @@ static void deleteDataset(String projectId, String datasetId)
     }
   }
 }
+// [END automl_tables_delete_dataset]
 // [END automl_delete_dataset_beta]
diff --git a/automl/snippets/src/main/java/com/beta/automl/DeleteModel.java b/automl/snippets/src/main/java/com/beta/automl/DeleteModel.java
index cd1660ba80b..837bdbe005e 100644
--- a/automl/snippets/src/main/java/com/beta/automl/DeleteModel.java
+++ b/automl/snippets/src/main/java/com/beta/automl/DeleteModel.java
@@ -16,6 +16,7 @@
 
 package com.beta.automl;
 
+// [START automl_tables_delete_model]
 // [START automl_delete_model_beta]
 import com.google.cloud.automl.v1beta1.AutoMlClient;
 import com.google.cloud.automl.v1beta1.ModelName;
@@ -52,3 +53,4 @@ static void deleteModel(String projectId, String modelId)
   }
 }
 // [END automl_delete_model_beta]
+// [END automl_tables_delete_model]
diff --git a/automl/snippets/src/main/java/com/beta/automl/DeployModel.java b/automl/snippets/src/main/java/com/beta/automl/DeployModel.java
index 0f9c0d38116..32d42cf46b1 100644
--- a/automl/snippets/src/main/java/com/beta/automl/DeployModel.java
+++ b/automl/snippets/src/main/java/com/beta/automl/DeployModel.java
@@ -16,6 +16,7 @@
 
 package com.beta.automl;
 
+// [START automl_tables_deploy_model]
 // [START automl_deploy_model_beta]
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.automl.v1beta1.AutoMlClient;
@@ -55,3 +56,4 @@ static void deployModel(String projectId, String modelId)
   }
 }
 // [END automl_deploy_model_beta]
+// [END automl_tables_deploy_model]
diff --git a/automl/snippets/src/main/java/com/beta/automl/GetModelEvaluation.java b/automl/snippets/src/main/java/com/beta/automl/GetModelEvaluation.java
index 13393c71431..9c26c641a59 100644
--- a/automl/snippets/src/main/java/com/beta/automl/GetModelEvaluation.java
+++ b/automl/snippets/src/main/java/com/beta/automl/GetModelEvaluation.java
@@ -18,6 +18,7 @@
 
 // [START automl_video_classification_get_model_evaluation_beta]
 // [START automl_video_object_tracking_get_model_evaluation_beta]
+// [START automl_tables_get_model_evaluation]
 import com.google.cloud.automl.v1beta1.AutoMlClient;
 import com.google.cloud.automl.v1beta1.ModelEvaluation;
 import com.google.cloud.automl.v1beta1.ModelEvaluationName;
@@ -69,5 +70,6 @@ static void getModelEvaluation(String projectId, String modelId, String modelEva
     }
   }
 }
-// [END automl_video_classification_get_model_evaluation_beta]
+// [END automl_tables_get_model_evaluation]
 // [END automl_video_object_tracking_get_model_evaluation_beta]
+// [END automl_video_classification_get_model_evaluation_beta]
diff --git a/automl/snippets/src/main/java/com/beta/automl/GetOperationStatus.java b/automl/snippets/src/main/java/com/beta/automl/GetOperationStatus.java
index 711c91e6b26..fef7b5ac0fd 100644
--- a/automl/snippets/src/main/java/com/beta/automl/GetOperationStatus.java
+++ b/automl/snippets/src/main/java/com/beta/automl/GetOperationStatus.java
@@ -17,6 +17,7 @@
 package com.beta.automl;
 
 // [START automl_get_operation_status_beta]
+// [START automl_tables_get_operation_status]
 import com.google.cloud.automl.v1beta1.AutoMlClient;
 import com.google.longrunning.Operation;
 import java.io.IOException;
@@ -54,4 +55,5 @@ static void getOperationStatus(String operationFullId) throws IOException {
     }
   }
 }
+// [END automl_tables_get_operation_status]
 // [END automl_get_operation_status_beta]
diff --git a/automl/snippets/src/main/java/com/beta/automl/ImportDataset.java b/automl/snippets/src/main/java/com/beta/automl/ImportDataset.java
index 890ac50eb1a..26715e11644 100644
--- a/automl/snippets/src/main/java/com/beta/automl/ImportDataset.java
+++ b/automl/snippets/src/main/java/com/beta/automl/ImportDataset.java
@@ -16,7 +16,7 @@
 
 package com.beta.automl;
 
-// [START automl_import_dataset_beta]
+// [START automl_import_dataset]
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.cloud.automl.v1beta1.AutoMlClient;
@@ -87,4 +87,4 @@ static void importDataset(String projectId, String datasetId, String path)
     }
   }
 }
-// [END automl_import_dataset_beta]
+// [END automl_import_dataset]
diff --git a/automl/snippets/src/main/java/com/beta/automl/ListDatasets.java b/automl/snippets/src/main/java/com/beta/automl/ListDatasets.java
index 12cca0ce122..a36f714ed12 100644
--- a/automl/snippets/src/main/java/com/beta/automl/ListDatasets.java
+++ b/automl/snippets/src/main/java/com/beta/automl/ListDatasets.java
@@ -18,7 +18,7 @@
 
 // [START automl_video_classification_list_datasets_beta]
 // [START automl_video_object_tracking_list_datasets_beta]
-// [START automl_tables_list_datasets_beta]
+// [START automl_tables_list_datasets]
 import com.google.cloud.automl.v1beta1.AutoMlClient;
 import com.google.cloud.automl.v1beta1.AutoMlSettings;
 import com.google.cloud.automl.v1beta1.Dataset;
@@ -63,7 +63,7 @@ static void listDatasets(String projectId) throws IOException {
         System.out.format("\tnanos: %s%n", dataset.getCreateTime().getNanos());
 
         // [END automl_video_object_tracking_list_datasets_beta]
-        // [END automl_tables_list_datasets_beta]
+        // [END automl_tables_list_datasets]
         System.out.format(
             "Video classification dataset metadata: %s%n",
             dataset.getVideoClassificationDatasetMetadata());
@@ -75,7 +75,7 @@ static void listDatasets(String projectId) throws IOException {
             dataset.getVideoObjectTrackingDatasetMetadata());
         // [END automl_video_object_tracking_list_datasets_beta]
 
-        // [START automl_tables_list_datasets_beta]
+        // [START automl_tables_list_datasets]
         System.out.format("Tables dataset metadata: %s%n", dataset.getTablesDatasetMetadata());
 
         // [START automl_video_classification_list_datasets_beta]
@@ -86,4 +86,4 @@ static void listDatasets(String projectId) throws IOException {
 }
 // [END automl_video_classification_list_datasets_beta]
 // [END automl_video_object_tracking_list_datasets_beta]
-// [END automl_tables_list_datasets_beta]
+// [END automl_tables_list_datasets]
diff --git a/automl/snippets/src/main/java/com/beta/automl/ListModelEvaluations.java b/automl/snippets/src/main/java/com/beta/automl/ListModelEvaluations.java
index e165ec39353..161f02b74a0 100644
--- a/automl/snippets/src/main/java/com/beta/automl/ListModelEvaluations.java
+++ b/automl/snippets/src/main/java/com/beta/automl/ListModelEvaluations.java
@@ -16,7 +16,7 @@
 
 package com.beta.automl;
 
-// [START automl_tables_list_model_evaluations_beta]
+// [START automl_tables_list_model_evaluations]
 import com.google.cloud.automl.v1beta1.AutoMlClient;
 import com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest;
 import com.google.cloud.automl.v1beta1.ModelEvaluation;
@@ -63,4 +63,4 @@ static void listModelEvaluations(String projectId, String modelId) throws IOExce
     }
   }
 }
-// [END automl_tables_list_model_evaluations_beta]
+// [END automl_tables_list_model_evaluations]
diff --git a/automl/snippets/src/main/java/com/beta/automl/ListModels.java b/automl/snippets/src/main/java/com/beta/automl/ListModels.java
index 589594d41c7..0fc215979d5 100644
--- a/automl/snippets/src/main/java/com/beta/automl/ListModels.java
+++ b/automl/snippets/src/main/java/com/beta/automl/ListModels.java
@@ -16,8 +16,8 @@
 
 package com.beta.automl;
 
+// [START automl_tables_list_models]
 // [START automl_list_models_beta]
-
 import com.google.cloud.automl.v1beta1.AutoMlClient;
 import com.google.cloud.automl.v1beta1.AutoMlSettings;
 import com.google.cloud.automl.v1beta1.ListModelsRequest;
@@ -71,3 +71,4 @@ static void listModels(String projectId) throws IOException {
   }
 }
 // [END automl_list_models_beta]
+// [END automl_tables_list_models]
diff --git a/automl/snippets/src/main/java/com/beta/automl/TablesBatchPredictBigQuery.java b/automl/snippets/src/main/java/com/beta/automl/TablesBatchPredictBigQuery.java
index 9863beafd42..9b559d7d00f 100644
--- a/automl/snippets/src/main/java/com/beta/automl/TablesBatchPredictBigQuery.java
+++ b/automl/snippets/src/main/java/com/beta/automl/TablesBatchPredictBigQuery.java
@@ -16,7 +16,7 @@
 
 package com.beta.automl;
 
-// [START automl_tables_batch_predict_bigquery_beta]
+// [START automl_tables_batch_predict_bq]
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.automl.v1beta1.BatchPredictInputConfig;
 import com.google.cloud.automl.v1beta1.BatchPredictOutputConfig;
@@ -79,4 +79,4 @@ static void batchPredict(String projectId, String modelId, String inputUri, Stri
     }
   }
 }
-// [END automl_tables_batch_predict_bigquery_beta]
+// [END automl_tables_batch_predict_bq]
diff --git a/automl/snippets/src/main/java/com/beta/automl/TablesCreateDataset.java b/automl/snippets/src/main/java/com/beta/automl/TablesCreateDataset.java
index e48e4ab710d..879ce2cea94 100644
--- a/automl/snippets/src/main/java/com/beta/automl/TablesCreateDataset.java
+++ b/automl/snippets/src/main/java/com/beta/automl/TablesCreateDataset.java
@@ -16,7 +16,7 @@
 
 package com.beta.automl;
 
-// [START automl_tables_create_dataset_beta]
+// [START automl_tables_create_dataset]
 import com.google.cloud.automl.v1beta1.AutoMlClient;
 import com.google.cloud.automl.v1beta1.Dataset;
 import com.google.cloud.automl.v1beta1.LocationName;
@@ -60,4 +60,4 @@ static void createDataset(String projectId, String displayName) throws IOExcepti
     }
   }
 }
-// [END automl_tables_create_dataset_beta]
+// [END automl_tables_create_dataset]
diff --git a/automl/snippets/src/main/java/com/beta/automl/TablesCreateModel.java b/automl/snippets/src/main/java/com/beta/automl/TablesCreateModel.java
index 34cbca52bd9..6b17027e8e0 100644
--- a/automl/snippets/src/main/java/com/beta/automl/TablesCreateModel.java
+++ b/automl/snippets/src/main/java/com/beta/automl/TablesCreateModel.java
@@ -16,7 +16,7 @@
 
 package com.beta.automl;
 
-// [START automl_tables_create_model_beta]
+// [START automl_tables_create_model]
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.automl.v1beta1.AutoMlClient;
 import com.google.cloud.automl.v1beta1.ColumnSpec;
@@ -89,4 +89,4 @@ static void createModel(
     }
   }
 }
-// [END automl_tables_create_model_beta]
+// [END automl_tables_create_model]
diff --git a/automl/snippets/src/main/java/com/beta/automl/TablesImportDataset.java b/automl/snippets/src/main/java/com/beta/automl/TablesImportDataset.java
index ee2d9098168..3b319857c78 100644
--- a/automl/snippets/src/main/java/com/beta/automl/TablesImportDataset.java
+++ b/automl/snippets/src/main/java/com/beta/automl/TablesImportDataset.java
@@ -16,7 +16,7 @@
 
 package com.beta.automl;
 
-// [START automl_tables_import_dataset_beta]
+// [START automl_tables_import_data]
 import com.google.cloud.automl.v1beta1.AutoMlClient;
 import com.google.cloud.automl.v1beta1.BigQuerySource;
 import com.google.cloud.automl.v1beta1.DatasetName;
@@ -71,4 +71,4 @@ static void importDataset(String projectId, String datasetId, String path)
     }
   }
 }
-// [END automl_tables_import_dataset_beta]
+// [END automl_tables_import_data]
diff --git a/automl/snippets/src/main/java/com/beta/automl/TablesPredict.java b/automl/snippets/src/main/java/com/beta/automl/TablesPredict.java
index 8e4b24f3919..7c6756adb31 100644
--- a/automl/snippets/src/main/java/com/beta/automl/TablesPredict.java
+++ b/automl/snippets/src/main/java/com/beta/automl/TablesPredict.java
@@ -16,7 +16,7 @@
 
 package com.beta.automl;
 
-// [START automl_tables_predict_beta]
+// [START automl_tables_predict]
 import com.google.cloud.automl.v1beta1.AnnotationPayload;
 import com.google.cloud.automl.v1beta1.ExamplePayload;
 import com.google.cloud.automl.v1beta1.ModelName;
@@ -84,4 +84,4 @@ static void predict(String projectId, String modelId, List<Value> values) throws
     }
   }
 }
-// [END automl_tables_predict_beta]
+// [END automl_tables_predict]
diff --git a/automl/snippets/src/main/java/com/beta/automl/UndeployModel.java b/automl/snippets/src/main/java/com/beta/automl/UndeployModel.java
index 29722fe44f6..8c751098e36 100644
--- a/automl/snippets/src/main/java/com/beta/automl/UndeployModel.java
+++ b/automl/snippets/src/main/java/com/beta/automl/UndeployModel.java
@@ -16,6 +16,7 @@
 
 package com.beta.automl;
 
+// [START automl_tables_undeploy_model]
 // [START automl_undeploy_model_beta]
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.automl.v1beta1.AutoMlClient;
@@ -54,3 +55,4 @@ static void undeployModel(String projectId, String modelId)
   }
 }
 // [END automl_undeploy_model_beta]
+// [END automl_tables_undeploy_model]