diff --git a/lib/aasm/core/event.rb b/lib/aasm/core/event.rb
index fed9e09d..b3722820 100644
--- a/lib/aasm/core/event.rb
+++ b/lib/aasm/core/event.rb
@@ -4,7 +4,7 @@ module AASM::Core
   class Event
     include AASM::DslHelper
 
-    attr_reader :name, :state_machine, :options
+    attr_reader :name, :state_machine, :options, :default_display_name
 
     def initialize(name, state_machine, options = {}, &block)
       @name = name
@@ -13,6 +13,7 @@ def initialize(name, state_machine, options = {}, &block)
       @valid_transitions = {}
       @guards = Array(options[:guard] || options[:guards] || options[:if])
       @unless = Array(options[:unless]) #TODO: This could use a better name
+      @default_display_name = name.to_s.gsub(/_/, ' ').capitalize
 
       # from aasm4
       @options = options # QUESTION: .dup ?
diff --git a/lib/aasm/core/state.rb b/lib/aasm/core/state.rb
index c09da506..57448e14 100644
--- a/lib/aasm/core/state.rb
+++ b/lib/aasm/core/state.rb
@@ -2,12 +2,13 @@
 
 module AASM::Core
   class State
-    attr_reader :name, :state_machine, :options
+    attr_reader :name, :state_machine, :options, :default_display_name
 
     def initialize(name, klass, state_machine, options={})
       @name = name
       @klass = klass
       @state_machine = state_machine
+      @default_display_name = name.to_s.gsub(/_/, ' ').capitalize
       update(options)
     end
 
@@ -55,12 +56,10 @@ def fire_callbacks(action, record, *args)
 
     def display_name
       @display_name = begin
-        if @fixed_display_name
-          @fixed_display_name
-        elsif Module.const_defined?(:I18n)
+        if Module.const_defined?
           localized_name
         else
-          name.to_s.gsub(/_/, ' ').capitalize
+          default_display_name
         end
       end
     end
@@ -78,7 +77,7 @@ def for_select
 
     def update(options = {})
       if options.key?(:display)
-        @fixed_display_name = options.delete(:display)
+        @default_display_name = options.delete(:display)
       end
       @options = options
       self
diff --git a/lib/aasm/localizer.rb b/lib/aasm/localizer.rb
index dc19fa89..06b9faa2 100644
--- a/lib/aasm/localizer.rb
+++ b/lib/aasm/localizer.rb
@@ -5,7 +5,7 @@ def human_event_name(klass, event)
         list << :"#{i18n_scope(klass)}.events.#{i18n_klass(ancestor)}.#{event}"
         list
       end
-      translate_queue(checklist) || I18n.translate(checklist.shift, :default => event.to_s.humanize)
+      translate_queue(checklist) || I18n.translate(checklist.shift, :default => event.default_display_name)
     end
 
     def human_state_name(klass, state)
@@ -14,7 +14,7 @@ def human_state_name(klass, state)
         list << item_for(klass, state, ancestor, :old_style => true)
         list
       end
-      translate_queue(checklist) || I18n.translate(checklist.shift, :default => state.to_s.humanize)
+      translate_queue(checklist) || I18n.translate(checklist.shift, :default => state.default_display_name)
     end
 
   private