diff --git a/PRIMER.md b/PRIMER.md
index 1006b0fe..62e8e99a 100644
--- a/PRIMER.md
+++ b/PRIMER.md
@@ -22,8 +22,8 @@ Bare-minum Custom Element sugaring
 | [Bespoke constructor support](#bespoke-constructor) | constructor: function() { … }
 | [Basic lifecycle callbacks](#basic-callbacks) | created, attached, detached, attributeChanged
 | [Native HTML element extension](#type-extension) | extends: ‘…’
-| [Configure properties](#property-config) | propertyConfig: { … }
-| [Attribute deserialization to property](#attribute-deserialization) | propertyConfig: { \<property>: \<Type> }
+| [Configure properties](#property-config) | properties: { … }
+| [Attribute deserialization to property](#attribute-deserialization) | properties: { \<property>: \<Type> }
 | [Module registry](#module-registry) | modularize, using
 | [Prototype Mixins](#prototype-mixins) | mixins: [ … ]
 
@@ -46,15 +46,15 @@ Declarative data binding, events, and property nofication
 | [Local node marshalling](#node-marshalling) | this.$.\<id>
 | [Event listener setup](#event-listeners)| listeners: { ‘\<node>.\<event>’: ‘function’, ... }
 | [Annotated event listener setup](#annotated-listeners) | \<element on-[event]=”function”>
-| [Property change callbacks](#change-callbacks) | propertyConfig: \<prop>: { observer: ‘function’ }
+| [Property change callbacks](#change-callbacks) | properties: \<prop>: { observer: ‘function’ }
 | [Declarative property binding](#property-binding) | \<element prop=”{{property\|path}}”>
-| [Property change notification](#property-notification) | propertyConfig: { \<prop>: { notify: true } }
+| [Property change notification](#property-notification) | properties: { \<prop>: { notify: true } }
 | [Binding to structured data](#path-binding) | \<element prop=”{{obj.sub.path}}”>
 | [Path change notification](#set-path) | setPathValue(\<path>, \<value>)
 | [Declarative attribute binding](#attribute-binding) | \<element attr$=”{{property\|path}}”>
-| [Reflecting properties to attributes](#attribute-reflection) | propertyConfig: \<prop>: { reflect: true } }
+| [Reflecting properties to attributes](#attribute-reflection) | properties: \<prop>: { reflect: true } }
 | [Computed properties](#computed-properties) | computed: { \<property>: ‘function(\<property>)’ }
-| [Read-only properties](#read-only) |  propertyConfig: { \<prop>: { readOnly: true } }
+| [Read-only properties](#read-only) |  properties: { \<prop>: { readOnly: true } }
 | [Utility functions](#utility-functions) | toggleClass, toggleAttribute, fire, async, …
 | [Attribute-based layout](#layout-html) | layout.html (layout horizontal flex ...)
 
@@ -214,9 +214,9 @@ See the [section on configuring elements](#configuring-elements) for a more in-d
 <a name="property-config"></a>
 ## Configuring properties
 
-Placing an object-valued `propertyConfig` property on your prototype allows you to define metadata regarding your Custom Element's properties, which can then be accessed via an API for use by other Polymer features.
+Placing an object-valued `properties` property on your prototype allows you to define metadata regarding your Custom Element's properties, which can then be accessed via an API for use by other Polymer features.
 
-By itself, the `propertyConfig` feature **doesn't do anything**. It only provides API for asking questions about these special properties (see featues below for details).
+By itself, the `properties` feature **doesn't do anything**. It only provides API for asking questions about these special properties (see featues below for details).
 
 Example:
 
@@ -225,7 +225,7 @@ Polymer({
 
   is: 'x-custom',
 
-  propertyConfig: {
+  properties: {
     user: String,
     isHappy: Boolean,
     count: {
@@ -247,7 +247,7 @@ Remember that the fields assigned to `count`, such as `readOnly` and `notify` do
 <a name="attribute-deserialization"></a>
 ## Attribute deserialization
 
-If an attribute matches a property listed in the `propertyConfig` object, the attribute value will be assigned to a property of the same name on the element instance.  Attribute values (always strings) will be automatically converted to the propertyConfig type when assigned to the property.  If no other `propertyConfig` options are specified for a property, the type (specified using the type constructor, e.g. `Object`, `String`, etc.) can be set directly as the value of the property in the propertyConfig object; otherwise it should be provided as the value to the `type` key in the `propertyConfig` configuration object.
+If an attribute matches a property listed in the `properties` object, the attribute value will be assigned to a property of the same name on the element instance.  Attribute values (always strings) will be automatically converted to the properties type when assigned to the property.  If no other `properties` options are specified for a property, the type (specified using the type constructor, e.g. `Object`, `String`, etc.) can be set directly as the value of the property in the properties object; otherwise it should be provided as the value to the `type` key in the `properties` configuration object.
 
 The type system includes support for Object values expressed as JSON, or Date objects expressed as any Date-parsable string representation. Boolean properties set based on the existence of the attribute: if the attribute exists at all, its value is true, regardless of its string-value (and the value is only false if the attribute does not exist).
 
@@ -260,7 +260,7 @@ Example:
 
     is: 'x-custom',
 
-    propertyConfig: {
+    properties: {
       user: String,
       manager: {
         type: Boolean,
@@ -666,7 +666,7 @@ Example:
 <a name="change-callbacks"></a>
 ## Property change callbacks (observers)
 
-Custom element properties may be observed for changes by specifying `observer` property in the `propertyConfig` for the property that gives the name of a funciton to call.  When the property changes, the change handler will be called with the new and old values as arguments.
+Custom element properties may be observed for changes by specifying `observer` property in the `properties` for the property that gives the name of a funciton to call.  When the property changes, the change handler will be called with the new and old values as arguments.
 
 Example:
 
@@ -675,7 +675,7 @@ Polymer({
 
   is: 'x-custom',
 
-  propertyConfig: {
+  properties: {
     disabled: {
       type: Boolean,
       observer: 'disabledChanged'
@@ -711,7 +711,7 @@ Polymer({
 
   is: 'x-custom',
 
-  propertyConfig: {
+  properties: {
     preload: Boolean,
     src: String,
     size: String
@@ -737,7 +737,7 @@ Polymer({
 
   is: 'x-custom',
 
-  propertyConfig: {
+  properties: {
     user: Object
   },
 
@@ -790,7 +790,7 @@ To bind to textContent, the binding annotation must currently span the entire co
 
     is: 'user-view',
 
-    propertyConfig: {
+    properties: {
       first: String,
       last: String
     }
@@ -818,7 +818,7 @@ To bind to properties, the binding annotation should be provided as the value to
 
     is: 'main-view',
 
-    propertyConfig: {
+    properties: {
       user: Object
     }
 
@@ -845,7 +845,7 @@ Note that currently binding to `style` is a special case which results in the va
 
 Polymer supports cooperative two-way binding between elements, allowing elements that "produce" data or changes to data to propagate those changes upwards to hosts when desired.
 
-When a Polymer elements changes a property that was configured in `propertyConfig` with the `notify` flag set to true, it automatically fires a non-bubbling DOM event to indicate those changes to interested hosts.  These events follow a naming convention of `<property>-changed`, and contain a `value` property in the `event.detail` object indicating the new value.
+When a Polymer elements changes a property that was configured in `properties` with the `notify` flag set to true, it automatically fires a non-bubbling DOM event to indicate those changes to interested hosts.  These events follow a naming convention of `<property>-changed`, and contain a `value` property in the `event.detail` object indicating the new value.
 
 As such, one could attach an `on-<property>-changed` listener to an element to be notified of changes to such properties, set the `event.detail.value` to a property on itself, and take necessary actions based on the new value.  However, given this is a common pattern, bindings using "curly-braces" (e.g. `{{property}}`) will automatically perform this upwards binding automatically without the user needing to perform those tasks.  This can be defeated by using "square-brace" syntax (e.g. `[[property]]`), which results in only one-way (downward) data-binding.
 
@@ -862,7 +862,7 @@ Example 1: Two-way binding
 
   Polymer({
     is: 'custom-element',
-    propertyConfig: {
+    properties: {
       prop: {
         type: String,
         notify: true
@@ -884,7 +884,7 @@ Example 2: One-way binding (downward)
 <script>
   Polymer({
     is: 'custom-element',
-    propertyConfig: {
+    properties: {
       prop: {
         type: String,
         notify: true
@@ -907,7 +907,7 @@ Example 3: One-way binding (downward)
 
   Polymer({
     is: 'custom-element',
-    propertyConfig: {
+    properties: {
       prop: String    // no `notify:true`!
     }
   });
@@ -926,7 +926,7 @@ Example 4: One-way binding (upward)
 <script>
   Polymer({
     is: 'custom-element',
-    propertyConfig: {
+    properties: {
       prop: {
           type: String,
           notify: true,
@@ -950,7 +950,7 @@ Example 5: Error / non-sensical state
 
   Polymer({
     is: 'custom-element',
-    propertyConfig: {
+    properties: {
       prop: {
           type: String,
           notify: true,
@@ -1070,13 +1070,13 @@ Again, as values must be serialized to strings when binding to attributes, it is
 <a name="attribute-reflection"></a>
 ## Reflecting properties to attributes
 
-In specific cases, it may be useful to keep an HTML attribute value in sync with a property value.  This may be achieved by setting `reflect: true` on a property in the `propertyConfig` configuration object.  This will cause any change to the property to be serialized out to an attribute of the same name.
+In specific cases, it may be useful to keep an HTML attribute value in sync with a property value.  This may be achieved by setting `reflect: true` on a property in the `properties` configuration object.  This will cause any change to the property to be serialized out to an attribute of the same name.
 
 ```html
 <script>
   Polymer({
 
-    propertyConfig: {
+    properties: {
      response: {
         type: Object,
         reflect: true
@@ -1097,7 +1097,7 @@ Values will be serialized according to type: Arrays/Objects will be `JSON.string
 <a name="computed-properties"></a>
 ## Computed properties
 
-Polymer supports virtual properties whose values are calculated from other properties.  Computed properties can be defined in the `propertyConfig` object by providing a `computed` key mapping to a computing function.  The name of the function to compute the value is provided as a string with dependent properties as arguments in parenthesis.  The function will be called once (asynchronously) for any change to the dependent properties.
+Polymer supports virtual properties whose values are calculated from other properties.  Computed properties can be defined in the `properties` object by providing a `computed` key mapping to a computing function.  The name of the function to compute the value is provided as a string with dependent properties as arguments in parenthesis.  The function will be called once (asynchronously) for any change to the dependent properties.
 
 ```html
 <dom-module id="x-custom">
@@ -1111,7 +1111,7 @@ Polymer supports virtual properties whose values are calculated from other prope
 
     is: 'x-custom',
 
-    propertyConfig: {
+    properties: {
 
       first: String,
 
@@ -1141,13 +1141,13 @@ Note: Only direct properties of the element (as opposed to sub-properties of an
 <a name="read-only"></a>
 ## Read-only properties
 
-When a property only "produces" data and never consumes data, this can be made explicit to avoid accidental changes from the host by setting the `readOnly` flag to `true` in the `propertyConfig` property definition.  In order for the element to actually change the value of the property, it must use a private generated setter of the convention `_set<Property>(value)`.
+When a property only "produces" data and never consumes data, this can be made explicit to avoid accidental changes from the host by setting the `readOnly` flag to `true` in the `properties` property definition.  In order for the element to actually change the value of the property, it must use a private generated setter of the convention `_set<Property>(value)`.
 
 ```html
 <script>
   Polymer({
 
-    propertyConfig: {
+    properties: {
       response: {
         type: Object,
         readOnly: true,
diff --git a/README.md b/README.md
index bbef9254..95083631 100644
--- a/README.md
+++ b/README.md
@@ -67,16 +67,16 @@ By default, the default Polymer distribution include several features. Although
 
 ### Feature: _property-config_
 
-The first feature implements support for the `propertyConfig` property. By placing a object-valued `propertyConfig` property on your prototype, let's you define various aspects of your custom-elements public API. 
+The first feature implements support for the `properties` property. By placing a object-valued `properties` property on your prototype, let's you define various aspects of your custom-elements public API. 
 
-By itself, the `propertyConfig` feature **doesn't do anything**. It only provides API for asking questions about these special properties (see [link to docs] for details).
+By itself, the `properties` feature **doesn't do anything**. It only provides API for asking questions about these special properties (see [link to docs] for details).
 
 ```js
 Polymer({
 
   is: 'x-custom',
 
-  propertyConfig: {
+  properties: {
     user: String,
     isHappy: Boolean,
     count: {
@@ -128,7 +128,7 @@ Many custom elements want to support configuration using HTML attributes. Custom
 
 Although it's relatively simple, having to write this code becomes annoying when working with multiple attributes or non-String types. It's also not very DRY. 
 
-Instead, Polymer's `attributes` feature handles this work for you (using the `propertyConfig` feature data). If an attribute is set that matches a property listed in the `propertyConfig` object, the value is captured into the matching property. Strings are automatically converted to the specified type.
+Instead, Polymer's `attributes` feature handles this work for you (using the `properties` feature data). If an attribute is set that matches a property listed in the `properties` object, the value is captured into the matching property. Strings are automatically converted to the specified type.
 
 The type system includes support for Object values expressed as JSON, or Date objects expressed as any Date-parsable string representation. Boolean properties are mapped to Boolean attributes, in other words, if the attribute exists at all, its value is true, regardless of its string-value (and the value is only false if the attribute does not exist).
 
@@ -141,7 +141,7 @@ Here is the equivalent of the above code, taking advantage of the `attributes` f
 
     is: 'x-custom',
 
-    propertyConfig: {
+    properties: {
       user: String
     },
 
diff --git a/explainer/samples.html b/explainer/samples.html
index f30400a3..b960472b 100644
--- a/explainer/samples.html
+++ b/explainer/samples.html
@@ -33,7 +33,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
       is: 'x-custom',
 
-      propertyConfig: {
+      properties: {
         user: String
       },
 
diff --git a/property-config.html b/property-config.html
new file mode 100644
index 00000000..ed460e56
--- /dev/null
+++ b/property-config.html
@@ -0,0 +1,159 @@
+<script>
+
+  Polymer({
+
+    is: 'core-image',
+
+    properties: {
+
+      // Public properties
+
+      propertyName: {   // Information about properties
+        type: String,   // Type to use when deserializing attribute
+        notify: true,   // Whether or not to send <propertyName>-changed event
+        readOnly: true, // Setter is no op, must use private _setPropertyName setter
+        value: 'foo',   // Default value; may also be function that returns value
+        computed: 'computeFn(dep1, dep2)', // Function that computes this value based on dependencies
+        observer: 'propertyChanged' // Function to call upon changed
+      },
+
+      src: {
+        type: String,
+        value: '',
+        observer: 'srcChanged'
+      },
+
+      preventLoad: {
+        type: Boolean,
+        value: false
+      },
+
+      sizing: {
+        type: String,
+        value: null
+      },
+
+      position: {
+        type: String,
+        value: 'center'
+      },
+
+      preload: {
+        type: Boolean,
+        value: false
+      },
+
+      placeholder: {
+        type: String,
+        value: null
+      },
+
+      fade: {
+        type: Boolean,
+        value: false
+      },
+
+      loaded: {
+        type: Boolean,
+        notify: true,
+        readOnly: true,
+        value: false
+      },
+
+      loading: {
+        type: Boolean,
+        notify: true,
+        readOnly: true,
+        value: false
+      },
+
+      width: {
+        type: Number,
+        value: null,
+        observer: 'widthChanged'
+      },
+
+      height: {
+        type: Number,
+        value: null,
+        observer: 'heightChanged'
+      },
+
+      someObject: {
+        type: Object,
+        notify: true,
+        value: function() { return {}; }
+      },
+
+      // Private properties
+
+      imageClassName: {
+        computed: 'computeImageClassName(sizing)'
+      },
+
+      placeholderClassName: {
+        computed: 'computePlaceholderClassName(fade,loaded,preload)'
+      },
+
+      placeholderBackgroundUrl: {
+        computed: 'computePlaceholderBackgroundUrl(preload,placeholder)'
+      },
+      
+      requiresPreload: {
+        computed: 'computeRequiresPreload(preload,loaded)'
+      },
+
+      canLoad: {
+        computed: 'computeCanLoad(preventLoad,src)'
+      }
+
+    },
+
+    observers: {
+      'sizing position': 'transformChanged',
+      'canLoad preload loaded': 'loadBehaviorChanged',
+      'src preload loaded': 'loadStateChanged',
+      'items.*': 'itemStuffChanged'
+    }
+
+  });
+
+  Polymer({
+
+    properties: {
+
+      propertyName: {   // Information about properties
+        type: String,   // Type to use when deserializing attribute
+        notify: true,   // Whether or not to send <propertyName>-changed event
+        readOnly: true, // Setter is no op, must use private _setPropertyName setter
+
+        value: 'foo',   // Default value; may also be function that returns value
+        // value: function(inputs) { return ... },
+        // noInitialObserver: true,
+        computed: 'computeFn(dep1, dep2)', // Function that computes this value based on dependencies
+        observer: 'propertyChanged' // Function to call upon changed
+      }
+
+    },
+
+    observers: {
+      'dep1 dep2': 'dependenciesChanged',
+      'object.path.*': 'pathChanged'
+    },
+
+    listeners: {
+      'click': 'clickHandler'
+    },
+
+    configure: function(inputs) {
+      return {
+        propertyName: 'default1',
+        propertyName2: 'default2'
+      };
+    }
+
+  });
+
+
+</script>
+
diff --git a/src/features/micro/attributes.html b/src/features/micro/attributes.html
index 3d7db805..1ab24322 100644
--- a/src/features/micro/attributes.html
+++ b/src/features/micro/attributes.html
@@ -19,7 +19,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
    *
    * Support for mapping attributes to properties.
    *
-   * Properties that are configured in `propertyConfig` with a type are mapped
+   * Properties that are configured in `properties` with a type are mapped
    * to attributes.
    * 
    * A value set in an attribute is deserialized into the specified 
@@ -27,7 +27,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
    *
    * Example:
    *
-   *     propertyConfig: {
+   *     properties: {
    *       // values set to index attribute are converted to Number and propagated
    *       // to index property
    *       index: Number,
@@ -78,7 +78,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       },
 
       _takeAttributesToModel: function(model) {
-        for (var name in this.propertyConfig) {
+        for (var name in this.properties) {
           var type = this.getPropertyType(name);
           if (type && this.hasAttribute(name)) {
             this.setAttributeToProperty(model, name, type);
diff --git a/src/features/micro/property-config.html b/src/features/micro/property-config.html
index 505e65ef..c77f4b37 100644
--- a/src/features/micro/property-config.html
+++ b/src/features/micro/property-config.html
@@ -16,16 +16,16 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     /**
      * Define property metadata.
      *
-     *     propertyConfig: {
+     *     properties: {
      *       <property>: <Type || Object>,
      *       ...
      *     }
      * 
      * Example:
      * 
-     *     propertyConfig: {
+     *     properties: {
      *       // `foo` property can be assigned via attribute, will be deserialized to
-     *       // the specified data-type. All `propertyConfig` properties have this behavior.
+     *       // the specified data-type. All `properties` properties have this behavior.
      *       foo: String,
      *
      *       // `bar` property has additional behavior specifiers.
@@ -39,7 +39,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
      *       }
      *     }
      *
-     * By itself the propertyConfig feature doesn't do anything but provide property
+     * By itself the properties feature doesn't do anything but provide property
      * information. Other features use this information to control behavior.
      *
      * The `type` information is used by the `attributes` feature to convert
@@ -54,24 +54,24 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
      * `readOnly` properties have a getter, but no setter. To set a read-only
      * property, use the private setter method `_set_<property>(value)`.
      *
-     * @class base feature: propertyConfig
+     * @class base feature: properties
      */
 
     Base.addFeature({
 
-      propertyConfig: {
+      properties: {
       },
 
       nob: Object.create(null),
 
       getPropertyInfo: function(property) {
-        return this._getPropertyInfo(property, this.propertyConfig);
+        return this._getPropertyInfo(property, this.properties);
       },
 
-      _getPropertyInfo: function(property, propertyConfig) {
-        var p = propertyConfig[property];
+      _getPropertyInfo: function(property, properties) {
+        var p = properties[property];
         if (typeof(p) === 'function') {
-          p = propertyConfig[property] = {
+          p = properties[property] = {
             type: p
           };
         }
diff --git a/src/features/standard/configure.html b/src/features/standard/configure.html
index a236eb94..6a992338 100644
--- a/src/features/standard/configure.html
+++ b/src/features/standard/configure.html
@@ -68,8 +68,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         var i;
         // get individual default values from property config
         var config = {};
-        for (i in this.propertyConfig) {
-          var c = this.propertyConfig[i];
+        for (i in this.properties) {
+          var c = this.properties[i];
           if (c.value !== undefined) {
             if (typeof c.value == 'function') {
               config[i] = c.value.call(this, this._config);
diff --git a/src/features/standard/effects.html b/src/features/standard/effects.html
index ad137925..8644d41e 100644
--- a/src/features/standard/effects.html
+++ b/src/features/standard/effects.html
@@ -16,7 +16,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
   /**
    * Support for the declarative property sugaring via mustache `{{ }}` 
-   * annotations in templates, and via the `propertyConfig` objects on 
+   * annotations in templates, and via the `properties` objects on 
    * prototypes.
    *
    * Example:
@@ -25,11 +25,11 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
    *       <span hidden="{{hideSpan}}">{{name}}</span> is on the hook.
    *     </template>
    * 
-   * The `propertyConfig` object syntax is as follows:
+   * The `properties` object syntax is as follows:
    *
    *     Polymer({
    *     
-   *       propertyConfig: {
+   *       properties: {
    *         myProp: {
    *           observer: 'myPropChanged',
    *           computed: 'computemyProp(input1, input2)'
@@ -44,7 +44,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
    * properties.
    * 
    * Property effects can be created imperatively, by template-annotations
-   * (e.g. mustache notation), or by declaration in the `propertyConfig` object.
+   * (e.g. mustache notation), or by declaration in the `properties` object.
    *
    * The effect data is consumed by the `bind` subsystem (`/src/bind/*`), 
    * which compiles the effects into efficient JavaScript that is triggered, 
@@ -69,7 +69,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
       _prepEffects: function() {
         Bind.prepareModel(this);
-        this._addDynamicEffects(this.propertyConfig);
+        this._addDynamicEffects(this.properties);
         this._addObserverEffects(this.observers);
         this._addAnnotationEffects(this._annotes);
         Bind.createBindings(this);
diff --git a/src/features/standard/notify-path.html b/src/features/standard/notify-path.html
index e09d31a2..23b1dff0 100644
--- a/src/features/standard/notify-path.html
+++ b/src/features/standard/notify-path.html
@@ -26,7 +26,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
    *   
    *       is: 'x-date',
    *   
-   *       propertyConfig: {
+   *       properties: {
    *         date: {
    *           type: Object,
    *           notify: true
diff --git a/src/lib/template/x-array-selector.html b/src/lib/template/x-array-selector.html
index 5d381e3f..7f982a7a 100644
--- a/src/lib/template/x-array-selector.html
+++ b/src/lib/template/x-array-selector.html
@@ -15,7 +15,7 @@ using('Collection', function(Collection) {
   Polymer({
     is: 'x-array-selector',
     
-    propertyConfig: {
+    properties: {
       items: Array,
       selected: {
         type: Object,
diff --git a/src/lib/template/x-repeat.html b/src/lib/template/x-repeat.html
index cae82a82..3c6ac4f5 100644
--- a/src/lib/template/x-repeat.html
+++ b/src/lib/template/x-repeat.html
@@ -32,7 +32,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       is: 'x-repeat',
       extends: 'template',
 
-      propertyConfig: {
+      properties: {
         items: {
           type: Array
         },
diff --git a/test/smoke/polymer-smoke.html b/test/smoke/polymer-smoke.html
index 75568fcd..89fb794b 100644
--- a/test/smoke/polymer-smoke.html
+++ b/test/smoke/polymer-smoke.html
@@ -199,7 +199,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
     hostAttributes: 'block',
 
-    propertyConfig: {
+    properties: {
       attribute: String
     },
 
diff --git a/test/unit/attributes-elements.html b/test/unit/attributes-elements.html
index 8feff7d9..a2410aa2 100644
--- a/test/unit/attributes-elements.html
+++ b/test/unit/attributes-elements.html
@@ -1,7 +1,7 @@
 <script>
   Polymer({
     is: 'x-basic',
-    propertyConfig: {
+    properties: {
       object: {
         type: Object,
         value: function() { return {}; }
@@ -37,7 +37,7 @@
 <script>
   Polymer({
     is: 'x-reflect',
-    propertyConfig: {
+    properties: {
       object: {
         type: Object,
         reflect: true,
diff --git a/test/unit/bind-elements.html b/test/unit/bind-elements.html
index 38739dfb..dcedba5c 100644
--- a/test/unit/bind-elements.html
+++ b/test/unit/bind-elements.html
@@ -4,7 +4,7 @@
 <script>
   Polymer({
     is: 'x-basic',
-    propertyConfig: {
+    properties: {
       value: {
         observer: 'valueChanged'
       },
@@ -98,7 +98,7 @@
 <script>
   Polymer({
     is: 'x-reflect',
-    propertyConfig: {
+    properties: {
       reflectedobject: {
         type: Object,
         reflect: true
diff --git a/test/unit/configure-elements.html b/test/unit/configure-elements.html
index 780ce5e2..1cf63c8b 100644
--- a/test/unit/configure-elements.html
+++ b/test/unit/configure-elements.html
@@ -1,7 +1,7 @@
 <script>
   var configureMixin = {
 
-    propertyConfig: {
+    properties: {
       content: {
         type: String,
         notify: true,
diff --git a/test/unit/configure.html b/test/unit/configure.html
index 07fb6663..75cd3d95 100644
--- a/test/unit/configure.html
+++ b/test/unit/configure.html
@@ -55,12 +55,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
   suite('configure', function() {
 
-    test('value set in propertyConfig initializes correctly', function() {
+    test('value set in properties initializes correctly', function() {
       var e = document.querySelector('x-configure-value');
       testConfigure(e, 'default', 'obj-default');      
     });
 
-    test('attribute overrides value set in propertyConfig', function() {
+    test('attribute overrides value set in properties', function() {
       var e = document.querySelector('x-configure-value[content]');
       testConfigure(e, 'attr', 'obj-attr');
     });
diff --git a/test/unit/notify-path-elements.html b/test/unit/notify-path-elements.html
index 6f988104..62423851 100644
--- a/test/unit/notify-path-elements.html
+++ b/test/unit/notify-path-elements.html
@@ -1,7 +1,7 @@
 <script>
   Polymer({
     is: 'x-basic',
-    propertyConfig: {
+    properties: {
       notifyingValue: {
         type: Number,
         notify: true
@@ -18,7 +18,7 @@
 <script>
   Polymer({
     is: 'x-compose',
-    propertyConfig: {
+    properties: {
       obj: {
         type: Object,
         notify: true
@@ -39,7 +39,7 @@
 <script>
   Polymer({
     is: 'x-forward',
-    propertyConfig: {
+    properties: {
       obj: {
         type: Object,
         notify: true