diff --git a/.eslintrc.js b/.eslintrc.js
index fc844a43c..ea3a7524f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,5 +1,6 @@
 // vim: foldmethod=marker:foldmarker={{{,}}}
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/build/all.py b/build/all.py
index 857adb217..f232c3974 100755
--- a/build/all.py
+++ b/build/all.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2016 Google Inc.  All Rights Reserved.
+# Copyright 2016 Google LLC
 #
 # 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/build/apps.py b/build/apps.py
index e983fb8f4..4ffdede3e 100755
--- a/build/apps.py
+++ b/build/apps.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2016 Google Inc.  All Rights Reserved.
+# Copyright 2016 Google LLC
 #
 # 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/build/build.py b/build/build.py
index e452b484e..253b51f5d 100755
--- a/build/build.py
+++ b/build/build.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2016 Google Inc.  All Rights Reserved.
+# Copyright 2016 Google LLC
 #
 # 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/build/check.py b/build/check.py
index 92b72453a..29f849ca0 100755
--- a/build/check.py
+++ b/build/check.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2016 Google Inc.  All Rights Reserved.
+# Copyright 2016 Google LLC
 #
 # 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/build/checkversion.py b/build/checkversion.py
index 5eedccdf3..4bc770dc2 100755
--- a/build/checkversion.py
+++ b/build/checkversion.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2016 Google Inc.  All Rights Reserved.
+# Copyright 2016 Google LLC
 #
 # 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/build/compiler.py b/build/compiler.py
index 92979966a..5cc9723ad 100644
--- a/build/compiler.py
+++ b/build/compiler.py
@@ -1,4 +1,4 @@
-# Copyright 2016 Google Inc.  All Rights Reserved.
+# Copyright 2016 Google LLC
 #
 # 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/build/conformance.textproto b/build/conformance.textproto
index 936cd41f2..2dbcd372b 100644
--- a/build/conformance.textproto
+++ b/build/conformance.textproto
@@ -1,4 +1,4 @@
-# Copyright 2016 Google Inc.
+# Copyright 2016 Google LLC
 #
 # 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/build/docs.py b/build/docs.py
index f1ac806fe..5f2058ae0 100755
--- a/build/docs.py
+++ b/build/docs.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2016 Google Inc.  All Rights Reserved.
+# Copyright 2016 Google LLC
 #
 # 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/build/eslint-plugin-shaka-rules/arg-comment-spacing.js b/build/eslint-plugin-shaka-rules/arg-comment-spacing.js
index 58007075f..0fcade47c 100644
--- a/build/eslint-plugin-shaka-rules/arg-comment-spacing.js
+++ b/build/eslint-plugin-shaka-rules/arg-comment-spacing.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/build/eslint-plugin-shaka-rules/index.js b/build/eslint-plugin-shaka-rules/index.js
index f11ac7e8c..0b0ba3f32 100644
--- a/build/eslint-plugin-shaka-rules/index.js
+++ b/build/eslint-plugin-shaka-rules/index.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/build/eslint-plugin-shaka-rules/private.js b/build/eslint-plugin-shaka-rules/private.js
index 61e9d228f..f15c44c52 100644
--- a/build/eslint-plugin-shaka-rules/private.js
+++ b/build/eslint-plugin-shaka-rules/private.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/build/gendeps.py b/build/gendeps.py
index 953482081..22f02bac8 100755
--- a/build/gendeps.py
+++ b/build/gendeps.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2016 Google Inc.  All Rights Reserved.
+# Copyright 2016 Google LLC
 #
 # 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/build/generateExterns.js b/build/generateExterns.js
index f735cf280..318b4d1f3 100755
--- a/build/generateExterns.js
+++ b/build/generateExterns.js
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/build/generateLocalizations.py b/build/generateLocalizations.py
index cf3e43db4..6e071b517 100755
--- a/build/generateLocalizations.py
+++ b/build/generateLocalizations.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2018 Google Inc.  All Rights Reserved.
+# Copyright 2018 Google LLC
 #
 # 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/build/pixelsChanged.js b/build/pixelsChanged.js
index d63dcb7d1..0866eb854 100755
--- a/build/pixelsChanged.js
+++ b/build/pixelsChanged.js
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/build/shakaBuildHelpers.py b/build/shakaBuildHelpers.py
index efbc8abc9..3dc5991a4 100644
--- a/build/shakaBuildHelpers.py
+++ b/build/shakaBuildHelpers.py
@@ -1,4 +1,4 @@
-# Copyright 2016 Google Inc.  All Rights Reserved.
+# Copyright 2016 Google LLC
 #
 # 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/build/stats.py b/build/stats.py
index 966a4a97a..ef40ff03b 100755
--- a/build/stats.py
+++ b/build/stats.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2016 Google Inc.  All Rights Reserved.
+# Copyright 2016 Google LLC
 #
 # 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/build/test.py b/build/test.py
index fb3b3493d..a51e8416a 100755
--- a/build/test.py
+++ b/build/test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2016 Google Inc.  All Rights Reserved.
+# Copyright 2016 Google LLC
 #
 # 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/build/updateScreenshots.py b/build/updateScreenshots.py
