4 files changed, 9 insertions, 14 deletions
diff --git a/activesupport/lib/active_support/core_ext/fixnum.rb b/activesupport/lib/active_support/core_ext/fixnum.rb
deleted file mode 100644
index 519408fb0d..0000000000
--- a/activesupport/lib/active_support/core_ext/fixnum.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require File.dirname(__FILE__) + '/fixnum/even_odd'
-require File.dirname(__FILE__) + '/fixnum/inflections'
-
-class Fixnum #:nodoc:
-  include ActiveSupport::CoreExtensions::Fixnum::EvenOdd
-  include ActiveSupport::CoreExtensions::Fixnum::Inflections
-end
-
-class Bignum #:nodoc:
-  include ActiveSupport::CoreExtensions::Fixnum::EvenOdd
-  include ActiveSupport::CoreExtensions::Fixnum::Inflections
-end
-\ No newline at end of file
diff --git a/activesupport/lib/active_support/core_ext/integer.rb b/activesupport/lib/active_support/core_ext/integer.rb
new file mode 100644
index 0000000000..9346b88fd5
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/integer.rb
@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/integer/even_odd'
+require File.dirname(__FILE__) + '/integer/inflections'
+
+class Integer #:nodoc:
+  include ActiveSupport::CoreExtensions::Integer::EvenOdd
+  include ActiveSupport::CoreExtensions::Integer::Inflections
+end
diff --git a/activesupport/lib/active_support/core_ext/fixnum/even_odd.rb b/activesupport/lib/active_support/core_ext/integer/even_odd.rb
index c0e9da18fa..3762308cc3 100644
--- a/activesupport/lib/active_support/core_ext/fixnum/even_odd.rb
+++ b/activesupport/lib/active_support/core_ext/integer/even_odd.rb
@@ -1,6 +1,6 @@
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
-    module Fixnum #:nodoc:
+    module Integer #:nodoc:
       # For checking if a fixnum is even or odd. 
       # * 1.even? # => false
       # * 1.odd?  # => true
diff --git a/activesupport/lib/active_support/core_ext/fixnum/inflections.rb b/activesupport/lib/active_support/core_ext/integer/inflections.rb
index 13c4f1130a..a86c4cc26c 100644
--- a/activesupport/lib/active_support/core_ext/fixnum/inflections.rb
+++ b/activesupport/lib/active_support/core_ext/integer/inflections.rb
@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../../inflector'
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
-    module Fixnum #:nodoc:
+    module Integer #:nodoc:
       module Inflections
         # 1.ordinalize  # => "1st"
         # 3.ordinalize  # => "3rd"