lib/generators/templates/views/edit.html.erb in merb_datamapper-0.9.5 vs lib/generators/templates/views/edit.html.erb in merb_datamapper-0.9.6

@@ -1,20 +1,18 @@
 <h1><%= class_name %> controller, edit action</h1>
 
 <p>Edit this file in <tt>app/views/<%= file_name %>/edit.html.erb</tt></p>
 
-<%%= error_messages_for :<%= singular_model %> %>
-
-<%% form_for(@<%= singular_model %>, :action => url(:<%= singular_model %>, @<%= singular_model %>)) do %>
+<%%= form_for(@<%= singular_model %>, :action => url(:<%= singular_model %>, @<%= singular_model %>)) do %>
 <% for property in properties.select{|p| !p.key?} -%>
   <p>
-    <%%= text_control :<%= property.getter %>, :label => "<%= Extlib::Inflection.humanize(property.field) %>"  %>
+    <%%= text_field :<%= property %>, :label => "<%= Extlib::Inflection.humanize(property) %>"  %>
   </p>
 
 <% end -%>
   <p>
-    <%%= submit_button "Update" %>
+    <%%= submit "Update" %>
   </p>
-<%% end %>
+<%% end =%>
 
 <%%= link_to 'Show', url(:<%= singular_model %>, @<%= singular_model %>) %> |
 <%%= link_to 'Back', url(:<%= plural_model %>) %>