diff --git a/.php_cs b/.php_cs
deleted file mode 100644
index 3cd1a16a01..0000000000
--- a/.php_cs
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$finder = Symfony\CS\Finder\DefaultFinder::create()
-    ->in(__DIR__)
-;
-
-return Symfony\CS\Config\Config::create()
-    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
-    ->fixers([
-        'concat_with_spaces',
-        'unused_use',
-        'trailing_spaces',
-        'indentation',
-	'-psr0'
-    ])
-    ->finder($finder)
-;
diff --git a/.php_cs.dist b/.php_cs.dist
new file mode 100644
index 0000000000..f52c9327a2
--- /dev/null
+++ b/.php_cs.dist
@@ -0,0 +1,15 @@
+<?php
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@PSR2' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'no_unused_imports' => true,
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->notPath('appengine/wordpress/src/files/flexible/wp-config.php')
+            ->notPath('appengine/wordpress/src/files/standard/wp-config.php')
+            ->in(__DIR__)
+    )
+;
diff --git a/appengine/flexible/analytics/app.php b/appengine/flexible/analytics/app.php
index 4b2084585b..441edce334 100644
--- a/appengine/flexible/analytics/app.php
+++ b/appengine/flexible/analytics/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/analytics/web/index.php b/appengine/flexible/analytics/web/index.php
index 73e87535a1..c09b62f0db 100644
--- a/appengine/flexible/analytics/web/index.php
+++ b/appengine/flexible/analytics/web/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/cloudsql/app.php b/appengine/flexible/cloudsql/app.php
index c6df99c118..53ebcd352f 100644
--- a/appengine/flexible/cloudsql/app.php
+++ b/appengine/flexible/cloudsql/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/cloudsql/index.php b/appengine/flexible/cloudsql/index.php
index 9c4a8931de..ca82fdf933 100644
--- a/appengine/flexible/cloudsql/index.php
+++ b/appengine/flexible/cloudsql/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/datastore/app.php b/appengine/flexible/datastore/app.php
index 6bcf61923d..46d59d04e3 100644
--- a/appengine/flexible/datastore/app.php
+++ b/appengine/flexible/datastore/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/datastore/index.php b/appengine/flexible/datastore/index.php
index 753ee09664..12d4356e34 100644
--- a/appengine/flexible/datastore/index.php
+++ b/appengine/flexible/datastore/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/drupal8/tests/bootstrap.php b/appengine/flexible/drupal8/tests/bootstrap.php
index ca595fa911..ee2e3fe6e6 100644
--- a/appengine/flexible/drupal8/tests/bootstrap.php
+++ b/appengine/flexible/drupal8/tests/bootstrap.php
@@ -1,5 +1,19 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../../../../testing/ExecuteCommandTrait.php';
 require_once __DIR__ . '/../../../../testing/FileUtil.php';
diff --git a/appengine/flexible/laravel/tests/bootstrap.php b/appengine/flexible/laravel/tests/bootstrap.php
index ca595fa911..ee2e3fe6e6 100644
--- a/appengine/flexible/laravel/tests/bootstrap.php
+++ b/appengine/flexible/laravel/tests/bootstrap.php
@@ -1,5 +1,19 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../../../../testing/ExecuteCommandTrait.php';
 require_once __DIR__ . '/../../../../testing/FileUtil.php';
diff --git a/appengine/flexible/mailgun/app.php b/appengine/flexible/mailgun/app.php
index dd81169340..cc7969a4a6 100644
--- a/appengine/flexible/mailgun/app.php
+++ b/appengine/flexible/mailgun/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/mailgun/index.php b/appengine/flexible/mailgun/index.php
index 02b05de69f..1fc2c34391 100644
--- a/appengine/flexible/mailgun/index.php
+++ b/appengine/flexible/mailgun/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/mailgun/test/bootstrap.php b/appengine/flexible/mailgun/test/bootstrap.php
index 294da6d79f..15d727445c 100644
--- a/appengine/flexible/mailgun/test/bootstrap.php
+++ b/appengine/flexible/mailgun/test/bootstrap.php
@@ -1,4 +1,18 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../../../../testing/FileUtil.php';
diff --git a/appengine/flexible/mailjet/app.php b/appengine/flexible/mailjet/app.php
index 1aefa04840..fc5b3d9c58 100644
--- a/appengine/flexible/mailjet/app.php
+++ b/appengine/flexible/mailjet/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/mailjet/index.php b/appengine/flexible/mailjet/index.php
index 9924cf8240..248b8b209a 100644
--- a/appengine/flexible/mailjet/index.php
+++ b/appengine/flexible/mailjet/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/mailjet/test/bootstrap.php b/appengine/flexible/mailjet/test/bootstrap.php
index 294da6d79f..15d727445c 100644
--- a/appengine/flexible/mailjet/test/bootstrap.php
+++ b/appengine/flexible/mailjet/test/bootstrap.php
@@ -1,4 +1,18 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../../../../testing/FileUtil.php';
diff --git a/appengine/flexible/memcache/app.php b/appengine/flexible/memcache/app.php
index eb3ecffa78..4ae04544dc 100644
--- a/appengine/flexible/memcache/app.php
+++ b/appengine/flexible/memcache/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/memcache/web/index.php b/appengine/flexible/memcache/web/index.php
index 65f6655a78..71f345ee80 100644
--- a/appengine/flexible/memcache/web/index.php
+++ b/appengine/flexible/memcache/web/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/sendgrid/app.php b/appengine/flexible/sendgrid/app.php
index a03f412da1..6f36b43d06 100644
--- a/appengine/flexible/sendgrid/app.php
+++ b/appengine/flexible/sendgrid/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/sendgrid/index.php b/appengine/flexible/sendgrid/index.php
index 1c87655f31..6e2a2d21ff 100644
--- a/appengine/flexible/sendgrid/index.php
+++ b/appengine/flexible/sendgrid/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/sendgrid/test/LocalTest.php b/appengine/flexible/sendgrid/test/LocalTest.php
index 7787491a0e..893e9101b3 100644
--- a/appengine/flexible/sendgrid/test/LocalTest.php
+++ b/appengine/flexible/sendgrid/test/LocalTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/flexible/sendgrid/test/bootstrap.php b/appengine/flexible/sendgrid/test/bootstrap.php
index 294da6d79f..15d727445c 100644
--- a/appengine/flexible/sendgrid/test/bootstrap.php
+++ b/appengine/flexible/sendgrid/test/bootstrap.php
@@ -1,4 +1,18 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../../../../testing/FileUtil.php';
diff --git a/appengine/flexible/staticcontent/app.php b/appengine/flexible/staticcontent/app.php
index d617850926..bb0b7948f8 100644
--- a/appengine/flexible/staticcontent/app.php
+++ b/appengine/flexible/staticcontent/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/staticcontent/web/index.php b/appengine/flexible/staticcontent/web/index.php
index 65f6655a78..71f345ee80 100644
--- a/appengine/flexible/staticcontent/web/index.php
+++ b/appengine/flexible/staticcontent/web/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/symfony/tests/bootstrap.php b/appengine/flexible/symfony/tests/bootstrap.php
index ca595fa911..ee2e3fe6e6 100644
--- a/appengine/flexible/symfony/tests/bootstrap.php
+++ b/appengine/flexible/symfony/tests/bootstrap.php
@@ -1,5 +1,19 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../../../../testing/ExecuteCommandTrait.php';
 require_once __DIR__ . '/../../../../testing/FileUtil.php';
diff --git a/appengine/flexible/twilio/app.php b/appengine/flexible/twilio/app.php
index cc24c2861e..d7b88568de 100644
--- a/appengine/flexible/twilio/app.php
+++ b/appengine/flexible/twilio/app.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/flexible/twilio/index.php b/appengine/flexible/twilio/index.php
index fc4f9bdce1..0c28f3b726 100644
--- a/appengine/flexible/twilio/index.php
+++ b/appengine/flexible/twilio/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/flexible/twilio/test/TwilioTest.php b/appengine/flexible/twilio/test/TwilioTest.php
index 0b465312f3..c9dffc4b7f 100644
--- a/appengine/flexible/twilio/test/TwilioTest.php
+++ b/appengine/flexible/twilio/test/TwilioTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/flexible/twilio/test/bootstrap.php b/appengine/flexible/twilio/test/bootstrap.php
index 294da6d79f..15d727445c 100644
--- a/appengine/flexible/twilio/test/bootstrap.php
+++ b/appengine/flexible/twilio/test/bootstrap.php
@@ -1,4 +1,18 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../../../../testing/FileUtil.php';
diff --git a/appengine/standard/cloudsql/app.php b/appengine/standard/cloudsql/app.php
index 31c509f743..fe69392214 100644
--- a/appengine/standard/cloudsql/app.php
+++ b/appengine/standard/cloudsql/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/cloudsql/index.php b/appengine/standard/cloudsql/index.php
index 80016624d0..ec6bd541b4 100644
--- a/appengine/standard/cloudsql/index.php
+++ b/appengine/standard/cloudsql/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/cloudsql/test/bootstrap.php b/appengine/standard/cloudsql/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/appengine/standard/cloudsql/test/bootstrap.php
+++ b/appengine/standard/cloudsql/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/appengine/standard/cloudsql/test/cloudsqlTest.php b/appengine/standard/cloudsql/test/cloudsqlTest.php
index fed26c5c24..2c1686b824 100644
--- a/appengine/standard/cloudsql/test/cloudsqlTest.php
+++ b/appengine/standard/cloudsql/test/cloudsqlTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/http/app.php b/appengine/standard/http/app.php
index 3f38ab5d4f..2f6ca26c45 100644
--- a/appengine/standard/http/app.php
+++ b/appengine/standard/http/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/http/index.php b/appengine/standard/http/index.php
index 197ad6d13c..5f7836c2d5 100644
--- a/appengine/standard/http/index.php
+++ b/appengine/standard/http/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/http/test/bootstrap.php b/appengine/standard/http/test/bootstrap.php
index c941b3e020..823a5ebe55 100644
--- a/appengine/standard/http/test/bootstrap.php
+++ b/appengine/standard/http/test/bootstrap.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/http/test/httpTest.php b/appengine/standard/http/test/httpTest.php
index e58d8ff5dc..4e9e9a3961 100644
--- a/appengine/standard/http/test/httpTest.php
+++ b/appengine/standard/http/test/httpTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/logging/syslog.php b/appengine/standard/logging/syslog.php
index 2e3899f65f..b4e05123bd 100644
--- a/appengine/standard/logging/syslog.php
+++ b/appengine/standard/logging/syslog.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/logging/test/bootstrap.php b/appengine/standard/logging/test/bootstrap.php
index b0fcf9de72..4c42bef975 100644
--- a/appengine/standard/logging/test/bootstrap.php
+++ b/appengine/standard/logging/test/bootstrap.php
@@ -1,5 +1,19 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/mocks/AppLogLine.php';
 require_once __DIR__ . '/mocks/LogService.php';
