diff --git a/polymer.html b/polymer.html
index 37cd51dde4..5f0c5e06e8 100644
--- a/polymer.html
+++ b/polymer.html
@@ -88,8 +88,8 @@
 </script>
 
 <link rel="import" href="src/lib/custom-style.html">
-<link rel="import" href="src/lib/template/x-autobind.html">
-<link rel="import" href="src/lib/template/x-template.html">
-<link rel="import" href="src/lib/template/x-repeat.html">
-<link rel="import" href="src/lib/template/x-array-selector.html">
-<link rel="import" href="src/lib/template/x-if.html">
+<link rel="import" href="src/lib/template/dom-bind.html">
+<link rel="import" href="src/lib/template/dom-template.html">
+<link rel="import" href="src/lib/template/dom-repeat.html">
+<link rel="import" href="src/lib/template/array-selector.html">
+<link rel="import" href="src/lib/template/dom-if.html">
diff --git a/src/lib/custom-style.html b/src/lib/custom-style.html
index 1c69b90937..054a46e513 100644
--- a/src/lib/custom-style.html
+++ b/src/lib/custom-style.html
@@ -17,12 +17,12 @@
 in the main document that can take advantage of several special features of
 Polymer's styling system:
 
-* Document styles defined in an `x-style` will be shimmed to ensure they do
+* Document styles defined in a `custom-style` will be shimmed to ensure they do
 not leak into local DOM when running on browsers without non-native Shadow DOM.
 * Shadow DOM-specific `/deep/` and `::shadow` combinators will be shimmed on
 browsers without non-native Shadow DOM.
-* Custom properties used by Polymer's experimental shim for cross-scope styling
-may be defined in an `x-style`.
+* Custom properties used by Polymer's shim for cross-scope styling
+may be defined in an `custom-style`.
 
 Example:
 
diff --git a/src/lib/template/x-array-selector.html b/src/lib/template/array-selector.html
similarity index 93%
rename from src/lib/template/x-array-selector.html
rename to src/lib/template/array-selector.html
index 92f5006aa2..7ee67838c6 100644
--- a/src/lib/template/x-array-selector.html
+++ b/src/lib/template/array-selector.html
@@ -10,7 +10,7 @@
 
 <!--
 Keeping structured data in sync requires that Polymer understand the path
-associations of data being bound.  The `x-array-selector` element ensures path
+associations of data being bound.  The `array-selector` element ensures path
 linkage when selecting specific items from an array (either single or multiple).
 The `items` property accepts an array of user data, and via the `select(item)`
 and `deselect(item)` API, updates the `selected` property which may be bound to
@@ -25,16 +25,16 @@
   <template>
 
     <div> Employee list: </div>
-    <template is="x-repeat" id="employeeList" items="{{employees}}">
+    <template is="dom-repeat" id="employeeList" items="{{employees}}">
         <div>First name: <span>{{item.first}}</span></div>
         <div>Last name: <span>{{item.last}}</span></div>
         <button on-click="toggleSelection">Select</button>
     </template>
 
-    <x-array-selector id="selector" items="{{employees}}" selected="{{selected}}" multi toggle></x-array-selector>
+    <array-selector id="selector" items="{{employees}}" selected="{{selected}}" multi toggle></array-selector>
 
     <div> Selected employees: </div>
-    <template is="x-repeat" items="{{selected}}">
+    <template is="dom-repeat" items="{{selected}}">
         <div>First name: <span>{{item.first}}</span></div>
         <div>Last name: <span>{{item.last}}</span></div>
     </template>
