diff --git a/taglibs/core/core-tag-transformer.js b/taglibs/core/core-tag-transformer.js
index 243b7100e..5305b9497 100644
--- a/taglibs/core/core-tag-transformer.js
+++ b/taglibs/core/core-tag-transformer.js
@@ -214,7 +214,7 @@ function handleAttr(node, compiler, template) {
         node.addError('Invalid attributes for tag ' + node.toString() + ': ' + invalidAttrs.join(', '));
         return;
     }
-    //Cleanup whitespace between <c-attr> tags
+    //Cleanup whitespace between <attr> tags
     if (node.previousSibling && node.previousSibling.isTextNode() && node.previousSibling.getText().trim() === '') {
         node.previousSibling.detach();
     }
@@ -238,7 +238,7 @@ function handleAttr(node, compiler, template) {
 
 function findNestedAttrs(node, compiler, template) {
     node.forEachChild(function (child) {
-        if (child.qName === 'c-attr') {
+        if (child.qName === 'attr') {
             handleAttr(child, compiler, template);
         }
     });
diff --git a/taglibs/core/marko-taglib.json b/taglibs/core/marko-taglib.json
index 6d724174c..8fc73a485 100644
--- a/taglibs/core/marko-taglib.json
+++ b/taglibs/core/marko-taglib.json
@@ -191,7 +191,7 @@
                 }
             }
         },
