diff --git a/bower.json b/bower.json
index 204466a..2aa7b77 100644
--- a/bower.json
+++ b/bower.json
@@ -35,6 +35,9 @@
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
   "resolutions": {
+    "paper-input": "feature/multipleValidators",
+    "iron-validator-behavior": "feature/multipleValidators",
+    "iron-input": "feature/multipleValidators",
     "iron-validatable-behavior": "feature/multipleValidators"
   }
 }
diff --git a/demo/old-vs-new/index.html b/demo/old-vs-new/index.html
index 416efcf..4485b3a 100755
--- a/demo/old-vs-new/index.html
+++ b/demo/old-vs-new/index.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
-    <title>tgc-forms Demo</title>
+    <title>Multiple validators - Before and after</title>
     <script src="../../../webcomponentsjs/webcomponents-lite.min.js"></script>
 
     <link rel="stylesheet" href="../../../prism/themes/prism.css">
diff --git a/iron-validatable-behavior.html b/iron-validatable-behavior.html
index 9b5b111..1c9dda9 100644
--- a/iron-validatable-behavior.html
+++ b/iron-validatable-behavior.html
@@ -13,224 +13,225 @@
 
 <script>
 
-    (function () {
-
-        /**
-         * Singleton IronMeta instances.
-         */
-        var customMeta = null;
-        var nativeMeta = null;
-
-        /**
-         * `Use Polymer.IronValidatableBehavior` to implement an element that validates user input.
-         * Use the related `Polymer.IronValidatorBehavior` to add custom validation logic to an iron-input.
-         *
-         * By default, an `<iron-form>` element validates its fields when the user presses the submit button.
-         * To validate a form imperatively, call the form's `validate()` method, which in turn will
-         * call `validate()` on all its children. By using `Polymer.IronValidatableBehavior`, your
-         * custom element will get a public `validate()`, which
-         * will return the validity of the element, and a corresponding `invalid` attribute,
-         * which can be used for styling.
-         *
-         * To implement the custom validation logic of your element, you must override
-         * the protected `_getValidity()` method of this behaviour, rather than `validate()`.
-         * See [this](https://github.com/PolymerElements/iron-form/blob/master/demo/simple-element.html)
-         * for an example.
-         *
-         * ### Accessibility
-         *
-         * Changing the `invalid` property, either manually or by calling `validate()` will update the
-         * `aria-invalid` attribute.
-         *
-         * @demo demo/index.html
-         * @polymerBehavior
-         */
-        Polymer.IronValidatableBehavior = {
-
-            properties: {
-
-                /**
-                 * Name of the validator(s) to use.
-                 * Accepts a list of validators, separated by spaces.
-                 * Note that the order of the validators determines the priority of the error messages.
-                 */
-                validator: {
-                    type: String
-                },
-
-                /**
-                 * True if the last call to `validate` is invalid.
-                 */
-                invalid: {
-                    notify: true,
-                    reflectToAttribute: true,
-                    type: Boolean,
-                    value: false
-                },
-
-                /**
-                 * This property is deprecated and should not be used. Use the global
-                 * validator meta singleton, `Polymer.IronValidatableBehaviorMeta` instead.
-                 */
-                _validatorMeta: {
-                    type: Object
-                },
-
-                /**
-                 * Namespace for this validator. This property is deprecated and should
-                 * not be used. For all intents and purposes, please consider it a
-                 * read-only, config-time property.
-                 */
-                validatorType: {
-                    type: String,
-                    value: 'validator'
-                },
-
-                _validator: {
-                    type: Object,
-                    computed: '__computeValidator(validator)'
-                },
-
-                /**
-                 * Array holding error objects for the current state of the validatable element.
-                 * Each error has the following format:
-                 * {Object} error
-                 * {string} error.name -- validator name of custom validator instance with IronValidatorBehavior
-                 * {string} error.message -- message that is assigned to the validator instance
-                 * {number} error.priority -- priority of the error message, based on order supplied in validator property
-                 */
-                errors: {
-                    type: Array,
-                    readOnly: true,
-                    notify: true,
-                    value: function () {
-                        return [];
-                    }
-                },
-
-                /**
-                 * The id used to connect the validator instance implementing IronValidatableBehavior(having a 'for' property)
-                 * to the validatable. This is useful for validator instances containing custom messages.
-                 */
-                validatableId: {
-                    type: String,
-                    value: ''
-                }
-
-            },
-
-            observers: [
-                '_invalidChanged(invalid)'
-            ],
-
-            registered: function () {
-                customMeta = new Polymer.IronMeta({type: 'validator'});
-                nativeMeta = new Polymer.IronMeta({type: 'native-validator'});
-            },
-
-            _invalidChanged: function () {
-                if (this.invalid) {
-                    this.setAttribute('aria-invalid', 'true');
-                } else {
-                    this.removeAttribute('aria-invalid');
-                }
-            },
-
-            /**
-             * @return {boolean} True if the validator `validator` exists.
-             */
-            hasValidator: function () {
-                return this._validator != null;
-            },
-
-            /**
-             * Returns true if the `value` is valid, and updates `invalid`. If you want
-             * your element to have custom validation logic, do not override this method;
-             * override `_getValidity(value)` instead.
-
-             * @param {Object} value The value to be validated. By default, it is passed
-             * to the validator's `validate()` function, if a validator is set.
-             * @return {boolean} True if `value` is valid.
-             */
-            validate: function (value) {
-                this.invalid = !this._getValidity(value);
-                return !this.invalid;
-            },
-
-            /**
-             * Returns true if `value` is valid.  By default, it is passed
-             * to the validator's `validate()` function, if a validator is set. You
-             * should override this method if you want to implement custom validity
-             * logic for your element.
-             *
-             * @param {Object} value The value to be validated
-             * @return {boolean} True if `value` is valid.
-             */
-            _getValidity: function (value) {
-                this._fillErrorArray(value);
-                return this.errors.length === 0;
-            },
-
-            /**
-             * Fills the errors property with objects as described in errors documentation.
-             * @param {Object} value The value to be validated.
-             */
-            _fillErrorArray: function (value) {
-                var index = 0;
-                this._setErrors([]);
-
-                // Fill error array that is prioritized based on order of arguments in validator attribute
-                for (var v in this._validator) {
-                    if (!this._validator[v].validate(value, this)) {
-                        this.push('errors', {
-                            name: this._validator[v].validatorName,
-                            message: this._validator[v].message,
-                            priority: index
-                        });
-                        index++;
-                    }
-                }
-            },
-
-            /**
-             * Creates an object with multiple validators.
-             *
-             * @return {Object} validators The validators to be executed.
-             */
-            __computeValidator: function () {
-                var result = {};
-                var suffix = '--' + this.validatableId; // Suffix needed for specific instances of custom validators, overriding the default error message
-                var validators = this.validator.replace(/\s+/g, ' ').split(' ');
-
-                // Gather all meta information from custom and native validators
-                var meta = {custom: customMeta, native: nativeMeta};
-
-                validators.forEach(function (v) {
-                    // Custom validators need to be web components and will therefore always contain a hyphen.
-                    // Native validators (think of required, maxlength etc.) never contain a hyphen.
-                    var type = v.indexOf('-') !== -1 ? 'custom' : 'native';
-
-                    // Custom instance exists
-                    if (meta[type] && meta[type].byKey(v + suffix)) {
-                        result[v] = meta[type].byKey(v + suffix);
-                    }
-                    // Default instance exists
-                    else if (meta[type] && meta[type].byKey(v)) {
-                        result[v] = meta[type].byKey(v);
-                    }
-                    // No instance at all, create one for custom validators.
-                    // (Instantiating native validators via iron-native validator wouldn't make sense here, since
-                    // they don't have messages by default and an instance will be present if message is supplied. )
-                    else if (type === 'custom' && (!meta[type] || !meta[type].byKey(v))) {
-                        result[v] = document.createElement(v);
-                    }
-                }, this);
-
-                return result;
-            }
-
-        };
-
-    }());
+(function() {
+
+  /**
+   * Singleton IronMeta instances.
+   */
+  var customMeta = null;
+  var nativeMeta = null;
+
+  /**
+   * `Use Polymer.IronValidatableBehavior` to implement an element that validates user input.
+   * Use the related `Polymer.IronValidatorBehavior` to add custom validation logic to an iron-input.
+   *
+   * By default, an `<iron-form>` element validates its fields when the user presses the submit button.
+   * To validate a form imperatively, call the form's `validate()` method, which in turn will
+   * call `validate()` on all its children. By using `Polymer.IronValidatableBehavior`, your
+   * custom element will get a public `validate()`, which
+   * will return the validity of the element, and a corresponding `invalid` attribute,
+   * which can be used for styling.
+   *
+   * To implement the custom validation logic of your element, you must override
+   * the protected `_getValidity()` method of this behaviour, rather than `validate()`.
+   * See [this](https://github.com/PolymerElements/iron-form/blob/master/demo/simple-element.html)
+   * for an example.
+   *
+   * ### Accessibility
+   *
+   * Changing the `invalid` property, either manually or by calling `validate()` will update the
+   * `aria-invalid` attribute.
+   *
+   * @demo demo/index.html
+   * @polymerBehavior
+   */
+  Polymer.IronValidatableBehavior = {
+
+    properties: {
+
+      /**
+       * Name of the validator(s) to use.
+       * Accepts a list of validators, separated by spaces.
+       * Note that the order of the validators determines the priority of the error messages.
+       */
+      validator: {
+        type: String
+      },
+
+      /**
+       * True if the last call to `validate` is invalid.
+       */
+      invalid: {
+        notify: true,
+        reflectToAttribute: true,
+        type: Boolean,
+        value: false
+      },
+
+      /**
+       * This property is deprecated and should not be used. Use the global
+       * validator meta singleton, `Polymer.IronValidatableBehaviorMeta` instead.
+       */
+      _validatorMeta: {
+        type: Object
+      },
+
+      /**
+       * Namespace for this validator. This property is deprecated and should
+       * not be used. For all intents and purposes, please consider it a
+       * read-only, config-time property.
+       */
+      validatorType: {
+        type: String,
+        value: 'validator'
+      },
+
+      _validator: {
+        type: Object,
+        computed: '__computeValidator(validator)'
+      },
+
+      /**
+       * Array holding error objects for the current state of the validatable element.
+       * Each error has the following keys:
+       * <ul>
+       * <li><b>validator</b> (String) : name of custom validator instance with IronValidatorBehavior</li>
+       * <li><b>message</b> (String) : message that is assigned to the validator instance</li>
+       * <li><b>priority</b> (Number) : priority of the error message, based on order supplied in validator property</li>
+       * </ul>
+       */
+      errors: {
+        type: Array,
+        readOnly: true,
+        notify: true,
+        value: function() {
+          return [];
+        }
+      },
+
+      /**
+       * The id used to connect the validator instance implementing IronValidatableBehavior(having a 'for' property)
+       * to the validatable. This is useful for validator instances containing custom messages.
+       */
+      validatableId: {
+        type: String,
+        value: ''
+      }
+
+    },
+
+    observers: [
+      '_invalidChanged(invalid)'
+    ],
+
+    registered: function() {
+      customMeta = new Polymer.IronMeta({type: 'validator'});
+      nativeMeta = new Polymer.IronMeta({type: 'native-validator'});
+    },
+
+    _invalidChanged: function() {
+      if (this.invalid) {
+        this.setAttribute('aria-invalid', 'true');
+      } else {
+        this.removeAttribute('aria-invalid');
+      }
+    },
+
+    /**
+     * @return {boolean} True if the validator `validator` exists.
+     */
+    hasValidator: function() {
+      return this._validator != null;
+    },
+
+    /**
+     * Returns true if the `value` is valid, and updates `invalid`. If you want
+     * your element to have custom validation logic, do not override this method;
+     * override `_getValidity(value)` instead.
+
+     * @param {Object} value The value to be validated. By default, it is passed
+     * to the validator's `validate()` function, if a validator is set.
+     * @return {boolean} True if `value` is valid.
+     */
+    validate: function(value) {
+      this.invalid = !this._getValidity(value);
+      return !this.invalid;
+    },
+
+    /**
+     * Returns true if `value` is valid.  By default, it is passed
+     * to the validator's `validate()` function, if a validator is set. You
+     * should override this method if you want to implement custom validity
+     * logic for your element.
+     *
+     * @param {Object} value The value to be validated.
+     * @return {boolean} True if `value` is valid.
+     */
+    _getValidity: function(value) {
+      this._fillErrorArray(value);
+      return this.errors.length === 0;
+    },
+
+    /**
+     * Fills the errors property with objects as described in errors documentation.
+     * @param {Object} value The value to be validated.
+     */
+    _fillErrorArray: function(value) {
+      var index = 0;
+      this._setErrors([]);
+
+      // Fill error array that is prioritized based on order of arguments in validator attribute
+      for (var v in this._validator) {
+        if (!this._validator[v].validate(value, this)) {
+          this.push('errors', {
+            validator: this._validator[v].validatorName,
+            message: this._validator[v].message,
+            priority: index
+          });
+          index++;
+        }
+      }
+    },
+
+    /**
+     * Creates an object with multiple validators.
+     *
+     * @return {Object} validators The validators to be executed.
+     */
+    __computeValidator: function() {
+      var result = {};
+      var suffix = '--' + this.validatableId; // Suffix needed for specific instances of custom validators, overriding the default error message
+      var validators = this.validator.replace(/\s+/g, ' ').split(' ');
+
+      // Gather all meta information from custom and native validators
+      var meta = {custom: customMeta, native: nativeMeta};
+
+      validators.forEach(function(v) {
+        // Custom validators need to be web components and will therefore always contain a hyphen.
+        // Native validators (think of required, maxlength etc.) never contain a hyphen.
+        var type = v.indexOf('-') !== -1 ? 'custom' : 'native';
+
+        // Custom instance exists
+        if (meta[type] && meta[type].byKey(v + suffix)) {
+          result[v] = meta[type].byKey(v + suffix);
+        }
+        // Default instance exists
+        else if (meta[type] && meta[type].byKey(v)) {
+          result[v] = meta[type].byKey(v);
+        }
+        // No instance at all, create one for custom validators.
+        // (Instantiating native validators via iron-native validator wouldn't make sense here, since
+        // they don't have messages by default and an instance will be present if message is supplied. )
+        else if (type === 'custom' && (!meta[type] || !meta[type].byKey(v))) {
+          result[v] = document.createElement(v);
+        }
+      }, this);
+
+      return result;
+    }
+
+  };
+
+ }());
 
 </script>
