diff --git a/src/standard/annotations.html b/src/standard/annotations.html
index 897eb18be1..3696ed4e41 100644
--- a/src/standard/annotations.html
+++ b/src/standard/annotations.html
@@ -161,10 +161,12 @@
             this._discoverTemplateParentProps(note.templateContent._notes);
           var bindings = [];
           for (var prop in pp) {
+            var name = '_parent_' + prop;
             bindings.push({
               index: note.index,
               kind: 'property',
-              name: '_parent_' + prop,
+              name: name,
+              propertyName: name,
               parts: [{
                 mode: '{',
                 model: prop,
diff --git a/test/unit/templatizer.html b/test/unit/templatizer.html
index 0621232622..703590dbbf 100644
--- a/test/unit/templatizer.html
+++ b/test/unit/templatizer.html
@@ -256,6 +256,10 @@
       assert.notOk(Object.getOwnPropertyDescriptor(Object.getPrototypeOf(host), 33));
     });
 
+    test('ensure undefined is not set on templatizee', function() {
+      assert.equal(host.$.templatizee[undefined], undefined);
+    });
+
   });
 
 </script>