-        "c-attr": {
+        "attr": {
             "attributes": {
                 "name": {
                     "type": "string"
@@ -243,7 +243,7 @@
                 }
             }
         },
-        "c-assign": {
+        "assign": {
             "node-class": "./AssignNode",
             "attributes": {
                 "var": {
diff --git a/test/test-project/html-templates/entities.marko b/test/test-project/html-templates/entities.marko
index e7c105599..e39fed8b4 100644
--- a/test/test-project/html-templates/entities.marko
+++ b/test/test-project/html-templates/entities.marko
@@ -1,6 +1,6 @@
 <div data-attr="Hello &lt;John&gt; &lt;hello&gt;">
-    <c-attr name="data-nested-attr">Hello &lt;John&gt; <![CDATA[<hello>]]></c-attr>
-    <c-attr name="data-nested-attr2" value="Hello &lt;John&gt; &lt;hello&gt;"/>
+    <attr name="data-nested-attr">Hello &lt;John&gt; <![CDATA[<hello>]]></attr>
+    <attr name="data-nested-attr2" value="Hello &lt;John&gt; &lt;hello&gt;"/>
     Hello &lt;John&gt;© <![CDATA[<hello>]]>
     ${startTag:START}
 </div>
diff --git a/test/test-project/html-templates/errors.marko b/test/test-project/html-templates/errors.marko
index a0dca24e1..4cf3b7a56 100644
--- a/test/test-project/html-templates/errors.marko
+++ b/test/test-project/html-templates/errors.marko
@@ -75,11 +75,11 @@ INVALID
 </else>
 
 <div class="test">
-    <c-attr name="class" value="duplicate"/>
+    <attr name="class" value="duplicate"/>
 </div>
 
 <test-popover title="Popover Title" invalidAttr1="invalidValue1">
-    <c-attr name="invalidAttr2" value="invalidValue2"/>
-    <c-attr name="invalidAttr3">invalidValue3</c-attr>
-    <c-attr name="invalidAttr4" if="invalidIf">invalidValue4</c-attr>
+    <attr name="invalidAttr2" value="invalidValue2"/>
+    <attr name="invalidAttr3">invalidValue3</attr>
+    <attr name="invalidAttr4" if="invalidIf">invalidValue4</attr>
 </test-popover>
\ No newline at end of file
diff --git a/test/test-project/html-templates/nested-attrs.marko b/test/test-project/html-templates/nested-attrs.marko
index 013e52787..676dd61fb 100644
--- a/test/test-project/html-templates/nested-attrs.marko
+++ b/test/test-project/html-templates/nested-attrs.marko
@@ -1,19 +1,19 @@
 <var name="active" value="data.active"/>
 
 <test-popover>
-    <c-attr name="title">Popover Title</c-attr>
-    <c-attr name="content">Popover Content</c-attr>
+    <attr name="title">Popover Title</attr>
+    <attr name="content">Popover Content</attr>
     
     Link Text
 </test-popover>
 
 <div>
-    <c-attr name="class" value="{?active;tab-active}"/>
-    <c-attr name="align">center</c-attr>
+    <attr name="class" value="{?active;tab-active}"/>
+    <attr name="align">center</attr>
 </div>
 
 <div>
-    <c-attr name="title">
+    <attr name="title">
         <for each="color in ['red', 'green', 'blue']"> $color! </for>
-    </c-attr>
+    </attr>
 </div>
\ No newline at end of file
diff --git a/test/test-project/html-templates/var.marko b/test/test-project/html-templates/var.marko
index acbf72d7b..f5bd67ebb 100644
--- a/test/test-project/html-templates/var.marko
+++ b/test/test-project/html-templates/var.marko
@@ -4,7 +4,7 @@
     $color
 </div>
 
-<c-assign var="colors" value="['orange', 'purple', 'yellow']"/>
+<assign var="colors" value="['orange', 'purple', 'yellow']"/>
 
 <div for="color in colors">
     $color
diff --git a/test/test-project/html-templates/xml-escaping.marko b/test/test-project/html-templates/xml-escaping.marko
index 4ebe40db0..2e71e9728 100644
--- a/test/test-project/html-templates/xml-escaping.marko
+++ b/test/test-project/html-templates/xml-escaping.marko
@@ -9,8 +9,8 @@ $name
 <div title="$welcome &lt;hello&gt;" data-name="$name"/>
 
 <div data-attr="Hello $name &lt;hello&gt;">
-    <c-attr name="data-nested-attr">&lt;Hello> $name <![CDATA[<hello>]]></c-attr>
-    <c-attr name="data-nested-attr2" value="Hello &lt;John&gt; &lt;hello&gt;"/>
+    <attr name="data-nested-attr">&lt;Hello> $name <![CDATA[<hello>]]></attr>
+    <attr name="data-nested-attr2" value="Hello &lt;John&gt; &lt;hello&gt;"/>
     Hello &lt;John&gt;© <![CDATA[<hello>]]>
     ${startTag:START}
 </div>
\ No newline at end of file
diff --git a/test/test-project/xml-templates/entities.marko.xml b/test/test-project/xml-templates/entities.marko.xml
index 15cfbcb6d..5c0af4361 100644
--- a/test/test-project/xml-templates/entities.marko.xml
+++ b/test/test-project/xml-templates/entities.marko.xml
@@ -1,8 +1,8 @@
 <c-template
     params="">
     <div data-attr="Hello &lt;John&gt; &lt;hello&gt;">
-        <c-attr name="data-nested-attr">Hello &lt;John&gt; <![CDATA[<hello>]]></c-attr>
-        <c-attr name="data-nested-attr2" value="Hello &lt;John&gt; &lt;hello&gt;"/>
+        <attr name="data-nested-attr">Hello &lt;John&gt; <![CDATA[<hello>]]></attr>
+        <attr name="data-nested-attr2" value="Hello &lt;John&gt; &lt;hello&gt;"/>
         Hello &lt;John&gt;© <![CDATA[<hello>]]>
         ${startTag:START}
     </div>
diff --git a/test/test-project/xml-templates/errors.marko.xml b/test/test-project/xml-templates/errors.marko.xml
index 75392dadf..0fc025e96 100644
--- a/test/test-project/xml-templates/errors.marko.xml
+++ b/test/test-project/xml-templates/errors.marko.xml
@@ -79,12 +79,12 @@
     </else>
     
     <div class="test">
-        <c-attr name="class" value="duplicate"/>
+        <attr name="class" value="duplicate"/>
     </div>
     
     <test-popover title="Popover Title" invalidAttr1="invalidValue1">
-        <c-attr name="invalidAttr2" value="invalidValue2"/>
-        <c-attr name="invalidAttr3">invalidValue3</c-attr>
-        <c-attr name="invalidAttr4" if="invalidIf">invalidValue4</c-attr>
+        <attr name="invalidAttr2" value="invalidValue2"/>
+        <attr name="invalidAttr3">invalidValue3</attr>
+        <attr name="invalidAttr4" if="invalidIf">invalidValue4</attr>
     </test-popover>
 </c-template>
\ No newline at end of file
diff --git a/test/test-project/xml-templates/nested-attrs.marko.xml b/test/test-project/xml-templates/nested-attrs.marko.xml
index 7a35d33f5..656f06f62 100644
--- a/test/test-project/xml-templates/nested-attrs.marko.xml
+++ b/test/test-project/xml-templates/nested-attrs.marko.xml
@@ -2,20 +2,20 @@
     params="active">
     
     <test-popover>
-        <c-attr name="title">Popover Title</c-attr>
-        <c-attr name="content">Popover Content</c-attr>
+        <attr name="title">Popover Title</attr>
+        <attr name="content">Popover Content</attr>
         
         Link Text
     </test-popover>
     
     <div>
-        <c-attr name="class" value="{?active;tab-active}"/>
-        <c-attr name="align">center</c-attr>
+        <attr name="class" value="{?active;tab-active}"/>
+        <attr name="align">center</attr>
     </div>
     
     <div>
-        <c-attr name="title">
+        <attr name="title">
             <for each="color in ['red', 'green', 'blue']"> $color! </for>
-        </c-attr>
+        </attr>
     </div>
 </c-template>
\ No newline at end of file
diff --git a/test/test-project/xml-templates/var.marko.xml b/test/test-project/xml-templates/var.marko.xml
index bba8608f4..a3d4e54dd 100644
--- a/test/test-project/xml-templates/var.marko.xml
+++ b/test/test-project/xml-templates/var.marko.xml
@@ -6,7 +6,7 @@
         $color
     </div>
     
-    <c-assign var="colors" value="['orange', 'purple', 'yellow']"/>
+    <assign var="colors" value="['orange', 'purple', 'yellow']"/>
     
     <div for="color in colors">
         $color
diff --git a/test/test-project/xml-templates/xml-escaping.marko.xml b/test/test-project/xml-templates/xml-escaping.marko.xml
index 09c7b0938..bd9109aea 100644
--- a/test/test-project/xml-templates/xml-escaping.marko.xml
+++ b/test/test-project/xml-templates/xml-escaping.marko.xml
@@ -9,8 +9,8 @@
     <div title="$welcome &lt;hello&gt;" data-name="$name"/>
 
     <div data-attr="Hello $name &lt;hello&gt;">
-        <c-attr name="data-nested-attr">&lt;Hello> $name <![CDATA[<hello>]]></c-attr>
-        <c-attr name="data-nested-attr2" value="Hello &lt;John&gt; &lt;hello&gt;"/>
+        <attr name="data-nested-attr">&lt;Hello> $name <![CDATA[<hello>]]></attr>
+        <attr name="data-nested-attr2" value="Hello &lt;John&gt; &lt;hello&gt;"/>
         Hello &lt;John&gt;© <![CDATA[<hello>]]>
         ${startTag:START}
     </div>