index e9c9bf142..39bb45d88 100755
--- a/build/updateScreenshots.py
+++ b/build/updateScreenshots.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2016 Google Inc.  All Rights Reserved.
+# Copyright 2016 Google LLC
 #
 # 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/demo/cast_receiver/index.html b/demo/cast_receiver/index.html
index 1d66801e6..74e9520f2 100644
--- a/demo/cast_receiver/index.html
+++ b/demo/cast_receiver/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
- Copyright 2016 Google Inc.
+ Copyright 2016 Google LLC
 
  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/demo/index.html b/demo/index.html
index bdd123893..9cb49301f 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
- Copyright 2016 Google Inc.
+ Copyright 2016 Google LLC
 
  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/docs/jsdoc-plugin.js b/docs/jsdoc-plugin.js
index 826b221bc..b54f01da5 100644
--- a/docs/jsdoc-plugin.js
+++ b/docs/jsdoc-plugin.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/docs/jsdoc-template/static/scripts/show-widget.js b/docs/jsdoc-template/static/scripts/show-widget.js
index 5c993b2c8..b2c2ab658 100644
--- a/docs/jsdoc-template/static/scripts/show-widget.js
+++ b/docs/jsdoc-template/static/scripts/show-widget.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/audiotrack.js b/externs/audiotrack.js
index 1331b5086..58d7ed61f 100644
--- a/externs/audiotrack.js
+++ b/externs/audiotrack.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/awesomplete.js b/externs/awesomplete.js
index d7a117d1d..3c7b762b7 100644
--- a/externs/awesomplete.js
+++ b/externs/awesomplete.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/cache.js b/externs/cache.js
index 569f92a8f..38cce6bf3 100644
--- a/externs/cache.js
+++ b/externs/cache.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/chromecast.js b/externs/chromecast.js
index bff57ae30..ed2ef74c2 100644
--- a/externs/chromecast.js
+++ b/externs/chromecast.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/dialog_polyfill.js b/externs/dialog_polyfill.js
index 184efd45d..98d66edc4 100644
--- a/externs/dialog_polyfill.js
+++ b/externs/dialog_polyfill.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/domstringlist.js b/externs/domstringlist.js
index caa88883e..0f8f4e506 100644
--- a/externs/domstringlist.js
+++ b/externs/domstringlist.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/fetch.js b/externs/fetch.js
index 8d82b964a..dea5c0726 100644
--- a/externs/fetch.js
+++ b/externs/fetch.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/idb.js b/externs/idb.js
index 128b3a358..134011965 100644
--- a/externs/idb.js
+++ b/externs/idb.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/ima.js b/externs/ima.js
index e4bd1ec37..988a56ea6 100644
--- a/externs/ima.js
+++ b/externs/ima.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/jwk_set.js b/externs/jwk_set.js
index ca48dc739..4685c1876 100644
--- a/externs/jwk_set.js
+++ b/externs/jwk_set.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/less.js b/externs/less.js
index ad0dfe2e2..49b628c91 100644
--- a/externs/less.js
+++ b/externs/less.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/mdl.js b/externs/mdl.js
index ae1d539d0..40b43eb86 100644
--- a/externs/mdl.js
+++ b/externs/mdl.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/mediaerror.js b/externs/mediaerror.js
index 5d6dac57c..41c20664f 100644
--- a/externs/mediaerror.js
+++ b/externs/mediaerror.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/mediasession.js b/externs/mediasession.js
index 800b3454a..ab7fec514 100644
--- a/externs/mediasession.js
+++ b/externs/mediasession.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/msmediakeys.js b/externs/msmediakeys.js
index 3838f46f6..5780f0cdd 100644
--- a/externs/msmediakeys.js
+++ b/externs/msmediakeys.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/mux.js b/externs/mux.js
index db38b521a..6e2c89e12 100644
--- a/externs/mux.js
+++ b/externs/mux.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/network_information.js b/externs/network_information.js
index ab423ed7f..d9d92e425 100644
--- a/externs/network_information.js
+++ b/externs/network_information.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/pictureinpicture.js b/externs/pictureinpicture.js
index c2b31181b..6bd16b6b4 100644
--- a/externs/pictureinpicture.js
+++ b/externs/pictureinpicture.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/prefixed_eme.js b/externs/prefixed_eme.js
index 46588da8a..4f09a3364 100644
--- a/externs/prefixed_eme.js
+++ b/externs/prefixed_eme.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/shaka/abortable.js b/externs/shaka/abortable.js
index 6013237a0..093efd18f 100644
--- a/externs/shaka/abortable.js
+++ b/externs/shaka/abortable.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/shaka/abr_manager.js b/externs/shaka/abr_manager.js
index 1b05798d8..56a7444d9 100644
--- a/externs/shaka/abr_manager.js
+++ b/externs/shaka/abr_manager.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/shaka/ads.js b/externs/shaka/ads.js
index 772094a25..867d4e067 100644
--- a/externs/shaka/ads.js
+++ b/externs/shaka/ads.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/shaka/error.js b/externs/shaka/error.js
index b527b9407..5001f6828 100644
--- a/externs/shaka/error.js
+++ b/externs/shaka/error.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/shaka/manifest.js b/externs/shaka/manifest.js
index 229140ae8..63974d670 100644
--- a/externs/shaka/manifest.js
+++ b/externs/shaka/manifest.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/shaka/manifest_parser.js b/externs/shaka/manifest_parser.js
index e42dc65bf..af3cb74c2 100644
--- a/externs/shaka/manifest_parser.js
+++ b/externs/shaka/manifest_parser.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/shaka/mp4_parser.js b/externs/shaka/mp4_parser.js
index 049b1bc8f..6383f1c23 100644
--- a/externs/shaka/mp4_parser.js
+++ b/externs/shaka/mp4_parser.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/shaka/namespace.js b/externs/shaka/namespace.js
index 64a2ba7c0..0c20126b9 100644
--- a/externs/shaka/namespace.js
+++ b/externs/shaka/namespace.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/shaka/net.js b/externs/shaka/net.js
index 6f5ec0a66..df76a908a 100644
--- a/externs/shaka/net.js
+++ b/externs/shaka/net.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/shaka/offline.js b/externs/shaka/offline.js
index a50460bcd..c4d44a531 100644
--- a/externs/shaka/offline.js
+++ b/externs/shaka/offline.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/shaka/offline_compat_v1.js b/externs/shaka/offline_compat_v1.js
index ee452370a..6bf8643bb 100644
--- a/externs/shaka/offline_compat_v1.js
+++ b/externs/shaka/offline_compat_v1.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/shaka/offline_compat_v2.js b/externs/shaka/offline_compat_v2.js
index 67e699916..203028eca 100644
--- a/externs/shaka/offline_compat_v2.js
+++ b/externs/shaka/offline_compat_v2.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/shaka/player.js b/externs/shaka/player.js
index 930567389..32564ebe0 100644
--- a/externs/shaka/player.js
+++ b/externs/shaka/player.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/shaka/text.js b/externs/shaka/text.js
index fc4e3a402..85b4fdf15 100644
--- a/externs/shaka/text.js
+++ b/externs/shaka/text.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/svgelement.js b/externs/svgelement.js
index 333ed7bf3..3bcaa2073 100644
--- a/externs/svgelement.js
+++ b/externs/svgelement.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/texttrack.js b/externs/texttrack.js
index fa37d9dff..37fc78159 100644
--- a/externs/texttrack.js
+++ b/externs/texttrack.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/tippy.js b/externs/tippy.js
index cf8785c80..799b00694 100644
--- a/externs/tippy.js
+++ b/externs/tippy.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/trackevent.js b/externs/trackevent.js
index ffbb1f2d9..3815bd269 100644
--- a/externs/trackevent.js
+++ b/externs/trackevent.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/videotrack.js b/externs/videotrack.js
index 313ebf261..951aba50e 100644
--- a/externs/videotrack.js
+++ b/externs/videotrack.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/webkitmediakeys.js b/externs/webkitmediakeys.js
index a45eafc35..a9768ad64 100644
--- a/externs/webkitmediakeys.js
+++ b/externs/webkitmediakeys.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/externs/xmlhttprequest.js b/externs/xmlhttprequest.js
index 573c191d6..7cbd716d9 100644
--- a/externs/xmlhttprequest.js
+++ b/externs/xmlhttprequest.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/index.html b/index.html
index f54cfdc6c..81b670797 100644
--- a/index.html
+++ b/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
- Copyright 2016 Google Inc.
+ Copyright 2016 Google LLC
 
  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/karma.conf.js b/karma.conf.js
