diff --git a/lib/com/vaadin/polymer/Polymer.java b/lib/com/vaadin/polymer/Polymer.java
index f645ef3..0f4b8ad 100644
--- a/lib/com/vaadin/polymer/Polymer.java
+++ b/lib/com/vaadin/polymer/Polymer.java
@@ -591,7 +591,7 @@ public native static <T> T property(Object jso, String name)
     public native static void property(HTMLElement jso, String name, String value)
     /*-{
         if (jso.setAttribute && /^[\[\{]/.test(value)) {
-          jso.setAttribute(name, value);
+          jso.setAttribute(name.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase(), value);
         } else {
           jso[name] = value;
         }
@@ -633,5 +633,3 @@ public static DomApi dom(Object element) {
         return Polymer.dom(element);
     }
 }
-
-
diff --git a/template/Widget.template b/template/Widget.template
index 33d426f..0004749 100644
--- a/template/Widget.template
+++ b/template/Widget.template
@@ -72,7 +72,7 @@ public class <%= className() %> extends <%= base ? base : 'PolymerWidget' %> {
      * <%= item.isBehavior ? ('@behavior ' + item.behavior ) : ''%>
      */
     public void <%= computeSetterWithPrefix(item) %>(String value) {
-        Polymer.property(this.getPolymerElement(), "<%= hyphenize(item.name) %>", value);
+        Polymer.property(this.getPolymerElement(), "<%= item.name %>", value);
     }
 <% }); %>
 <% _.forEach(getMethods(properties), function(item) { var retType = returnString(item); %>