diff --git a/appengine/standard/logging/test/loggingTest.php b/appengine/standard/logging/test/loggingTest.php
index dd61c8e50e..c9959f6231 100644
--- a/appengine/standard/logging/test/loggingTest.php
+++ b/appengine/standard/logging/test/loggingTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/logging/test/mocks/AppLogLine.php b/appengine/standard/logging/test/mocks/AppLogLine.php
index 7e19feabb6..8eb63b0443 100644
--- a/appengine/standard/logging/test/mocks/AppLogLine.php
+++ b/appengine/standard/logging/test/mocks/AppLogLine.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/logging/test/mocks/Functions.php b/appengine/standard/logging/test/mocks/Functions.php
index 62cc55ede2..eadbc58059 100644
--- a/appengine/standard/logging/test/mocks/Functions.php
+++ b/appengine/standard/logging/test/mocks/Functions.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/logging/test/mocks/LogService.php b/appengine/standard/logging/test/mocks/LogService.php
index 4a2809e302..2943fd1dc9 100644
--- a/appengine/standard/logging/test/mocks/LogService.php
+++ b/appengine/standard/logging/test/mocks/LogService.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/logging/test/mocks/RequestLog.php b/appengine/standard/logging/test/mocks/RequestLog.php
index d349902bd4..8f7619834d 100644
--- a/appengine/standard/logging/test/mocks/RequestLog.php
+++ b/appengine/standard/logging/test/mocks/RequestLog.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/logging/timeout.php b/appengine/standard/logging/timeout.php
index d6b14fea46..5ece5e11aa 100644
--- a/appengine/standard/logging/timeout.php
+++ b/appengine/standard/logging/timeout.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/mail/handle_bounced_email.php b/appengine/standard/mail/handle_bounced_email.php
index bd2f39796c..12f18815dc 100644
--- a/appengine/standard/mail/handle_bounced_email.php
+++ b/appengine/standard/mail/handle_bounced_email.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/mail/handle_incoming_email.php b/appengine/standard/mail/handle_incoming_email.php
index c06cb2e3b3..40260eec71 100644
--- a/appengine/standard/mail/handle_incoming_email.php
+++ b/appengine/standard/mail/handle_incoming_email.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/mail/index.php b/appengine/standard/mail/index.php
index 91335df7aa..73c2074b0f 100644
--- a/appengine/standard/mail/index.php
+++ b/appengine/standard/mail/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/mail/test/bootstrap.php b/appengine/standard/mail/test/bootstrap.php
index 827580e1b2..dd2838ea7c 100644
--- a/appengine/standard/mail/test/bootstrap.php
+++ b/appengine/standard/mail/test/bootstrap.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/mail/test/mailTest.php b/appengine/standard/mail/test/mailTest.php
index 7aa3bce04a..02593eda00 100644
--- a/appengine/standard/mail/test/mailTest.php
+++ b/appengine/standard/mail/test/mailTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/mail/test/mocks/Message.php b/appengine/standard/mail/test/mocks/Message.php
index 00ab065bb3..b4068b8e6d 100644
--- a/appengine/standard/mail/test/mocks/Message.php
+++ b/appengine/standard/mail/test/mocks/Message.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/mailgun/app.php b/appengine/standard/mailgun/app.php
index dd81169340..3031e3d197 100644
--- a/appengine/standard/mailgun/app.php
+++ b/appengine/standard/mailgun/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,8 +72,8 @@
     $recipient,
     $mailgunDomain,
     $mailgunApiKey,