index d1f9e2e61..f292da532 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/support.html b/support.html
index 65f741a3a..9b97987e1 100644
--- a/support.html
+++ b/support.html
@@ -1,7 +1,7 @@
 <!-- htmlhint style-disabled:false -->
 <!DOCTYPE html>
 <!--
- Copyright 2016 Google Inc.
+ Copyright 2016 Google LLC
 
  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/test/abr/simple_abr_manager_unit.js b/test/abr/simple_abr_manager_unit.js
index 38503327e..d7b8f70ff 100644
--- a/test/abr/simple_abr_manager_unit.js
+++ b/test/abr/simple_abr_manager_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/ads/ad_manager_unit.js b/test/ads/ad_manager_unit.js
index a2ec645c1..d2c58a81a 100644
--- a/test/ads/ad_manager_unit.js
+++ b/test/ads/ad_manager_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/assumptions/uint8_array_unit.js b/test/assumptions/uint8_array_unit.js
index be9ae3bf7..12a725cf8 100644
--- a/test/assumptions/uint8_array_unit.js
+++ b/test/assumptions/uint8_array_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/cast/cast_proxy_unit.js b/test/cast/cast_proxy_unit.js
index b4fb86e2c..8ae9ca5e9 100644
--- a/test/cast/cast_proxy_unit.js
+++ b/test/cast/cast_proxy_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/cast/cast_receiver_integration.js b/test/cast/cast_receiver_integration.js
index 3711e7c2f..129ba89d8 100644
--- a/test/cast/cast_receiver_integration.js
+++ b/test/cast/cast_receiver_integration.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/cast/cast_receiver_unit.js b/test/cast/cast_receiver_unit.js
index 0e8787081..ae3b6aa4b 100644
--- a/test/cast/cast_receiver_unit.js
+++ b/test/cast/cast_receiver_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/cast/cast_sender_unit.js b/test/cast/cast_sender_unit.js
index b97392671..2602fc54d 100644
--- a/test/cast/cast_sender_unit.js
+++ b/test/cast/cast_sender_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/cast/cast_utils_unit.js b/test/cast/cast_utils_unit.js
index c52c8b6e5..104de5eb2 100644
--- a/test/cast/cast_utils_unit.js
+++ b/test/cast/cast_utils_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/dash/dash_parser_content_protection_unit.js b/test/dash/dash_parser_content_protection_unit.js
index dcf438f8e..cdc728a1e 100644
--- a/test/dash/dash_parser_content_protection_unit.js
+++ b/test/dash/dash_parser_content_protection_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/dash/dash_parser_live_unit.js b/test/dash/dash_parser_live_unit.js
index 93c038835..a18901344 100644
--- a/test/dash/dash_parser_live_unit.js
+++ b/test/dash/dash_parser_live_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/dash/dash_parser_manifest_unit.js b/test/dash/dash_parser_manifest_unit.js
index 48038d1d5..1c5a967fb 100644
--- a/test/dash/dash_parser_manifest_unit.js
+++ b/test/dash/dash_parser_manifest_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/dash/dash_parser_segment_base_unit.js b/test/dash/dash_parser_segment_base_unit.js
index ff4376ddc..db4d4ef16 100644
--- a/test/dash/dash_parser_segment_base_unit.js
+++ b/test/dash/dash_parser_segment_base_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/dash/dash_parser_segment_list_unit.js b/test/dash/dash_parser_segment_list_unit.js
index ddc5d39e8..c1b9f2d78 100644
--- a/test/dash/dash_parser_segment_list_unit.js
+++ b/test/dash/dash_parser_segment_list_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/dash/dash_parser_segment_template_unit.js b/test/dash/dash_parser_segment_template_unit.js
index 45d378c96..47328d5cf 100644
--- a/test/dash/dash_parser_segment_template_unit.js
+++ b/test/dash/dash_parser_segment_template_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/dash/mpd_utils_unit.js b/test/dash/mpd_utils_unit.js
index 94544e4fb..7365a526f 100644
--- a/test/dash/mpd_utils_unit.js
+++ b/test/dash/mpd_utils_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/demo/demo_unit.js b/test/demo/demo_unit.js
index 6949a85c3..24c12a680 100644
--- a/test/demo/demo_unit.js
+++ b/test/demo/demo_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/deprecate/enforcer_unit.js b/test/deprecate/enforcer_unit.js
index 3be0eff78..1968d1d0b 100644
--- a/test/deprecate/enforcer_unit.js
+++ b/test/deprecate/enforcer_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/deprecate/version_unit.js b/test/deprecate/version_unit.js
index 3d9d0929f..b1962ef2b 100644
--- a/test/deprecate/version_unit.js
+++ b/test/deprecate/version_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/hls/hls_live_unit.js b/test/hls/hls_live_unit.js
index afc67bfaf..aaa15e4bf 100644
--- a/test/hls/hls_live_unit.js
+++ b/test/hls/hls_live_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/hls/hls_parser_unit.js b/test/hls/hls_parser_unit.js
index 3f0c0d715..e4dad8e72 100644
--- a/test/hls/hls_parser_unit.js
+++ b/test/hls/hls_parser_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/hls/manifest_text_parser_unit.js b/test/hls/manifest_text_parser_unit.js
index 971c58bd1..614ba372f 100644
--- a/test/hls/manifest_text_parser_unit.js
+++ b/test/hls/manifest_text_parser_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/adaptation_set_criteria_unit.js b/test/media/adaptation_set_criteria_unit.js
index bb87c84db..9bcd96310 100644
--- a/test/media/adaptation_set_criteria_unit.js
+++ b/test/media/adaptation_set_criteria_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/adaptation_set_unit.js b/test/media/adaptation_set_unit.js
index a40e9bec2..404a2c837 100644
--- a/test/media/adaptation_set_unit.js
+++ b/test/media/adaptation_set_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/buffering_observer_unit.js b/test/media/buffering_observer_unit.js
index a536e307a..6196a642e 100644
--- a/test/media/buffering_observer_unit.js
+++ b/test/media/buffering_observer_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/drm_engine_integration.js b/test/media/drm_engine_integration.js
index 9351faf2c..7267a8cb2 100644
--- a/test/media/drm_engine_integration.js
+++ b/test/media/drm_engine_integration.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/drm_engine_unit.js b/test/media/drm_engine_unit.js
index 5648c91bd..40a594301 100644
--- a/test/media/drm_engine_unit.js
+++ b/test/media/drm_engine_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/manifest_parser_unit.js b/test/media/manifest_parser_unit.js
index 64115e0d5..3f9bb1c2a 100644
--- a/test/media/manifest_parser_unit.js
+++ b/test/media/manifest_parser_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/media_source_engine_integration.js b/test/media/media_source_engine_integration.js
index 9569ab618..c55c90911 100644
--- a/test/media/media_source_engine_integration.js
+++ b/test/media/media_source_engine_integration.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/media_source_engine_unit.js b/test/media/media_source_engine_unit.js
index 77c85105d..ed6e54661 100644
--- a/test/media/media_source_engine_unit.js
+++ b/test/media/media_source_engine_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/mp4_segment_index_parser_unit.js b/test/media/mp4_segment_index_parser_unit.js
index 7d2811294..c67cf465b 100644
--- a/test/media/mp4_segment_index_parser_unit.js
+++ b/test/media/mp4_segment_index_parser_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/play_rate_controller_unit.js b/test/media/play_rate_controller_unit.js
index 75551794a..4ff5c86cf 100644
--- a/test/media/play_rate_controller_unit.js
+++ b/test/media/play_rate_controller_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/playhead_unit.js b/test/media/playhead_unit.js
index de9e989d6..847ff54dc 100644
--- a/test/media/playhead_unit.js
+++ b/test/media/playhead_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/presentation_timeline_unit.js b/test/media/presentation_timeline_unit.js
index 06d02cb88..6ba50b00d 100644
--- a/test/media/presentation_timeline_unit.js
+++ b/test/media/presentation_timeline_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/region_observer_unit.js b/test/media/region_observer_unit.js
index 7d649fa70..8610ee011 100644
--- a/test/media/region_observer_unit.js
+++ b/test/media/region_observer_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/region_timeline_unit.js b/test/media/region_timeline_unit.js
index 4c901e0de..ebb0a0bc9 100644
--- a/test/media/region_timeline_unit.js
+++ b/test/media/region_timeline_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/segment_index_unit.js b/test/media/segment_index_unit.js
index 05c5025d6..5c1566f0c 100644
--- a/test/media/segment_index_unit.js
+++ b/test/media/segment_index_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/segment_reference_unit.js b/test/media/segment_reference_unit.js
index 86fd45d95..381535558 100644
--- a/test/media/segment_reference_unit.js
+++ b/test/media/segment_reference_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/stall_detector_unit.js b/test/media/stall_detector_unit.js
index ecc2ac7e0..a44edb4f7 100644
--- a/test/media/stall_detector_unit.js
+++ b/test/media/stall_detector_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/streaming_engine_integration.js b/test/media/streaming_engine_integration.js
index 1f63c72b7..bf9ab589f 100644
--- a/test/media/streaming_engine_integration.js
+++ b/test/media/streaming_engine_integration.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/streaming_engine_unit.js b/test/media/streaming_engine_unit.js
index 8f827c0e2..843044dbb 100644
--- a/test/media/streaming_engine_unit.js
+++ b/test/media/streaming_engine_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/time_ranges_utils_unit.js b/test/media/time_ranges_utils_unit.js
index 37aa820fe..fbc343411 100644
--- a/test/media/time_ranges_utils_unit.js
+++ b/test/media/time_ranges_utils_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/transmuxer_integration.js b/test/media/transmuxer_integration.js
index 6e2c49494..10c0c7190 100644
--- a/test/media/transmuxer_integration.js
+++ b/test/media/transmuxer_integration.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/media/webm_segment_index_parser_unit.js b/test/media/webm_segment_index_parser_unit.js
index e39c17587..6050f7af4 100644
--- a/test/media/webm_segment_index_parser_unit.js
+++ b/test/media/webm_segment_index_parser_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/net/data_uri_plugin_unit.js b/test/net/data_uri_plugin_unit.js
index 946e550b5..6ed0f87be 100644
--- a/test/net/data_uri_plugin_unit.js
+++ b/test/net/data_uri_plugin_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/net/http_plugin_unit.js b/test/net/http_plugin_unit.js
index 0c486bea5..07d87c219 100644
--- a/test/net/http_plugin_unit.js
+++ b/test/net/http_plugin_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/net/networking_engine_unit.js b/test/net/networking_engine_unit.js
index 53992f66e..cd4429f92 100644
--- a/test/net/networking_engine_unit.js
+++ b/test/net/networking_engine_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/offline/download_progress_estimator_unit.js b/test/offline/download_progress_estimator_unit.js
index e32b9ad26..1cc0513f4 100644
--- a/test/offline/download_progress_estimator_unit.js
+++ b/test/offline/download_progress_estimator_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/offline/indexeddb_storage_unit.js b/test/offline/indexeddb_storage_unit.js
index bb32e2e6b..f210b9b49 100644
--- a/test/offline/indexeddb_storage_unit.js
+++ b/test/offline/indexeddb_storage_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/offline/manifest_convert_unit.js b/test/offline/manifest_convert_unit.js
index 79e4ee57b..d3d0b6f85 100644
--- a/test/offline/manifest_convert_unit.js
+++ b/test/offline/manifest_convert_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/offline/offline_integration.js b/test/offline/offline_integration.js
index aed5cdc05..1e9e69326 100644
--- a/test/offline/offline_integration.js
+++ b/test/offline/offline_integration.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/offline/offline_manifest_parser_unit.js b/test/offline/offline_manifest_parser_unit.js
index d8c9b6d4f..97c73bb86 100644
--- a/test/offline/offline_manifest_parser_unit.js
+++ b/test/offline/offline_manifest_parser_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/offline/offline_scheme_unit.js b/test/offline/offline_scheme_unit.js
index 8d5d4f141..95c180f5e 100644
--- a/test/offline/offline_scheme_unit.js
+++ b/test/offline/offline_scheme_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/offline/offline_uri_unit.js b/test/offline/offline_uri_unit.js
index 073aa08b2..85f348b86 100644
--- a/test/offline/offline_uri_unit.js
+++ b/test/offline/offline_uri_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/offline/storage_compatibility_unit.js b/test/offline/storage_compatibility_unit.js
index bebc321ee..3e124add4 100644
--- a/test/offline/storage_compatibility_unit.js
+++ b/test/offline/storage_compatibility_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/offline/storage_integration.js b/test/offline/storage_integration.js
index 97906a87a..00ad1e040 100644
--- a/test/offline/storage_integration.js
+++ b/test/offline/storage_integration.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/player_external.js b/test/player_external.js
index 771a8e9ce..7ec0ccbb3 100644
--- a/test/player_external.js
+++ b/test/player_external.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/player_integration.js b/test/player_integration.js
index ef7fbe0d8..e32193a38 100644
--- a/test/player_integration.js
+++ b/test/player_integration.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/player_load_graph_integration.js b/test/player_load_graph_integration.js
index 9bfa83d99..79c0aa2a5 100644
--- a/test/player_load_graph_integration.js
+++ b/test/player_load_graph_integration.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/player_src_equals_external.js b/test/player_src_equals_external.js
index 4ae7189dc..cf9959b4e 100644
--- a/test/player_src_equals_external.js
+++ b/test/player_src_equals_external.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/player_src_equals_integration.js b/test/player_src_equals_integration.js
index a63ddf459..4e3d7f984 100644
--- a/test/player_src_equals_integration.js
+++ b/test/player_src_equals_integration.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/player_unit.js b/test/player_unit.js
index 3de6076d1..df9674b07 100644
--- a/test/player_unit.js
+++ b/test/player_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/routing/walker_unit.js b/test/routing/walker_unit.js
index c8a49e6b1..cce94f0a5 100644
--- a/test/routing/walker_unit.js
+++ b/test/routing/walker_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/assets/screenshots/review.html b/test/test/assets/screenshots/review.html
index 6c7c7991f..afae8f2d6 100644
--- a/test/test/assets/screenshots/review.html
+++ b/test/test/assets/screenshots/review.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
- Copyright 2016 Google Inc.
+ Copyright 2016 Google LLC
 
  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/test/test/boot.js b/test/test/boot.js
