jruby · Feb 24, 2018 · Feb 24, 2018
diff --git a/core/src/main/java/org/jruby/RubyConverter.java b/core/src/main/java/org/jruby/RubyConverter.java
@@ -114,7 +114,7 @@ public class RubyConverter extends RubyObject {
     }
 
     public static RubyClass createConverterClass(Ruby runtime) {
-        RubyClass converterc = runtime.defineClassUnder("Converter", runtime.getClass("Data"), CONVERTER_ALLOCATOR, runtime.getEncoding());
+        RubyClass converterc = runtime.defineClassUnder("Converter", runtime.getData(), CONVERTER_ALLOCATOR, runtime.getEncoding());
         runtime.setConverter(converterc);
         converterc.setClassIndex(ClassIndex.CONVERTER);
         converterc.setReifiedClass(RubyConverter.class);

diff --git a/core/src/main/java/org/jruby/RubyNameError.java b/core/src/main/java/org/jruby/RubyNameError.java
@@ -161,7 +161,7 @@ static RubyClass createNameErrorClass(Ruby runtime, RubyClass StandardError) {
     }
 
     static RubyClass createNameErrorMessageClass(Ruby runtime, RubyClass NameError) {
-        RubyClass Message = NameError.defineClassUnder("Message", runtime.getClass("Data"), RubyNameErrorMessage.ALLOCATOR);
+        RubyClass Message = NameError.defineClassUnder("Message", runtime.getData(), RubyNameErrorMessage.ALLOCATOR);
         NameError.setConstantVisibility(runtime, "Message", true);
         Message.defineAnnotatedMethods(RubyNameErrorMessage.class);
         return Message;

diff --git a/core/src/main/java/org/jruby/ext/socket/Addrinfo.java b/core/src/main/java/org/jruby/ext/socket/Addrinfo.java
@@ -50,7 +50,7 @@ public class Addrinfo extends RubyObject {
     public static void createAddrinfo(Ruby runtime) {
         RubyClass addrinfo = runtime.defineClass(
                 "Addrinfo",
-                runtime.getClass("Data"),
+                runtime.getData(),
                 new ObjectAllocator() {
                     public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
                         return new Addrinfo(runtime, klazz);

diff --git a/core/src/main/java/org/jruby/ext/socket/Ifaddr.java b/core/src/main/java/org/jruby/ext/socket/Ifaddr.java
@@ -39,7 +39,7 @@ public class Ifaddr extends RubyObject {
     public static void createIfaddr(Ruby runtime) {
         RubyClass ifaddr = runtime.getClass("Socket").defineClassUnder(
                 "Ifaddr",
-                runtime.getClass("Data"),
+                runtime.getData(),
                 new ObjectAllocator() {
                     public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
                         return new Ifaddr(runtime, klazz);

diff --git a/lib/ruby/stdlib/date.rb b/lib/ruby/stdlib/date.rb
@@ -825,7 +825,7 @@ def self.ordinal(y=-4712, d=1, sg=ITALY)
   #
   # +sg+ specifies the Day of Calendar Reform.
   def self.civil(y=-4712, m=1, d=1, sg=ITALY)
-    if Fixnum === y and Fixnum === m and Fixnum === d and d > 0
+    if Integer === y and Integer === m and Integer === d and d > 0
       m += 13 if m < 0
       y -= 1 if y <= 0 and sg > 0 # TODO
       begin