diff --git a/spanner/src/add_column.php b/spanner/src/add_column.php
index d6550ec0ee..be35c2bab1 100644
--- a/spanner/src/add_column.php
+++ b/spanner/src/add_column.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\Spanner;
 
-// [START add_column]
+// [START spanner_add_column]
 use Google\Cloud\Spanner\SpannerClient;
 
 /**
@@ -51,4 +51,4 @@ function add_column($instanceId, $databaseId)
 
     printf('Added the MarketingBudget column.' . PHP_EOL);
 }
-// [END add_column]
+// [END spanner_add_column]
diff --git a/spanner/src/create_database.php b/spanner/src/create_database.php
index af90d6ad1e..ab39b895b7 100644
--- a/spanner/src/create_database.php
+++ b/spanner/src/create_database.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\Spanner;
 
-// [START create_database]
+// [START spanner_create_database]
 use Google\Cloud\Spanner\SpannerClient;
 
 /**
@@ -66,4 +66,4 @@ function create_database($instanceId, $databaseId)
     printf('Created database %s on instance %s' . PHP_EOL,
         $databaseId, $instanceId);
 }
-// [END create_database]
+// [END spanner_create_database]
diff --git a/spanner/src/create_index.php b/spanner/src/create_index.php
index 396dc9a1d5..51ffacb8f5 100644
--- a/spanner/src/create_index.php
+++ b/spanner/src/create_index.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\Spanner;
 
-// [START create_index]
+// [START spanner_create_index]
 use Google\Cloud\Spanner\SpannerClient;
 
 /**
@@ -51,4 +51,4 @@ function create_index($instanceId, $databaseId)
 
     printf('Added the AlbumsByAlbumTitle index.' . PHP_EOL);
 }
-// [END create_index]
+// [END spanner_create_index]
diff --git a/spanner/src/create_storing_index.php b/spanner/src/create_storing_index.php
index 86826bc822..bdee340ae5 100644
--- a/spanner/src/create_storing_index.php
+++ b/spanner/src/create_storing_index.php
@@ -27,7 +27,7 @@
 
 namespace Google\Cloud\Samples\Spanner;
 
-// [START create_storing_index]
+// [START spanner_create_storing_index]
 use Google\Cloud\Spanner\SpannerClient;
 
 /**
@@ -63,4 +63,4 @@ function create_storing_index($instanceId, $databaseId)
 
     printf('Added the AlbumsByAlbumTitle2 index.' . PHP_EOL);
 }
-// [END create_storing_index]
+// [END spanner_create_storing_index]
diff --git a/spanner/src/insert_data.php b/spanner/src/insert_data.php
index 9747985d60..4668d27c62 100644
--- a/spanner/src/insert_data.php
+++ b/spanner/src/insert_data.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\Spanner;
 
-// [START insert_data]
+// [START spanner_insert_data]
 use Google\Cloud\Spanner\SpannerClient;
 
 /**
@@ -64,4 +64,4 @@ function insert_data($instanceId, $databaseId)
 
     print('Inserted data.' . PHP_EOL);
 }
-// [END insert_data]
+// [END spanner_insert_data]
diff --git a/spanner/src/query_data.php b/spanner/src/query_data.php
index ffbacbe0fe..fc019ac877 100644
--- a/spanner/src/query_data.php
+++ b/spanner/src/query_data.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\Spanner;
 
-// [START query_data]
+// [START spanner_query_data]
 use Google\Cloud\Spanner\SpannerClient;
 
 /**
@@ -51,4 +51,4 @@ function query_data($instanceId, $databaseId)
             $row['SingerId'], $row['AlbumId'], $row['AlbumTitle']);
     }
 }
-// [END query_data]
+// [END spanner_query_data]
diff --git a/spanner/src/query_data_with_index.php b/spanner/src/query_data_with_index.php
index 2a63bbf1b3..50f1fd1e67 100644
--- a/spanner/src/query_data_with_index.php
+++ b/spanner/src/query_data_with_index.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\Spanner;
 
-// [START query_data_with_index]
+// [START spanner_query_data_with_index]
 use Google\Cloud\Spanner\SpannerClient;
 
 /**
@@ -68,4 +68,4 @@ function query_data_with_index($instanceId, $databaseId, $startTitle, $endTitle)
             $row['AlbumId'], $row['AlbumTitle'], $row['MarketingBudget']);
     }
 }
-// [END query_data_with_index]
+// [END spanner_query_data_with_index]
diff --git a/spanner/src/query_data_with_new_column.php b/spanner/src/query_data_with_new_column.php
index cf17a03dc1..8b1d5e18ac 100644
--- a/spanner/src/query_data_with_new_column.php
+++ b/spanner/src/query_data_with_new_column.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\Spanner;
 
-// [START query_data_with_new_column]
+// [START spanner_query_data_with_new_column]
 use Google\Cloud\Spanner\SpannerClient;
 
 /**
@@ -57,4 +57,4 @@ function query_data_with_new_column($instanceId, $databaseId)
             $row['SingerId'], $row['AlbumId'], $row['MarketingBudget']);
     }
 }
-// [END query_data_with_new_column]
+// [END spanner_query_data_with_new_column]
diff --git a/spanner/src/read_data.php b/spanner/src/read_data.php
index 1347da28b6..2b19b74d25 100644
--- a/spanner/src/read_data.php
+++ b/spanner/src/read_data.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\Spanner;
 
-// [START read_data]
+// [START spanner_read_data]
 use Google\Cloud\Spanner\SpannerClient;
 
 /**
@@ -54,4 +54,4 @@ function read_data($instanceId, $databaseId)
             $row['SingerId'], $row['AlbumId'], $row['AlbumTitle']);
     }
 }
-// [END read_data]
+// [END spanner_read_data]
diff --git a/spanner/src/read_data_with_index.php b/spanner/src/read_data_with_index.php
index f5e335af9c..864c24b166 100644
--- a/spanner/src/read_data_with_index.php
+++ b/spanner/src/read_data_with_index.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\Spanner;
 
-// [START read_data_with_index]
+// [START spanner_read_data_with_index]
 use Google\Cloud\Spanner\SpannerClient;
 
 /**
@@ -62,4 +62,4 @@ function read_data_with_index($instanceId, $databaseId)
             $row['AlbumId'], $row['AlbumTitle']);
     }
 }
-// [END read_data_with_index]
+// [END spanner_read_data_with_index]
diff --git a/spanner/src/read_data_with_storing_index.php b/spanner/src/read_data_with_storing_index.php
index 3adb46ce04..afb33d4a8a 100644
--- a/spanner/src/read_data_with_storing_index.php
+++ b/spanner/src/read_data_with_storing_index.php
@@ -27,7 +27,7 @@
 
 namespace Google\Cloud\Samples\Spanner;
 
-// [START read_data_with_storing_index]
+// [START spanner_read_data_with_storing_index]
 use Google\Cloud\Spanner\SpannerClient;
 
 /**
@@ -68,4 +68,4 @@ function read_data_with_storing_index($instanceId, $databaseId)
             $row['AlbumId'], $row['AlbumTitle'], $row['MarketingBudget']);
     }
 }
-// [END read_data_with_storing_index]
+// [END spanner_read_data_with_storing_index]
diff --git a/spanner/src/read_only_transaction.php b/spanner/src/read_only_transaction.php
index 957490f2e6..72f0bfc6c7 100644
--- a/spanner/src/read_only_transaction.php
+++ b/spanner/src/read_only_transaction.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\Spanner;
 
-// [START read_only_transaction]
+// [START spanner_read_only_transaction]
 use Google\Cloud\Spanner\SpannerClient;
 
 /**
@@ -71,4 +71,4 @@ function read_only_transaction($instanceId, $databaseId)
             $row['SingerId'], $row['AlbumId'], $row['AlbumTitle']);
     }
 }
-// [END read_only_transaction]
+// [END spanner_read_only_transaction]
diff --git a/spanner/src/read_stale_data.php b/spanner/src/read_stale_data.php
index c9b09da1f5..87c22c79f2 100644
--- a/spanner/src/read_stale_data.php
+++ b/spanner/src/read_stale_data.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\Spanner;
 
-// [START read_stale_data]
+// [START spanner_read_stale_data]
 use Google\Cloud\Spanner\Duration;
 use Google\Cloud\Spanner\SpannerClient;
 
@@ -56,4 +56,4 @@ function read_stale_data($instanceId, $databaseId)
             $row['SingerId'], $row['AlbumId'], $row['AlbumTitle']);
     }
 }
-// [END read_stale_data]
+// [END spanner_read_stale_data]
diff --git a/spanner/src/read_write_transaction.php b/spanner/src/read_write_transaction.php
index 5268cf2b99..c547145954 100644
--- a/spanner/src/read_write_transaction.php
+++ b/spanner/src/read_write_transaction.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\Spanner;
 
-// [START read_write_transaction]
+// [START spanner_read_write_transaction]
 use Google\Cloud\Spanner\SpannerClient;
 use Google\Cloud\Spanner\Transaction;
 use UnexpectedValueException;
@@ -104,4 +104,4 @@ function read_write_transaction($instanceId, $databaseId)
 
     print('Transaction complete.' . PHP_EOL);
 }
-// [END read_write_transaction]
+// [END spanner_read_write_transaction]
diff --git a/spanner/src/update_data.php b/spanner/src/update_data.php
index 3b49779a5f..2a682433b3 100644
--- a/spanner/src/update_data.php
+++ b/spanner/src/update_data.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\Spanner;
 
-// [START update_data]
+// [START spanner_update_data]
 use Google\Cloud\Spanner\SpannerClient;
 
 /**
@@ -58,4 +58,4 @@ function update_data($instanceId, $databaseId)
 
     print('Updated data.' . PHP_EOL);
 }
-// [END update_data]
+// [END spanner_update_data]