diff --git a/app.js b/app.js
index ef82f26af..4c6c1166c 100644
--- a/app.js
+++ b/app.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,12 +13,13 @@
  * 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.
- *
- * @fileoverview Implements the application layer of the test application.
  */
 
 
-/** @class */
+/**
+ * The application layer of the test application.
+ * @class
+ */
 var app = function() {};
 
 
diff --git a/controls.js b/controls.js
index 1f0ca7453..e06c8a8c6 100644
--- a/controls.js
+++ b/controls.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,12 +13,13 @@
  * 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.
- *
- * @fileoverview Implements the video controls overlay.
  */
 
 
-/** @class */
+/**
+ * The video controls overlay for the test app.
+ * @class
+ */
 var playerControls = function() {};
 
 
diff --git a/externs/fullscreen.js b/externs/fullscreen.js
index 66f53d246..2dac8b719 100644
--- a/externs/fullscreen.js
+++ b/externs/fullscreen.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +13,9 @@
  * 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.
- *
+ */
+
+/**
  * @fileoverview Externs for prefixed fullscreen methods.
  * @externs
  */
diff --git a/externs/htmltrackelement.js b/externs/htmltrackelement.js
index 5c73c24d8..024d6c1c4 100644
--- a/externs/htmltrackelement.js
+++ b/externs/htmltrackelement.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,10 @@
  * 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.
- *
- * @fileoverview HTMLTrackElement externs.
+ */
+
+/**
+ * @fileoverview Externs for HTMLTrackElement.
  * @externs
  */
 
diff --git a/externs/jwk_set.js b/externs/jwk_set.js
index 0d602d065..f1f0ace57 100644
--- a/externs/jwk_set.js
+++ b/externs/jwk_set.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +13,9 @@
  * 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.
- *
+ */
+
+/**
  * @fileoverview Externs for JWK set.
  * @externs
  */
diff --git a/externs/mediakeys.js b/externs/mediakeys.js
index 5424a4ecd..8183a3175 100644
--- a/externs/mediakeys.js
+++ b/externs/mediakeys.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,9 +13,12 @@
  * 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.
+ */
+
+/**
+ * @fileoverview Externs for MediaKeys based on
+ * {@link http://goo.gl/blgtZZ EME draft 12 March 2015}
  *
- * @fileoverview MediaKey externs.
- * Based on {@link http://goo.gl/blgtZZ EME draft 12 March 2015}.
  * @externs
  */
 
diff --git a/externs/prefixed_eme.js b/externs/prefixed_eme.js
index 261631e0c..2edbb6862 100644
--- a/externs/prefixed_eme.js
+++ b/externs/prefixed_eme.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +13,9 @@
  * 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.
- *
+ */
+
+/**
  * @fileoverview Externs for prefixed EME v0.1b.
  * @externs
  */
diff --git a/externs/xmlhttprequest.js b/externs/xmlhttprequest.js
index c60b8f470..db02f0686 100644
--- a/externs/xmlhttprequest.js
+++ b/externs/xmlhttprequest.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,12 @@
  * 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.
+ */
+
+/**
+ * @fileoverview Externs for XMLHttpRequest which are missing from the closure
+ * compiler.
  *
- * @fileoverview XMLHttpRequest externs missing from closure.
  * @externs
  */
 
diff --git a/index.css b/index.css
index bf6ee86e7..2426f11ff 100644
--- a/index.css
+++ b/index.css
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Google Inc.
+ * Copyright 2015 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/index.html b/index.html
index ca9a44de8..daba130ce 100644
--- a/index.html
+++ b/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
- Copyright 2014 Google Inc.
+ Copyright 2015 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/integration_tests.html b/integration_tests.html
index 20aeeb707..f51e8aa84 100644
--- a/integration_tests.html
+++ b/integration_tests.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
- Copyright 2014 Google Inc.
+ Copyright 2015 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/lib/dash/container_segment_index_source.js b/lib/dash/container_segment_index_source.js
index f785baa52..0c34c6add 100644
--- a/lib/dash/container_segment_index_source.js
+++ b/lib/dash/container_segment_index_source.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,9 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a SegmentIndexSource that constructs a SegmentIndex
- * from an MP4 or WebM container.
  */
 
 goog.provide('shaka.dash.ContainerSegmentIndexSource');
@@ -34,7 +32,8 @@ goog.require('shaka.util.TypedBind');
 
 
 /**
- * Creates a ContainerSegmentIndexSource.
+ * Creates an ISegmentIndexSource that constructs a SegmentIndex from an MP4 or
+ * WebM container.
  *
  * @param {!shaka.dash.mpd.Mpd} mpd
  * @param {!shaka.dash.mpd.Period} period
diff --git a/lib/dash/duration_segment_index_source.js b/lib/dash/duration_segment_index_source.js
index 627adc936..a80f3f34b 100644
--- a/lib/dash/duration_segment_index_source.js
+++ b/lib/dash/duration_segment_index_source.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,9 +13,6 @@
  * 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.
- *
- * @fileoverview Implements an ISegmentIndexSource that constructs a
- * SegmentIndex from a SegmentTemplate with a segment duration.
  */
 
 goog.provide('shaka.dash.DurationSegmentIndexSource');
@@ -32,7 +30,8 @@ goog.require('shaka.util.TypedBind');
 
 
 /**
- * Creates a DurationSegmentIndexSource.
+ * Creates an ISegmentIndexSource that constructs a SegmentIndex from a
+ * SegmentTemplate with a segment duration.
  *
  * @param {!shaka.dash.mpd.Mpd} mpd
  * @param {!shaka.dash.mpd.Period} period
diff --git a/lib/dash/dynamic_live_segment_index.js b/lib/dash/dynamic_live_segment_index.js
index 2c9a6049c..07257fae7 100644
--- a/lib/dash/dynamic_live_segment_index.js
+++ b/lib/dash/dynamic_live_segment_index.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,9 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a SegmentIndex that supports live DASH content and
- * dynamically generates SegmentReferences.
  */
 
 goog.provide('shaka.dash.DynamicLiveSegmentIndex');
@@ -28,10 +26,9 @@ goog.require('shaka.util.ArrayUtils');
 
 
 /**
- * Creates a DynamicLiveSegmentIndex.
- *
- * A DynamicLiveSegmentIndex generates SegmentReferences as needed and
- * automatically evicts SegmentReferences that are no longer available.
+ * Creates a SegmentIndex that supports live DASH content by generating
+ * SegmentReferences as needed and automatically evicting SegmentReferences
+ * that are no longer available.
  *
  * If the SegmentIndex's corresponding stream is not available yet then the
  * SegmentIndex will be inactive: it will not contain any SegmentReferences nor
diff --git a/lib/dash/list_segment_index_source.js b/lib/dash/list_segment_index_source.js
index 7868e4ea4..7f770f8e9 100644
--- a/lib/dash/list_segment_index_source.js
+++ b/lib/dash/list_segment_index_source.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,9 +13,6 @@
  * 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.
- *
- * @fileoverview Implements an ISegmentIndexSource that constructs a
- * SegmentIndex from a SegmentList.
  */
 
 goog.provide('shaka.dash.ListSegmentIndexSource');
@@ -31,7 +29,8 @@ goog.require('shaka.util.TypedBind');
 
 
 /**
- * Creates a ListSegmentIndexSource.
+ * Creates an ISegmentIndexSource that constructs a SegmentIndex from a
+ * SegmentList.
  *
  * @param {!shaka.dash.mpd.Mpd} mpd
  * @param {!shaka.dash.mpd.Period} period
diff --git a/lib/dash/live_segment_index.js b/lib/dash/live_segment_index.js
index 09b282a6e..b9bacd5c7 100644
--- a/lib/dash/live_segment_index.js
+++ b/lib/dash/live_segment_index.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a SegmentIndex that supports live DASH content.
  */
 
 goog.provide('shaka.dash.LiveSegmentIndex');
@@ -27,7 +26,7 @@ goog.require('shaka.util.Clock');
 
 
 /**
- * Creates a LiveSegmentIndex.
+ * Creates a SegmentIndex that supports live DASH content.
  *
  * A LiveSegmentIndex automatically evicts SegmentReferences that are no longer
  * available. However, it does not generate any new SegmentReferences.
diff --git a/lib/dash/mpd_parser.js b/lib/dash/mpd_parser.js
index 07aa1998d..e46ddfd11 100644
--- a/lib/dash/mpd_parser.js
+++ b/lib/dash/mpd_parser.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a media presentation description object.
  */
 
 goog.provide('shaka.dash.mpd');
diff --git a/lib/dash/mpd_processor.js b/lib/dash/mpd_processor.js
index 018949ca0..8fe06c38d 100644
--- a/lib/dash/mpd_processor.js
+++ b/lib/dash/mpd_processor.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements MpdProcessor.
  */
 
 goog.provide('shaka.dash.MpdProcessor');
@@ -1015,7 +1014,7 @@ shaka.dash.MpdProcessor.prototype.validateSegmentTemplate_ = function(
 
 
 /**
- * Creates a SegmentIndexSource from a SegmentTemplate.
+ * Creates an ISegmentIndexSource from a SegmentTemplate.
  *
  * @param {!shaka.dash.mpd.Mpd} mpd
  * @param {!shaka.dash.mpd.Period} period
@@ -1069,7 +1068,7 @@ shaka.dash.MpdProcessor.prototype.makeSegmentIndexSourceViaSegmentTemplate_ =
 
 
 /**
- * Creates a SegmentIndexSource from a SegmentTemplate with an index URL
+ * Creates an ISegmentIndexSource from a SegmentTemplate with an index URL
  * template.
  *
  * @param {!shaka.dash.mpd.Mpd} mpd
diff --git a/lib/dash/mpd_request.js b/lib/dash/mpd_request.js
index a1a21cb9a..0ecdb4e8f 100644
--- a/lib/dash/mpd_request.js
+++ b/lib/dash/mpd_request.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements an MPD request.
  */
 
 goog.provide('shaka.dash.MpdRequest');
diff --git a/lib/dash/mpd_utils.js b/lib/dash/mpd_utils.js
index c52633812..dd04e474e 100644
--- a/lib/dash/mpd_utils.js
+++ b/lib/dash/mpd_utils.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview MPD processing utility functions.
  */
 
 goog.provide('shaka.dash.MpdUtils');
diff --git a/lib/dash/timeline_segment_index_source.js b/lib/dash/timeline_segment_index_source.js
index 897a6cd55..3d1b4289d 100644
--- a/lib/dash/timeline_segment_index_source.js
+++ b/lib/dash/timeline_segment_index_source.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,9 +13,6 @@
  * 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.
- *
- * @fileoverview Implements an ISegmentIndexSource that constructs a
- * SegmentIndex from a SegmentTemplate with a SegmentTimeline.
  */
 
 goog.provide('shaka.dash.TimelineSegmentIndexSource');
@@ -31,7 +29,8 @@ goog.require('shaka.util.TypedBind');
 
 
 /**
- * Creates a TimelineSegmentIndexSource.
+ * Creates an ISegmentIndexSource that constructs a SegmentIndex from a
+ * SegmentTemplate with a SegmentTimeline.
  *
  * @param {!shaka.dash.mpd.Mpd} mpd
  * @param {!shaka.dash.mpd.Period} period
diff --git a/lib/debug/asserts.js b/lib/debug/asserts.js
index a09367f5d..a1b7c64d9 100644
--- a/lib/debug/asserts.js
+++ b/lib/debug/asserts.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements assert functions which can be compiled out.
  */
 
 goog.provide('shaka.asserts');
diff --git a/lib/debug/log.js b/lib/debug/log.js
index 5968e0e2c..0dee0cf5b 100644
--- a/lib/debug/log.js
+++ b/lib/debug/log.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements log functions which can be compiled out.
  */
 
 goog.provide('shaka.log');
diff --git a/lib/debug/timer.js b/lib/debug/timer.js
index cb8ec58e4..ab9646bfc 100644
--- a/lib/debug/timer.js
+++ b/lib/debug/timer.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements performance timers.
  */
 
 goog.provide('shaka.timer');
diff --git a/lib/media/eme_manager.js b/lib/media/eme_manager.js
index 28a00a77f..d475655d0 100644
--- a/lib/media/eme_manager.js
+++ b/lib/media/eme_manager.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements the EME manager.
  */
 
 goog.provide('shaka.media.EmeManager');
diff --git a/lib/media/i_abr_manager.js b/lib/media/i_abr_manager.js
index fe1c4256b..606159748 100644
--- a/lib/media/i_abr_manager.js
+++ b/lib/media/i_abr_manager.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,9 +13,6 @@
  * 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.
- *
- * @fileoverview An interface for tracking bandwidth samples and estimating
- * available bandwidth.
  */
 
 goog.provide('shaka.media.IAbrManager');
@@ -22,7 +20,7 @@ goog.provide('shaka.media.IAbrManager');
 
 
 /**
- * An interface for a generic adaptive bit-rate Manager.  An AbrManager listens
+ * An interface for a generic adaptive bitrate manager.  An AbrManager listens
  * for bandwidth events and makes decisions about which stream should be used at
  * any given time.  It can be queried for the initial stream to use when
  * starting playback, and it will make active stream changes during playback
diff --git a/lib/media/i_segment_index_source.js b/lib/media/i_segment_index_source.js
index 8c7f1acc5..2c6ec236b 100644
--- a/lib/media/i_segment_index_source.js
+++ b/lib/media/i_segment_index_source.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Defines the ISegmentIndexSource interface.
  */
 
 goog.provide('shaka.media.ISegmentIndexSource');
diff --git a/lib/media/i_stream.js b/lib/media/i_stream.js
index c585622ae..a34f4bf11 100644
--- a/lib/media/i_stream.js
+++ b/lib/media/i_stream.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview A generic stream interface.
  */
 
 goog.provide('shaka.media.IStream');
diff --git a/lib/media/manifest_updater.js b/lib/media/manifest_updater.js
index 62e223a71..c00fe5a7f 100644
--- a/lib/media/manifest_updater.js
+++ b/lib/media/manifest_updater.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a ManifestUpdater.
  */
 
 goog.provide('shaka.media.ManifestUpdater');
diff --git a/lib/media/mp4_segment_index_parser.js b/lib/media/mp4_segment_index_parser.js
index 89a338b39..b34603482 100644
--- a/lib/media/mp4_segment_index_parser.js
+++ b/lib/media/mp4_segment_index_parser.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a SIDX parser.
  */
 
 goog.provide('shaka.media.Mp4SegmentIndexParser');
@@ -28,7 +27,7 @@ goog.require('shaka.util.FailoverUri');
 
 
 /**
- * Creates an Mp4SegmentIndexParser.
+ * Creates an MP4 SIDX parser.
  *
  * @constructor
  * @struct
diff --git a/lib/media/offline_segment_index_source.js b/lib/media/offline_segment_index_source.js
index 61da20bfa..84e809723 100644
--- a/lib/media/offline_segment_index_source.js
+++ b/lib/media/offline_segment_index_source.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,9 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a SegmentIndexSource that constructs a SegmentIndex
- * from an existing set of SegmentReferences.
  */
 
 goog.provide('shaka.media.OfflineSegmentIndexSource');
@@ -30,7 +28,8 @@ goog.require('shaka.util.ContentDatabase');
 
 
 /**
- * Creates a OfflineSegmentIndexSource.
+ * Creates an ISegmentIndexSource that constructs a SegmentIndex from an
+ * existing set of SegmentReferences.
  *
  * @param {!Array.<!shaka.util.ContentDatabase.SegmentInformation>} segmentInfos
  * @constructor
diff --git a/lib/media/segment_index.js b/lib/media/segment_index.js
index f176a0c15..4a2acffd5 100644
--- a/lib/media/segment_index.js
+++ b/lib/media/segment_index.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a SegmentIndex.
  */
 
 goog.provide('shaka.media.SegmentIndex');
diff --git a/lib/media/segment_init_source.js b/lib/media/segment_init_source.js
index 5a5569db2..1d9cf4c7a 100644
--- a/lib/media/segment_init_source.js
+++ b/lib/media/segment_init_source.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements SegmentInitSource.
  */
 
 goog.provide('shaka.media.SegmentInitSource');
diff --git a/lib/media/segment_reference.js b/lib/media/segment_reference.js
index f2091788c..570d3578c 100644
--- a/lib/media/segment_reference.js
+++ b/lib/media/segment_reference.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a segment reference structure.
  */
 
 goog.provide('shaka.media.SegmentReference');
diff --git a/lib/media/simple_abr_manager.js b/lib/media/simple_abr_manager.js
index aed8d7de2..61847a78a 100644
--- a/lib/media/simple_abr_manager.js
+++ b/lib/media/simple_abr_manager.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a manager for adaptive bitrate streaming.
  */
 
 goog.provide('shaka.media.SimpleAbrManager');
diff --git a/lib/media/source_buffer_manager.js b/lib/media/source_buffer_manager.js
index 3f97d08eb..493a2a11b 100644
--- a/lib/media/source_buffer_manager.js
+++ b/lib/media/source_buffer_manager.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,9 +13,6 @@
  * 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.
- *
- * @fileoverview Manages a SourceBuffer an provides an enhanced interface
- * based on Promises.
  */
 
 goog.provide('shaka.media.SourceBufferManager');
@@ -30,7 +28,8 @@ goog.require('shaka.util.TypedBind');
 
 
 /**
- * Creates a SourceBufferManager (SBM).
+ * Creates a SourceBufferManager (SBM), which manages a SourceBuffer and
+ * provides an enhanced interface based on Promises.
  *
  * The SBM manages access to a SourceBuffer object through a fetch operation
  * and a clear operation. It also maintains a "virtual source buffer" to keep
diff --git a/lib/media/stream.js b/lib/media/stream.js
index 417232434..38e523035 100644
--- a/lib/media/stream.js
+++ b/lib/media/stream.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a media stream.
  */
 
 goog.provide('shaka.media.Stream');
diff --git a/lib/media/stream_info.js b/lib/media/stream_info.js
index e92295f5e..e9d803393 100644
--- a/lib/media/stream_info.js
+++ b/lib/media/stream_info.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,9 +13,6 @@
  * 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.
- *
- * @fileoverview Defines stream information, which is a manifist agnostic
- * description of a stream.
  */
 
 goog.provide('shaka.media.ManifestInfo');
@@ -287,7 +285,8 @@ shaka.media.PeriodInfo.prototype.destroy = function() {
 
 
 /**
- * Creates a ManifestInfo.
+ * Creates a ManifestInfo, which is a manifest-format-agnostic description of
+ * the content.
  *
  * @constructor
  * @struct
diff --git a/lib/media/stream_info_processor.js b/lib/media/stream_info_processor.js
index b2593dbbf..0a8aa5e0c 100644
--- a/lib/media/stream_info_processor.js
+++ b/lib/media/stream_info_processor.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements StreamInfoProcessor.
  */
 
 goog.provide('shaka.media.StreamInfoProcessor');
diff --git a/lib/media/text_segment_index_source.js b/lib/media/text_segment_index_source.js
index 37573a8b4..1180dced4 100644
--- a/lib/media/text_segment_index_source.js
+++ b/lib/media/text_segment_index_source.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,9 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a SegmentIndexSource that constructs a SegmentIndex
- * from a single subtitles URL.
  */
 
 goog.provide('shaka.media.TextSegmentIndexSource');
@@ -29,7 +27,8 @@ goog.require('shaka.util.FailoverUri');
 
 
 /**
- * Creates a TextSegmentIndexSource.
+ * Creates an ISegmentIndexSource that constructs a SegmentIndex from a single
+ * subtitles URL.
  *
  * @param {!shaka.util.FailoverUri} subtitlesUrl
  * @constructor
diff --git a/lib/media/text_stream.js b/lib/media/text_stream.js
index 8796b9017..5e1e71ff6 100644
--- a/lib/media/text_stream.js
+++ b/lib/media/text_stream.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a media stream for text tracks.
  */
 
 goog.provide('shaka.media.TextStream');
diff --git a/lib/media/webm_segment_index_parser.js b/lib/media/webm_segment_index_parser.js
index 6c448fb56..f223b78e9 100644
--- a/lib/media/webm_segment_index_parser.js
+++ b/lib/media/webm_segment_index_parser.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a WebM Cues element parser.
  */
 
 goog.provide('shaka.media.WebmSegmentIndexParser');
@@ -29,7 +28,7 @@ goog.require('shaka.util.FailoverUri');
 
 
 /**
- * Creates a WebmSegmentIndexParser.
+ * Creates a WebM Cues element parser.
  *
  * @constructor
  * @struct
diff --git a/lib/player/audio_track.js b/lib/player/audio_track.js
index f9d577914..544b7df23 100644
--- a/lib/player/audio_track.js
+++ b/lib/player/audio_track.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview AudioTrack class.
  */
 
 goog.provide('shaka.player.AudioTrack');
diff --git a/lib/player/dash_video_source.js b/lib/player/dash_video_source.js
index c41204200..ac7c51220 100644
--- a/lib/player/dash_video_source.js
+++ b/lib/player/dash_video_source.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a DASH video source.
  */
 
 goog.provide('shaka.player.DashVideoSource');
diff --git a/lib/player/defaults.js b/lib/player/defaults.js
index 203a8269f..b32b3df4a 100644
--- a/lib/player/defaults.js
+++ b/lib/player/defaults.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Default values for the player.
  */
 
 goog.provide('shaka.player.Defaults');
diff --git a/lib/player/drm_info.js b/lib/player/drm_info.js
index 870aafd3f..29c51515e 100644
--- a/lib/player/drm_info.js
+++ b/lib/player/drm_info.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Defines the DrmInfo class.
  */
 
 goog.provide('shaka.player.DrmInfo');
diff --git a/lib/player/drm_scheme_info.js b/lib/player/drm_scheme_info.js
index 71b455b71..58ed502b6 100644
--- a/lib/player/drm_scheme_info.js
+++ b/lib/player/drm_scheme_info.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Defines DRM scheme information.
  */
 
 goog.provide('shaka.player.DrmSchemeInfo');
diff --git a/lib/player/http_video_source.js b/lib/player/http_video_source.js
index de0e851be..4726eddd1 100644
--- a/lib/player/http_video_source.js
+++ b/lib/player/http_video_source.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements an HTTP video source.
  */
 
 goog.provide('shaka.player.HttpVideoSource');
diff --git a/lib/player/i_video_source.js b/lib/player/i_video_source.js
index e7ebe8f3b..ffd80d1d3 100644
--- a/lib/player/i_video_source.js
+++ b/lib/player/i_video_source.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Defines the IVideoSource interface.
  */
 
 goog.provide('shaka.player.IVideoSource');
diff --git a/lib/player/offline_video_source.js b/lib/player/offline_video_source.js
index e65e11314..18cf24a69 100644
--- a/lib/player/offline_video_source.js
+++ b/lib/player/offline_video_source.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements an offline video source.
  */
 
 goog.provide('shaka.player.OfflineVideoSource');
diff --git a/lib/player/player.js b/lib/player/player.js
index f6d3eb08a..28b22ca85 100644
--- a/lib/player/player.js
+++ b/lib/player/player.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements the player.
  */
 
 goog.provide('shaka.player.Player');
diff --git a/lib/player/restrictions.js b/lib/player/restrictions.js
index 2e1e852d1..e3a62eef2 100644
--- a/lib/player/restrictions.js
+++ b/lib/player/restrictions.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Defines the Restrictions class.
  */
 
 goog.provide('shaka.player.Restrictions');
diff --git a/lib/player/stats.js b/lib/player/stats.js
index 19d94d5c3..160c49901 100644
--- a/lib/player/stats.js
+++ b/lib/player/stats.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a player stats object.
  */
 
 goog.provide('shaka.player.Stats');
diff --git a/lib/player/stream_video_source.js b/lib/player/stream_video_source.js
index adfceadc0..e71406240 100644
--- a/lib/player/stream_video_source.js
+++ b/lib/player/stream_video_source.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a stream oriented video source.
  */
 
 goog.provide('shaka.player.StreamVideoSource');
diff --git a/lib/player/text_style.js b/lib/player/text_style.js
index ab8fcc391..2a1d386f6 100644
--- a/lib/player/text_style.js
+++ b/lib/player/text_style.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview A structure to contain text style.
  */
 
 goog.provide('shaka.player.TextStyle');
diff --git a/lib/player/text_track.js b/lib/player/text_track.js
index 2d826dc85..66bedfbc8 100644
--- a/lib/player/text_track.js
+++ b/lib/player/text_track.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview TextTrack class.
  */
 
 goog.provide('shaka.player.TextTrack');
diff --git a/lib/player/video_track.js b/lib/player/video_track.js
index 9fa48a70a..f5a48842d 100644
--- a/lib/player/video_track.js
+++ b/lib/player/video_track.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview VideoTrack class.
  */
 
 goog.provide('shaka.player.VideoTrack');
diff --git a/lib/polyfill/all.js b/lib/polyfill/all.js
index f678f9148..8ebb7ff7f 100644
--- a/lib/polyfill/all.js
+++ b/lib/polyfill/all.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +13,6 @@
  * 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.
- *
- * @fileoverview A one-stop installer for all polyfills.
- *
- * @see http://enwp.org/polyfill
  */
 
 goog.provide('shaka.polyfill.installAll');
@@ -28,6 +25,8 @@ goog.require('shaka.polyfill.VideoPlaybackQuality');
 
 /**
  * @namespace shaka.polyfill
+ * @summary A one-stop installer for all polyfills.
+ * @see http://enwp.org/polyfill
  * @export
  */
 
diff --git a/lib/polyfill/customevent.js b/lib/polyfill/customevent.js
index d4f076499..8eb07bead 100644
--- a/lib/polyfill/customevent.js
+++ b/lib/polyfill/customevent.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +13,6 @@
  * 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.
- *
- * @fileoverview A polyfill to implement the CustomEvent constructor.
- *
- * @see http://enwp.org/polyfill
  */
 
 goog.provide('shaka.polyfill.CustomEvent');
diff --git a/lib/polyfill/fullscreen.js b/lib/polyfill/fullscreen.js
index 19c4118ae..138f9271d 100644
--- a/lib/polyfill/fullscreen.js
+++ b/lib/polyfill/fullscreen.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,6 @@
  * 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.
- *
- * @fileoverview A polyfill to unify fullscreen APIs.
- *
- * @see http://enwp.org/polyfill
  */
 
 goog.provide('shaka.polyfill.Fullscreen');
diff --git a/lib/polyfill/mediakeys.js b/lib/polyfill/mediakeys.js
index 05248bf5a..bcbacd4c7 100644
--- a/lib/polyfill/mediakeys.js
+++ b/lib/polyfill/mediakeys.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,6 @@
  * 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.
- *
- * @fileoverview A polyfill to unify EME APIs across browser versions.
- *
- * @see http://enwp.org/polyfill
  */
 
 goog.provide('shaka.polyfill.MediaKeys');
diff --git a/lib/polyfill/patchedmediakeys_nop.js b/lib/polyfill/patchedmediakeys_nop.js
index 0b09fd6f0..d1d4a0bd9 100644
--- a/lib/polyfill/patchedmediakeys_nop.js
+++ b/lib/polyfill/patchedmediakeys_nop.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,11 +13,6 @@
  * 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.
- *
- * @fileoverview A polyfill to stub out {@link http://goo.gl/blgtZZ EME draft
- * 12 March 2015} on browsers without EME.  All methods will fail.
- *
- * @see http://enwp.org/polyfill
  */
 
 goog.provide('shaka.polyfill.PatchedMediaKeys.nop');
@@ -26,7 +22,8 @@ goog.require('shaka.log');
 
 
 /**
- * Install the polyfill.
+ * Install a polyfill to stub out {@link http://goo.gl/blgtZZ EME draft
+ * 12 March 2015} on browsers without EME.  All methods will fail.
  */
 shaka.polyfill.PatchedMediaKeys.nop.install = function() {
   shaka.log.debug('PatchedMediaKeys.nop.install');
diff --git a/lib/polyfill/patchedmediakeys_v01b.js b/lib/polyfill/patchedmediakeys_v01b.js
index 1abd8a889..f37b7b9aa 100644
--- a/lib/polyfill/patchedmediakeys_v01b.js
+++ b/lib/polyfill/patchedmediakeys_v01b.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,11 +13,6 @@
  * 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.
- *
- * @fileoverview A polyfill to implement {@link http://goo.gl/blgtZZ EME draft
- * 12 March 2015} on top of {@link http://goo.gl/FSpoAo EME v0.1b}.
- *
- * @see http://enwp.org/polyfill
  */
 
 goog.provide('shaka.polyfill.PatchedMediaKeys.v01b');
@@ -31,7 +27,8 @@ goog.require('shaka.util.Uint8ArrayUtils');
 
 
 /**
- * Install the polyfill.
+ * Install a polyfill to implement {@link http://goo.gl/blgtZZ EME draft
+ * 12 March 2015} on top of {@link http://goo.gl/FSpoAo EME v0.1b}.
  */
 shaka.polyfill.PatchedMediaKeys.v01b.install = function() {
   shaka.log.debug('v01b.install');
diff --git a/lib/polyfill/videoplaybackquality.js b/lib/polyfill/videoplaybackquality.js
index 276dcf09d..05d9970ae 100644
--- a/lib/polyfill/videoplaybackquality.js
+++ b/lib/polyfill/videoplaybackquality.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,11 +13,6 @@
  * 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.
- *
- * @fileoverview A polyfill to provide MSE VideoPlaybackQuality metrics with a
- * single API.
- *
- * @see http://enwp.org/polyfill
  */
 
 goog.provide('shaka.polyfill.VideoPlaybackQuality');
diff --git a/lib/util/ajax_request.js b/lib/util/ajax_request.js
index 64f908b16..79fdb5d64 100644
--- a/lib/util/ajax_request.js
+++ b/lib/util/ajax_request.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements an asynchronous HTTP request.
  */
 
 goog.provide('shaka.util.AjaxRequest');
@@ -32,7 +31,8 @@ goog.require('shaka.util.Uint8ArrayUtils');
 
 
 /**
- * Creates an AjaxRequest. An AjaxRequest manages retries automatically.
+ * Creates an asynchronous HTTP request object which manages retries
+ * automatically.
  *
  * @param {string} url The URL to request.
  * @param {shaka.util.AjaxRequest.Parameters=} opt_parameters
diff --git a/lib/util/array_utils.js b/lib/util/array_utils.js
index 6f2ce5601..ac9c8999a 100644
--- a/lib/util/array_utils.js
+++ b/lib/util/array_utils.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Array utility functions.
  */
 
 goog.provide('shaka.util.ArrayUtils');
diff --git a/lib/util/clock.js b/lib/util/clock.js
index 64e81f9b8..d41e669b3 100644
--- a/lib/util/clock.js
+++ b/lib/util/clock.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview A synchronizable clock.
  */
 
 goog.provide('shaka.util.Clock');
diff --git a/lib/util/content_database.js b/lib/util/content_database.js
index 0b7d2f764..2609e59b6 100644
--- a/lib/util/content_database.js
+++ b/lib/util/content_database.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Stores and manages content streams in a database.
  */
 
 goog.provide('shaka.util.ContentDatabase');
diff --git a/lib/util/content_database_reader.js b/lib/util/content_database_reader.js
index 03fbd7da0..60f8c225f 100644
--- a/lib/util/content_database_reader.js
+++ b/lib/util/content_database_reader.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a content database reader.
  */
 
 goog.provide('shaka.util.ContentDatabaseReader');
diff --git a/lib/util/content_database_writer.js b/lib/util/content_database_writer.js
index dc9fbc89d..f4ffcdc62 100644
--- a/lib/util/content_database_writer.js
+++ b/lib/util/content_database_writer.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a content database writer.
  */
 
 goog.provide('shaka.util.ContentDatabaseWriter');
diff --git a/lib/util/data_view_reader.js b/lib/util/data_view_reader.js
index 9b101100b..9ffdf5950 100644
--- a/lib/util/data_view_reader.js
+++ b/lib/util/data_view_reader.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,9 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a data view reader, which abstracts a DataView
- * object.
  */
 
 goog.provide('shaka.util.DataViewReader');
@@ -24,7 +22,7 @@ goog.require('shaka.asserts');
 
 
 /**
- * Creates a DataViewReader
+ * Creates a DataViewReader, which abstracts a DataView object.
  *
  * @param {!DataView} dataView The DataView.
  * @param {shaka.util.DataViewReader.Endianness} endianness The endianness.
diff --git a/lib/util/ebml_parser.js b/lib/util/ebml_parser.js
index e4f3efcd3..e83ac3178 100644
--- a/lib/util/ebml_parser.js
+++ b/lib/util/ebml_parser.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements an Extensible Binary Markup Language (EBML) parser.
  */
 
 goog.provide('shaka.util.EbmlElement');
@@ -22,7 +21,7 @@ goog.provide('shaka.util.EbmlParser');
 
 
 /**
- * Creates an EbmlParser.
+ * Creates an Extensible Binary Markup Language (EBML) parser.
  * @param {!DataView} dataView The EBML data.
  * @constructor
  */
diff --git a/lib/util/eme_utils.js b/lib/util/eme_utils.js
index d7abbd32e..22a688dae 100644
--- a/lib/util/eme_utils.js
+++ b/lib/util/eme_utils.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview EME utility functions.
  */
 
 
diff --git a/lib/util/event_manager.js b/lib/util/event_manager.js
index ac0c67b49..4d9fd6dd7 100644
--- a/lib/util/event_manager.js
+++ b/lib/util/event_manager.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview EventManager class.
  */
 
 goog.provide('shaka.util.EventManager');
diff --git a/lib/util/ewma.js b/lib/util/ewma.js
index 2f8b2ba0e..734a936c9 100644
--- a/lib/util/ewma.js
+++ b/lib/util/ewma.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Computes an exponentially-weighted moving average.
  */
 
 goog.provide('shaka.util.EWMA');
diff --git a/lib/util/ewma_bandwidth_estimator.js b/lib/util/ewma_bandwidth_estimator.js
index 44c08b2c9..90c087df3 100644
--- a/lib/util/ewma_bandwidth_estimator.js
+++ b/lib/util/ewma_bandwidth_estimator.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,6 @@
  * 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.
- *
- * @fileoverview Tracks bandwidth samples and estimates available bandwidth.
- * Based on the minimum of two exponentially-weighted moving averages with
- * different half-lives.
  */
 
 goog.provide('shaka.util.EWMABandwidthEstimator');
@@ -29,6 +26,8 @@ goog.require('shaka.util.IBandwidthEstimator');
 
 /**
  * Tracks bandwidth samples and estimates available bandwidth.
+ * Based on the minimum of two exponentially-weighted moving averages with
+ * different half-lives.
  *
  * @struct
  * @constructor
diff --git a/lib/util/failover_uri.js b/lib/util/failover_uri.js
index 6606d86c9..a83d5035f 100644
--- a/lib/util/failover_uri.js
+++ b/lib/util/failover_uri.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,9 +13,6 @@
  * 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.
- *
- * @fileoverview Defines a FailoverUri which handles multiple URLs and handles
- * requests and failures.
  */
 
 goog.provide('shaka.util.FailoverUri');
@@ -27,7 +25,8 @@ goog.require('shaka.util.AjaxRequest');
 
 
 /**
- * Creates a FailoverUri.
+ * Creates a FailoverUri, which handles requests to multiple URLs in case of
+ * failure.
  *
  * @param {shaka.util.FailoverUri.NetworkCallback} callback
  * @param {Array.<!goog.Uri>} urls
diff --git a/lib/util/fake_event.js b/lib/util/fake_event.js
index 459aaffe5..533db3b8d 100644
--- a/lib/util/fake_event.js
+++ b/lib/util/fake_event.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview A utility to simplify the creation of fake events.
  */
 
 goog.provide('shaka.util.FakeEvent');
diff --git a/lib/util/fake_event_target.js b/lib/util/fake_event_target.js
index 6ab0aaaab..71326129b 100644
--- a/lib/util/fake_event_target.js
+++ b/lib/util/fake_event_target.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,9 +13,6 @@
  * 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.
- *
- * @fileoverview A utility base class which is a non-DOM work-alike for
- * EventTarget.  This simplifies the dispatch of events from custom classes.
  */
 
 goog.provide('shaka.util.FakeEventTarget');
diff --git a/lib/util/features.js b/lib/util/features.js
index 6fba008f2..5067c396b 100644
--- a/lib/util/features.js
+++ b/lib/util/features.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Defines the compiler flags to enable features
  */
 
 goog.provide('shaka.features');
@@ -21,7 +20,7 @@ goog.provide('shaka.features');
 
 /**
  * @namespace shaka.features
- * @summary Contains features flags used to enable features.
+ * @summary Contains compiler flags used to enable features.
  */
 
 
diff --git a/lib/util/i_bandwidth_estimator.js b/lib/util/i_bandwidth_estimator.js
index 3182fef57..99f73e0d0 100644
--- a/lib/util/i_bandwidth_estimator.js
+++ b/lib/util/i_bandwidth_estimator.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,9 +13,6 @@
  * 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.
- *
- * @fileoverview An interface for tracking bandwidth samples and estimating
- * available bandwidth.
  */
 
 goog.provide('shaka.util.IBandwidthEstimator');
diff --git a/lib/util/language_utils.js b/lib/util/language_utils.js
index 9a495d9a7..34723b3e6 100644
--- a/lib/util/language_utils.js
+++ b/lib/util/language_utils.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Language utility functions.
  */
 
 goog.provide('shaka.util.LanguageUtils');
diff --git a/lib/util/license_request.js b/lib/util/license_request.js
index ede11c73a..1c601a8b2 100644
--- a/lib/util/license_request.js
+++ b/lib/util/license_request.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a license request.
  */
 
 goog.provide('shaka.util.LicenseRequest');
diff --git a/lib/util/map_utils.js b/lib/util/map_utils.js
index b161754b1..9cc38a2ca 100644
--- a/lib/util/map_utils.js
+++ b/lib/util/map_utils.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Map utility functions.
  */
 
 goog.provide('shaka.util.MapUtils');
diff --git a/lib/util/multi_map.js b/lib/util/multi_map.js
index 3493e691f..787652d62 100644
--- a/lib/util/multi_map.js
+++ b/lib/util/multi_map.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview A simple multimap template.
  */
 
 goog.provide('shaka.util.MultiMap');
@@ -21,6 +20,7 @@ goog.provide('shaka.util.MultiMap');
 
 
 /**
+ * A simple multimap template.
  * @constructor
  * @struct
  * @template T
diff --git a/lib/util/pssh.js b/lib/util/pssh.js
index c399b628a..58dab18fa 100644
--- a/lib/util/pssh.js
+++ b/lib/util/pssh.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Implements a PSSH parser.
  */
 
 goog.provide('shaka.util.Pssh');
diff --git a/lib/util/public_promise.js b/lib/util/public_promise.js
index e9c6f3de6..c93e1dd44 100644
--- a/lib/util/public_promise.js
+++ b/lib/util/public_promise.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,9 +13,6 @@
  * 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.
- *
- * @fileoverview A utility to create Promises with convenient public resolve
- * and reject methods.
  */
 
 goog.provide('shaka.util.PublicPromise');
@@ -22,6 +20,9 @@ goog.provide('shaka.util.PublicPromise');
 
 
 /**
+ * A utility to create Promises with convenient public resolve and reject
+ * methods.
+ *
  * @constructor
  * @extends {Promise.<T>}
  * @template T
diff --git a/lib/util/string_utils.js b/lib/util/string_utils.js
index 8ed57222f..f11be4493 100644
--- a/lib/util/string_utils.js
+++ b/lib/util/string_utils.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview String utility functions.
  */
 
 goog.provide('shaka.util.StringUtils');
diff --git a/lib/util/task.js b/lib/util/task.js
index 55e24a312..8d44fd7cd 100644
--- a/lib/util/task.js
+++ b/lib/util/task.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,9 +13,6 @@
  * 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.
- *
- * @fileoverview A utility to create abortable, multi-stage tasks based on
- * Promises.
  */
 
 goog.provide('shaka.util.Task');
@@ -25,6 +23,7 @@ goog.require('shaka.util.PublicPromise');
 
 
 /**
+ * A utility to create abortable, multi-stage tasks based on Promises.
  * @constructor
  */
 shaka.util.Task = function() {
diff --git a/lib/util/typed_bind.js b/lib/util/typed_bind.js
index 962ed7d65..b6ae9da10 100644
--- a/lib/util/typed_bind.js
+++ b/lib/util/typed_bind.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview A bind wrapper which infers and preserves type information.
  */
 
 goog.provide('shaka.util.TypedBind');
diff --git a/lib/util/uint8array_utils.js b/lib/util/uint8array_utils.js
index c8a4bde79..2b9e63053 100644
--- a/lib/util/uint8array_utils.js
+++ b/lib/util/uint8array_utils.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Uint8Array utility functions.
  */
 
 goog.provide('shaka.util.Uint8ArrayUtils');
diff --git a/load.js b/load.js
index 5a6a17f8b..388e5cf0f 100644
--- a/load.js
+++ b/load.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,9 +13,12 @@
  * 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.
+ */
+
+/**
+ * Loads the library.  Chooses compiled or debug version of the library based
+ * on the presence or absence of the URL parameter "compiled".
  *
- * @fileoverview Loads the library.  Chooses compiled or debug version of the
- * library based on the presence or absence of the URL parameter "compiled".
  * This dynamic loading process is not necessary in a production environment,
  * but greatly simplifies the process of switching between compiled and
  * uncompiled mode during development.
@@ -22,7 +26,6 @@
  * This is used in the provided test app, but can also be used to load the
  * uncompiled version of the library into your own application environment.
  */
-
 (function() {  // anonymous namespace
   // The sources may be in a different folder from the test app.
   // Compute the base URL for all library sources.
diff --git a/shaka-player.uncompiled.js b/shaka-player.uncompiled.js
index 53faa38c3..7cd7725ad 100644
--- a/shaka-player.uncompiled.js
+++ b/shaka-player.uncompiled.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,9 @@
  * 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.
- *
- * @fileoverview Requires all exported classes from the library.
  */
 
+// Require all exported classes from the library.
 goog.require('shaka.player.DashVideoSource');
 goog.require('shaka.player.DrmSchemeInfo');
 goog.require('shaka.player.HttpVideoSource');
diff --git a/spec/ajax_request_spec.js b/spec/ajax_request_spec.js
index 44b33055f..bdd5a4939 100644
--- a/spec/ajax_request_spec.js
+++ b/spec/ajax_request_spec.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview ajax_request.js unit tests.
  */
 
 goog.require('shaka.media.SegmentIndex');
diff --git a/spec/content_database_spec.js b/spec/content_database_spec.js
index cbf09d2f9..8f852ca24 100644
--- a/spec/content_database_spec.js
+++ b/spec/content_database_spec.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview content_database.js unit tests.
  */
 
 
diff --git a/spec/data_view_reader_spec.js b/spec/data_view_reader_spec.js
index 92b12cde8..e4d9a10ba 100644
--- a/spec/data_view_reader_spec.js
+++ b/spec/data_view_reader_spec.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview data_view_reader.js unit tests.
  */
 
 goog.require('shaka.util.DataViewReader');
diff --git a/spec/ebml_parser_spec.js b/spec/ebml_parser_spec.js
index f9b7a7dd5..d2f565cb6 100644
--- a/spec/ebml_parser_spec.js
+++ b/spec/ebml_parser_spec.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview ebml_parser.js unit tests.
  */
 
 goog.require('shaka.util.EbmlParser');
diff --git a/spec/event_manager_spec.js b/spec/event_manager_spec.js
index 696e2e004..e301fcdb1 100644
--- a/spec/event_manager_spec.js
+++ b/spec/event_manager_spec.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview event_manager.js unit tests.
  */
 
 goog.require('shaka.util.EventManager');
diff --git a/spec/fake_event_spec.js b/spec/fake_event_spec.js
index ff9da6148..4ccf2b991 100644
--- a/spec/fake_event_spec.js
+++ b/spec/fake_event_spec.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview FakeEvent and FakeEventTarget unit tests.
  */
 
 goog.require('shaka.util.FakeEvent');
diff --git a/spec/language_utils_spec.js b/spec/language_utils_spec.js
index 39e476253..9d9dafe19 100644
--- a/spec/language_utils_spec.js
+++ b/spec/language_utils_spec.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview language_utils.js unit tests.
  */
 
 goog.require('shaka.util.LanguageUtils');
diff --git a/spec/license_request_spec.js b/spec/license_request_spec.js
index 78274a51b..9523c89fc 100644
--- a/spec/license_request_spec.js
+++ b/spec/license_request_spec.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview license_request.js unit tests.
  */
 
 goog.require('shaka.util.LicenseRequest');
diff --git a/spec/live_integration.js b/spec/live_integration.js
index 7d560abc7..1e209cff9 100644
--- a/spec/live_integration.js
+++ b/spec/live_integration.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Live integration tests.
  */
 
 goog.require('shaka.dash.MpdRequest');
diff --git a/spec/manifest_updater_spec.js b/spec/manifest_updater_spec.js
index 3272a0c8c..a23bc57b0 100644
--- a/spec/manifest_updater_spec.js
+++ b/spec/manifest_updater_spec.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview manifest_updater.js tests.
  */
 
 goog.require('shaka.media.ManifestInfo');
diff --git a/spec/mpd_base_url_spec.js b/spec/mpd_base_url_spec.js
index cb4ddd825..81c475ce6 100644
--- a/spec/mpd_base_url_spec.js
+++ b/spec/mpd_base_url_spec.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview mpd_parser.js unit tests.
  */
 
 goog.require('shaka.dash.mpd');
diff --git a/spec/mpd_content_protection_spec.js b/spec/mpd_content_protection_spec.js
index 075ca1b4f..bd2ae98d2 100644
--- a/spec/mpd_content_protection_spec.js
+++ b/spec/mpd_content_protection_spec.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview mpd_parser.js unit tests.
  */
 
 goog.require('shaka.dash.mpd');
diff --git a/spec/mpd_processor_spec.js b/spec/mpd_processor_spec.js
index 9dddec1de..1768ad3d1 100644
--- a/spec/mpd_processor_spec.js
+++ b/spec/mpd_processor_spec.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview mpd_processor.js unit tests.
  */
 
 goog.require('shaka.dash.MpdProcessor');
diff --git a/spec/mpd_segment_base_spec.js b/spec/mpd_segment_base_spec.js
index 8ca93095a..90e9bb0b4 100644
--- a/spec/mpd_segment_base_spec.js
+++ b/spec/mpd_segment_base_spec.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview mpd_parser.js unit tests.
  */
 
 goog.require('shaka.dash.mpd');
diff --git a/spec/mpd_segment_list_spec.js b/spec/mpd_segment_list_spec.js
index f4d98f27d..e2e84556c 100644
--- a/spec/mpd_segment_list_spec.js
+++ b/spec/mpd_segment_list_spec.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview mpd_parser.js unit tests.
  */
 
 goog.require('shaka.dash.mpd');
diff --git a/spec/mpd_segment_template_spec.js b/spec/mpd_segment_template_spec.js
index a45419abd..7cccdba95 100644
--- a/spec/mpd_segment_template_spec.js
+++ b/spec/mpd_segment_template_spec.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview mpd_parser.js unit tests.
  */
 
 goog.require('shaka.dash.mpd');
diff --git a/spec/mpd_spec.js b/spec/mpd_spec.js
index 23a99620c..dccb59c76 100644
--- a/spec/mpd_spec.js
+++ b/spec/mpd_spec.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview mpd_parser.js unit tests.
  */
 
 goog.require('shaka.dash.mpd');
diff --git a/spec/mpd_utils_spec.js b/spec/mpd_utils_spec.js
index d6643da7c..7b4cf7b57 100644
--- a/spec/mpd_utils_spec.js
+++ b/spec/mpd_utils_spec.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview mpd_utils.js unit tests.
  */
 
 goog.require('shaka.dash.MpdUtils');
diff --git a/spec/player_integration.js b/spec/player_integration.js
index 4854815b4..e74fdf321 100644
--- a/spec/player_integration.js
+++ b/spec/player_integration.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Player integration tests.
  */
 
 goog.require('shaka.dash.MpdRequest');
diff --git a/spec/pssh_spec.js b/spec/pssh_spec.js
index 6761d6bdb..1dbdb3442 100644
--- a/spec/pssh_spec.js
+++ b/spec/pssh_spec.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview pssh.js unit tests.
  */
 
 goog.require('shaka.util.Pssh');
diff --git a/spec/segment_index_parser_spec.js b/spec/segment_index_parser_spec.js
index 3aef39fa1..4bba8b211 100644
--- a/spec/segment_index_parser_spec.js
+++ b/spec/segment_index_parser_spec.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview {mp4,webm}_segment_index_parser.js unit tests.
  */
 
 goog.require('shaka.media.Mp4SegmentIndexParser');
diff --git a/spec/segment_index_spec.js b/spec/segment_index_spec.js
index 0f3b55749..401c50e26 100644
--- a/spec/segment_index_spec.js
+++ b/spec/segment_index_spec.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview segment_index.js unit tests.
  */
 
 goog.require('goog.Uri');
diff --git a/spec/task_spec.js b/spec/task_spec.js
index 27090b7af..b2b2ea001 100644
--- a/spec/task_spec.js
+++ b/spec/task_spec.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Task unit tests.
  */
 
 goog.require('shaka.util.PublicPromise');
diff --git a/spec/util.js b/spec/util.js
index 90cba100b..9d7f5d675 100644
--- a/spec/util.js
+++ b/spec/util.js
@@ -1,5 +1,6 @@
 /**
- * Copyright 2014 Google Inc.
+ * @license
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +13,6 @@
  * 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.
- *
- * @fileoverview Utility functions for unit tests.
  */
 
 goog.require('shaka.asserts');
diff --git a/support.js b/support.js
index ce3791c2e..a9c248e4d 100644
--- a/support.js
+++ b/support.js
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/unit_tests.html b/unit_tests.html
index 2e924aa9b..c345c36fa 100644
--- a/unit_tests.html
+++ b/unit_tests.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
- Copyright 2014 Google Inc.
+ Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.