diff --git a/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java b/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
index 349fd8a8d..a9c7f3fe1 100644
--- a/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
+++ b/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
@@ -32,7 +32,7 @@ import org.apache.commons.math.ode.DerivativeException;
 import org.apache.commons.math.ode.IntegratorException;
 
 public class ClassicalRungeKuttaStepInterpolatorTest
-  extends AbstractStepInterpolatorTest {
+  extends StepInterpolatorAbstractTest {
 
   public ClassicalRungeKuttaStepInterpolatorTest(String name) {
     super(name);
diff --git a/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java b/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
index 3dd207d69..9981ac8ab 100644
--- a/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
+++ b/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
@@ -33,7 +33,7 @@ import org.apache.commons.math.ode.sampling.StepHandler;
 import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 public class DormandPrince54StepInterpolatorTest
-  extends AbstractStepInterpolatorTest {
+  extends StepInterpolatorAbstractTest {
 
   public DormandPrince54StepInterpolatorTest(String name) {
     super(name);
diff --git a/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java b/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
index fc03ba089..6209cbb86 100644
--- a/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
+++ b/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
@@ -33,7 +33,7 @@ import org.apache.commons.math.ode.sampling.StepHandler;
 import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 public class DormandPrince853StepInterpolatorTest
-  extends AbstractStepInterpolatorTest {
+  extends StepInterpolatorAbstractTest {
 
   public DormandPrince853StepInterpolatorTest(String name) {
     super(name);
diff --git a/src/test/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java b/src/test/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java
index 93f6cb36b..c6576ffa6 100644
--- a/src/test/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java
+++ b/src/test/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java
@@ -33,7 +33,7 @@ import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
 import org.apache.commons.math.ode.IntegratorException;
 
 public class EulerStepInterpolatorTest
-  extends AbstractStepInterpolatorTest {
+  extends StepInterpolatorAbstractTest {
 
   public EulerStepInterpolatorTest(String name) {
     super(name);
diff --git a/src/test/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java b/src/test/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java
index 60838c988..dfffaddac 100644
--- a/src/test/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java
+++ b/src/test/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java
@@ -31,7 +31,7 @@ import org.apache.commons.math.ode.IntegratorException;
 import org.apache.commons.math.ode.nonstiff.GillIntegrator;
 
 public class GillStepInterpolatorTest
-  extends AbstractStepInterpolatorTest {
+  extends StepInterpolatorAbstractTest {
 
   public GillStepInterpolatorTest(String name) {
     super(name);
diff --git a/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java b/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
index 88d91f23b..d1115cc76 100644
--- a/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
+++ b/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
@@ -33,7 +33,7 @@ import org.apache.commons.math.ode.sampling.StepHandler;
 import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 public class GraggBulirschStoerStepInterpolatorTest
-  extends AbstractStepInterpolatorTest {
+  extends StepInterpolatorAbstractTest {
 
   public GraggBulirschStoerStepInterpolatorTest(String name) {
     super(name);
diff --git a/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java b/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java
index eecfe549b..2cb962057 100644
--- a/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java
+++ b/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java
@@ -33,7 +33,7 @@ import org.apache.commons.math.ode.sampling.StepHandler;
 import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 public class HighamHall54StepInterpolatorTest
-  extends AbstractStepInterpolatorTest {
+  extends StepInterpolatorAbstractTest {
 
   public HighamHall54StepInterpolatorTest(String name) {
     super(name);
diff --git a/src/test/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java b/src/test/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java
index ba97eced5..37afab9b4 100644
--- a/src/test/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java
+++ b/src/test/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java
@@ -32,7 +32,7 @@ import org.apache.commons.math.ode.DerivativeException;
 import org.apache.commons.math.ode.IntegratorException;
 
 public class MidpointStepInterpolatorTest
-  extends AbstractStepInterpolatorTest {
+  extends StepInterpolatorAbstractTest {
 
   public MidpointStepInterpolatorTest(String name) {
     super(name);
diff --git a/src/test/org/apache/commons/math/ode/nonstiff/AbstractStepInterpolatorTest.java b/src/test/org/apache/commons/math/ode/nonstiff/StepInterpolatorAbstractTest.java
similarity index 97%
rename from src/test/org/apache/commons/math/ode/nonstiff/AbstractStepInterpolatorTest.java
rename to src/test/org/apache/commons/math/ode/nonstiff/StepInterpolatorAbstractTest.java
index 4401d092b..941ffa67d 100644
--- a/src/test/org/apache/commons/math/ode/nonstiff/AbstractStepInterpolatorTest.java
+++ b/src/test/org/apache/commons/math/ode/nonstiff/StepInterpolatorAbstractTest.java
@@ -24,9 +24,9 @@ import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 import junit.framework.TestCase;
 
-public class AbstractStepInterpolatorTest extends TestCase {
+public class StepInterpolatorAbstractTest extends TestCase {
 
-    protected AbstractStepInterpolatorTest(String name) {
+    protected StepInterpolatorAbstractTest(String name) {
         super(name);
     }
 
diff --git a/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java b/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java
index 948c4a07e..f9770be3a 100644
--- a/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java
+++ b/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java
@@ -32,7 +32,7 @@ import org.apache.commons.math.ode.DerivativeException;
 import org.apache.commons.math.ode.IntegratorException;
 
 public class ThreeEighthesStepInterpolatorTest
-  extends AbstractStepInterpolatorTest {
+  extends StepInterpolatorAbstractTest {
 
   public ThreeEighthesStepInterpolatorTest(String name) {
     super(name);