diff --git a/lib/utils/binding-parser.html b/lib/utils/strict-binding-parser.html
similarity index 98%
rename from lib/utils/binding-parser.html
rename to lib/utils/strict-binding-parser.html
index 6bff5f35dd..5b94efe5b9 100644
--- a/lib/utils/binding-parser.html
+++ b/lib/utils/strict-binding-parser.html
@@ -110,13 +110,14 @@
   /**
    * Mixin that parses binding expressions and generates corresponding metadata.
    * The implementation is different than in `property-effects`, as it uses a
-   * state machine instead of a regex.
+   * state machine instead of a regex. As such, this implementation is able to
+   * handle more cases, with the potential performance hit.
    *
    * @namespace
    * @memberof Polymer
    * @summary Mixin that parses binding expressions and generates corresponding metadata.
    */
-  const BindingParser = Polymer.dedupingMixin((base) => {
+  const StrictBindingParser = Polymer.dedupingMixin((base) => {
 
     return class extends base {
 
@@ -399,6 +400,6 @@
     };
   });
 
-  Polymer.BindingParser = BindingParser;
+  Polymer.StrictBindingParser = StrictBindingParser;
 })();
 </script>
diff --git a/test/unit/property-effects-elements.html b/test/unit/property-effects-elements.html
index 8defcc9519..622d128f55 100644
--- a/test/unit/property-effects-elements.html
+++ b/test/unit/property-effects-elements.html
@@ -7,7 +7,7 @@
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<link rel="import" href="../../lib/utils/binding-parser.html">
+<link rel="import" href="../../lib/utils/strict-binding-parser.html">
 <dom-module id="x-basic">
   <template>
     <div id="boundChild"
@@ -332,10 +332,10 @@
     });
 
     HTMLImports.whenReady(() => {
-      class XBasicWithBindingParser extends Polymer.BindingParser(customElements.get('x-basic')) {
-        static get is() { return 'x-basic-binding-parser'; }
+      class XBasicWithStrictBindingParser extends Polymer.StrictBindingParser(customElements.get('x-basic')) {
+        static get is() { return 'x-basic-strict-binding-parser'; }
       }
-      customElements.define(XBasicWithBindingParser.is, XBasicWithBindingParser);
+      customElements.define(XBasicWithStrictBindingParser.is, XBasicWithStrictBindingParser);
     });
   </script>
 </dom-module>
diff --git a/test/unit/property-effects.html b/test/unit/property-effects.html
index 2a567e335c..f0c78ac772 100644
--- a/test/unit/property-effects.html
+++ b/test/unit/property-effects.html
@@ -420,10 +420,10 @@
     });
   });
 
-  suite('can work with binding parser', function() {
+  suite('can work with strict binding parser', function() {
     setup(function() {
       document.body.removeChild(el);
-      el = document.createElement('x-basic-binding-parser');
+      el = document.createElement('x-basic-strict-binding-parser');
       document.body.appendChild(el);
     });