diff --git a/app/views/enumerations/_form.html.erb b/app/views/enumerations/_form.html.erb
index 21b948166d..d64b087a1b 100644
--- a/app/views/enumerations/_form.html.erb
+++ b/app/views/enumerations/_form.html.erb
@@ -1,19 +1,19 @@
 <%= error_messages_for 'enumeration' %>
 <div class="box">
 <!--[form:optvalue]-->
-<%= hidden_field 'enumeration', 'type'  %>
+<%= hidden_field 'enumeration', 'type' %>
 
-<p><label for="enumeration_name"><%=l(:field_name)%></label>
-<%= text_field 'enumeration', 'name'  %></p>
+<p><label for="enumeration_name"><%= Enumeration.human_attribute_name(:name) %></label>
+<%= text_field 'enumeration', 'name' %></p>
 
-<p><label for="enumeration_active"><%=l(:field_active)%></label>
-<%= check_box 'enumeration', 'active'  %></p>
+<p><label for="enumeration_active"><%= Enumeration.human_attribute_name(:active) %></label>
+<%= check_box 'enumeration', 'active' %></p>
 
-<p><label for="enumeration_is_default"><%=l(:field_is_default)%></label>
-<%= check_box 'enumeration', 'is_default'  %></p>
+<p><label for="enumeration_is_default"><%= Enumeration.human_attribute_name(:is_default) %></label>
+<%= check_box 'enumeration', 'is_default' %></p>
 <!--[eoform:optvalue]-->
 
 <% @enumeration.custom_field_values.each do |value| %>
-	<p><%= custom_field_tag_with_label :enumeration, value %></p>
+  <p><%= custom_field_tag_with_label :enumeration, value %></p>
 <% end %>
 </div>
diff --git a/app/views/enumerations/index.html.erb b/app/views/enumerations/index.html.erb
index 3b1191c7bc..38e2109f82 100644
--- a/app/views/enumerations/index.html.erb
+++ b/app/views/enumerations/index.html.erb
@@ -7,24 +7,24 @@
 <% if enumerations.any? %>
 <table class="list"><thead>
 <tr>
-    <th><%= l(:field_name) %></th>
-    <th style="width:15%;"><%= l(:field_is_default) %></th>
-    <th style="width:15%;"><%= l(:field_active) %></th>
-    <th style="width:15%;"></th>
-    <th align="center" style="width:10%;"> </th>
+  <th><%= Enumeration.human_attribute_name(:name) %></th>
+  <th style="width:15%;"><%= Enumeration.human_attribute_name(:is_default) %></th>
+  <th style="width:15%;"><%= Enumeration.human_attribute_name(:active) %></th>
+  <th style="width:15%;"></th>
+  <th align="center" style="width:10%;"> </th>
 </tr></thead>
 <% enumerations.each do |enumeration| %>
 <tr class="<%= cycle('odd', 'even') %>">
-    <td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td>
-    <td class="center" style="width:15%;"><%= checked_image enumeration.is_default? %></td>
-    <td class="center" style="width:15%;"><%= checked_image enumeration.active? %></td>
-    <td style="width:15%;"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}, :method => :put) %></td>
-    <td class="buttons">
+  <td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td>
+  <td class="center" style="width:15%;"><%= checked_image enumeration.is_default? %></td>
+  <td class="center" style="width:15%;"><%= checked_image enumeration.active? %></td>
+  <td style="width:15%;"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}, :method => :put) %></td>
+  <td class="buttons">
     <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration },
-    															 :method => :post,
-    															 :confirm => l(:text_are_you_sure),
-    															 :class => 'icon icon-del' %>
-    </td>
+                :method => :post,
+                :confirm => l(:text_are_you_sure),
+                :class => 'icon icon-del' %>
+  </td>
 </tr>
 <% end %>
 </table>