diff --git a/README.mkd b/README.mkd
index dddd3a4198..162b19e1cb 100644
--- a/README.mkd
+++ b/README.mkd
@@ -30,6 +30,15 @@ Help
 If you have a question, you can ask the [official RailsAdmin mailing list](http://groups.google.com/group/rails_admin)
 or ping sferik on IRC in [#railsadmin on irc.freenode.net](http://webchat.freenode.net/?channels=railsadmin).
 
+API Update Note
+---------------
+The ability to set model labels for each section (list, navigation, update, ...) has been removed,
+as it was deemed unnecessarily granular and was not fully honored in all displays.
+That also means that the methods `label_for_navigation`, etc. are no longer functional. They print a warning at the moment.
+See details in the examples below for the currently supported way to label models.
+This change was motivated by the conversation following a [bug report](https://github.com/sferik/rails_admin/issues/319/#issue/319/comment/875868)
+about label display errors.
+
 Screenshots
 -----------
 ![List view](https://github.com/sferik/rails_admin/raw/master/screenshots/list.png "List view")
@@ -78,6 +87,7 @@ configuration DSL which allows you to customize many aspects of the interface.
 The configuration code should be placed in an initializer file, for example:
     config/initializers/rails_admin.rb
 
+
 ### General
 
 You can customize authentication by providing a custom block for `RailsAdmin.authenticate_with`.
@@ -91,6 +101,58 @@ You can exclude models from RailsAdmin by appending those models to `excluded_mo
       config.excluded_models << ClassName
     end
 
+
+### Model Class and Instance Labels ###
+
+**Setting the model's label**
+
+If you need to customize the label of the model, use:
+
+    RailsAdmin.config do |config|
+      config.model Team do
+        label "List of teams"
+      end
+    end
+
+This label will be used anywhere the model name is shown, e.g. on the navigation tabs,
+Dashboard page, list pages, etc.
+
+**The object_label method**
+
+The model configuration has another option `object_label` which configures
+the title display of a single database record, i.e. an instance of a model.
+
+By default it tries to call "name" or "title" methods on the record in question. If the object responds to neither,
+then the label will be constructed from the model's classname appended with its
+database identifier. You can add label methods (or replace the default [:name, :title]) with:
+
+    RailsAdmin.config {|c| c.label_methods << :description}
+
+This `object_label` value is used in a number of places in RailsAdmin--for instance as the
+output of belongs to associations in the listing views of related models, as
+the option labels of the relational fields' input widgets in the edit views of
+related models and as part of the audit information stored in the history
+records--so keep in mind that this configuration option has widespread
+effects.
+
+    RailsAdmin.config do |config|
+      config.model Team do
+        object_label do
+          "#{bindings[:object].name} - #{bindings[:object].league.name}"
+        end
+      end
+    end
+
+This would output "Team's name - Team's league's name" in all the places
+mentioned in paragraph above example.
+
+*Difference between `label` and `object_label`*
+
+`label` and `object_label` are both model configuration options. `label` is used
+whenever Rails Admin refers to a model class, while `object_label` is used whenever
+Rails Admin refers to an instance of a model class (representing a single database record).
+
+
 ### Navigation ###
 
 * hiding a model
@@ -161,30 +223,6 @@ Both also accept a block:
  hide_in_navigation but that name is now deprecated - you should
  change your code to use hide_from_navigation.
 
-**Setting the model's label**
-
-If you need to customize the label of the model within the navigation tab, use:
-
-    RailsAdmin.config do |config|
-      config.model Team do
-        navigation do
-          label "List of teams"
-        end
-      end
-    end
-
-Remember, you can pass the value as an argument or as a block as with the
-before mentioned visibility options. Besides that, the label also has a
-shorthand syntax:
-
-    RailsAdmin.config do |config|
-      config.model Team do
-        label_for_navigation "List of teams"
-      end
-    end
-
-which allows both forms of configuration value passing as well.
-
 **To enable CKEditor for a field**
 
 Configure the model/field like so:
@@ -216,7 +254,8 @@ tabs. Even though this option is not model specific, it shares the same
 semantics as the earlier ones - you could also pass in a block which would be
 evaluated at runtime.
 
-### List view
+
+### List view ###
 
 * Number of items per page
 * Number of items per page per model
@@ -230,7 +269,6 @@ evaluated at runtime.
   * Sortability
   * Column CSS class
   * Column width
-  * The object_label method
 
 **Number of items per page**
 
@@ -456,37 +494,6 @@ column, you can:
       end
     end
 
-**Fields - The object_label method**
-
-List section has a configuration option `object_label` which configures
-the title of a single database record.
-
-By default it queries if the record in question has columns named "name" or
-"title". If neither is found it returns the model's classname appended with its
-database identifier. You can add label methods (or replace the default [:name, :title]) with:
-
-    RailsAdmin.config {|c| c.label_methods << :description}
-
-This value is used in a number of places in RailsAdmin - for instance as the
-output of belongs to associations in the listing views of related models, as
-the option labels of the relational fields' input widgets in the edit views of
-related models and as part of the audit information stored in the history
-records - so keep in mind that this configuration option has widespread
-effects.
-
-    RailsAdmin.config do |config|
-      config.model Team do
-        list do
-          object_label do
-            "#{bindings[:object].name} - #{bindings[:object].league.name}"
-          end
-        end
-      end
-    end
-
-This would output "Team's name - Team's league's name" in all the places
-mentioned in paragraph above example.
-
 ### Create and update views
 
 * Field groupings
diff --git a/app/controllers/rails_admin/history_controller.rb b/app/controllers/rails_admin/history_controller.rb
index e643e835c4..a2ea8dd7de 100644
--- a/app/controllers/rails_admin/history_controller.rb
+++ b/app/controllers/rails_admin/history_controller.rb
@@ -24,7 +24,7 @@ def slider
 
     def for_model
       @page_type = @abstract_model.pretty_name.downcase
-      @page_name = t("admin.history.page_name", :name => @model_config.list.label)
+      @page_name = t("admin.history.page_name", :name => @model_config.label)
       @general = true
 
       @page_count, @history = AbstractHistory.history_for_model @abstract_model, params[:query], params[:sort], params[:sort_reverse], params[:all], params[:page]
@@ -34,7 +34,7 @@ def for_model
 
     def for_object
       @page_type = @abstract_model.pretty_name.downcase
-      @page_name = t("admin.history.page_name", :name => @model_config.list.with(:object => @object).object_label)
+      @page_name = t("admin.history.page_name", :name => @model_config.with(:object => @object).object_label)
       @general = false
 
       @history = AbstractHistory.history_for_object @abstract_model, @object, params[:query], params[:sort], params[:sort_reverse]
diff --git a/app/controllers/rails_admin/main_controller.rb b/app/controllers/rails_admin/main_controller.rb
index 1284895547..8db9430eec 100644
--- a/app/controllers/rails_admin/main_controller.rb
+++ b/app/controllers/rails_admin/main_controller.rb
@@ -50,7 +50,7 @@ def new
         end
         @authorization_adapter.authorize(:new, @abstract_model, @object)
       end
-      @page_name = t("admin.actions.create").capitalize + " " + @model_config.create.label.downcase
+      @page_name = t("admin.actions.create").capitalize + " " + @model_config.label.downcase
       @page_type = @abstract_model.pretty_name.downcase
       render :layout => 'rails_admin/form'
     end
@@ -66,11 +66,11 @@ def create
       end
       @object.attributes = @attributes
       @object.associations = params[:associations]
-      @page_name = t("admin.actions.create").capitalize + " " + @model_config.create.label.downcase
+      @page_name = t("admin.actions.create").capitalize + " " + @model_config.label.downcase
       @page_type = @abstract_model.pretty_name.downcase
 
       if @object.save
-        AbstractHistory.create_history_item("Created #{@model_config.list.with(:object => @object).object_label}", @object, @abstract_model, _current_user)
+        AbstractHistory.create_history_item("Created #{@model_config.with(:object => @object).object_label}", @object, @abstract_model, _current_user)
         redirect_to_on_success
       else
         render_error
@@ -80,7 +80,7 @@ def create
     def edit
       @authorization_adapter.authorize(:edit, @abstract_model, @object) if @authorization_adapter
 
-      @page_name = t("admin.actions.update").capitalize + " " + @model_config.update.label.downcase
+      @page_name = t("admin.actions.update").capitalize + " " + @model_config.label.downcase
       @page_type = @abstract_model.pretty_name.downcase
 
       render :layout => 'rails_admin/form'
@@ -92,7 +92,7 @@ def update
       @cached_assocations_hash = associations_hash
       @modified_assoc = []
 
-      @page_name = t("admin.actions.update").capitalize + " " + @model_config.update.label.downcase
+      @page_name = t("admin.actions.update").capitalize + " " + @model_config.label.downcase
       @page_type = @abstract_model.pretty_name.downcase
 
       @old_object = @object.clone
@@ -111,7 +111,7 @@ def update
     def delete
       @authorization_adapter.authorize(:delete, @abstract_model, @object) if @authorization_adapter
 
-      @page_name = t("admin.actions.delete").capitalize + " " + @model_config.list.label.downcase
+      @page_name = t("admin.actions.delete").capitalize + " " + @model_config.label.downcase
       @page_type = @abstract_model.pretty_name.downcase
 
       render :layout => 'rails_admin/delete'
@@ -121,9 +121,9 @@ def destroy
       @authorization_adapter.authorize(:destroy, @abstract_model, @object) if @authorization_adapter
 
       @object = @object.destroy
-      flash[:notice] = t("admin.delete.flash_confirmation", :name => @model_config.list.label)
+      flash[:notice] = t("admin.delete.flash_confirmation", :name => @model_config.label)
 
-      AbstractHistory.create_history_item("Destroyed #{@model_config.list.with(:object => @object).object_label}", @object, @abstract_model, _current_user)
+      AbstractHistory.create_history_item("Destroyed #{@model_config.with(:object => @object).object_label}", @object, @abstract_model, _current_user)
 
       redirect_to rails_admin_list_path(:model_name => @abstract_model.to_param)
     end
@@ -131,7 +131,7 @@ def destroy
     def bulk_delete
       @authorization_adapter.authorize(:bulk_delete, @abstract_model) if @authorization_adapter
 
-      @page_name = t("admin.actions.delete").capitalize + " " + @model_config.list.label.downcase
+      @page_name = t("admin.actions.delete").capitalize + " " + @model_config.label.downcase
       @page_type = @abstract_model.pretty_name.downcase
 
       render :layout => 'rails_admin/delete'
@@ -144,7 +144,7 @@ def bulk_destroy
       @destroyed_objects = @abstract_model.destroy(params[:bulk_ids], scope)
 
       @destroyed_objects.each do |object|
-        message = "Destroyed #{@model_config.list.with(:object => object).object_label}"
+        message = "Destroyed #{@model_config.with(:object => object).object_label}"
         AbstractHistory.create_history_item(message, object, @abstract_model, _current_user)
       end
 
@@ -241,7 +241,7 @@ def get_attributes
 
     def redirect_to_on_success
       param = @abstract_model.to_param
-      pretty_name = @model_config.update.label
+      pretty_name = @model_config.label
       action = params[:action]
 
       if params[:_add_another]
@@ -258,7 +258,7 @@ def redirect_to_on_success
 
     def render_error whereto = :new
       action = params[:action]
-      flash.now[:error] = t("admin.flash.error", :name => @model_config.update.label, :action => t("admin.actions.#{action}d"))
+      flash.now[:error] = t("admin.flash.error", :name => @model_config.label, :action => t("admin.actions.#{action}d"))
       render whereto, :layout => 'rails_admin/form'
     end
 
@@ -301,7 +301,7 @@ def list_entries(other = {})
       @record_count = @abstract_model.count(options, scope)
 
       @page_type = @abstract_model.pretty_name.downcase
-      @page_name = t("admin.list.select", :name => @model_config.list.label.downcase)
+      @page_name = t("admin.list.select", :name => @model_config.label.downcase)
     end
 
     def associations_hash
diff --git a/app/views/layouts/rails_admin/delete.html.erb b/app/views/layouts/rails_admin/delete.html.erb
index 20a0c5319e..b8896a5734 100644
--- a/app/views/layouts/rails_admin/delete.html.erb
+++ b/app/views/layouts/rails_admin/delete.html.erb
@@ -20,7 +20,7 @@
           </li>
           <li>
             &rsaquo;
-            <%= link_to(@model_config.list.label, rails_admin_list_path(:model_name => @abstract_model.to_param)) %>
+            <%= link_to(@model_config.label, rails_admin_list_path(:model_name => @abstract_model.to_param)) %>
           </li>
           <li>
             &rsaquo;
diff --git a/app/views/layouts/rails_admin/form.html.erb b/app/views/layouts/rails_admin/form.html.erb
index 8beec5e9cb..5c2ec755e8 100644
--- a/app/views/layouts/rails_admin/form.html.erb
+++ b/app/views/layouts/rails_admin/form.html.erb
@@ -69,7 +69,7 @@
           </li>
           <li>
             &rsaquo;
-            <%= link_to(@model_config.update.label, rails_admin_list_path(:model_name => @abstract_model.to_param)) %>
+            <%= link_to(@model_config.label, rails_admin_list_path(:model_name => @abstract_model.to_param)) %>
           </li>
           <li>
             &rsaquo;
diff --git a/app/views/layouts/rails_admin/list.html.erb b/app/views/layouts/rails_admin/list.html.erb
index b90f856cf5..d5f1d3d574 100644
--- a/app/views/layouts/rails_admin/list.html.erb
+++ b/app/views/layouts/rails_admin/list.html.erb
@@ -43,7 +43,7 @@
           <% if @history %>
           <li>
             &rsaquo;
-            <%= link_to(@model_config.list.label, rails_admin_list_path(:model_name => @abstract_model.to_param)) %>
+            <%= link_to(@model_config.label, rails_admin_list_path(:model_name => @abstract_model.to_param)) %>
           </li>
           <li>
             &rsaquo;
@@ -52,7 +52,7 @@
           <% else %>
            <li>
              &rsaquo;
-            <span><%= @model_config.list.label %></span>
+            <span><%= @model_config.label %></span>
            </li>
           <% end%>
         </ul>
diff --git a/app/views/rails_admin/main/_delete_notice.html.erb b/app/views/rails_admin/main/_delete_notice.html.erb
index f9985237fc..70cbff3c8c 100644
--- a/app/views/rails_admin/main/_delete_notice.html.erb
+++ b/app/views/rails_admin/main/_delete_notice.html.erb
@@ -5,12 +5,12 @@
 %>
 <ul>
   <li>
-    <%= @abstract_model.pretty_name %>: <%= link_to(model_config.list.with(:object => object).object_label, rails_admin_edit_path(:model_name => @abstract_model.to_param, :id => object.id)) %>
+    <%= @abstract_model.pretty_name %>: <%= link_to(model_config.with(:object => object).object_label, rails_admin_edit_path(:model_name => @abstract_model.to_param, :id => object.id)) %>
     <ul>
       <% @abstract_model.has_many_associations.each do |association| %>
       <% object.send(association[:name]).reject{|child| child.nil?}.each do |child| %>
       <li>
-        One or more <%= @abstract_model.pretty_name.pluralize.downcase %> in <%= association[:pretty_name].downcase %>: <%= link_to(RailsAdmin.config(child).list.with(:object => child).object_label, rails_admin_edit_path(:model_name => association[:name].to_s.singularize.to_sym, :id => child.id)) %>
+        One or more <%= @abstract_model.pretty_name.pluralize.downcase %> in <%= association[:pretty_name].downcase %>: <%= link_to(RailsAdmin.config(child).with(:object => child).object_label, rails_admin_edit_path(:model_name => association[:name].to_s.singularize.to_sym, :id => child.id)) %>
       </li>
       <% end %>
       <% end %>
@@ -18,7 +18,7 @@
       <% child = object.send(association[:name]) %>
       <% next if child.nil? %>
       <li>
-        A <%= @abstract_model.pretty_name.downcase %> in <%= association[:pretty_name].downcase %>: <%= link_to(RailsAdmin.config(child).list.with(:object => child).object_label, rails_admin_edit_path(:model_name => association[:name], :id => child.id)) %>
+        A <%= @abstract_model.pretty_name.downcase %> in <%= association[:pretty_name].downcase %>: <%= link_to(RailsAdmin.config(child).with(:object => child).object_label, rails_admin_edit_path(:model_name => association[:name], :id => child.id)) %>
       </li>
       <% end %>
     </ul>
diff --git a/app/views/rails_admin/main/_has_and_belongs_to_many_association.html.erb b/app/views/rails_admin/main/_has_and_belongs_to_many_association.html.erb
index e3fdcf3303..c7c4ea0679 100644
--- a/app/views/rails_admin/main/_has_and_belongs_to_many_association.html.erb
+++ b/app/views/rails_admin/main/_has_and_belongs_to_many_association.html.erb
@@ -4,7 +4,7 @@
 
   # for edit action
   selected = field.bindings[:object].send(association_name).map{|object|
-    [field.associated_model_config.list.with(:object => object).object_label, object.id]
+    [field.associated_model_config.with(:object => object).object_label, object.id]
   }.sort_by{|object| object.first}
 
   # if error accurs - show the selected associations
diff --git a/app/views/rails_admin/main/_has_many_association.html.erb b/app/views/rails_admin/main/_has_many_association.html.erb
index 5fad224d09..2aafddee2c 100644
--- a/app/views/rails_admin/main/_has_many_association.html.erb
+++ b/app/views/rails_admin/main/_has_many_association.html.erb
@@ -4,7 +4,7 @@
 
   # for edit action
   selected = field.bindings[:object].send(association_name).map{|object|
-    [field.associated_model_config.list.with(:object => object).object_label, object.id]
+    [field.associated_model_config.with(:object => object).object_label, object.id]
   }.sort_by{|object| object.first}
 
   # if error accurs - show the selected associations
diff --git a/app/views/rails_admin/main/_navigation.html.erb b/app/views/rails_admin/main/_navigation.html.erb
index 968555c8aa..37d7dfde9d 100644
--- a/app/views/rails_admin/main/_navigation.html.erb
+++ b/app/views/rails_admin/main/_navigation.html.erb
@@ -5,14 +5,14 @@
       <ul id="nav">
         <li <%if @page_type == "dashboard" %>class="active"<% end %>><%= link_to(t("admin.dashboard.name"), rails_admin_dashboard_path) %></li>
 <% models[0..max_visible_tabs-1].each do |model| %>
-        <li <%if @page_type == model.abstract_model.pretty_name.downcase %>class="active"<% end %>><%= link_to(model.navigation.label, rails_admin_list_path(:model_name => model.abstract_model.to_param)) %></li>
+        <li <%if @page_type == model.abstract_model.pretty_name.downcase %>class="active"<% end %>><%= link_to(model.label, rails_admin_list_path(:model_name => model.abstract_model.to_param)) %></li>
 <% end %>
 <% if models.size > max_visible_tabs %>
         <li class="more">
           <a href="#">&raquo;</a>
           <ul>
           <% models[max_visible_tabs..models.size].each do |model| %>
-          <li <%if @page_type == model.abstract_model.pretty_name.downcase %>class="active"<% end %>><%= link_to(model.navigation.label, rails_admin_list_path(:model_name => model.abstract_model.to_param)) %></li>
+          <li <%if @page_type == model.abstract_model.pretty_name.downcase %>class="active"<% end %>><%= link_to(model.label, rails_admin_list_path(:model_name => model.abstract_model.to_param)) %></li>
           <% end %>
           </ul>
         </li>
diff --git a/app/views/rails_admin/main/delete.html.erb b/app/views/rails_admin/main/delete.html.erb
index 1e24228f21..5d166d5f0a 100644
--- a/app/views/rails_admin/main/delete.html.erb
+++ b/app/views/rails_admin/main/delete.html.erb
@@ -3,7 +3,7 @@
         </div>
 <%= render(:partial => 'layouts/rails_admin/flash', :locals => {:flash => flash}) -%>
         <div id="contentMainDelete">
-          <p>Are you sure you want to delete the <%= @abstract_model.pretty_name.downcase %> &ldquo;<strong><%= @model_config.list.with(:object => @object).object_label %></strong>&rdquo;? All of the following related items will be deleted:</p>
+          <p>Are you sure you want to delete the <%= @abstract_model.pretty_name.downcase %> &ldquo;<strong><%= @model_config.with(:object => @object).object_label %></strong>&rdquo;? All of the following related items will be deleted:</p>
           <%= render :partial => "delete_notice", :object => @object %>
           <%= form_for(@object, :url => rails_admin_destroy_path(:model_name => @abstract_model.to_param, :id => @object.id), :html => {:method => "delete"}) do %>
             <div id="deleteConfirmation">
diff --git a/app/views/rails_admin/main/index.html.erb b/app/views/rails_admin/main/index.html.erb
index 46f904f09f..e848b7ff2b 100644
--- a/app/views/rails_admin/main/index.html.erb
+++ b/app/views/rails_admin/main/index.html.erb
@@ -17,7 +17,7 @@
               <% if authorized? :list, abstract_model %>
                 <tr class="<%= cycle 'odd', 'even' %>">
                   <td class="modelNameRow">
-                    <%= link_to(RailsAdmin.config(abstract_model).list.label, rails_admin_list_path(:model_name => abstract_model.to_param), :class => "show") %>
+                    <%= link_to(RailsAdmin.config(abstract_model).label, rails_admin_list_path(:model_name => abstract_model.to_param), :class => "show") %>
                   </td>
                   <td>
                   <% if (last_used = @most_recent_changes[abstract_model.pretty_name]) %>
diff --git a/app/views/rails_admin/main/list.html.erb b/app/views/rails_admin/main/list.html.erb
index ec3e1a770b..293d86ace0 100644
--- a/app/views/rails_admin/main/list.html.erb
+++ b/app/views/rails_admin/main/list.html.erb
@@ -104,7 +104,7 @@
         <%= paginate(@current_page, @page_count, :url => params).html_safe %>
       <% end %>
       <%= @record_count %>
-      <%= @model_config.abstract_model.model.model_name.human(:count => @record_count, :default => @record_count != 1 ? @model_config.list.label.downcase.pluralize : @model_config.list.label.downcase) %>
+      <%= @model_config.abstract_model.model.model_name.human(:count => @record_count, :default => @record_count != 1 ? @model_config.label.downcase.pluralize : @model_config.label.downcase) %>
       <% if @page_count.to_i == 2 %>
         <%= link_to(t("admin.list.show_all"), params.merge(:all => true), :class => "showall") %>
       <% end %>
diff --git a/lib/rails_admin/config/base.rb b/lib/rails_admin/config/base.rb
index 0af151e799..917f6f20d0 100644
--- a/lib/rails_admin/config/base.rb
+++ b/lib/rails_admin/config/base.rb
@@ -40,7 +40,7 @@ def with(bindings = {})
       end
 
       # Register an instance option. Instance option is a configuration
-      # option that stores it's value within an instance variable and is
+      # option that stores its value within an instance variable and is
       # accessed by an instance method. Both go by the name of the option.
       def self.register_instance_option(option_name, scope = self, &default)
         unless options = scope.instance_variable_get("@config_options")
diff --git a/lib/rails_admin/config/fields/association.rb b/lib/rails_admin/config/fields/association.rb
index ce16d54446..5744ef3622 100644
--- a/lib/rails_admin/config/fields/association.rb
+++ b/lib/rails_admin/config/fields/association.rb
@@ -28,7 +28,7 @@ def association
         # [label, id] arrays.
         def associated_collection
           associated_model_config.abstract_model.all.map do |object|
-            [associated_model_config.list.with(:object => object).object_label, object.id]
+            [associated_model_config.with(:object => object).object_label, object.id]
           end
         end
 
diff --git a/lib/rails_admin/config/fields/types/belongs_to_association.rb b/lib/rails_admin/config/fields/types/belongs_to_association.rb
index 429cbf7d7d..8b1a48d6e6 100644
--- a/lib/rails_admin/config/fields/types/belongs_to_association.rb
+++ b/lib/rails_admin/config/fields/types/belongs_to_association.rb
@@ -19,7 +19,7 @@ def initialize(parent, name, properties, association)
           register_instance_option(:formatted_value) do
             object = bindings[:object].send(association[:name])
             unless object.nil?
-              RailsAdmin::Config.model(object).list.with(:object => object).object_label
+              RailsAdmin::Config.model(object).with(:object => object).object_label
             else
               nil
             end
@@ -27,7 +27,7 @@ def initialize(parent, name, properties, association)
 
           def associated_collection
             associated_model_config.abstract_model.all.map do |object|
-              [associated_model_config.list.with(:object => object).object_label, object.id]
+              [associated_model_config.with(:object => object).object_label, object.id]
             end
           end
 
diff --git a/lib/rails_admin/config/labelable.rb b/lib/rails_admin/config/labelable.rb
deleted file mode 100644
index d2e7ef4e32..0000000000
--- a/lib/rails_admin/config/labelable.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module RailsAdmin
-  module Config
-    # Defines a generic label/name/title configuration
-    module Labelable
-      # Try to find a user-friendly label for an object, falling back
-      # to its class and ID.
-      def self.object_label(object)
-        Config.label_methods.each {|l| label = (object.respond_to? l and object.send l) and return label}
-        "#{object.class.to_s} ##{object.try :id}"
-      end
-
-      def self.included(klass)
-        klass.register_instance_option(:label) do
-          abstract_model.model.model_name.human(:default => abstract_model.model.model_name.titleize)
-        end
-        klass.register_instance_option(:object_label) {Labelable.object_label bindings[:object]}
-      end
-    end
-  end
-end
diff --git a/lib/rails_admin/config/model.rb b/lib/rails_admin/config/model.rb
index d1722acd13..44e10167f0 100644
--- a/lib/rails_admin/config/model.rb
+++ b/lib/rails_admin/config/model.rb
@@ -36,6 +36,28 @@ def edit(&block)
         end
       end
 
+      # The display for a model instance (i.e. a single database record).
+      # Unless configured in a model config block, it'll try to use :name followed by :title methods, then
+      # any methods that may have been added to the label_methods array via Configuration.
+      # Failing all of these, it'll return the class name followed by the model's id.
+      def object_label
+        object = @bindings[:object]
+        Config.label_methods.each {|l| label = (object.respond_to? l and object.send l) and return label}
+        "#{object.class.to_s} ##{object.try :id}"
+      end
+
+      register_instance_option(:label) do
+        abstract_model.model.model_name.human(:default => abstract_model.model.model_name.titleize)
+      end
+
+      register_instance_option(:object_label) do
+        object = bindings[:object]
+        label = ''
+        Config.label_methods.any? { |method|
+          object.respond_to?(method) and (label=object.send(method)).present?
+        } ? label : "#{object.class.to_s} ##{object.try :id}"
+      end
+
       # Act as a proxy for the section configurations that actually
       # store the configurations.
       def method_missing(m, *args, &block)
diff --git a/lib/rails_admin/config/sections.rb b/lib/rails_admin/config/sections.rb
index 677bdb4941..88d1c450cd 100644
--- a/lib/rails_admin/config/sections.rb
+++ b/lib/rails_admin/config/sections.rb
@@ -11,8 +11,8 @@ module Config
     #
     # Each section's class object can store generic configuration about that section (such as the
     # number of visible tabs in the main navigation), while the instances (accessed via model
-    # configuration objects) store model specific configuration (such as the label of the
-    # model to be used as the title in the main navigation tabs).
+    # configuration objects) store model specific configuration (such as the visibility of the
+    # model).
     module Sections
       def self.included(klass)
         # Register accessors for all the sections in this namespace
@@ -28,8 +28,9 @@ def self.included(klass)
             @sections[name]
           end
           # Register a shortcut to define the model's label for each section.
-          klass.send(:define_method, "label_for_#{name}") do |*args, &block|
-            send(name).label(block ? block : args[0])
+          klass.send(:define_method, "label_for_#{name}") do
+            # TODO: Remove this warning in the next release, after people have updated their applications
+            $stderr.puts("WARNING: label_for_#{name} has been removed. This configuration will be ignored. Model names can be configured with 'label' and section-specific names are no longer supported. See README for details.")
           end
           # Register a shortcut to hide the model for each section.
           # NOTE: "hide_in_" is deprecated, use "hide_from_" instead.
diff --git a/lib/rails_admin/config/sections/list.rb b/lib/rails_admin/config/sections/list.rb
index 2fa149bb2c..53f6ff87fa 100644
--- a/lib/rails_admin/config/sections/list.rb
+++ b/lib/rails_admin/config/sections/list.rb
@@ -1,6 +1,5 @@
 require 'rails_admin/config/base'
 require 'rails_admin/config/hideable'
-require 'rails_admin/config/labelable'
 require 'rails_admin/config/fields'
 require 'rails_admin/config/has_fields'
 
@@ -11,7 +10,6 @@ module Sections
       class List < RailsAdmin::Config::Base
         include RailsAdmin::Config::HasFields
         include RailsAdmin::Config::Hideable
-        include RailsAdmin::Config::Labelable
 
         def initialize(parent)
           super(parent)
diff --git a/lib/rails_admin/config/sections/navigation.rb b/lib/rails_admin/config/sections/navigation.rb
index 4145cdcf82..2343fc8980 100644
--- a/lib/rails_admin/config/sections/navigation.rb
+++ b/lib/rails_admin/config/sections/navigation.rb
@@ -1,6 +1,5 @@
 require 'rails_admin/config/base'
 require 'rails_admin/config/hideable'
-require 'rails_admin/config/labelable'
 
 module RailsAdmin
   module Config
@@ -8,7 +7,6 @@ module Sections
       # Configuration of the navigation view
       class Navigation < RailsAdmin::Config::Base
         include RailsAdmin::Config::Hideable
-        include RailsAdmin::Config::Labelable
 
         # Defines the number of tabs to be renderer in the main navigation.
         # Rest of the links will be rendered to a drop down menu.
@@ -21,7 +19,7 @@ class Navigation < RailsAdmin::Config::Base
         # @see RailsAdmin::Config::Hideable
         def self.visible_models
           RailsAdmin::Config.models.select {|m| m.navigation.visible? }.sort do |a, b|
-            a.navigation.label.downcase <=> b.navigation.label.downcase
+            a.label.downcase <=> b.label.downcase
           end
         end
       end
diff --git a/lib/rails_admin/config/sections/update.rb b/lib/rails_admin/config/sections/update.rb
index 04a6a1567a..7435bc17f6 100644
--- a/lib/rails_admin/config/sections/update.rb
+++ b/lib/rails_admin/config/sections/update.rb
@@ -1,6 +1,5 @@
 require 'rails_admin/config/base'
 require 'rails_admin/config/hideable'
-require 'rails_admin/config/labelable'
 require 'rails_admin/config/fields'
 require 'rails_admin/config/has_fields'
 require 'rails_admin/config/has_groups'
@@ -14,7 +13,6 @@ class Update < RailsAdmin::Config::Base
         include RailsAdmin::Config::HasFields
         include RailsAdmin::Config::HasGroups
         include RailsAdmin::Config::Hideable
-        include RailsAdmin::Config::Labelable
 
         # Default items per page value used if a model level option has not
         # been configured
diff --git a/lib/rails_admin/version.rb b/lib/rails_admin/version.rb
index 197d7ef4da..0b62deda01 100644
--- a/lib/rails_admin/version.rb
+++ b/lib/rails_admin/version.rb
@@ -2,5 +2,5 @@ module RailsAdmin
   # FIXME: this needs to be manually kept in sync with the gemspec's
   # s.version until http://jira.codehaus.org/browse/JRUBY-5319 is
   # fixed
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end
diff --git a/rails_admin.gemspec b/rails_admin.gemspec
index 172d606c53..09eaf57ef2 100644
--- a/rails_admin.gemspec
+++ b/rails_admin.gemspec
@@ -31,5 +31,5 @@ Gem::Specification.new do |s|
   # FIXME: this should reference RailsAdmin::VERSION but because of
   # http://jira.codehaus.org/browse/JRUBY-5319 we can't use "require"
   # in our gemspec
-  s.version = '0.0.1'
+  s.version = '0.0.2'
 end
diff --git a/spec/requests/config/navigation/rails_admin_config_navigation_spec.rb b/spec/requests/config/navigation/rails_admin_config_navigation_spec.rb
index 7a5f15c770..e6e58f99cd 100644
--- a/spec/requests/config/navigation/rails_admin_config_navigation_spec.rb
+++ b/spec/requests/config/navigation/rails_admin_config_navigation_spec.rb
@@ -46,42 +46,6 @@
       end
     end
 
-    it "should be editable via shortcut" do
-      RailsAdmin.config Fan do
-        label_for_navigation "Fan test 2"
-      end
-      get rails_admin_dashboard_path
-      response.should have_tag("#nav") do |navigation|
-        navigation.should have_tag("li a", :content => "Fan test 2")
-      end
-    end
-
-    it "should be editable via navigation configuration" do
-      RailsAdmin.config Fan do
-        navigation do
-          label "Fan test 3"
-        end
-      end
-      get rails_admin_dashboard_path
-      response.should have_tag("#nav") do |navigation|
-        navigation.should have_tag("li a", :content => "Fan test 3")
-      end
-    end
-
-    it "should be editable with a block via navigation configuration" do
-      RailsAdmin.config Fan do
-        navigation do
-          label do
-            "#{label} test 4"
-          end
-        end
-      end
-      get rails_admin_dashboard_path
-      response.should have_tag("#nav") do |navigation|
-        navigation.should have_tag("li a", :content => "Fan test 4")
-      end
-    end
-
     it "should be hideable" do
       RailsAdmin.config Fan do
         hide
diff --git a/spec/requests/config/rails_admin_config_spec.rb b/spec/requests/config/rails_admin_config_spec.rb
index a8d0f3bcfc..3ff2b20174 100644
--- a/spec/requests/config/rails_admin_config_spec.rb
+++ b/spec/requests/config/rails_admin_config_spec.rb
@@ -70,5 +70,18 @@
       config_setup.should_not raise_error
     end
   end
-  
+
+  describe "object_label" do
+    it 'should be configurable' do
+      RailsAdmin.config League do
+        object_label { "League '#{bindings[:object].name}'"}
+      end
+
+      league = RailsAdmin::AbstractModel.new('League').create(:name => "Bundesliga")
+      league.should be_persisted
+
+      RailsAdmin.config('League').with(:object => league).object_label.should == "League 'Bundesliga'"
+    end
+  end
+
 end