diff --git a/src/wrappers/Document.js b/src/wrappers/Document.js
index 1390058..e132592 100644
--- a/src/wrappers/Document.js
+++ b/src/wrappers/Document.js
@@ -138,8 +138,8 @@
       // and not from the spec since the spec is out of date.
       [
         'createdCallback',
-        'enteredDocumentCallback',
-        'leftDocumentCallback',
+        'enteredViewCallback',
+        'leftViewCallback',
         'attributeChangedCallback',
       ].forEach(function(name) {
         var f = prototype[name];
diff --git a/test/js/Document.js b/test/js/Document.js
index 250b0d1..30e5769 100644
--- a/test/js/Document.js
+++ b/test/js/Document.js
@@ -373,24 +373,24 @@ htmlSuite('Document', function() {
     assert.equal(self, a);
   });
 
-  test('document.register enteredDocumentCallback, leftDocumentCallback',
+  test('document.register enteredViewCallback, leftViewCallback',
       function() {
     if (!document.register)
       return;
 
-    var enteredDocumentCalls = 0;
-    var leftDocumentCalls = 0;
+    var enteredViewCalls = 0;
+    var leftViewCalls = 0;
 
     function A() {}
     A.prototype = {
       __proto__: HTMLElement.prototype,
-      enteredDocumentCallback: function() {
-        enteredDocumentCalls++;
+      enteredViewCallback: function() {
+        enteredViewCalls++;
         assert.instanceOf(this, A);
         assert.equal(a, this);
       },
-      leftDocumentCallback: function() {
-        leftDocumentCalls++;
+      leftViewCallback: function() {
+        leftViewCalls++;
         assert.instanceOf(this, A);
         assert.equal(a, this);
       }
@@ -400,9 +400,9 @@ htmlSuite('Document', function() {
 
     var a = new A;
     document.body.appendChild(a);
-    assert.equal(enteredDocumentCalls, 1);
+    assert.equal(enteredViewCalls, 1);
     document.body.removeChild(a);
-    assert.equal(leftDocumentCalls, 1);
+    assert.equal(leftViewCalls, 1);
   });
 
   test('document.register attributeChangedCallback', function() {