diff --git a/samples/snippets/src/main/java/com/example/bigquery/SetHivePartitioningOptions.java b/samples/snippets/src/main/java/com/example/bigquery/CreateTableExternalHivePartitioned.java
similarity index 89%
rename from samples/snippets/src/main/java/com/example/bigquery/SetHivePartitioningOptions.java
rename to samples/snippets/src/main/java/com/example/bigquery/CreateTableExternalHivePartitioned.java
index 0263c3905..7f5f349a7 100644
--- a/samples/snippets/src/main/java/com/example/bigquery/SetHivePartitioningOptions.java
+++ b/samples/snippets/src/main/java/com/example/bigquery/CreateTableExternalHivePartitioned.java
@@ -16,6 +16,7 @@
 
 package com.example.bigquery;
 
+// [START bigquery_create_table_external_hivepartitioned]
 // [START bigquery_set_hivepartitioningoptions]
 import com.google.cloud.bigquery.BigQuery;
 import com.google.cloud.bigquery.BigQueryException;
@@ -27,7 +28,7 @@
 import com.google.cloud.bigquery.TableInfo;
 
 // Sample to create external table using hive partitioning
-public class SetHivePartitioningOptions {
+public class CreateTableExternalHivePartitioned {
 
   public static void main(String[] args) {
     // TODO(developer): Replace these variables before running the sample.
@@ -36,10 +37,10 @@ public static void main(String[] args) {
     String sourceUri = "gs://cloud-samples-data/bigquery/hive-partitioning-samples/customlayout/*";
     String sourceUriPrefix =
         "gs://cloud-samples-data/bigquery/hive-partitioning-samples/customlayout/{pkey:STRING}/";
-    setHivePartitioningOptions(datasetName, tableName, sourceUriPrefix, sourceUri);
+    createTableExternalHivePartitioned(datasetName, tableName, sourceUriPrefix, sourceUri);
   }
 
-  public static void setHivePartitioningOptions(
+  public static void createTableExternalHivePartitioned(
       String datasetName, String tableName, String sourceUriPrefix, String sourceUri) {
     try {
       // Initialize client that will be used to send requests. This client only needs to be created
@@ -68,3 +69,4 @@ public static void setHivePartitioningOptions(
   }
 }
 // [END bigquery_set_hivepartitioningoptions]
+// [END bigquery_create_table_external_hivepartitioned]
diff --git a/samples/snippets/src/test/java/com/example/bigquery/SetHivePartitioningOptionsIT.java b/samples/snippets/src/test/java/com/example/bigquery/CreateTableExternalHivePartitionedIT.java
similarity index 93%
rename from samples/snippets/src/test/java/com/example/bigquery/SetHivePartitioningOptionsIT.java
rename to samples/snippets/src/test/java/com/example/bigquery/CreateTableExternalHivePartitionedIT.java
index bc01e3861..b460dec9b 100644
--- a/samples/snippets/src/test/java/com/example/bigquery/SetHivePartitioningOptionsIT.java
+++ b/samples/snippets/src/test/java/com/example/bigquery/CreateTableExternalHivePartitionedIT.java
@@ -29,7 +29,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class SetHivePartitioningOptionsIT {
+public class CreateTableExternalHivePartitionedIT {
 
   private static final String ID = UUID.randomUUID().toString().substring(0, 8);
   private final Logger log = Logger.getLogger(this.getClass().getName());
@@ -74,11 +74,11 @@ public void tearDown() {
   }
 
   @Test
-  public void testSetHivePartitioningOptions() {
+  public void testCreateTableExternalHivePartitioned() {
     String sourceUri = "gs://cloud-samples-data/bigquery/hive-partitioning-samples/customlayout/*";
     String sourceUriPrefix =
         "gs://cloud-samples-data/bigquery/hive-partitioning-samples/customlayout/{pkey:STRING}/";
-    SetHivePartitioningOptions.setHivePartitioningOptions(
+    CreateTableExternalHivePartitioned.createTableExternalHivePartitioned(
         BIGQUERY_DATASET_NAME, tableName, sourceUriPrefix, sourceUri);
     assertThat(bout.toString()).contains("External table created using hivepartitioningoptions");
   }