index 581eb3ff3..c36bafbd4 100644
--- a/test/test/boot.js
+++ b/test/test/boot.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/externs/filters.js b/test/test/externs/filters.js
index f4cf9361f..2417299ea 100644
--- a/test/test/externs/filters.js
+++ b/test/test/externs/filters.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/externs/fontfaceonload.js b/test/test/externs/fontfaceonload.js
index eacea20f0..3e4f3a43a 100644
--- a/test/test/externs/fontfaceonload.js
+++ b/test/test/externs/fontfaceonload.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/externs/jasmine.js b/test/test/externs/jasmine.js
index 323ef9c83..f9f7bbb47 100644
--- a/test/test/externs/jasmine.js
+++ b/test/test/externs/jasmine.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/externs/karma.js b/test/test/externs/karma.js
index 260517f2f..a98a11e9d 100644
--- a/test/test/externs/karma.js
+++ b/test/test/externs/karma.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/externs/require.js b/test/test/externs/require.js
index eb56b897b..21be7c829 100644
--- a/test/test/externs/require.js
+++ b/test/test/externs/require.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/externs/sprintf.js b/test/test/externs/sprintf.js
index 7178790c2..958b7ca0e 100644
--- a/test/test/externs/sprintf.js
+++ b/test/test/externs/sprintf.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/canned_idb.js b/test/test/util/canned_idb.js
index cebec087d..76eb119c6 100644
--- a/test/test/util/canned_idb.js
+++ b/test/test/util/canned_idb.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/dash_parser_util.js b/test/test/util/dash_parser_util.js
index 44f7e26e0..15cd16593 100644
--- a/test/test/util/dash_parser_util.js
+++ b/test/test/util/dash_parser_util.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/fake_ad.js b/test/test/util/fake_ad.js
index 33261b396..59d850350 100644
--- a/test/test/util/fake_ad.js
+++ b/test/test/util/fake_ad.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/fake_ad_manager.js b/test/test/util/fake_ad_manager.js
index 117f3d5d9..f3846e2fe 100644
--- a/test/test/util/fake_ad_manager.js
+++ b/test/test/util/fake_ad_manager.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/fake_demo_main.js b/test/test/util/fake_demo_main.js
index a3bb70012..279042312 100644
--- a/test/test/util/fake_demo_main.js
+++ b/test/test/util/fake_demo_main.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/fake_drm_engine.js b/test/test/util/fake_drm_engine.js
index 97887e04b..597fa13b8 100644
--- a/test/test/util/fake_drm_engine.js
+++ b/test/test/util/fake_drm_engine.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/fake_media_source_engine.js b/test/test/util/fake_media_source_engine.js
index 39011c950..c99e4bb30 100644
--- a/test/test/util/fake_media_source_engine.js
+++ b/test/test/util/fake_media_source_engine.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/fake_networking_engine.js b/test/test/util/fake_networking_engine.js
index a5f2ccde4..b89dd84d6 100644
--- a/test/test/util/fake_networking_engine.js
+++ b/test/test/util/fake_networking_engine.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/fake_text_displayer.js b/test/test/util/fake_text_displayer.js
index 59a910410..b0aa192cc 100644
--- a/test/test/util/fake_text_displayer.js
+++ b/test/test/util/fake_text_displayer.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/indexeddb_utils.js b/test/test/util/indexeddb_utils.js
index 41cf7e8e3..51c148e38 100644
--- a/test/test/util/indexeddb_utils.js
+++ b/test/test/util/indexeddb_utils.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/jasmine_fetch.js b/test/test/util/jasmine_fetch.js
index 92c831976..9a2314ad9 100644
--- a/test/test/util/jasmine_fetch.js
+++ b/test/test/util/jasmine_fetch.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/manifest_generator.js b/test/test/util/manifest_generator.js
index 5ce031ac6..1c3335311 100644
--- a/test/test/util/manifest_generator.js
+++ b/test/test/util/manifest_generator.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/manifest_parser_util.js b/test/test/util/manifest_parser_util.js
index 7cd581873..102be2282 100644
--- a/test/test/util/manifest_parser_util.js
+++ b/test/test/util/manifest_parser_util.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/offline_utils.js b/test/test/util/offline_utils.js
index 7ab5b9158..465368d2c 100644
--- a/test/test/util/offline_utils.js
+++ b/test/test/util/offline_utils.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/simple_fakes.js b/test/test/util/simple_fakes.js
index e7004eee4..4ba9e4e02 100644
--- a/test/test/util/simple_fakes.js
+++ b/test/test/util/simple_fakes.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/stream_generator.js b/test/test/util/stream_generator.js
index 4cecf16a5..aab23d58e 100644
--- a/test/test/util/stream_generator.js
+++ b/test/test/util/stream_generator.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/streaming_engine_util.js b/test/test/util/streaming_engine_util.js
index 6ac897d6e..b0d545991 100644
--- a/test/test/util/streaming_engine_util.js
+++ b/test/test/util/streaming_engine_util.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/test_scheme.js b/test/test/util/test_scheme.js
index 0971ed4ff..4a9a160ee 100644
--- a/test/test/util/test_scheme.js
+++ b/test/test/util/test_scheme.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/ui_utils.js b/test/test/util/ui_utils.js
index 694b02053..64b5ef6e0 100644
--- a/test/test/util/ui_utils.js
+++ b/test/test/util/ui_utils.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/util.js b/test/test/util/util.js
index 30d5829da..c7ac6c4e5 100644
--- a/test/test/util/util.js
+++ b/test/test/util/util.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/test/util/waiter.js b/test/test/util/waiter.js
index 279f66917..5b45b1abf 100644
--- a/test/test/util/waiter.js
+++ b/test/test/util/waiter.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/text/cue_integration.js b/test/text/cue_integration.js
index b88057256..0ffd7049c 100644
--- a/test/text/cue_integration.js
+++ b/test/text/cue_integration.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/text/mp4_ttml_parser_unit.js b/test/text/mp4_ttml_parser_unit.js
index 51c1b8c8e..4b8002d63 100644
--- a/test/text/mp4_ttml_parser_unit.js
+++ b/test/text/mp4_ttml_parser_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/text/mp4_vtt_parser_unit.js b/test/text/mp4_vtt_parser_unit.js
index 37bad6679..38b758916 100644
--- a/test/text/mp4_vtt_parser_unit.js
+++ b/test/text/mp4_vtt_parser_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/text/simple_text_displayer_unit.js b/test/text/simple_text_displayer_unit.js
index 4dd1455bf..d29afe228 100644
--- a/test/text/simple_text_displayer_unit.js
+++ b/test/text/simple_text_displayer_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/text/text_engine_unit.js b/test/text/text_engine_unit.js
index c40d48475..57abf7e76 100644
--- a/test/text/text_engine_unit.js
+++ b/test/text/text_engine_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/text/text_track_integration.js b/test/text/text_track_integration.js
index 4ba3f589d..08079c47e 100644
--- a/test/text/text_track_integration.js
+++ b/test/text/text_track_integration.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/text/ttml_text_parser_unit.js b/test/text/ttml_text_parser_unit.js
index b4d8b6a25..7d5bdd578 100644
--- a/test/text/ttml_text_parser_unit.js
+++ b/test/text/ttml_text_parser_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/text/ui_text_displayer_unit.js b/test/text/ui_text_displayer_unit.js
index b572e37fe..ee81c749d 100644
--- a/test/text/ui_text_displayer_unit.js
+++ b/test/text/ui_text_displayer_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/text/vtt_text_parser_unit.js b/test/text/vtt_text_parser_unit.js
index 88aee8922..aea2e315a 100644
--- a/test/text/vtt_text_parser_unit.js
+++ b/test/text/vtt_text_parser_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/ui/ad_ui_unit.js b/test/ui/ad_ui_unit.js
index 67cc36f70..35cc66e4b 100644
--- a/test/ui/ad_ui_unit.js
+++ b/test/ui/ad_ui_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/ui/localization_unit.js b/test/ui/localization_unit.js
index 3ce1faa03..d8489e0aa 100644
--- a/test/ui/localization_unit.js
+++ b/test/ui/localization_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/ui/text_displayer_layout_unit.js b/test/ui/text_displayer_layout_unit.js
index 53427f982..c4ab5e6d8 100644
--- a/test/ui/text_displayer_layout_unit.js
+++ b/test/ui/text_displayer_layout_unit.js
@@ -1,18 +1,7 @@
-/**
- * @license
- * Copyright 2016 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this 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.
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 const Util = shaka.test.Util;
diff --git a/test/ui/text_displayer_unit.js b/test/ui/text_displayer_unit.js
index b572e37fe..ee81c749d 100644
--- a/test/ui/text_displayer_unit.js
+++ b/test/ui/text_displayer_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/ui/ui_customization_unit.js b/test/ui/ui_customization_unit.js
index e373d294b..e4cf525ae 100644
--- a/test/ui/ui_customization_unit.js
+++ b/test/ui/ui_customization_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/ui/ui_integration.js b/test/ui/ui_integration.js
index 1f50e6eb9..d4c6968fb 100644
--- a/test/ui/ui_integration.js
+++ b/test/ui/ui_integration.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/ui/ui_unit.js b/test/ui/ui_unit.js
index a513ee19b..9b0e9f082 100644
--- a/test/ui/ui_unit.js
+++ b/test/ui/ui_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/abortable_operation_unit.js b/test/util/abortable_operation_unit.js
index 293bd6d5b..53ab7ad77 100644
--- a/test/util/abortable_operation_unit.js
+++ b/test/util/abortable_operation_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/array_utils_unit.js b/test/util/array_utils_unit.js
index 50a75809b..6ded6d042 100644
--- a/test/util/array_utils_unit.js
+++ b/test/util/array_utils_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/buffer_utils_unit.js b/test/util/buffer_utils_unit.js
index 97dbb3d05..a43f60d4b 100644
--- a/test/util/buffer_utils_unit.js
+++ b/test/util/buffer_utils_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/data_view_reader_unit.js b/test/util/data_view_reader_unit.js
index 79f67c454..6bc7322a8 100644
--- a/test/util/data_view_reader_unit.js
+++ b/test/util/data_view_reader_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/ebml_parser_unit.js b/test/util/ebml_parser_unit.js
index eadc7e0ce..b4ae1d477 100644
--- a/test/util/ebml_parser_unit.js
+++ b/test/util/ebml_parser_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/event_manager_unit.js b/test/util/event_manager_unit.js
index 02c9475e9..196b3accf 100644
--- a/test/util/event_manager_unit.js
+++ b/test/util/event_manager_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/fake_event_target_unit.js b/test/util/fake_event_target_unit.js
index 3716fe9a7..a8bb1b475 100644
--- a/test/util/fake_event_target_unit.js
+++ b/test/util/fake_event_target_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/iterables_unit.js b/test/util/iterables_unit.js
index ec7ac40a6..3187b7aff 100644
--- a/test/util/iterables_unit.js
+++ b/test/util/iterables_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/language_utils_unit.js b/test/util/language_utils_unit.js
index 5b61005df..711caf5c6 100644
--- a/test/util/language_utils_unit.js
+++ b/test/util/language_utils_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/manifest_parser_utils_unit.js b/test/util/manifest_parser_utils_unit.js
index 25fc38225..e12220bee 100644
--- a/test/util/manifest_parser_utils_unit.js
+++ b/test/util/manifest_parser_utils_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/mp4_parser_unit.js b/test/util/mp4_parser_unit.js
index 6d755e219..17a5300c0 100644
--- a/test/util/mp4_parser_unit.js
+++ b/test/util/mp4_parser_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/object_utils_unit.js b/test/util/object_utils_unit.js
index 2092b785b..496ae34ab 100644
--- a/test/util/object_utils_unit.js
+++ b/test/util/object_utils_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/periods_unit.js b/test/util/periods_unit.js
index b733bb256..7a09f53da 100644
--- a/test/util/periods_unit.js
+++ b/test/util/periods_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/pssh_unit.js b/test/util/pssh_unit.js
index a2fdffd53..730900574 100644
--- a/test/util/pssh_unit.js
+++ b/test/util/pssh_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/state_history_unit.js b/test/util/state_history_unit.js
index 45e418a51..317e1ac69 100644
--- a/test/util/state_history_unit.js
+++ b/test/util/state_history_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/stream_utils_unit.js b/test/util/stream_utils_unit.js
index fbcc81774..35d2660ef 100644
--- a/test/util/stream_utils_unit.js
+++ b/test/util/stream_utils_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/string_utils_unit.js b/test/util/string_utils_unit.js
index 48ed99b5f..1f8cee938 100644
--- a/test/util/string_utils_unit.js
+++ b/test/util/string_utils_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/text_parser_unit.js b/test/util/text_parser_unit.js
index c52a4264b..5bd877577 100644
--- a/test/util/text_parser_unit.js
+++ b/test/util/text_parser_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/test/util/xml_utils_unit.js b/test/util/xml_utils_unit.js
index 59d7501c6..2cb75318c 100644
--- a/test/util/xml_utils_unit.js
+++ b/test/util/xml_utils_unit.js
@@ -1,4 +1,5 @@
-/** @license
+/*! @license
+ * Shaka Player
  * Copyright 2016 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */