diff --git a/examples/acroforms/index.html b/examples/acroforms/index.html
index d6c644f4..a54ba704 100644
--- a/examples/acroforms/index.html
+++ b/examples/acroforms/index.html
@@ -12,7 +12,7 @@
   <script src="../../src/display/pattern_helper.js"></script>
   <script src="../../src/display/font_loader.js"></script>
   <script src="../../src/display/dom_utils.js"></script>
-  <script src="../../src/display/annotation_helper.js"></script>
+  <script src="../../src/display/annotation_layer.js"></script>
   <script src="../../src/display/text_layer.js"></script>
 
   <script>
diff --git a/examples/helloworld/index.html b/examples/helloworld/index.html
index b113164f..02947cf9 100644
--- a/examples/helloworld/index.html
+++ b/examples/helloworld/index.html
@@ -12,7 +12,7 @@
   <script src="../../src/display/pattern_helper.js"></script>
   <script src="../../src/display/font_loader.js"></script>
   <script src="../../src/display/dom_utils.js"></script>
-  <script src="../../src/display/annotation_helper.js"></script>
+  <script src="../../src/display/annotation_layer.js"></script>
   <script src="../../src/display/text_layer.js"></script>
 
   <script>
diff --git a/make.js b/make.js
index bb36b472..44c62bd9 100644
--- a/make.js
+++ b/make.js
@@ -531,7 +531,7 @@ target.bundle = function(args) {
     'display/pattern_helper.js',
     'display/font_loader.js',
     'display/dom_utils.js',
-    'display/annotation_helper.js',
+    'display/annotation_layer.js',
     'display/text_layer.js',
     'display/svg.js'
   ]);
diff --git a/src/display/annotation_helper.js b/src/display/annotation_layer.js
similarity index 98%
rename from src/display/annotation_helper.js
rename to src/display/annotation_layer.js
index f9c0c8c9..ad4e4c69 100644
--- a/src/display/annotation_helper.js
+++ b/src/display/annotation_layer.js
@@ -19,7 +19,7 @@
 
 var ANNOT_MIN_SIZE = 10; // px
 
-var AnnotationUtils = (function AnnotationUtilsClosure() {
+var AnnotationLayer = (function AnnotationLayerClosure() {
   // TODO(mack): This dupes some of the logic in CanvasGraphics.setFont()
   function setTextStyles(element, item, fontObj) {
 
@@ -286,4 +286,5 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
     getHtmlElement: getHtmlElement
   };
 })();
-PDFJS.AnnotationUtils = AnnotationUtils;
+
+PDFJS.AnnotationLayer = AnnotationLayer;
diff --git a/test/font/font_test.html b/test/font/font_test.html
index 0f52cbd3..77c581a7 100644
--- a/test/font/font_test.html
+++ b/test/font/font_test.html
@@ -36,7 +36,7 @@
   <script src="../../src/core/parser.js"></script>
   <script src="../../src/core/ps_parser.js"></script>
   <script src="../../src/display/pattern_helper.js"></script>
-  <script src="../../src/display/annotation_helper.js"></script>
+  <script src="../../src/display/annotation_layer.js"></script>
   <script src="../../src/display/text_layer.js"></script>
   <script src="../../src/core/stream.js"></script>
   <script src="../../src/core/worker.js"></script>
diff --git a/test/test_slave.html b/test/test_slave.html
index 7236914d..ad33b590 100644
--- a/test/test_slave.html
+++ b/test/test_slave.html
@@ -26,7 +26,7 @@ limitations under the License.
     <script src="../src/display/pattern_helper.js"></script>
     <script src="../src/display/font_loader.js"></script>
     <script src="../src/display/dom_utils.js"></script>
-    <script src="../src/display/annotation_helper.js"></script>
+    <script src="../src/display/annotation_layer.js"></script>
     <script src="../src/display/text_layer.js"></script>
     <script src="driver.js"></script>
   </head>
diff --git a/test/unit/unit_test.html b/test/unit/unit_test.html
index fcce65d1..2fbfa8d8 100644
--- a/test/unit/unit_test.html
+++ b/test/unit/unit_test.html
@@ -37,7 +37,7 @@
   <script src="../../src/display/pattern_helper.js"></script>
   <script src="../../src/display/font_loader.js"></script>
   <script src="../../src/display/dom_utils.js"></script>
-  <script src="../../src/display/annotation_helper.js"></script>
+  <script src="../../src/display/annotation_layer.js"></script>
   <script src="../../src/display/text_layer.js"></script>
   <script src="../../src/core/stream.js"></script>
   <script src="../../src/core/worker.js"></script>
diff --git a/web/annotations_layer_builder.js b/web/annotations_layer_builder.js
index 11ae32d5..99d05c60 100644
--- a/web/annotations_layer_builder.js
+++ b/web/annotations_layer_builder.js
@@ -105,7 +105,7 @@ var AnnotationsLayerBuilder = (function AnnotationsLayerBuilderClosure() {
               continue;
             }
 
-            element = PDFJS.AnnotationUtils.getHtmlElement(data,
+            element = PDFJS.AnnotationLayer.getHtmlElement(data,
               pdfPage.commonObjs);
             element.setAttribute('data-annotation-id', data.id);
             if (typeof mozL10n !== 'undefined') {
diff --git a/web/viewer.html b/web/viewer.html
index dbbaece0..8cc4ea96 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -61,7 +61,7 @@ See https://github.com/adobe-type-tools/cmap-resources
     <script src="../src/display/pattern_helper.js"></script>
     <script src="../src/display/font_loader.js"></script>
     <script src="../src/display/dom_utils.js"></script>
-    <script src="../src/display/annotation_helper.js"></script>
+    <script src="../src/display/annotation_layer.js"></script>
     <script src="../src/display/text_layer.js"></script>
     <script>PDFJS.workerSrc = '../src/worker_loader.js';</script>
 <!--#endif-->