-    $cc = 'cc@example.com',
-    $bcc = 'bcc@example.com'
+    $cc = '',
+    $bcc = ''
 ) {
     # [START complex_message]
     // Instantiate the client.
@@ -81,16 +81,24 @@
     $mailgunClient = new Mailgun\Mailgun($mailgunApiKey, $httpClient);
     $fileAttachment = __DIR__ . '/attachment.txt';
 
-    // Make the call to the client.
-    $result = $mailgunClient->sendMessage($mailgunDomain, array(
+    $postData = array(
         'from' => sprintf('Example Sender <mailgun@%s>', $mailgunDomain),
         'to' => $recipient,
-        'cc' => $cc,
-        'bcc' => $bcc,
         'subject' => 'Hello',
         'text' => 'Testing some Mailgun awesomeness!',
         'html' => '<html>HTML version of the body</html>',
-    ), array(
+    );
+
+    if ($cc) {
+        $postData['cc'] = $cc;
+    }
+
+    if ($bcc) {
+        $postData['bcc'] = $bcc;
+    }
+
+    // Make the call to the client.
+    $result = $mailgunClient->sendMessage($mailgunDomain, $postData, array(
         'attachment' => array($fileAttachment, $fileAttachment),
     ));
     # [END complex_message]
diff --git a/appengine/standard/mailgun/index.php b/appengine/standard/mailgun/index.php
index 02b05de69f..1fc2c34391 100644
--- a/appengine/standard/mailgun/index.php
+++ b/appengine/standard/mailgun/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/mailgun/test/bootstrap.php b/appengine/standard/mailgun/test/bootstrap.php
index 294da6d79f..15d727445c 100644
--- a/appengine/standard/mailgun/test/bootstrap.php
+++ b/appengine/standard/mailgun/test/bootstrap.php
@@ -1,4 +1,18 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../../../../testing/FileUtil.php';
diff --git a/appengine/standard/mailgun/test/mailgunTest.php b/appengine/standard/mailgun/test/mailgunTest.php
index 7575eb5379..80fa7c8a1a 100644
--- a/appengine/standard/mailgun/test/mailgunTest.php
+++ b/appengine/standard/mailgun/test/mailgunTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,6 +18,8 @@
 
 class mailgunTest extends WebTestCase
 {
+    private $recipient;
+
     public function createApplication()
     {
         $app = require __DIR__ . '/../app.php';
@@ -30,9 +32,11 @@ public function createApplication()
         // set your Mailgun domain name and API key
         $mailgunDomain = getenv('MAILGUN_DOMAIN');
         $mailgunApiKey = getenv('MAILGUN_APIKEY');
+        $this->recipient = getenv('MAILGUN_RECIPIENT');
 
-        if (empty($mailgunDomain) || empty($mailgunApiKey)) {
-            $this->markTestSkipped('set the MAILGUN_DOMAIN and MAILGUN_APIKEY environment variables');
+        if (empty($mailgunDomain) || empty($mailgunApiKey) || empty($this->recipient)) {
+            $this->markTestSkipped('set the MAILGUN_DOMAIN, MAILGUN_APIKEY ' .
+                'and MAILGUN_RECIPIENT environment variables');
         }
 
         $app['mailgun.domain'] = $mailgunDomain;
@@ -58,7 +62,7 @@ public function testSimpleEmail()
         $client = $this->createClient();
 
         $crawler = $client->request('POST', '/', [
-            'recipient' => 'fake@example.com',
+            'recipient' => $this->recipient,
             'submit' => 'simple',
         ]);
 
@@ -72,7 +76,7 @@ public function testComplexEmail()
         $client = $this->createClient();
 
         $crawler = $client->request('POST', '/', [
-            'recipient' => 'fake@example.com',
+            'recipient' => $this->recipient,
             'submit' => 'complex',
         ]);
 
diff --git a/appengine/standard/mailjet/app.php b/appengine/standard/mailjet/app.php
index 1aefa04840..fc5b3d9c58 100644
--- a/appengine/standard/mailjet/app.php
+++ b/appengine/standard/mailjet/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/mailjet/index.php b/appengine/standard/mailjet/index.php
index 9924cf8240..248b8b209a 100644
--- a/appengine/standard/mailjet/index.php
+++ b/appengine/standard/mailjet/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/mailjet/test/bootstrap.php b/appengine/standard/mailjet/test/bootstrap.php
index 294da6d79f..15d727445c 100644
--- a/appengine/standard/mailjet/test/bootstrap.php
+++ b/appengine/standard/mailjet/test/bootstrap.php
@@ -1,4 +1,18 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../../../../testing/FileUtil.php';
diff --git a/appengine/standard/mailjet/test/mailjetTest.php b/appengine/standard/mailjet/test/mailjetTest.php
index 06f14eedb1..de315785f8 100644
--- a/appengine/standard/mailjet/test/mailjetTest.php
+++ b/appengine/standard/mailjet/test/mailjetTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/memcache/app.php b/appengine/standard/memcache/app.php
index 070055597c..bcd557e818 100644
--- a/appengine/standard/memcache/app.php
+++ b/appengine/standard/memcache/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/memcache/index.php b/appengine/standard/memcache/index.php
index 6f62b84898..d9125f5540 100644
--- a/appengine/standard/memcache/index.php
+++ b/appengine/standard/memcache/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/modules/tests/unit/ModulesApiTest.php b/appengine/standard/modules/tests/unit/ModulesApiTest.php
index 074c7121d2..de7e9e6101 100644
--- a/appengine/standard/modules/tests/unit/ModulesApiTest.php
+++ b/appengine/standard/modules/tests/unit/ModulesApiTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/modules/tests/unit/mocks/Functions.php b/appengine/standard/modules/tests/unit/mocks/Functions.php
index dec8a6f697..2f6991d52b 100644
--- a/appengine/standard/modules/tests/unit/mocks/Functions.php
+++ b/appengine/standard/modules/tests/unit/mocks/Functions.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/modules/tests/unit/mocks/ModulesService.php b/appengine/standard/modules/tests/unit/mocks/ModulesService.php
index 763b48c06c..c6f1fb842f 100644
--- a/appengine/standard/modules/tests/unit/mocks/ModulesService.php
+++ b/appengine/standard/modules/tests/unit/mocks/ModulesService.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/storage/app.php b/appengine/standard/storage/app.php
index 4eb4aae418..19fcabadeb 100644
--- a/appengine/standard/storage/app.php
+++ b/appengine/standard/storage/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/storage/index.php b/appengine/standard/storage/index.php
index f16d438c50..1cbbd67c50 100644
--- a/appengine/standard/storage/index.php
+++ b/appengine/standard/storage/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/storage/test/bootstrap.php b/appengine/standard/storage/test/bootstrap.php
index bf44415019..ca9b766890 100644
--- a/appengine/standard/storage/test/bootstrap.php
+++ b/appengine/standard/storage/test/bootstrap.php
@@ -1,5 +1,19 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/mocks/CloudStorageStreamWrapper.php';
 require_once __DIR__ . '/mocks/CloudStorageTools.php';
diff --git a/appengine/standard/storage/test/mocks/CloudStorageStreamWrapper.php b/appengine/standard/storage/test/mocks/CloudStorageStreamWrapper.php
index 8899b0b6c6..bfc5c3b151 100644
--- a/appengine/standard/storage/test/mocks/CloudStorageStreamWrapper.php
+++ b/appengine/standard/storage/test/mocks/CloudStorageStreamWrapper.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/storage/test/mocks/CloudStorageTools.php b/appengine/standard/storage/test/mocks/CloudStorageTools.php
index 8f620fda56..b7f26ceda7 100644
--- a/appengine/standard/storage/test/mocks/CloudStorageTools.php
+++ b/appengine/standard/storage/test/mocks/CloudStorageTools.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/storage/test/storageTest.php b/appengine/standard/storage/test/storageTest.php
index 4137b49ebb..320e261325 100644
--- a/appengine/standard/storage/test/storageTest.php
+++ b/appengine/standard/storage/test/storageTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/taskqueue/tests/unit/TaskQueueTest.php b/appengine/standard/taskqueue/tests/unit/TaskQueueTest.php
index 32aec307ad..bebaec1481 100644
--- a/appengine/standard/taskqueue/tests/unit/TaskQueueTest.php
+++ b/appengine/standard/taskqueue/tests/unit/TaskQueueTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/twilio/app.php b/appengine/standard/twilio/app.php
index 9d8c534209..c84a014ba9 100644
--- a/appengine/standard/twilio/app.php
+++ b/appengine/standard/twilio/app.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/twilio/index.php b/appengine/standard/twilio/index.php
index e6a9c65ea1..755dd8a59c 100644
--- a/appengine/standard/twilio/index.php
+++ b/appengine/standard/twilio/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/twilio/test/bootstrap.php b/appengine/standard/twilio/test/bootstrap.php
index c941b3e020..823a5ebe55 100644
--- a/appengine/standard/twilio/test/bootstrap.php
+++ b/appengine/standard/twilio/test/bootstrap.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/twilio/test/twilioTest.php b/appengine/standard/twilio/test/twilioTest.php
index 66f6498bb8..6bd8516e30 100644
--- a/appengine/standard/twilio/test/twilioTest.php
+++ b/appengine/standard/twilio/test/twilioTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/users/app.php b/appengine/standard/users/app.php
index abcb1c3a4e..711f597d56 100644
--- a/appengine/standard/users/app.php
+++ b/appengine/standard/users/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/users/index.php b/appengine/standard/users/index.php
index d1d5b07b7f..051e9e59dd 100644
--- a/appengine/standard/users/index.php
+++ b/appengine/standard/users/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine/standard/users/tests/unit/UsersApiTest.php b/appengine/standard/users/tests/unit/UsersApiTest.php
index f1c3db9bec..695905d268 100644
--- a/appengine/standard/users/tests/unit/UsersApiTest.php
+++ b/appengine/standard/users/tests/unit/UsersApiTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/users/tests/unit/mocks/User.php b/appengine/standard/users/tests/unit/mocks/User.php
index e8df17889b..b82968138c 100644
--- a/appengine/standard/users/tests/unit/mocks/User.php
+++ b/appengine/standard/users/tests/unit/mocks/User.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/appengine/standard/users/tests/unit/mocks/UserService.php b/appengine/standard/users/tests/unit/mocks/UserService.php
index 5f06e468cd..82bb7e666a 100644
--- a/appengine/standard/users/tests/unit/mocks/UserService.php
+++ b/appengine/standard/users/tests/unit/mocks/UserService.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/bigquery.php b/bigquery/api/bigquery.php
index 85db71d49a..90d141b255 100644
--- a/bigquery/api/bigquery.php
+++ b/bigquery/api/bigquery.php
@@ -1,5 +1,19 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require __DIR__ . '/vendor/autoload.php';
 
 use Google\Cloud\Samples\BigQuery\BrowseTableCommand;
diff --git a/bigquery/api/src/BrowseTableCommand.php b/bigquery/api/src/BrowseTableCommand.php
index 7abbcd95f2..8ad600f9f8 100644
--- a/bigquery/api/src/BrowseTableCommand.php
+++ b/bigquery/api/src/BrowseTableCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/CopyTableCommand.php b/bigquery/api/src/CopyTableCommand.php
index d8a894cbcc..abfec0fa9c 100644
--- a/bigquery/api/src/CopyTableCommand.php
+++ b/bigquery/api/src/CopyTableCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/DatasetsCommand.php b/bigquery/api/src/DatasetsCommand.php
index ffe5ffa801..cdc2aadd11 100644
--- a/bigquery/api/src/DatasetsCommand.php
+++ b/bigquery/api/src/DatasetsCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/ExportCommand.php b/bigquery/api/src/ExportCommand.php
index 2982419e83..b2e3e27825 100644
--- a/bigquery/api/src/ExportCommand.php
+++ b/bigquery/api/src/ExportCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/ImportCommand.php b/bigquery/api/src/ImportCommand.php
index fe71d0d51d..382316a886 100644
--- a/bigquery/api/src/ImportCommand.php
+++ b/bigquery/api/src/ImportCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/ProjectIdTrait.php b/bigquery/api/src/ProjectIdTrait.php
index 7358a04b58..27daf7b4dc 100644
--- a/bigquery/api/src/ProjectIdTrait.php
+++ b/bigquery/api/src/ProjectIdTrait.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/ProjectsCommand.php b/bigquery/api/src/ProjectsCommand.php
index 562eb7eb05..d8744ebaee 100644
--- a/bigquery/api/src/ProjectsCommand.php
+++ b/bigquery/api/src/ProjectsCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/QueryCommand.php b/bigquery/api/src/QueryCommand.php
index 126cbd47d3..fe079068ca 100644
--- a/bigquery/api/src/QueryCommand.php
+++ b/bigquery/api/src/QueryCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/SchemaCommand.php b/bigquery/api/src/SchemaCommand.php
index 8dfa7c581f..a8d9ac1d24 100644
--- a/bigquery/api/src/SchemaCommand.php
+++ b/bigquery/api/src/SchemaCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/TablesCommand.php b/bigquery/api/src/TablesCommand.php
index fbf04773b7..6498442584 100644
--- a/bigquery/api/src/TablesCommand.php
+++ b/bigquery/api/src/TablesCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/functions/bigquery_client.php b/bigquery/api/src/functions/bigquery_client.php
index 1a62ca316d..d483f841ba 100644
--- a/bigquery/api/src/functions/bigquery_client.php
+++ b/bigquery/api/src/functions/bigquery_client.php
@@ -1,5 +1,19 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 namespace Google\Cloud\Samples\BigQuery;
 
 /**
diff --git a/bigquery/api/src/functions/browse_table.php b/bigquery/api/src/functions/browse_table.php
index 5534989e87..616f5df70d 100644
--- a/bigquery/api/src/functions/browse_table.php
+++ b/bigquery/api/src/functions/browse_table.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/functions/copy_table.php b/bigquery/api/src/functions/copy_table.php
index af269430dd..5e7938df8d 100644
--- a/bigquery/api/src/functions/copy_table.php
+++ b/bigquery/api/src/functions/copy_table.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/functions/create_dataset.php b/bigquery/api/src/functions/create_dataset.php
index e2f6844c68..c2856c8f30 100644
--- a/bigquery/api/src/functions/create_dataset.php
+++ b/bigquery/api/src/functions/create_dataset.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/functions/create_table.php b/bigquery/api/src/functions/create_table.php
index e1463d3a36..1f8af3e7c0 100644
--- a/bigquery/api/src/functions/create_table.php
+++ b/bigquery/api/src/functions/create_table.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/functions/delete_table.php b/bigquery/api/src/functions/delete_table.php
index b6604f52ec..443a5979cf 100644
--- a/bigquery/api/src/functions/delete_table.php
+++ b/bigquery/api/src/functions/delete_table.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/functions/export_table.php b/bigquery/api/src/functions/export_table.php
index b1d0af80df..20f9ad612d 100644
--- a/bigquery/api/src/functions/export_table.php
+++ b/bigquery/api/src/functions/export_table.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/functions/import_from_file.php b/bigquery/api/src/functions/import_from_file.php
index c72e445931..547c1452c5 100644
--- a/bigquery/api/src/functions/import_from_file.php
+++ b/bigquery/api/src/functions/import_from_file.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/functions/import_from_storage.php b/bigquery/api/src/functions/import_from_storage.php
index 6e98f50806..bbd8e15191 100644
--- a/bigquery/api/src/functions/import_from_storage.php
+++ b/bigquery/api/src/functions/import_from_storage.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/functions/insert_sql.php b/bigquery/api/src/functions/insert_sql.php
index 97750d4d2f..7dc8f26dfb 100644
--- a/bigquery/api/src/functions/insert_sql.php
+++ b/bigquery/api/src/functions/insert_sql.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/functions/list_datasets.php b/bigquery/api/src/functions/list_datasets.php
index 8b00a6c357..3e151e0607 100644
--- a/bigquery/api/src/functions/list_datasets.php
+++ b/bigquery/api/src/functions/list_datasets.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/functions/list_projects.php b/bigquery/api/src/functions/list_projects.php
index 13778b9d97..4cbd8316f6 100644
--- a/bigquery/api/src/functions/list_projects.php
+++ b/bigquery/api/src/functions/list_projects.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/functions/list_tables.php b/bigquery/api/src/functions/list_tables.php
index 637a434b37..68e4241512 100644
--- a/bigquery/api/src/functions/list_tables.php
+++ b/bigquery/api/src/functions/list_tables.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/functions/run_query.php b/bigquery/api/src/functions/run_query.php
index 7bb6d4c8a9..df5f5a0515 100644
--- a/bigquery/api/src/functions/run_query.php
+++ b/bigquery/api/src/functions/run_query.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/functions/run_query_as_job.php b/bigquery/api/src/functions/run_query_as_job.php
index 908d970920..d3b5d1f639 100644
--- a/bigquery/api/src/functions/run_query_as_job.php
+++ b/bigquery/api/src/functions/run_query_as_job.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/src/functions/stream_row.php b/bigquery/api/src/functions/stream_row.php
index ebe78cdb90..8781a7e87a 100644
--- a/bigquery/api/src/functions/stream_row.php
+++ b/bigquery/api/src/functions/stream_row.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/test/BrowseTableCommandTest.php b/bigquery/api/test/BrowseTableCommandTest.php
index e90d49d4cf..5a909e5cc6 100644
--- a/bigquery/api/test/BrowseTableCommandTest.php
+++ b/bigquery/api/test/BrowseTableCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/test/CopyTableCommandTest.php b/bigquery/api/test/CopyTableCommandTest.php
index 94559bfbaa..a332cd666f 100644
--- a/bigquery/api/test/CopyTableCommandTest.php
+++ b/bigquery/api/test/CopyTableCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/test/DatasetsCommandTest.php b/bigquery/api/test/DatasetsCommandTest.php
index 172cc112d5..90f97f5e65 100644
--- a/bigquery/api/test/DatasetsCommandTest.php
+++ b/bigquery/api/test/DatasetsCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/test/ExportCommandTest.php b/bigquery/api/test/ExportCommandTest.php
index 14498b722e..6c812d9906 100644
--- a/bigquery/api/test/ExportCommandTest.php
+++ b/bigquery/api/test/ExportCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/test/FunctionsTest.php b/bigquery/api/test/FunctionsTest.php
index 751777671f..4cd636fe78 100644
--- a/bigquery/api/test/FunctionsTest.php
+++ b/bigquery/api/test/FunctionsTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/test/ImportCommandTest.php b/bigquery/api/test/ImportCommandTest.php
index 7a4a38ad7a..5c1503bcbe 100644
--- a/bigquery/api/test/ImportCommandTest.php
+++ b/bigquery/api/test/ImportCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/test/ProjectsCommandTest.php b/bigquery/api/test/ProjectsCommandTest.php
index b0bc3ad107..2abe989689 100644
--- a/bigquery/api/test/ProjectsCommandTest.php
+++ b/bigquery/api/test/ProjectsCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/test/QueryCommandTest.php b/bigquery/api/test/QueryCommandTest.php
index 1fec4b7fa4..7355930d8b 100644
--- a/bigquery/api/test/QueryCommandTest.php
+++ b/bigquery/api/test/QueryCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/test/SchemaCommandTest.php b/bigquery/api/test/SchemaCommandTest.php
index 034195edca..ac8332cc40 100644
--- a/bigquery/api/test/SchemaCommandTest.php
+++ b/bigquery/api/test/SchemaCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/test/TablesCommandTest.php b/bigquery/api/test/TablesCommandTest.php
index 966c87b19a..76843b3d85 100644
--- a/bigquery/api/test/TablesCommandTest.php
+++ b/bigquery/api/test/TablesCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/api/test/bootstrap.php b/bigquery/api/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/bigquery/api/test/bootstrap.php
+++ b/bigquery/api/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/bigquery/quickstart/quickstart.php b/bigquery/quickstart/quickstart.php
index 2a02598a60..76b7503788 100644
--- a/bigquery/quickstart/quickstart.php
+++ b/bigquery/quickstart/quickstart.php
@@ -1,6 +1,20 @@
 <?php
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-# [START bigquery_quickstart]
 # Includes the autoloader for libraries installed with composer
 require __DIR__ . '/vendor/autoload.php';
 
diff --git a/bigquery/quickstart/test/bootstrap.php b/bigquery/quickstart/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/bigquery/quickstart/test/bootstrap.php
+++ b/bigquery/quickstart/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/bigquery/quickstart/test/quickstartTest.php b/bigquery/quickstart/test/quickstartTest.php
index ddcb7f6c4c..07e97e13c9 100644
--- a/bigquery/quickstart/test/quickstartTest.php
+++ b/bigquery/quickstart/test/quickstartTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/shakespeare/shakespeare.php b/bigquery/shakespeare/shakespeare.php
index 6f61d36a4f..8474ba52d9 100644
--- a/bigquery/shakespeare/shakespeare.php
+++ b/bigquery/shakespeare/shakespeare.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bigquery/shakespeare/test/bootstrap.php b/bigquery/shakespeare/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/bigquery/shakespeare/test/bootstrap.php
+++ b/bigquery/shakespeare/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/bigquery/shakespeare/test/shakespeareTest.php b/bigquery/shakespeare/test/shakespeareTest.php
index 9284e16732..831d398c85 100644
--- a/bigquery/shakespeare/test/shakespeareTest.php
+++ b/bigquery/shakespeare/test/shakespeareTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/compute/logging/index.php b/compute/logging/index.php
index b1a49a8712..df33693748 100644
--- a/compute/logging/index.php
+++ b/compute/logging/index.php
@@ -1,6 +1,20 @@
 <?php
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-# [START logging]
 require_once __DIR__ . '/vendor/autoload.php';
 
 use Fluent\Logger\FluentLogger;
diff --git a/compute/logging/test/bootstrap.php b/compute/logging/test/bootstrap.php
index d7d0417d4b..6805a7b157 100644
--- a/compute/logging/test/bootstrap.php
+++ b/compute/logging/test/bootstrap.php
@@ -1,4 +1,18 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/mocks/FluentLogger.php';
diff --git a/compute/logging/test/loggingTest.php b/compute/logging/test/loggingTest.php
index f5ab8450ea..0a6b8494c5 100644
--- a/compute/logging/test/loggingTest.php
+++ b/compute/logging/test/loggingTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/compute/logging/test/mocks/FluentLogger.php b/compute/logging/test/mocks/FluentLogger.php
index 8dbaf61ab9..665e15b2b7 100644
--- a/compute/logging/test/mocks/FluentLogger.php
+++ b/compute/logging/test/mocks/FluentLogger.php
@@ -1,5 +1,19 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 namespace Fluent\Logger;
 
 class FluentLogger
diff --git a/datastore/api/src/functions/concepts.php b/datastore/api/src/functions/concepts.php
index d809bae6a0..7c7310ebe7 100644
--- a/datastore/api/src/functions/concepts.php
+++ b/datastore/api/src/functions/concepts.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -733,7 +733,7 @@ function unindexed_property_query(DatastoreClient $datastore)
     // [START unindexed_property_query]
     $query = $datastore->query()
         ->kind('Task')
-        ->filter('description',  '=', 'A task description.');
+        ->filter('description', '=', 'A task description.');
     // [END unindexed_property_query]
     return $query;
 }
diff --git a/datastore/api/test/ConceptsTest.php b/datastore/api/test/ConceptsTest.php
index 81ef42acfc..467e930893 100644
--- a/datastore/api/test/ConceptsTest.php
+++ b/datastore/api/test/ConceptsTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/datastore/api/test/bootstrap.php b/datastore/api/test/bootstrap.php
index 85a1a5557f..823a5ebe55 100644
--- a/datastore/api/test/bootstrap.php
+++ b/datastore/api/test/bootstrap.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/datastore/quickstart/quickstart.php b/datastore/quickstart/quickstart.php
index 58e1b1e5f9..809eb6cc98 100644
--- a/datastore/quickstart/quickstart.php
+++ b/datastore/quickstart/quickstart.php
@@ -1,6 +1,20 @@
 <?php
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-# [START datastore_quickstart]
 # Includes the autoloader for libraries installed with composer
 require __DIR__ . '/vendor/autoload.php';
 
diff --git a/datastore/quickstart/test/bootstrap.php b/datastore/quickstart/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/datastore/quickstart/test/bootstrap.php
+++ b/datastore/quickstart/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/datastore/quickstart/test/quickstartTest.php b/datastore/quickstart/test/quickstartTest.php
index 505b413d4f..207a544691 100644
--- a/datastore/quickstart/test/quickstartTest.php
+++ b/datastore/quickstart/test/quickstartTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/datastore/tutorial/src/CreateTaskCommand.php b/datastore/tutorial/src/CreateTaskCommand.php
index 0503157af1..e151790298 100644
--- a/datastore/tutorial/src/CreateTaskCommand.php
+++ b/datastore/tutorial/src/CreateTaskCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/datastore/tutorial/src/DeleteTaskCommand.php b/datastore/tutorial/src/DeleteTaskCommand.php
index 51b17442f0..ffe889247f 100644
--- a/datastore/tutorial/src/DeleteTaskCommand.php
+++ b/datastore/tutorial/src/DeleteTaskCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/datastore/tutorial/src/ListTasksCommand.php b/datastore/tutorial/src/ListTasksCommand.php
index 5e42e47518..102099595b 100644
--- a/datastore/tutorial/src/ListTasksCommand.php
+++ b/datastore/tutorial/src/ListTasksCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/datastore/tutorial/src/MarkTaskDoneCommand.php b/datastore/tutorial/src/MarkTaskDoneCommand.php
index 03c434794c..eb93a7253e 100644
--- a/datastore/tutorial/src/MarkTaskDoneCommand.php
+++ b/datastore/tutorial/src/MarkTaskDoneCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/datastore/tutorial/src/functions.php b/datastore/tutorial/src/functions.php
index 40e6832d81..8f851c3464 100644
--- a/datastore/tutorial/src/functions.php
+++ b/datastore/tutorial/src/functions.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/datastore/tutorial/test/CommandSystemTest.php b/datastore/tutorial/test/CommandSystemTest.php
index 21a03c33b9..84e4690398 100644
--- a/datastore/tutorial/test/CommandSystemTest.php
+++ b/datastore/tutorial/test/CommandSystemTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/datastore/tutorial/test/FunctionsTest.php b/datastore/tutorial/test/FunctionsTest.php
index 0977603b8d..b64e7d26e9 100644
--- a/datastore/tutorial/test/FunctionsTest.php
+++ b/datastore/tutorial/test/FunctionsTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/datastore/tutorial/test/bootstrap.php b/datastore/tutorial/test/bootstrap.php
index 85a1a5557f..823a5ebe55 100644
--- a/datastore/tutorial/test/bootstrap.php
+++ b/datastore/tutorial/test/bootstrap.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/endpoints/getting-started/EndpointsCommand.php b/endpoints/getting-started/EndpointsCommand.php
index 2fbed4ec56..d623f5f5a3 100644
--- a/endpoints/getting-started/EndpointsCommand.php
+++ b/endpoints/getting-started/EndpointsCommand.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/endpoints/getting-started/app.php b/endpoints/getting-started/app.php
index 4a486f3330..14246f3867 100644
--- a/endpoints/getting-started/app.php
+++ b/endpoints/getting-started/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/endpoints/getting-started/index.php b/endpoints/getting-started/index.php
index 55af8d9efd..94f61c3743 100644
--- a/endpoints/getting-started/index.php
+++ b/endpoints/getting-started/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/endpoints/getting-started/test/EndpointsCommandTest.php b/endpoints/getting-started/test/EndpointsCommandTest.php
index 740a2c4bef..0c53d9df5a 100644
--- a/endpoints/getting-started/test/EndpointsCommandTest.php
+++ b/endpoints/getting-started/test/EndpointsCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/endpoints/getting-started/test/LocalTest.php b/endpoints/getting-started/test/LocalTest.php
index baf84bc8d0..727f724b8e 100644
--- a/endpoints/getting-started/test/LocalTest.php
+++ b/endpoints/getting-started/test/LocalTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/endpoints/getting-started/test/bootstrap.php b/endpoints/getting-started/test/bootstrap.php
index f7a2f103bc..435fd9d57a 100644
--- a/endpoints/getting-started/test/bootstrap.php
+++ b/endpoints/getting-started/test/bootstrap.php
@@ -1,5 +1,19 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../../../testing/FileUtil.php';
 require_once __DIR__ . '/../../../testing/ExecuteCommandTrait.php';
diff --git a/language/api/language.php b/language/api/language.php
index 5097941bbf..3a5e051d26 100644
--- a/language/api/language.php
+++ b/language/api/language.php
@@ -1,5 +1,19 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require __DIR__ . '/vendor/autoload.php';
 
 use Google\Cloud\Samples\Language\AllCommand;
diff --git a/language/api/src/AllCommand.php b/language/api/src/AllCommand.php
index 3787d58061..fa4ca864a6 100644
--- a/language/api/src/AllCommand.php
+++ b/language/api/src/AllCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/src/EntitiesCommand.php b/language/api/src/EntitiesCommand.php
index c3575086d7..ba19d55eea 100644
--- a/language/api/src/EntitiesCommand.php
+++ b/language/api/src/EntitiesCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/src/SentimentCommand.php b/language/api/src/SentimentCommand.php
index 6c7d4cadc1..3bef27ffd1 100644
--- a/language/api/src/SentimentCommand.php
+++ b/language/api/src/SentimentCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/src/SyntaxCommand.php b/language/api/src/SyntaxCommand.php
index c071a16fba..b71c46d6a6 100644
--- a/language/api/src/SyntaxCommand.php
+++ b/language/api/src/SyntaxCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/src/functions/analyze_all.php b/language/api/src/functions/analyze_all.php
index 7967abb193..5c2b233ef0 100644
--- a/language/api/src/functions/analyze_all.php
+++ b/language/api/src/functions/analyze_all.php
@@ -1,12 +1,12 @@
 <?php
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
+/**
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/src/functions/analyze_all_from_file.php b/language/api/src/functions/analyze_all_from_file.php
index 561e5ac34b..9175adf819 100644
--- a/language/api/src/functions/analyze_all_from_file.php
+++ b/language/api/src/functions/analyze_all_from_file.php
@@ -1,12 +1,12 @@
 <?php
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
+/**
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/src/functions/analyze_entities.php b/language/api/src/functions/analyze_entities.php
index e08f51a0d5..13aa02ada8 100644
--- a/language/api/src/functions/analyze_entities.php
+++ b/language/api/src/functions/analyze_entities.php
@@ -1,12 +1,12 @@
 <?php
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
+/**
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/src/functions/analyze_entities_from_file.php b/language/api/src/functions/analyze_entities_from_file.php
index 1436bc4735..5cd2dc6ef1 100644
--- a/language/api/src/functions/analyze_entities_from_file.php
+++ b/language/api/src/functions/analyze_entities_from_file.php
@@ -1,12 +1,12 @@
 <?php
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
+/**
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/src/functions/analyze_sentiment.php b/language/api/src/functions/analyze_sentiment.php
index f73aa6b8f3..87d5118e03 100644
--- a/language/api/src/functions/analyze_sentiment.php
+++ b/language/api/src/functions/analyze_sentiment.php
@@ -1,12 +1,12 @@
 <?php
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
+/**
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/src/functions/analyze_sentiment_from_file.php b/language/api/src/functions/analyze_sentiment_from_file.php
index 2d8a031643..1933539374 100644
--- a/language/api/src/functions/analyze_sentiment_from_file.php
+++ b/language/api/src/functions/analyze_sentiment_from_file.php
@@ -1,12 +1,12 @@
 <?php
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
+/**
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/src/functions/analyze_syntax.php b/language/api/src/functions/analyze_syntax.php
index b7cb13cc18..737408bb41 100644
--- a/language/api/src/functions/analyze_syntax.php
+++ b/language/api/src/functions/analyze_syntax.php
@@ -1,12 +1,12 @@
 <?php
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
+/**
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/src/functions/analyze_syntax_from_file.php b/language/api/src/functions/analyze_syntax_from_file.php
index 3d3fdd1b9d..7e4ab164dd 100644
--- a/language/api/src/functions/analyze_syntax_from_file.php
+++ b/language/api/src/functions/analyze_syntax_from_file.php
@@ -1,12 +1,12 @@
 <?php
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
+/**
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/src/functions/annotation_to_string.php b/language/api/src/functions/annotation_to_string.php
index 60316eaad0..db04c3f902 100644
--- a/language/api/src/functions/annotation_to_string.php
+++ b/language/api/src/functions/annotation_to_string.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/test/AllCommandTest.php b/language/api/test/AllCommandTest.php
index e27a69f67d..4a1b44969a 100644
--- a/language/api/test/AllCommandTest.php
+++ b/language/api/test/AllCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/test/EntitiesCommandTest.php b/language/api/test/EntitiesCommandTest.php
index 824bfbbb3a..88f7102de9 100644
--- a/language/api/test/EntitiesCommandTest.php
+++ b/language/api/test/EntitiesCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/test/SentimentCommandTest.php b/language/api/test/SentimentCommandTest.php
index dc6cd5dd3f..2f7c4d5cba 100644
--- a/language/api/test/SentimentCommandTest.php
+++ b/language/api/test/SentimentCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/test/SyntaxCommandTest.php b/language/api/test/SyntaxCommandTest.php
index 1a8d009151..e2cece8508 100644
--- a/language/api/test/SyntaxCommandTest.php
+++ b/language/api/test/SyntaxCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/language/api/test/bootstrap.php b/language/api/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/language/api/test/bootstrap.php
+++ b/language/api/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/language/quickstart/quickstart.php b/language/quickstart/quickstart.php
index 7742e9bce6..1425ba07d7 100644
--- a/language/quickstart/quickstart.php
+++ b/language/quickstart/quickstart.php
@@ -1,6 +1,20 @@
 <?php
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-# [START language_quickstart]
 # Includes the autoloader for libraries installed with composer
 require __DIR__ . '/vendor/autoload.php';
 
diff --git a/language/quickstart/test/bootstrap.php b/language/quickstart/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/language/quickstart/test/bootstrap.php
+++ b/language/quickstart/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/language/quickstart/test/quickstartTest.php b/language/quickstart/test/quickstartTest.php
index a334915e7b..1312cea014 100644
--- a/language/quickstart/test/quickstartTest.php
+++ b/language/quickstart/test/quickstartTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/src/BaseCommand.php b/logging/api/src/BaseCommand.php
index f27fbf391f..c52ecde985 100644
--- a/logging/api/src/BaseCommand.php
+++ b/logging/api/src/BaseCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/src/CreateSinkCommand.php b/logging/api/src/CreateSinkCommand.php
index 38e87bd2ac..fcff45f889 100644
--- a/logging/api/src/CreateSinkCommand.php
+++ b/logging/api/src/CreateSinkCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/src/DeleteLoggerCommand.php b/logging/api/src/DeleteLoggerCommand.php
index 7fbd53c49a..bffdf8306c 100644
--- a/logging/api/src/DeleteLoggerCommand.php
+++ b/logging/api/src/DeleteLoggerCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/src/DeleteSinkCommand.php b/logging/api/src/DeleteSinkCommand.php
index daa8296f65..e402a44911 100644
--- a/logging/api/src/DeleteSinkCommand.php
+++ b/logging/api/src/DeleteSinkCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/src/ListEntriesCommand.php b/logging/api/src/ListEntriesCommand.php
index e42997feb9..236cef58cb 100644
--- a/logging/api/src/ListEntriesCommand.php
+++ b/logging/api/src/ListEntriesCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/src/ListSinksCommand.php b/logging/api/src/ListSinksCommand.php
index daa65f0fd9..1768dad3b4 100644
--- a/logging/api/src/ListSinksCommand.php
+++ b/logging/api/src/ListSinksCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/src/UpdateSinkCommand.php b/logging/api/src/UpdateSinkCommand.php
index 6100f33ec2..1c1bbf8774 100644
--- a/logging/api/src/UpdateSinkCommand.php
+++ b/logging/api/src/UpdateSinkCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/src/WriteCommand.php b/logging/api/src/WriteCommand.php
index 53fee6d750..7569e5c8fa 100644
--- a/logging/api/src/WriteCommand.php
+++ b/logging/api/src/WriteCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/src/functions/log_entry_functions.php b/logging/api/src/functions/log_entry_functions.php
index 488dd8b1dc..7d726f5770 100644
--- a/logging/api/src/functions/log_entry_functions.php
+++ b/logging/api/src/functions/log_entry_functions.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/src/functions/sink_functions.php b/logging/api/src/functions/sink_functions.php
index 53914edf02..e3bd9c7980 100644
--- a/logging/api/src/functions/sink_functions.php
+++ b/logging/api/src/functions/sink_functions.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/test/CreateSinkCommandTest.php b/logging/api/test/CreateSinkCommandTest.php
index 03a9fc14e5..b0737b93dc 100644
--- a/logging/api/test/CreateSinkCommandTest.php
+++ b/logging/api/test/CreateSinkCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/test/DeleteLoggerCommandTest.php b/logging/api/test/DeleteLoggerCommandTest.php
index 3b94b4954f..a1f316ef8c 100644
--- a/logging/api/test/DeleteLoggerCommandTest.php
+++ b/logging/api/test/DeleteLoggerCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/test/DeleteSinkCommandTest.php b/logging/api/test/DeleteSinkCommandTest.php
index 203229c24f..075be3f2fa 100644
--- a/logging/api/test/DeleteSinkCommandTest.php
+++ b/logging/api/test/DeleteSinkCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/test/ListEntriesCommandTest.php b/logging/api/test/ListEntriesCommandTest.php
index 80a3e9fdbe..f4e774f397 100644
--- a/logging/api/test/ListEntriesCommandTest.php
+++ b/logging/api/test/ListEntriesCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/test/ListSinksCommandTest.php b/logging/api/test/ListSinksCommandTest.php
index 5de2175236..3fa5715531 100644
--- a/logging/api/test/ListSinksCommandTest.php
+++ b/logging/api/test/ListSinksCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/test/UpdateSinkCommandTest.php b/logging/api/test/UpdateSinkCommandTest.php
index cf349d9ea6..b3443258c4 100644
--- a/logging/api/test/UpdateSinkCommandTest.php
+++ b/logging/api/test/UpdateSinkCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/test/WriteCommandTest.php b/logging/api/test/WriteCommandTest.php
index d5dfe70adb..7626690ea4 100644
--- a/logging/api/test/WriteCommandTest.php
+++ b/logging/api/test/WriteCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/logging/api/test/bootstrap.php b/logging/api/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/logging/api/test/bootstrap.php
+++ b/logging/api/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/logging/quickstart/quickstart.php b/logging/quickstart/quickstart.php
index cac421c4de..67c8ce64e2 100644
--- a/logging/quickstart/quickstart.php
+++ b/logging/quickstart/quickstart.php
@@ -1,6 +1,20 @@
 <?php
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-# [START logging_quickstart]
 # Includes the autoloader for libraries installed with composer
 require __DIR__ . '/vendor/autoload.php';
 
diff --git a/logging/quickstart/test/bootstrap.php b/logging/quickstart/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/logging/quickstart/test/bootstrap.php
+++ b/logging/quickstart/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/logging/quickstart/test/quickstartTest.php b/logging/quickstart/test/quickstartTest.php
index f5e2a1b2be..44f577a81c 100644
--- a/logging/quickstart/test/quickstartTest.php
+++ b/logging/quickstart/test/quickstartTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/app/app.php b/pubsub/app/app.php
index 50be573a2e..f2e1f66a4c 100644
--- a/pubsub/app/app.php
+++ b/pubsub/app/app.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Google\Cloud\Samples\PubSub;
 
 use Silex\Application;
diff --git a/pubsub/app/index.php b/pubsub/app/index.php
index 4cbbf340fe..20b768a3e0 100644
--- a/pubsub/app/index.php
+++ b/pubsub/app/index.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 // composer autoloading
 require_once __DIR__ . '/vendor/autoload.php';
 
diff --git a/pubsub/app/test/appTest.php b/pubsub/app/test/appTest.php
index 695614f1a3..f20cac1dde 100644
--- a/pubsub/app/test/appTest.php
+++ b/pubsub/app/test/appTest.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Google\Cloud\Samples\PubSub\Tests;
 
 use Silex\WebTestCase;
diff --git a/pubsub/app/test/bootstrap.php b/pubsub/app/test/bootstrap.php
index f91a988cc6..de064f4954 100644
--- a/pubsub/app/test/bootstrap.php
+++ b/pubsub/app/test/bootstrap.php
@@ -1,4 +1,18 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../../../testing/FileUtil.php';
diff --git a/pubsub/cli/pubsub.php b/pubsub/cli/pubsub.php
index b7728d6a6e..763d003745 100644
--- a/pubsub/cli/pubsub.php
+++ b/pubsub/cli/pubsub.php
@@ -1,5 +1,19 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require __DIR__ . '/vendor/autoload.php';
 
 use Google\Cloud\Samples\PubSub\SubscriptionCommand;
diff --git a/pubsub/cli/src/IamCommand.php b/pubsub/cli/src/IamCommand.php
index d87bfb697f..c56f43a5a3 100644
--- a/pubsub/cli/src/IamCommand.php
+++ b/pubsub/cli/src/IamCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/ProjectIdTrait.php b/pubsub/cli/src/ProjectIdTrait.php
index 97c836fd7b..d80d6d6f67 100644
--- a/pubsub/cli/src/ProjectIdTrait.php
+++ b/pubsub/cli/src/ProjectIdTrait.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/SubscriptionCommand.php b/pubsub/cli/src/SubscriptionCommand.php
index 59627523b3..808f24b7d2 100644
--- a/pubsub/cli/src/SubscriptionCommand.php
+++ b/pubsub/cli/src/SubscriptionCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/TopicCommand.php b/pubsub/cli/src/TopicCommand.php
index e4197edef9..ceca3574a0 100644
--- a/pubsub/cli/src/TopicCommand.php
+++ b/pubsub/cli/src/TopicCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/functions/create_push_subscription.php b/pubsub/cli/src/functions/create_push_subscription.php
index 45d934b7ab..3f82368241 100644
--- a/pubsub/cli/src/functions/create_push_subscription.php
+++ b/pubsub/cli/src/functions/create_push_subscription.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/functions/create_subscription.php b/pubsub/cli/src/functions/create_subscription.php
index 824843616d..74dc311f72 100644
--- a/pubsub/cli/src/functions/create_subscription.php
+++ b/pubsub/cli/src/functions/create_subscription.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/functions/create_topic.php b/pubsub/cli/src/functions/create_topic.php
index 092e418a71..250731ba8c 100644
--- a/pubsub/cli/src/functions/create_topic.php
+++ b/pubsub/cli/src/functions/create_topic.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/functions/delete_subscription.php b/pubsub/cli/src/functions/delete_subscription.php
index f9ed94448c..a7ad61492b 100644
--- a/pubsub/cli/src/functions/delete_subscription.php
+++ b/pubsub/cli/src/functions/delete_subscription.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/functions/delete_topic.php b/pubsub/cli/src/functions/delete_topic.php
index 4977571e2f..44a6eec9b8 100644
--- a/pubsub/cli/src/functions/delete_topic.php
+++ b/pubsub/cli/src/functions/delete_topic.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/functions/get_subscription_policy.php b/pubsub/cli/src/functions/get_subscription_policy.php
index 5a9051ac99..a0854be983 100644
--- a/pubsub/cli/src/functions/get_subscription_policy.php
+++ b/pubsub/cli/src/functions/get_subscription_policy.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/functions/get_topic_policy.php b/pubsub/cli/src/functions/get_topic_policy.php
index 96ce432512..cac6754c54 100644
--- a/pubsub/cli/src/functions/get_topic_policy.php
+++ b/pubsub/cli/src/functions/get_topic_policy.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/functions/list_subscriptions.php b/pubsub/cli/src/functions/list_subscriptions.php
index bfe1c8f79a..726072d2e8 100644
--- a/pubsub/cli/src/functions/list_subscriptions.php
+++ b/pubsub/cli/src/functions/list_subscriptions.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/functions/list_topics.php b/pubsub/cli/src/functions/list_topics.php
index 220d1799ce..268408b45f 100644
--- a/pubsub/cli/src/functions/list_topics.php
+++ b/pubsub/cli/src/functions/list_topics.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/functions/publish_message.php b/pubsub/cli/src/functions/publish_message.php
index b29b5a005c..6454f2700e 100644
--- a/pubsub/cli/src/functions/publish_message.php
+++ b/pubsub/cli/src/functions/publish_message.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/functions/pubsub_client.php b/pubsub/cli/src/functions/pubsub_client.php
index 9da836c73a..9e8718cfe0 100644
--- a/pubsub/cli/src/functions/pubsub_client.php
+++ b/pubsub/cli/src/functions/pubsub_client.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/functions/pull_messages.php b/pubsub/cli/src/functions/pull_messages.php
index c04d486032..e77fb9dd91 100644
--- a/pubsub/cli/src/functions/pull_messages.php
+++ b/pubsub/cli/src/functions/pull_messages.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/functions/set_subscription_policy.php b/pubsub/cli/src/functions/set_subscription_policy.php
index ca6999bc69..1a504c5c73 100644
--- a/pubsub/cli/src/functions/set_subscription_policy.php
+++ b/pubsub/cli/src/functions/set_subscription_policy.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/functions/set_topic_policy.php b/pubsub/cli/src/functions/set_topic_policy.php
index 3c605a9c40..e429118420 100644
--- a/pubsub/cli/src/functions/set_topic_policy.php
+++ b/pubsub/cli/src/functions/set_topic_policy.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/functions/test_subscription_permissions.php b/pubsub/cli/src/functions/test_subscription_permissions.php
index 15a4a4ae06..c659ecfc80 100644
--- a/pubsub/cli/src/functions/test_subscription_permissions.php
+++ b/pubsub/cli/src/functions/test_subscription_permissions.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/src/functions/test_topic_permissions.php b/pubsub/cli/src/functions/test_topic_permissions.php
index 2813c92d14..27ba36af9b 100644
--- a/pubsub/cli/src/functions/test_topic_permissions.php
+++ b/pubsub/cli/src/functions/test_topic_permissions.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/test/FunctionsTest.php b/pubsub/cli/test/FunctionsTest.php
index d2c5fc64af..7209752e0c 100644
--- a/pubsub/cli/test/FunctionsTest.php
+++ b/pubsub/cli/test/FunctionsTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/test/IamCommandTest.php b/pubsub/cli/test/IamCommandTest.php
index e3ac4aea4e..0cc1c96477 100644
--- a/pubsub/cli/test/IamCommandTest.php
+++ b/pubsub/cli/test/IamCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/test/SubscriptionCommandTest.php b/pubsub/cli/test/SubscriptionCommandTest.php
index 90cd088dbf..4c1ddf3e47 100644
--- a/pubsub/cli/test/SubscriptionCommandTest.php
+++ b/pubsub/cli/test/SubscriptionCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/test/TopicCommandTest.php b/pubsub/cli/test/TopicCommandTest.php
index 17e3df41c6..11a24af5a7 100644
--- a/pubsub/cli/test/TopicCommandTest.php
+++ b/pubsub/cli/test/TopicCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pubsub/cli/test/bootstrap.php b/pubsub/cli/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/pubsub/cli/test/bootstrap.php
+++ b/pubsub/cli/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/pubsub/quickstart/quickstart.php b/pubsub/quickstart/quickstart.php
index bb7138dc6f..a0bf433ffc 100644
--- a/pubsub/quickstart/quickstart.php
+++ b/pubsub/quickstart/quickstart.php
@@ -1,6 +1,20 @@
 <?php
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-# [START pubsub_quickstart]
 # Includes the autoloader for libraries installed with composer
 require __DIR__ . '/vendor/autoload.php';
 
diff --git a/pubsub/quickstart/test/bootstrap.php b/pubsub/quickstart/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/pubsub/quickstart/test/bootstrap.php
+++ b/pubsub/quickstart/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/pubsub/quickstart/test/quickstartTest.php b/pubsub/quickstart/test/quickstartTest.php
index 1e1c5d2e46..fd5b06a0e7 100644
--- a/pubsub/quickstart/test/quickstartTest.php
+++ b/pubsub/quickstart/test/quickstartTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/speech/api/speech.php b/speech/api/speech.php
index 3a21ed26ad..908bba189a 100644
--- a/speech/api/speech.php
+++ b/speech/api/speech.php
@@ -1,5 +1,19 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require __DIR__ . '/vendor/autoload.php';
 
 use Google\Cloud\Samples\Speech\TranscribeCommand;
diff --git a/speech/api/src/TranscribeCommand.php b/speech/api/src/TranscribeCommand.php
index 4299c7e5a2..6255cda39e 100644
--- a/speech/api/src/TranscribeCommand.php
+++ b/speech/api/src/TranscribeCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/speech/api/src/functions/base64_encode_audio.php b/speech/api/src/functions/base64_encode_audio.php
index ff3fa38d63..5359e92385 100644
--- a/speech/api/src/functions/base64_encode_audio.php
+++ b/speech/api/src/functions/base64_encode_audio.php
@@ -1,5 +1,19 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 namespace Google\Cloud\Samples\Speech;
 
 /**
diff --git a/speech/api/src/functions/transcribe_async.php b/speech/api/src/functions/transcribe_async.php
index d9e1376ec5..359bc524f2 100644
--- a/speech/api/src/functions/transcribe_async.php
+++ b/speech/api/src/functions/transcribe_async.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/speech/api/src/functions/transcribe_sync.php b/speech/api/src/functions/transcribe_sync.php
index a12c7717ab..f7020dfe5f 100644
--- a/speech/api/src/functions/transcribe_sync.php
+++ b/speech/api/src/functions/transcribe_sync.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/speech/api/test/FunctionsTest.php b/speech/api/test/FunctionsTest.php
index 0c0eca4e1a..c38c88971e 100644
--- a/speech/api/test/FunctionsTest.php
+++ b/speech/api/test/FunctionsTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/speech/api/test/TranscribeCommandTest.php b/speech/api/test/TranscribeCommandTest.php
index 4791074c80..fe2c9ff370 100644
--- a/speech/api/test/TranscribeCommandTest.php
+++ b/speech/api/test/TranscribeCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/speech/api/test/bootstrap.php b/speech/api/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/speech/api/test/bootstrap.php
+++ b/speech/api/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/speech/quickstart/quickstart.php b/speech/quickstart/quickstart.php
index 0f94585582..4cb10fd96e 100644
--- a/speech/quickstart/quickstart.php
+++ b/speech/quickstart/quickstart.php
@@ -1,6 +1,20 @@
 <?php
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-# [START speech_quickstart]
 # Includes the autoloader for libraries installed with composer
 require __DIR__ . '/vendor/autoload.php';
 
diff --git a/speech/quickstart/test/bootstrap.php b/speech/quickstart/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/speech/quickstart/test/bootstrap.php
+++ b/speech/quickstart/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/speech/quickstart/test/quickstartTest.php b/speech/quickstart/test/quickstartTest.php
index c86f407daa..59eccbd45b 100644
--- a/speech/quickstart/test/quickstartTest.php
+++ b/speech/quickstart/test/quickstartTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/BucketAclCommand.php b/storage/api/src/BucketAclCommand.php
index 8d93c11eaa..c8af19bc83 100644
--- a/storage/api/src/BucketAclCommand.php
+++ b/storage/api/src/BucketAclCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/BucketDefaultAclCommand.php b/storage/api/src/BucketDefaultAclCommand.php
index c7fc8a62df..5f686a459e 100644
--- a/storage/api/src/BucketDefaultAclCommand.php
+++ b/storage/api/src/BucketDefaultAclCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/BucketsCommand.php b/storage/api/src/BucketsCommand.php
index b1ff1df3d8..ab71e1bedb 100644
--- a/storage/api/src/BucketsCommand.php
+++ b/storage/api/src/BucketsCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/EncryptionCommand.php b/storage/api/src/EncryptionCommand.php
index 8ad71c8851..c958630db5 100644
--- a/storage/api/src/EncryptionCommand.php
+++ b/storage/api/src/EncryptionCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/ObjectAclCommand.php b/storage/api/src/ObjectAclCommand.php
index 34c9c4d933..9a92af1752 100644
--- a/storage/api/src/ObjectAclCommand.php
+++ b/storage/api/src/ObjectAclCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/ObjectsCommand.php b/storage/api/src/ObjectsCommand.php
index e792854641..3fcc2ef3aa 100644
--- a/storage/api/src/ObjectsCommand.php
+++ b/storage/api/src/ObjectsCommand.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/add_bucket_acl.php b/storage/api/src/functions/add_bucket_acl.php
index 64fa8bebcb..ec30a8c3c3 100644
--- a/storage/api/src/functions/add_bucket_acl.php
+++ b/storage/api/src/functions/add_bucket_acl.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/add_bucket_default_acl.php b/storage/api/src/functions/add_bucket_default_acl.php
index fbdd7e8a52..0f39726a47 100644
--- a/storage/api/src/functions/add_bucket_default_acl.php
+++ b/storage/api/src/functions/add_bucket_default_acl.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/add_object_acl.php b/storage/api/src/functions/add_object_acl.php
index 36355a2668..0adfa85d87 100644
--- a/storage/api/src/functions/add_object_acl.php
+++ b/storage/api/src/functions/add_object_acl.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/copy_object.php b/storage/api/src/functions/copy_object.php
index 0e7419b335..c9d60c50d2 100644
--- a/storage/api/src/functions/copy_object.php
+++ b/storage/api/src/functions/copy_object.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/create_bucket.php b/storage/api/src/functions/create_bucket.php
index cd99f28c41..e6026a8db0 100644
--- a/storage/api/src/functions/create_bucket.php
+++ b/storage/api/src/functions/create_bucket.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/delete_bucket.php b/storage/api/src/functions/delete_bucket.php
index 1d40bdd08c..f3384c744b 100644
--- a/storage/api/src/functions/delete_bucket.php
+++ b/storage/api/src/functions/delete_bucket.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/delete_bucket_acl.php b/storage/api/src/functions/delete_bucket_acl.php
index 2edd828bf2..b60cbd8487 100644
--- a/storage/api/src/functions/delete_bucket_acl.php
+++ b/storage/api/src/functions/delete_bucket_acl.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/delete_bucket_default_acl.php b/storage/api/src/functions/delete_bucket_default_acl.php
index 2019487c39..f4dd6c2bb3 100644
--- a/storage/api/src/functions/delete_bucket_default_acl.php
+++ b/storage/api/src/functions/delete_bucket_default_acl.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/delete_object.php b/storage/api/src/functions/delete_object.php
index 9d322a3f6b..5e18e2ab5d 100644
--- a/storage/api/src/functions/delete_object.php
+++ b/storage/api/src/functions/delete_object.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/delete_object_acl.php b/storage/api/src/functions/delete_object_acl.php
index c70b2c6ac6..6d00cb6a17 100644
--- a/storage/api/src/functions/delete_object_acl.php
+++ b/storage/api/src/functions/delete_object_acl.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/download_encrypted_object.php b/storage/api/src/functions/download_encrypted_object.php
index 04f283f277..d075e405c2 100644
--- a/storage/api/src/functions/download_encrypted_object.php
+++ b/storage/api/src/functions/download_encrypted_object.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/download_object.php b/storage/api/src/functions/download_object.php
index 9d8afaadfd..ec1a8aacc6 100644
--- a/storage/api/src/functions/download_object.php
+++ b/storage/api/src/functions/download_object.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/generate_encryption_key.php b/storage/api/src/functions/generate_encryption_key.php
index 6a9f1bf988..2b7b3678ee 100644
--- a/storage/api/src/functions/generate_encryption_key.php
+++ b/storage/api/src/functions/generate_encryption_key.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/get_bucket_acl.php b/storage/api/src/functions/get_bucket_acl.php
index 6c201334ed..102ad2f0b6 100644
--- a/storage/api/src/functions/get_bucket_acl.php
+++ b/storage/api/src/functions/get_bucket_acl.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/get_bucket_acl_for_entity.php b/storage/api/src/functions/get_bucket_acl_for_entity.php
index 6051babc02..1a70cbc766 100644
--- a/storage/api/src/functions/get_bucket_acl_for_entity.php
+++ b/storage/api/src/functions/get_bucket_acl_for_entity.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/get_bucket_default_acl.php b/storage/api/src/functions/get_bucket_default_acl.php
index eca279482d..f33932d43e 100644
--- a/storage/api/src/functions/get_bucket_default_acl.php
+++ b/storage/api/src/functions/get_bucket_default_acl.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/get_bucket_default_acl_for_entity.php b/storage/api/src/functions/get_bucket_default_acl_for_entity.php
index 4a016a4359..6d8e1719d7 100644
--- a/storage/api/src/functions/get_bucket_default_acl_for_entity.php
+++ b/storage/api/src/functions/get_bucket_default_acl_for_entity.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/get_object_acl.php b/storage/api/src/functions/get_object_acl.php
index 3957d987e5..5c9fcd062a 100644
--- a/storage/api/src/functions/get_object_acl.php
+++ b/storage/api/src/functions/get_object_acl.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/get_object_acl_for_entity.php b/storage/api/src/functions/get_object_acl_for_entity.php
index 9a2ed0df92..2b8f671e53 100644
--- a/storage/api/src/functions/get_object_acl_for_entity.php
+++ b/storage/api/src/functions/get_object_acl_for_entity.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/list_buckets.php b/storage/api/src/functions/list_buckets.php
index 7552e1cf6e..34122c8a79 100644
--- a/storage/api/src/functions/list_buckets.php
+++ b/storage/api/src/functions/list_buckets.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/list_objects.php b/storage/api/src/functions/list_objects.php
index 4b92af86a6..b2bf76825e 100644
--- a/storage/api/src/functions/list_objects.php
+++ b/storage/api/src/functions/list_objects.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/list_objects_with_prefix.php b/storage/api/src/functions/list_objects_with_prefix.php
index 36dbe49f59..965b8fbef1 100644
--- a/storage/api/src/functions/list_objects_with_prefix.php
+++ b/storage/api/src/functions/list_objects_with_prefix.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/make_public.php b/storage/api/src/functions/make_public.php
index c82e43f6fe..187a390fe3 100644
--- a/storage/api/src/functions/make_public.php
+++ b/storage/api/src/functions/make_public.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/move_object.php b/storage/api/src/functions/move_object.php
index 1183ffcfb3..63d259b2c3 100644
--- a/storage/api/src/functions/move_object.php
+++ b/storage/api/src/functions/move_object.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/object_metadata.php b/storage/api/src/functions/object_metadata.php
index 9b09b1b362..195e6a479e 100644
--- a/storage/api/src/functions/object_metadata.php
+++ b/storage/api/src/functions/object_metadata.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/rotate_encryption_key.php b/storage/api/src/functions/rotate_encryption_key.php
index 18b9d047bc..f95b16a064 100644
--- a/storage/api/src/functions/rotate_encryption_key.php
+++ b/storage/api/src/functions/rotate_encryption_key.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/upload_encrypted_object.php b/storage/api/src/functions/upload_encrypted_object.php
index 4054ac7e94..d5264ce510 100644
--- a/storage/api/src/functions/upload_encrypted_object.php
+++ b/storage/api/src/functions/upload_encrypted_object.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/src/functions/upload_object.php b/storage/api/src/functions/upload_object.php
index 7207371e36..be59cdee5c 100644
--- a/storage/api/src/functions/upload_object.php
+++ b/storage/api/src/functions/upload_object.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/storage.php b/storage/api/storage.php
index f6f7dc8636..f776aed989 100644
--- a/storage/api/storage.php
+++ b/storage/api/storage.php
@@ -1,5 +1,19 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require __DIR__ . '/vendor/autoload.php';
 
 use Google\Cloud\Samples\Storage\ObjectAclCommand;
diff --git a/storage/api/test/BucketAclCommandTest.php b/storage/api/test/BucketAclCommandTest.php
index 3c91d0bc56..b6dba99bed 100644
--- a/storage/api/test/BucketAclCommandTest.php
+++ b/storage/api/test/BucketAclCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/test/BucketDefaultAclCommandTest.php b/storage/api/test/BucketDefaultAclCommandTest.php
index 2469f7469e..0cbc6c148e 100644
--- a/storage/api/test/BucketDefaultAclCommandTest.php
+++ b/storage/api/test/BucketDefaultAclCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/test/BucketsCommandTest.php b/storage/api/test/BucketsCommandTest.php
index 1105ed0de1..8c1398d3c5 100644
--- a/storage/api/test/BucketsCommandTest.php
+++ b/storage/api/test/BucketsCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/test/EncryptionCommandTest.php b/storage/api/test/EncryptionCommandTest.php
index 6cbca9cf2c..3ced568cca 100644
--- a/storage/api/test/EncryptionCommandTest.php
+++ b/storage/api/test/EncryptionCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/test/ObjectAclCommandTest.php b/storage/api/test/ObjectAclCommandTest.php
index d24500a965..345e9a6ea6 100644
--- a/storage/api/test/ObjectAclCommandTest.php
+++ b/storage/api/test/ObjectAclCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/test/ObjectsCommandTest.php b/storage/api/test/ObjectsCommandTest.php
index 3034094bf6..cdb9bfc839 100644
--- a/storage/api/test/ObjectsCommandTest.php
+++ b/storage/api/test/ObjectsCommandTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/storage/api/test/bootstrap.php b/storage/api/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/storage/api/test/bootstrap.php
+++ b/storage/api/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/storage/quickstart/quickstart.php b/storage/quickstart/quickstart.php
index 3b46ff0e50..1972704e77 100644
--- a/storage/quickstart/quickstart.php
+++ b/storage/quickstart/quickstart.php
@@ -1,6 +1,20 @@
 <?php
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-# [START storage_quickstart]
 # Includes the autoloader for libraries installed with composer
 require __DIR__ . '/vendor/autoload.php';
 
diff --git a/storage/quickstart/test/bootstrap.php b/storage/quickstart/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/storage/quickstart/test/bootstrap.php
+++ b/storage/quickstart/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/storage/quickstart/test/quickstartTest.php b/storage/quickstart/test/quickstartTest.php
index a45e38b666..539d1b9be2 100644
--- a/storage/quickstart/test/quickstartTest.php
+++ b/storage/quickstart/test/quickstartTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/translate/api/src/DetectLanguageCommand.php b/translate/api/src/DetectLanguageCommand.php
index 4a80345277..8319eaf1fd 100644
--- a/translate/api/src/DetectLanguageCommand.php
+++ b/translate/api/src/DetectLanguageCommand.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Translate;
 
 use Symfony\Component\Console\Command\Command;
diff --git a/translate/api/src/ListCodesCommand.php b/translate/api/src/ListCodesCommand.php
index 5699c9e7a9..c968300b3c 100644
--- a/translate/api/src/ListCodesCommand.php
+++ b/translate/api/src/ListCodesCommand.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Translate;
 
 use Symfony\Component\Console\Command\Command;
diff --git a/translate/api/src/ListLanguagesCommand.php b/translate/api/src/ListLanguagesCommand.php
index f5ff23a7c9..01752fce9b 100644
--- a/translate/api/src/ListLanguagesCommand.php
+++ b/translate/api/src/ListLanguagesCommand.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Translate;
 
 use Symfony\Component\Console\Command\Command;
diff --git a/translate/api/src/TranslateCommand.php b/translate/api/src/TranslateCommand.php
index e6a828be87..d16b26bc04 100644
--- a/translate/api/src/TranslateCommand.php
+++ b/translate/api/src/TranslateCommand.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Translate;
 
 use Symfony\Component\Console\Command\Command;
diff --git a/translate/api/src/snippets/detect_language.php b/translate/api/src/snippets/detect_language.php
index 6ca2e42bf4..0a3dbc821e 100644
--- a/translate/api/src/snippets/detect_language.php
+++ b/translate/api/src/snippets/detect_language.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 // [START translate_detect_language]
 use Google\Cloud\Translate\TranslateClient;
 
diff --git a/translate/api/src/snippets/list_codes.php b/translate/api/src/snippets/list_codes.php
index f08786b870..07d8e5a907 100644
--- a/translate/api/src/snippets/list_codes.php
+++ b/translate/api/src/snippets/list_codes.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 // [START translate_list_codes]
 use Google\Cloud\Translate\TranslateClient;
 
diff --git a/translate/api/src/snippets/list_languages.php b/translate/api/src/snippets/list_languages.php
index 80480aede4..f1d491da43 100644
--- a/translate/api/src/snippets/list_languages.php
+++ b/translate/api/src/snippets/list_languages.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Translate;
 
 // [START translate_list_language_names]
diff --git a/translate/api/src/snippets/translate.php b/translate/api/src/snippets/translate.php
index b0b6e7321d..71f71468e5 100644
--- a/translate/api/src/snippets/translate.php
+++ b/translate/api/src/snippets/translate.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Translate;
 
 // [START translate_translate_text]
diff --git a/translate/api/test/CommandTest.php b/translate/api/test/CommandTest.php
index 76c709ff73..cf20bfd399 100644
--- a/translate/api/test/CommandTest.php
+++ b/translate/api/test/CommandTest.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Translate;
 
 use Symfony\Component\Console\Application;
diff --git a/translate/api/test/bootstrap.php b/translate/api/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/translate/api/test/bootstrap.php
+++ b/translate/api/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/translate/api/translate.php b/translate/api/translate.php
index 4185d583e6..c8a9f5b6bc 100644
--- a/translate/api/translate.php
+++ b/translate/api/translate.php
@@ -1,5 +1,19 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require __DIR__ . '/vendor/autoload.php';
 
 use Symfony\Component\Console\Application;
diff --git a/translate/quickstart/quickstart.php b/translate/quickstart/quickstart.php
index c20d64898e..7e0a4d2a5d 100644
--- a/translate/quickstart/quickstart.php
+++ b/translate/quickstart/quickstart.php
@@ -1,6 +1,20 @@
 <?php
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-# [START translate_quickstart]
 # Includes the autoloader for libraries installed with composer
 require __DIR__ . '/vendor/autoload.php';
 
diff --git a/translate/quickstart/test/bootstrap.php b/translate/quickstart/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/translate/quickstart/test/bootstrap.php
+++ b/translate/quickstart/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/translate/quickstart/test/quickstartTest.php b/translate/quickstart/test/quickstartTest.php
index 5fffd081ac..ed6cf3e73a 100644
--- a/translate/quickstart/test/quickstartTest.php
+++ b/translate/quickstart/test/quickstartTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/vision/api/src/DetectFaceCommand.php b/vision/api/src/DetectFaceCommand.php
index 8c7828dd5a..976d21c1d3 100644
--- a/vision/api/src/DetectFaceCommand.php
+++ b/vision/api/src/DetectFaceCommand.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Vision;
 
 use Symfony\Component\Console\Command\Command;
diff --git a/vision/api/src/DetectImagePropertyCommand.php b/vision/api/src/DetectImagePropertyCommand.php
index ddd3229e97..faacd702ca 100644
--- a/vision/api/src/DetectImagePropertyCommand.php
+++ b/vision/api/src/DetectImagePropertyCommand.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Vision;
 
 use Symfony\Component\Console\Command\Command;
diff --git a/vision/api/src/DetectLabelCommand.php b/vision/api/src/DetectLabelCommand.php
index 21c4bb2c72..387bd9b9ba 100644
--- a/vision/api/src/DetectLabelCommand.php
+++ b/vision/api/src/DetectLabelCommand.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Vision;
 
 use Symfony\Component\Console\Command\Command;
diff --git a/vision/api/src/DetectLandmarkCommand.php b/vision/api/src/DetectLandmarkCommand.php
index 1aeac5c2dd..f8553339c0 100644
--- a/vision/api/src/DetectLandmarkCommand.php
+++ b/vision/api/src/DetectLandmarkCommand.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Vision;
 
 use Symfony\Component\Console\Command\Command;
diff --git a/vision/api/src/DetectLogoCommand.php b/vision/api/src/DetectLogoCommand.php
index bae642267f..bd9fc9d9ad 100644
--- a/vision/api/src/DetectLogoCommand.php
+++ b/vision/api/src/DetectLogoCommand.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Vision;
 
 use Symfony\Component\Console\Command\Command;
diff --git a/vision/api/src/DetectSafeSearchCommand.php b/vision/api/src/DetectSafeSearchCommand.php
index f41a0b661b..76c309e766 100644
--- a/vision/api/src/DetectSafeSearchCommand.php
+++ b/vision/api/src/DetectSafeSearchCommand.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Vision;
 
 use Symfony\Component\Console\Command\Command;
diff --git a/vision/api/src/DetectTextCommand.php b/vision/api/src/DetectTextCommand.php
index 2f01dd8887..65f7a63b68 100644
--- a/vision/api/src/DetectTextCommand.php
+++ b/vision/api/src/DetectTextCommand.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Vision;
 
 use Symfony\Component\Console\Command\Command;
diff --git a/vision/api/src/snippets/detect_face.php b/vision/api/src/snippets/detect_face.php
index 137f97b8e4..d11d36e351 100644
--- a/vision/api/src/snippets/detect_face.php
+++ b/vision/api/src/snippets/detect_face.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Vision;
 
 // [START face_detection]
diff --git a/vision/api/src/snippets/detect_image_property.php b/vision/api/src/snippets/detect_image_property.php
index ef3da1d963..73d6529e4b 100644
--- a/vision/api/src/snippets/detect_image_property.php
+++ b/vision/api/src/snippets/detect_image_property.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Vision;
 
 // [START image_property_detection]
diff --git a/vision/api/src/snippets/detect_label.php b/vision/api/src/snippets/detect_label.php
index c1de46b45f..c26db8af7c 100644
--- a/vision/api/src/snippets/detect_label.php
+++ b/vision/api/src/snippets/detect_label.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Vision;
 
 // [START label_detection]
diff --git a/vision/api/src/snippets/detect_landmark.php b/vision/api/src/snippets/detect_landmark.php
index b405b0ddf7..bd911d0459 100644
--- a/vision/api/src/snippets/detect_landmark.php
+++ b/vision/api/src/snippets/detect_landmark.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 // [START landmark_detection]
 use Google\Cloud\Vision\VisionClient;
 
diff --git a/vision/api/src/snippets/detect_logo.php b/vision/api/src/snippets/detect_logo.php
index 273fee960b..6d8d68a78f 100644
--- a/vision/api/src/snippets/detect_logo.php
+++ b/vision/api/src/snippets/detect_logo.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Vision;
 
 // [START logo_detection]
diff --git a/vision/api/src/snippets/detect_safe_search.php b/vision/api/src/snippets/detect_safe_search.php
index b285a7f2ea..037eebf3aa 100644
--- a/vision/api/src/snippets/detect_safe_search.php
+++ b/vision/api/src/snippets/detect_safe_search.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 // [START safe_search_detection]
 use Google\Cloud\Vision\VisionClient;
 
diff --git a/vision/api/src/snippets/detect_text.php b/vision/api/src/snippets/detect_text.php
index 14c6d0fe14..cfb8651368 100644
--- a/vision/api/src/snippets/detect_text.php
+++ b/vision/api/src/snippets/detect_text.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 // [START text_detection]
 use Google\Cloud\Vision\VisionClient;
 
diff --git a/vision/api/test/CommandTest.php b/vision/api/test/CommandTest.php
index 9500c1d370..efd6e4e9d2 100644
--- a/vision/api/test/CommandTest.php
+++ b/vision/api/test/CommandTest.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +15,7 @@
  * limitations under the License.
  */
 
+
 namespace Google\Cloud\Samples\Vision;
 
 use Symfony\Component\Console\Application;
diff --git a/vision/api/test/bootstrap.php b/vision/api/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/vision/api/test/bootstrap.php
+++ b/vision/api/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/vision/api/vision.php b/vision/api/vision.php
index c3210c783e..a899bf889c 100644
--- a/vision/api/vision.php
+++ b/vision/api/vision.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/vision/quickstart/quickstart.php b/vision/quickstart/quickstart.php
index 5a6918ab58..67eb6556b4 100644
--- a/vision/quickstart/quickstart.php
+++ b/vision/quickstart/quickstart.php
@@ -1,6 +1,20 @@
 <?php
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-# [START vision_quickstart]
 # Includes the autoloader for libraries installed with composer
 require __DIR__ . '/vendor/autoload.php';
 
diff --git a/vision/quickstart/test/bootstrap.php b/vision/quickstart/test/bootstrap.php
index 6c8c4f51b9..864f1cd1b6 100644
--- a/vision/quickstart/test/bootstrap.php
+++ b/vision/quickstart/test/bootstrap.php
@@ -1,3 +1,17 @@
 <?php
-
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/vision/quickstart/test/quickstartTest.php b/vision/quickstart/test/quickstartTest.php
index 910738006d..e6a2df5f26 100644
--- a/vision/quickstart/test/quickstartTest.php
+++ b/vision/quickstart/test/quickstartTest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,