diff --git a/test/iron-validatable-behavior.html b/test/iron-validatable-behavior.html
index ab808fa..e9d1b46 100644
--- a/test/iron-validatable-behavior.html
+++ b/test/iron-validatable-behavior.html
@@ -185,10 +185,10 @@
         var validatable = fixture('multipleValidators')[2];
         validatable.validate('cat');
         assert.equal(validatable.errors.length, 2);
-        assert.equal(validatable.errors[0].name, 'no-cats');
+        assert.equal(validatable.errors[0].validator, 'no-cats');
         assert.equal(validatable.errors[0].message, 'No cat(s) allowed');
         assert.equal(validatable.errors[0].priority, 0);
-        assert.equal(validatable.errors[1].name, 'no-catfishes');
+        assert.equal(validatable.errors[1].validator, 'no-catfishes');
         assert.equal(validatable.errors[1].message, 'No cat(fish(es)) allowed');
         assert.equal(validatable.errors[1].priority, 1);
       });
@@ -215,13 +215,13 @@
         validatable.value = '';
         validatable.validate();
 
-        assert.equal(validatable.errors[0].name, 'required');
+        assert.equal(validatable.errors[0].validator, 'required');
         assert.equal(validatable.errors[0].priority, 0);
 
-        assert.equal(validatable.errors[1].name, 'cats-only');
+        assert.equal(validatable.errors[1].validator, 'cats-only');
         assert.equal(validatable.errors[1].priority, 1);
 