@@ -65,7 +65,7 @@
 <script>
 
   Polymer({
-    is: 'x-array-selector',
+    is: 'array-selector',
 
     properties: {
 
diff --git a/src/lib/template/x-autobind.html b/src/lib/template/dom-bind.html
similarity index 89%
rename from src/lib/template/x-autobind.html
rename to src/lib/template/dom-bind.html
index 11b0af5f42..3915880343 100644
--- a/src/lib/template/x-autobind.html
+++ b/src/lib/template/dom-bind.html
@@ -10,15 +10,13 @@
 
 <!--
 
-**THIS ELEMENT IS EXPERIMENTAL.  API AND NAME SUBJECT TO CHANGE.**
-
 Polymer's binding features are only available within templates that are managed
 by Polymer.  As such, these features are available in templates used to define
 Polymer elements, for example, but not for elements placed directly in the main
 document.
 
 In order to use Polymer bindings without defining a new custom element, elements
-utilizing bindings may be wrapped with the `x-autobind` template extension.
+utilizing bindings may be wrapped with the `dom-bind` template extension.
 This template will immediately stamp itself into the main document and bind
 elements to the template itself as the binding scope.
 
@@ -34,11 +32,11 @@
 </head>
 <body>
 
-  <template is="x-autobind">
+  <template is="dom-bind">
 
     <core-ajax url="http://..." lastresponse="{{data}}"></core-ajax>
 
-    <template is="x-repeat" items="{{data}}">
+    <template is="dom-repeat" items="{{data}}">
         <div><span>{{item.first}}</span> <span>{{item.last}}</span></div>
     </template>
 
@@ -54,7 +52,7 @@
 
   Polymer({
 
-    is: 'x-autobind',
+    is: 'dom-bind',
 
     extends: 'template',
 
diff --git a/src/lib/template/x-if.html b/src/lib/template/dom-if.html
similarity index 98%
rename from src/lib/template/x-if.html
rename to src/lib/template/dom-if.html
index f7acbc67c4..9aeb4f6659 100644
--- a/src/lib/template/x-if.html
+++ b/src/lib/template/dom-if.html
@@ -26,7 +26,7 @@
    */
   Polymer({
 
-    is: 'x-if',
+    is: 'dom-if',
     extends: 'template',
 
     /**
@@ -117,7 +117,7 @@
       if (this._instance) {
         var c = this._instance._children;
         if (c) {
-          // use first child parent, for case when x-if may have been detached
+          // use first child parent, for case when dom-if may have been detached
           var parent = Polymer.dom(Polymer.dom(c[0]).parentNode);
           c.forEach(function(n) {
             parent.removeChild(n);
diff --git a/src/lib/template/x-repeat.html b/src/lib/template/dom-repeat.html
similarity index 96%
rename from src/lib/template/x-repeat.html
rename to src/lib/template/dom-repeat.html
index 33b6698568..d852d3d5b3 100644
--- a/src/lib/template/x-repeat.html
+++ b/src/lib/template/dom-repeat.html
@@ -10,13 +10,11 @@
 
 <!--
 
-**THIS ELEMENT IS EXPERIMENTAL.  API AND NAME SUBJECT TO CHANGE.**
-
-The `x-repeat` element is a custom `HTMLTemplateElement` type extension that
+The `dom-repeat` element is a custom `HTMLTemplateElement` type extension that
 automatically stamps and binds one instance of template content to each object
-in a user-provided array.  `x-repeat` accepts an `items` property, and one
+in a user-provided array.  `dom-repeat` accepts an `items` property, and one
 instance of the template is stamped for each item into the DOM at the location
-of the `x-repeat` element.  The `item` property will be set on each instance's
+of the `dom-repeat` element.  The `item` property will be set on each instance's
 binding scope, thus templates should bind to sub-properties of `item`.
 
 Example:
@@ -27,7 +25,7 @@
   <template>
 
     <div> Employee list: </div>
-    <template is="x-repeat" items="{{employees}}">
+    <template is="dom-repeat" items="{{employees}}">
         <div>First name: <span>{{item.first}}</span></div>
         <div>Last name: <span>{{item.last}}</span></div>
     </template>
@@ -58,7 +56,7 @@
 shim of this API on unsupported browsers), and template instances are kept in
 sync with the data in the array.
 
-A view-specific filter/sort may be applied to each `x-repeat` by supplying a
+A view-specific filter/sort may be applied to each `dom-repeat` by supplying a
 `filter` and/or `sort` property.  This may be a string that names a function on
 the host, or a function may be assigned to the property directly.  The functions
 should implemented following the standard `Array` filter/sort API.
@@ -67,7 +65,7 @@
 of `items`, the `observe` property may be set as a space-separated list of
 `item` sub-fields that should cause a re-filter/sort when modified.
 
-For example, for an `x-repeat` with a filter of the following:
+For example, for an `dom-repeat` with a filter of the following:
 
 ```js
 isEngineer: function(item) {
@@ -78,7 +76,7 @@
 Then the `observe` property should be configured as follows:
 
 ```html
-<template is="x-repeat" items="{{employees}}"
+<template is="dom-repeat" items="{{employees}}"
           filter="isEngineer" observe="type manager.type">
 ```
 
@@ -91,7 +89,7 @@
 
   Polymer({
 
-    is: 'x-repeat',
+    is: 'dom-repeat',
     extends: 'template',
 
     /**
@@ -558,7 +556,7 @@
 
     /**
      * Returns the item associated with a given element stamped by
-     * this `x-repeat`.
+     * this `dom-repeat`.
      */
     itemForElement: function(el) {
       var instance = this._instanceForElement(el);
@@ -567,7 +565,7 @@
 
     /**
      * Returns the `Polymer.Collection` key associated with a given
-     * element stamped by this `x-repeat`.
+     * element stamped by this `dom-repeat`.
      */
     keyForElement: function(el) {
       var instance = this._instanceForElement(el);
@@ -575,7 +573,7 @@
     },
 
     /**
-     * Returns the row index for a given element stamped by this `x-repeat`.
+     * Returns the row index for a given element stamped by this `dom-repeat`.
      * If `sort` is provided, the index will reflect the sorted order (rather
      * than the original array order).
      */
diff --git a/src/lib/template/x-template.html b/src/lib/template/dom-template.html
similarity index 97%
rename from src/lib/template/x-template.html
rename to src/lib/template/dom-template.html
index 92e80f522b..e726f6d065 100644
--- a/src/lib/template/x-template.html
+++ b/src/lib/template/dom-template.html
@@ -23,7 +23,7 @@
    */
   Polymer({
 
-    is: 'x-template',
+    is: 'dom-template',
     extends: 'template',
 
     behaviors: [
diff --git a/test/runner.html b/test/runner.html
index c2e39522c8..bcf74ce6aa 100644
--- a/test/runner.html
+++ b/test/runner.html
@@ -42,8 +42,8 @@
       'unit/styling-cross-scope-apply.html',
       'unit/custom-style.html',
       'unit/dynamic-import.html',
-      'unit/x-repeat.html',
-      'unit/x-if.html'
+      'unit/dom-repeat.html',
+      'unit/dom-if.html'
     ]);
   </script>
 </body>
diff --git a/test/smoke/x-if.html b/test/smoke/dom-if.html
similarity index 84%
rename from test/smoke/x-if.html
rename to test/smoke/dom-if.html
index bdad8ee94e..deb658d5b9 100644
--- a/test/smoke/x-if.html
+++ b/test/smoke/dom-if.html
@@ -2,14 +2,14 @@
 <html>
 <head>
 
-  <title>x-if</title>
+  <title>dom-if</title>
 
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
   <link rel="import" href="../../polymer.html">
-  <link rel="import" href="../../src/lib/template/x-if.html">
+  <link rel="import" href="../../src/lib/template/dom-if.html">
 
 </head>
 <body>
@@ -27,14 +27,14 @@
       <br><br>
       <input value="{{value::input}}">
 
-      <template is="x-if" id="if1" if="[[checked]]">
+      <template is="dom-if" id="if1" if="[[checked]]">
         <h3>Lazy / hidden</h3>
         <div class="content">
           <div>I have been <input value="{{parent.value::input}}"></div>
         </div>
       </template>
 
-      <template is="x-if" id="if2" if="[[checked]]" restamp>
+      <template is="dom-if" id="if2" if="[[checked]]" restamp>
         <h3>Restamp</h3>
         <div class="content">
           <div>I have been <input value="{{parent.value::input}}"></div>
diff --git a/test/smoke/x-repeat.html b/test/smoke/dom-repeat.html
similarity index 92%
rename from test/smoke/x-repeat.html
rename to test/smoke/dom-repeat.html
index 9bafb8f490..b446fbd72b 100644
--- a/test/smoke/x-repeat.html
+++ b/test/smoke/dom-repeat.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 
-  <title>x-repeat</title>
+  <title>dom-repeat</title>
 
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -96,7 +96,7 @@
       <div class="layout horizontal flex">
 
         <div class="column flex">
-          <template is="x-repeat" id="xr1-1" items="{{items}}" as="itemA" inner-as="inner">
+          <template is="dom-repeat" id="xr1-1" items="{{items}}" as="itemA" inner-as="inner">
             <div class="item" id="xr1-1" idx$="{{index}}">
               <div class="index">idx: <span>{{index}}</span></div>
               <button on-click="changeOuterA">Change outerA</button>
@@ -105,7 +105,7 @@
               <x-labeled-input label="outerA" value="{{outerA}}"></x-labeled-input>
               <x-labeled-input label="outerObjA.value" value="{{outerObjA.value}}"></x-labeled-input>
               <x-labeled-input label="computeConcat(itemA.name, outerObjA.value)" value="{{computeConcat(itemA.name, outerObjA.value)}}" disabled></x-labeled-input>
-              <template is="x-repeat" id="xr1-2" idx$="{{index}}" items="{{itemA.items}}" as="itemB">
+              <template is="dom-repeat" id="xr1-2" idx$="{{index}}" items="{{itemA.items}}" as="itemB">
                 <div class="item" id="xr1-2" idx$="{{index}}">
                   <div class="index">idx: <span>{{index}}</span></div>
                   <button on-click="changeOuterB">Change outerB</button>
@@ -115,7 +115,7 @@
                   <x-labeled-input label="outerB" value="{{outerB}}"></x-labeled-input>
                   <x-labeled-input label="outerObjB.value" value="{{outerObjB.value}}"></x-labeled-input>
                   <x-labeled-input label="computeConcat(itemB.name, outerObjB.value)" value="{{computeConcat(itemB.name, outerObjB.value)}}" disabled></x-labeled-input>
-                  <template is="x-repeat" id="xr1-3" idx$="{{index}}" items="{{itemB.items}}" as="itemC">
+                  <template is="dom-repeat" id="xr1-3" idx$="{{index}}" items="{{itemB.items}}" as="itemC">
                     <div class="item" id="xr1-3" idx$="{{index}}">
                       <div class="index">idx: <span>{{index}}</span></div>
                       <button on-click="changeOuterC">Change outerC</button>
@@ -135,7 +135,7 @@
         </div>
 
         <div class="column flex">
-          <template is="x-repeat" id="xr2-1" items="{{items}}" as="itemA" inner-as="inner">
+          <template is="dom-repeat" id="xr2-1" items="{{items}}" as="itemA" inner-as="inner">
             <div class="item" id="xr2-1" idx$="{{index}}">
               <div class="index">idx: <span>{{index}}</span></div>
               <button on-click="changeOuterA">Change outerA</button>
@@ -144,7 +144,7 @@
               <x-labeled-input label="outerA" value="{{outerA}}"></x-labeled-input>
               <x-labeled-input label="outerObjA.value" value="{{outerObjA.value}}"></x-labeled-input>
               <x-labeled-input label="computeConcat(itemA.name, outerObjA.value)" value="{{computeConcat(itemA.name, outerObjA.value)}}" disabled></x-labeled-input>
-              <template is="x-repeat" id="xr2-2" idx$="{{index}}" items="{{itemA.items}}" as="itemB">
+              <template is="dom-repeat" id="xr2-2" idx$="{{index}}" items="{{itemA.items}}" as="itemB">
                 <div class="item" id="xr2-2" idx$="{{index}}">
                   <div class="index">idx: <span>{{index}}</span></div>
                   <button on-click="changeOuterB">Change outerB</button>
@@ -154,7 +154,7 @@
                   <x-labeled-input label="outerB" value="{{outerB}}"></x-labeled-input>
                   <x-labeled-input label="outerObjB.value" value="{{outerObjB.value}}"></x-labeled-input>
                   <x-labeled-input label="computeConcat(itemB.name, outerObjB.value)" value="{{computeConcat(itemB.name, outerObjB.value)}}" disabled></x-labeled-input>
-                  <template is="x-repeat" id="xr2-3" idx$="{{index}}" items="{{itemB.items}}" as="itemC">
+                  <template is="dom-repeat" id="xr2-3" idx$="{{index}}" items="{{itemB.items}}" as="itemC">
                     <div class="item" id="xr2-3" idx$="{{index}}">
                       <div class="index">idx: <span>{{index}}</span></div>
                       <button on-click="changeOuterC">Change outerC</button>
diff --git a/test/unit/x-if-elements.html b/test/unit/dom-if-elements.html
similarity index 85%
rename from test/unit/x-if-elements.html
rename to test/unit/dom-if-elements.html
index a4a92d7a66..0697ed430e 100644
--- a/test/unit/x-if-elements.html
+++ b/test/unit/dom-if-elements.html
@@ -33,17 +33,17 @@
 
 <dom-module id="x-nested-if">
   <template>
-    <template is="x-if" id="if-1" if="{{shouldStamp}}" on-dom-change="domUpdateHandler">
+    <template is="dom-if" id="if-1" if="{{shouldStamp}}" on-dom-change="domUpdateHandler">
       <x-foo on-test1="testHandler1"
              prop="{{prop}}"
              item-prop="{{item.prop}}">
       </x-foo>
-      <template is="x-if" id="if-2" if="{{shouldStamp}}">
+      <template is="dom-if" id="if-2" if="{{shouldStamp}}">
         <x-foo on-test2="testHandler2"
                prop="{{prop}}"
                item-prop="{{item.prop}}">
         </x-foo>
-        <template is="x-if" id="if-3" if="{{shouldStamp}}">
+        <template is="dom-if" id="if-3" if="{{shouldStamp}}">
           <x-foo on-test3="testHandler3"
                  prop="{{prop}}"
                  item-prop="{{item.prop}}">
@@ -80,15 +80,15 @@
 
 <dom-module id="x-nested-if-configured">
   <template>
-    <template is="x-if" id="if-1" if="{{shouldStamp}}">
+    <template is="dom-if" id="if-1" if="{{shouldStamp}}">
       <x-foo prop="{{prop}}"
              item-prop="{{item.prop}}">
       </x-foo>
-      <template is="x-if" id="if-2" if="{{shouldStamp}}">
+      <template is="dom-if" id="if-2" if="{{shouldStamp}}">
         <x-foo prop="{{prop}}"
                item-prop="{{item.prop}}">
         </x-foo>
-        <template is="x-if" id="if-3" if="{{shouldStamp}}">
+        <template is="dom-if" id="if-3" if="{{shouldStamp}}">
           <x-foo prop="{{prop}}"
                  item-prop="{{item.prop}}">
           </x-foo>
diff --git a/test/unit/x-if.html b/test/unit/dom-if.html
similarity index 93%
rename from test/unit/x-if.html
rename to test/unit/dom-if.html
index 827cca9ba7..ef53dfbb24 100644
--- a/test/unit/x-if.html
+++ b/test/unit/dom-if.html
@@ -14,29 +14,29 @@
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../../web-component-tester/browser.js"></script>
   <link rel="import" href="../../polymer.html">
-  <link rel="import" href="x-if-elements.html">
+  <link rel="import" href="dom-if-elements.html">
 </head>
 <body>
 
   <x-nested-if-configured id="configured"></x-nested-if-configured>
 
-  <template is="x-autobind" id="unconfigured">
+  <template is="dom-bind" id="unconfigured">
     <x-nested-if id="unconfigured1"></x-nested-if>
     <x-nested-if id="unconfigured2"></x-nested-if>
   </template>
 
   <div id="inDocumentContainer">
-    <template id="inDocumentIf" is="x-if">
+    <template id="inDocumentIf" is="dom-if">
       <x-foo
              prop="{{prop}}"
              item-prop="{{item.prop}}">
       </x-foo>
-      <template is="x-if">
+      <template is="dom-if">
         <x-foo
                prop="{{prop}}"
                item-prop="{{item.prop}}">
         </x-foo>
-        <template is="x-if">
+        <template is="dom-if">
           <x-foo
                  prop="{{prop}}"
                  item-prop="{{item.prop}}">
@@ -48,7 +48,7 @@
 
   <script>
 
-    suite('nested pre-configured x-if', function() {
+    suite('nested pre-configured dom-if', function() {
 
       test('parent scope binding', function() {
         var stamped = Polymer.dom(configured.root).querySelectorAll('*:not(template):not(span)');
@@ -84,7 +84,7 @@
 
     });
 
-    suite('nested un-configured x-if in document', function() {
+    suite('nested un-configured dom-if in document', function() {
 
       test('if=false: nothing rendered', function() {
         var stamped = Polymer.dom(inDocumentContainer).querySelectorAll('*:not(template)');
@@ -92,21 +92,21 @@
       });
 
       test('if=true: everything rendered and visible', function() {
-        // first x-if
+        // first dom-if
         inDocumentIf.if = true;
         inDocumentIf.render();
         var stamped = Polymer.dom(inDocumentContainer).querySelectorAll('*:not(template):not(span)');
         assert.equal(stamped.length, 1, 'total stamped count incorrect');
 
-        // second x-if
-        var xif = inDocumentContainer.querySelector('template[is=x-if]');
+        // second dom-if
+        var xif = inDocumentContainer.querySelector('template[is=dom-if]');
         xif.if = true;
         xif.render();
         stamped = Polymer.dom(inDocumentContainer).querySelectorAll('*:not(template):not(span)');
         assert.equal(stamped.length, 2, 'total stamped count incorrect');
 
-        // third x-if
-        xif = inDocumentContainer.querySelector('template[is=x-if]');
+        // third dom-if
+        xif = inDocumentContainer.querySelector('template[is=dom-if]');
         xif.if = true;
         xif.render();
         stamped = Polymer.dom(inDocumentContainer).querySelectorAll('*:not(template):not(span)');
@@ -156,23 +156,23 @@
 
       // repeat, just to get everything rendered again...
       test('if=true: everything rendered and visible', function() {
-        // first x-if
+        // first dom-if
         inDocumentIf.if = true;
         inDocumentIf.render();
         CustomElements.takeRecords();
         var stamped = Polymer.dom(inDocumentContainer).querySelectorAll('*:not(template):not(span)');
         assert.equal(stamped.length, 1, 'total stamped count incorrect');
 
-        // second x-if
-        var xif = inDocumentContainer.querySelector('template[is=x-if]');
+        // second dom-if
+        var xif = inDocumentContainer.querySelector('template[is=dom-if]');
         xif.if = true;
         xif.render();
         CustomElements.takeRecords();
         stamped = Polymer.dom(inDocumentContainer).querySelectorAll('*:not(template):not(span)');
         assert.equal(stamped.length, 2, 'total stamped count incorrect');
 
-        // third x-if
-        xif = inDocumentContainer.querySelector('template[is=x-if]');
+        // third dom-if
+        xif = inDocumentContainer.querySelector('template[is=dom-if]');
         xif.if = true;
         xif.render();
         CustomElements.takeRecords();
@@ -194,7 +194,7 @@
 
     });
 
-    suite('nested un-configured x-if', function() {
+    suite('nested un-configured dom-if', function() {
 
       test('if=false: nothing rendered', function() {
         var stamped = Polymer.dom(unconfigured1.root).querySelectorAll('*:not(template)');
@@ -294,9 +294,9 @@
 
     });
 
-    suite('notification between two x-ifs', function() {
+    suite('notification between two dom-ifs', function() {
 
-      test('change to one scope doesn\'t affect other x-if', function() {
+      test('change to one scope doesn\'t affect other dom-if', function() {
         var stamped1 = Polymer.dom(unconfigured1.root).querySelectorAll('*:not(template):not(span)');
         var stamped2 = Polymer.dom(unconfigured2.root).querySelectorAll('*:not(template):not(span)');
 
diff --git a/test/unit/x-repeat-elements.html b/test/unit/dom-repeat-elements.html
similarity index 92%
rename from test/unit/x-repeat-elements.html
rename to test/unit/dom-repeat-elements.html
index 4f8e8dd50d..28152166c7 100644
--- a/test/unit/x-repeat-elements.html
+++ b/test/unit/dom-repeat-elements.html
@@ -199,7 +199,7 @@
 
 <dom-module id="x-nested-repeat">
   <template>
-    <template id="repeater" is="x-repeat" items="{{items}}" as="itema" index-as="indexa" on-dom-change="domUpdateHandler">
+    <template id="repeater" is="dom-repeat" items="{{items}}" as="itema" index-as="indexa" on-dom-change="domUpdateHandler">
       <x-foo on-test1="testHandler1"
              innera-prop="{{innera.prop}}"
              itema-prop="{{itema.prop}}"
@@ -207,7 +207,7 @@
              outer-item-prop="{{item.prop}}"
              indexa="{{indexa}}">
       </x-foo>
-      <template is="x-repeat" items="{{itema.items}}" as="itemb" index-as="indexb">
+      <template is="dom-repeat" items="{{itema.items}}" as="itemb" index-as="indexb">
         <x-foo on-test2="testHandler2"
                innerb-prop="{{innerb.prop}}"
                itemb-prop="{{itemb.prop}}"
@@ -218,7 +218,7 @@
                indexa="{{indexa}}"
                indexb="{{indexb}}">
         </x-foo>
-        <template is="x-repeat" items="{{itemb.items}}" as="itemc" index-as="indexc">
+        <template is="dom-repeat" items="{{itemb.items}}" as="itemc" index-as="indexc">
           <x-foo on-test3="testHandler3"
                  innerc-prop="{{innerc.prop}}"
                  itemc-prop="{{itemc.prop}}"
@@ -261,7 +261,7 @@
 
 <dom-module id="x-nested-repeat-configured">
   <template>
-    <template id="repeater" is="x-repeat" items="{{items}}" as="itema" index-as="indexa">
+    <template id="repeater" is="dom-repeat" items="{{items}}" as="itema" index-as="indexa">
       <x-foo
              innera-prop="{{innera.prop}}"
              itema-prop="{{itema.prop}}"
@@ -269,7 +269,7 @@
              outer-item-prop="{{item.prop}}"
              indexa="{{indexa}}">
       </x-foo>
-      <template is="x-repeat" items="{{itema.items}}" as="itemb" index-as="indexb">
+      <template is="dom-repeat" items="{{itema.items}}" as="itemb" index-as="indexb">
         <x-foo
                innerb-prop="{{innerb.prop}}"
                itemb-prop="{{itemb.prop}}"
@@ -280,7 +280,7 @@
                indexa="{{indexa}}"
                indexb="{{indexb}}">
         </x-foo>
-        <template is="x-repeat" items="{{itemb.items}}" as="itemc" index-as="indexc">
+        <template is="dom-repeat" items="{{itemb.items}}" as="itemc" index-as="indexc">
           <x-foo
                  innerc-prop="{{innerc.prop}}"
                  itemc-prop="{{itemc.prop}}"
diff --git a/test/unit/x-repeat.html b/test/unit/dom-repeat.html
similarity index 99%
rename from test/unit/x-repeat.html
rename to test/unit/dom-repeat.html
index 06e7cc3316..80c40fa651 100644
--- a/test/unit/x-repeat.html
+++ b/test/unit/dom-repeat.html
@@ -14,14 +14,14 @@
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../../web-component-tester/browser.js"></script>
   <link rel="import" href="../../polymer.html">
-  <link rel="import" href="x-repeat-elements.html">
+  <link rel="import" href="dom-repeat-elements.html">
 </head>
 <body>
 
   <h4>x-nested-repeat-configured</h4>
   <x-nested-repeat-configured id="configured"></x-nested-repeat-configured>
 
-  <template is="x-autobind" id="unconfigured">
+  <template is="dom-bind" id="unconfigured">
     <h4>x-nested-repeat unconfigured1</h4>
     <x-nested-repeat id="unconfigured1" items="{{items}}"></x-nested-repeat>
     <h4>x-nested-repeat unconfigured2</h4>
@@ -30,13 +30,13 @@ <h4>x-nested-repeat unconfigured2</h4>
 
   <h4>inDocumentRepeater</h4>
   <div id="inDocumentContainer">
-    <template id="inDocumentRepeater" is="x-repeat" as="itema" index-as="indexa">
+    <template id="inDocumentRepeater" is="dom-repeat" as="itema" index-as="indexa">
       <x-foo
              innera-prop="{{innera.prop}}"
              itema-prop="{{itema.prop}}"
              indexa="{{indexa}}">
       </x-foo>
-      <template is="x-repeat" items="{{itema.items}}" as="itemb" index-as="indexb">
+      <template is="dom-repeat" items="{{itema.items}}" as="itemb" index-as="indexb">
         <x-foo
                innerb-prop="{{innerb.prop}}"
                itemb-prop="{{itemb.prop}}"
@@ -45,7 +45,7 @@ <h4>inDocumentRepeater</h4>
                indexa="{{indexa}}"
                indexb="{{indexb}}">
         </x-foo>
-        <template is="x-repeat" items="{{itemb.items}}" as="itemc" index-as="indexc">
+        <template is="dom-repeat" items="{{itemb.items}}" as="itemc" index-as="indexc">
           <x-foo
                  innerc-prop="{{innerc.prop}}"
                  itemc-prop="{{itemc.prop}}"
@@ -81,7 +81,7 @@ <h4>inDocumentRepeater</h4>
       stamped[38] .. 3-3-3
     */
 
-    suite('nested pre-configured x-repeat', function() {
+    suite('nested pre-configured dom-repeat', function() {
 
       test('basic rendering, downward item binding', function() {
         var stamped = Polymer.dom(configured.root).querySelectorAll('*:not(template)');
@@ -326,7 +326,7 @@ <h4>inDocumentRepeater</h4>
 
     });
 
-    suite('nested un-configured x-repeat in document', function() {
+    suite('nested un-configured dom-repeat in document', function() {
 
       test('basic rendering, downward item binding', function() {
         inDocumentRepeater.items = window.data;
@@ -403,7 +403,7 @@ <h4>inDocumentRepeater</h4>
 
     });
 
-    suite('nested un-configured x-repeat', function() {
+    suite('nested un-configured dom-repeat', function() {
 
       test('basic rendering, downward item binding', function() {
         unconfigured.items = window.data;
@@ -530,9 +530,9 @@ <h4>inDocumentRepeater</h4>
 
     });
 
-    suite('array notification between two x-repeats', function() {
+    suite('array notification between two dom-repeats', function() {
 
-      test('change to item from one x-repeat to other', function() {
+      test('change to item from one dom-repeat to other', function() {
         var stamped1 = Polymer.dom(unconfigured1.root).querySelectorAll('*:not(template)');
         var stamped2 = Polymer.dom(unconfigured2.root).querySelectorAll('*:not(template)');
 
@@ -592,7 +592,7 @@ <h4>inDocumentRepeater</h4>
         assert.equal(stamped1[38].indexc, 2);
       });
 
-      test('change to non-item scope doesn\'t affect other x-repeat', function() {
+      test('change to non-item scope doesn\'t affect other dom-repeat', function() {
         var stamped1 = Polymer.dom(unconfigured1.root).querySelectorAll('*:not(template)');
         var stamped2 = Polymer.dom(unconfigured2.root).querySelectorAll('*:not(template)');
 
diff --git a/test/unit/styling-scoped-elements.html b/test/unit/styling-scoped-elements.html
index deb633a91f..0e0d817d02 100644
--- a/test/unit/styling-scoped-elements.html
+++ b/test/unit/styling-scoped-elements.html
@@ -120,7 +120,7 @@
     <x-child2 class="wide" id="child2"></x-child2>
     <div id="computed" class$="{{computeClass(aClass)}}">Computed</div>
     <div id="repeatContainer">
-      <template id="repeat" is="x-repeat" items="{{items}}">
+      <template id="repeat" is="dom-repeat" items="{{items}}">
         <a class$="{{aaClass}}">A Computed</a>
       </template>
     </div>
diff --git a/test/unit/template/x-template.html b/test/unit/template/dom-template.html
similarity index 93%
rename from test/unit/template/x-template.html
rename to test/unit/template/dom-template.html
index 7c6cd91973..f36ddad403 100644
--- a/test/unit/template/x-template.html
+++ b/test/unit/template/dom-template.html
@@ -17,13 +17,13 @@
 </head>
 <body>
 
-<template is="x-template" id="bound">
+<template is="dom-template" id="bound">
   <span>{{text}}</span>
 </template>
 
 <script>
 
-suite('<x-template>', function() {
+suite('<dom-template>', function() {
 
   test('stamps', function() {
     var template = document.querySelector('#bound');