-        assert.equal(validatable.errors[2].name, 'dogs-only');
+        assert.equal(validatable.errors[2].validator, 'dogs-only');
         assert.equal(validatable.errors[2].priority, 2);
       });
 
@@ -230,9 +230,9 @@
         validatable.value = '2';
         validatable.validate();
 
-        assert.equal(validatable.errors[0].name, 'min');
+        assert.equal(validatable.errors[0].validator, 'min');
         assert.equal(validatable.errors[0].priority, 0);
-        assert.equal(validatable.errors[1].name, 'step');
+        assert.equal(validatable.errors[1].validator, 'step');
         assert.equal(validatable.errors[1].priority, 1);
       });
 
@@ -240,7 +240,7 @@
         var validatable = fixture('override-native-messages').querySelector('[min]');
         validatable.validate();
 
-        assert.equal(validatable.errors[0].name, 'min');
+        assert.equal(validatable.errors[0].validator, 'min');
         assert.equal(validatable.errors[0].message, 'customMin');
       });
 
@@ -264,7 +264,7 @@
 
             validatable.validate();
 
-            assert.equal(validatable.errors[0].name, validator, 'Validator [' + validator + '] is not triggered');
+            assert.equal(validatable.errors[0].validator, validator, 'Validator [' + validator + '] is not triggered');
             assert.equal(validatable.errors[0].message, msg, 'Validation message for validator [' + validator + '] is not set properly');
           });
         });
@@ -280,7 +280,7 @@
 
             validatable.validate();
 
-            assert.equal(validatable.errors[0].name, validator, 'Validator [' + validator + '] is not triggered');
+            assert.equal(validatable.errors[0].validator, validator, 'Validator [' + validator + '] is not triggered');
             assert.equal(validatable.errors[0].message, msg, 'Validation message for validator [' + validator + '] is not set properly');
           });
         });
