diff --git a/src/java/org/apache/commons/math/complex/ComplexMath.java b/src/java/org/apache/commons/math/complex/ComplexUtils.java
similarity index 98%
rename from src/java/org/apache/commons/math/complex/ComplexMath.java
rename to src/java/org/apache/commons/math/complex/ComplexUtils.java
index bc8cfa14d..a3025e5e4 100644
--- a/src/java/org/apache/commons/math/complex/ComplexMath.java
+++ b/src/java/org/apache/commons/math/complex/ComplexUtils.java
@@ -28,14 +28,14 @@ import org.apache.commons.math.util.MathUtils;
  * Multiple Precision Complex Arithmetic and Functions</a></li>
  * </ul>
  *
- * @version $Revision: 1.9 $ $Date: 2004/06/23 16:26:16 $
+ * @version $Revision: 1.1 $ $Date: 2004/07/12 00:27:09 $
  */
-public class ComplexMath {
+public class ComplexUtils {
     
     /**
      * Default constructor.
      */
-    private ComplexMath() {
+    private ComplexUtils() {
         super();
     }
     
diff --git a/src/test/org/apache/commons/math/complex/ComplexMathTest.java b/src/test/org/apache/commons/math/complex/ComplexUtilsTest.java
similarity index 64%
rename from src/test/org/apache/commons/math/complex/ComplexMathTest.java
rename to src/test/org/apache/commons/math/complex/ComplexUtilsTest.java
index 7bcae7f33..e2e3f09c6 100644
--- a/src/test/org/apache/commons/math/complex/ComplexMathTest.java
+++ b/src/test/org/apache/commons/math/complex/ComplexUtilsTest.java
@@ -21,178 +21,178 @@ import org.apache.commons.math.TestUtils;
 import junit.framework.TestCase;
 
 /**
- * @version $Revision: 1.3 $ $Date: 2004/02/21 21:35:16 $
+ * @version $Revision: 1.1 $ $Date: 2004/07/12 00:27:09 $
  */
-public class ComplexMathTest extends TestCase {
+public class ComplexUtilsTest extends TestCase {
     
     public void testAcos() {
         Complex z = new Complex(3, 4);
         Complex expected = new Complex(0.936812, -2.30551);
-        TestUtils.assertEquals(expected, ComplexMath.acos(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.acos(z), 1.0e-5);
     }
     
     public void testAcosNaN() {
-        assertTrue(ComplexMath.acos(Complex.NaN).isNaN());
+        assertTrue(ComplexUtils.acos(Complex.NaN).isNaN());
     }
     
     public void testAsin() {
         Complex z = new Complex(3, 4);
         Complex expected = new Complex(0.633984, 2.30551);
-        TestUtils.assertEquals(expected, ComplexMath.asin(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.asin(z), 1.0e-5);
     }
     
     public void testAsinNaN() {
-        assertTrue(ComplexMath.asin(Complex.NaN).isNaN());
+        assertTrue(ComplexUtils.asin(Complex.NaN).isNaN());
     }
     
     public void testAtan() {
         Complex z = new Complex(3, 4);
         Complex expected = new Complex(1.44831, 0.158997);
-        TestUtils.assertEquals(expected, ComplexMath.atan(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.atan(z), 1.0e-5);
     }
     
     public void testAtanNaN() {
-        assertTrue(ComplexMath.atan(Complex.NaN).isNaN());
+        assertTrue(ComplexUtils.atan(Complex.NaN).isNaN());
     }
     
     public void testCos() {
         Complex z = new Complex(3, 4);
         Complex expected = new Complex(-27.03495, -3.851153);
-        TestUtils.assertEquals(expected, ComplexMath.cos(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.cos(z), 1.0e-5);
     }
     
     public void testCosh() {
         Complex z = new Complex(3, 4);
         Complex expected = new Complex(-6.58066, -7.58155);
-        TestUtils.assertEquals(expected, ComplexMath.cosh(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.cosh(z), 1.0e-5);
     }
     
     public void testCoshNaN() {
-        assertTrue(ComplexMath.cosh(Complex.NaN).isNaN());
+        assertTrue(ComplexUtils.cosh(Complex.NaN).isNaN());
     }
     
     public void testCosNaN() {
-        assertTrue(ComplexMath.cos(Complex.NaN).isNaN());
+        assertTrue(ComplexUtils.cos(Complex.NaN).isNaN());
     }
     
     public void testExp() {
         Complex z = new Complex(3, 4);
         Complex expected = new Complex(-13.12878, -15.20078);
-        TestUtils.assertEquals(expected, ComplexMath.exp(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.exp(z), 1.0e-5);
     }
     
     public void testExpNaN() {
-        assertTrue(ComplexMath.exp(Complex.NaN).isNaN());
+        assertTrue(ComplexUtils.exp(Complex.NaN).isNaN());
     }
     
     public void testLog() {
         Complex z = new Complex(3, 4);
         Complex expected = new Complex(1.60944, 0.927295);
-        TestUtils.assertEquals(expected, ComplexMath.log(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.log(z), 1.0e-5);
     }
     
     public void testLogNaN() {
-        assertTrue(ComplexMath.log(Complex.NaN).isNaN());
+        assertTrue(ComplexUtils.log(Complex.NaN).isNaN());
     }
     
     public void testPow() {
         Complex x = new Complex(3, 4);
         Complex y = new Complex(5, 6);
         Complex expected = new Complex(-1.860893, 11.83677);
-        TestUtils.assertEquals(expected, ComplexMath.pow(x, y), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.pow(x, y), 1.0e-5);
     }
     
     public void testPowNaNBase() {
         Complex x = new Complex(3, 4);
-        assertTrue(ComplexMath.pow(Complex.NaN, x).isNaN());
+        assertTrue(ComplexUtils.pow(Complex.NaN, x).isNaN());
     }
     
     public void testPowNaNExponent() {
         Complex x = new Complex(3, 4);
-        assertTrue(ComplexMath.pow(x, Complex.NaN).isNaN());
+        assertTrue(ComplexUtils.pow(x, Complex.NaN).isNaN());
     }
     
     public void testSin() {
         Complex z = new Complex(3, 4);
         Complex expected = new Complex(3.853738, -27.01681);
-        TestUtils.assertEquals(expected, ComplexMath.sin(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.sin(z), 1.0e-5);
     }
     
     public void testSinh() {
         Complex z = new Complex(3, 4);
         Complex expected = new Complex(-6.54812, -7.61923);
-        TestUtils.assertEquals(expected, ComplexMath.sinh(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.sinh(z), 1.0e-5);
     }
     
     public void testSinhNaN() {
-        assertTrue(ComplexMath.sinh(Complex.NaN).isNaN());
+        assertTrue(ComplexUtils.sinh(Complex.NaN).isNaN());
     }
     
     public void testSinNaN() {
-        assertTrue(ComplexMath.sin(Complex.NaN).isNaN());
+        assertTrue(ComplexUtils.sin(Complex.NaN).isNaN());
     }
     
     public void testSqrtRealPositive() {
         Complex z = new Complex(3, 4);
         Complex expected = new Complex(2, 1);
-        TestUtils.assertEquals(expected, ComplexMath.sqrt(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.sqrt(z), 1.0e-5);
     }
     
     public void testSqrtRealZero() {
         Complex z = new Complex(0.0, 4);
         Complex expected = new Complex(1.41421, 1.41421);
-        TestUtils.assertEquals(expected, ComplexMath.sqrt(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.sqrt(z), 1.0e-5);
     }
     
     public void testSqrtRealNegative() {
         Complex z = new Complex(-3.0, 4);
         Complex expected = new Complex(1, 2);
-        TestUtils.assertEquals(expected, ComplexMath.sqrt(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.sqrt(z), 1.0e-5);
     }
     
     public void testSqrtImaginaryZero() {
         Complex z = new Complex(-3.0, 0.0);
         Complex expected = new Complex(0.0, 1.73205);
-        TestUtils.assertEquals(expected, ComplexMath.sqrt(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.sqrt(z), 1.0e-5);
     }
     
     public void testSqrtImaginaryNegative() {
         Complex z = new Complex(-3.0, -4.0);
         Complex expected = new Complex(1.0, -2.0);
-        TestUtils.assertEquals(expected, ComplexMath.sqrt(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.sqrt(z), 1.0e-5);
     }
 
     public void testSqrt1z() {
         Complex z = new Complex(3, 4);
         Complex expected = new Complex(4.08033, -2.94094);
-        TestUtils.assertEquals(expected, ComplexMath.sqrt1z(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.sqrt1z(z), 1.0e-5);
     }
     
     public void testSqrt1zNaN() {
-        assertTrue(ComplexMath.sqrt1z(Complex.NaN).isNaN());
+        assertTrue(ComplexUtils.sqrt1z(Complex.NaN).isNaN());
     }
     
     public void testSqrtNaN() {
-        assertTrue(ComplexMath.sqrt(Complex.NaN).isNaN());
+        assertTrue(ComplexUtils.sqrt(Complex.NaN).isNaN());
     }
     
     public void testTan() {
         Complex z = new Complex(3, 4);
         Complex expected = new Complex(-0.000187346, 0.999356);
-        TestUtils.assertEquals(expected, ComplexMath.tan(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.tan(z), 1.0e-5);
     }
     
     public void testTanh() {
         Complex z = new Complex(3, 4);
         Complex expected = new Complex(1.00071, 0.00490826);
-        TestUtils.assertEquals(expected, ComplexMath.tanh(z), 1.0e-5);
+        TestUtils.assertEquals(expected, ComplexUtils.tanh(z), 1.0e-5);
     }
     
     public void testTanhNaN() {
-        assertTrue(ComplexMath.tanh(Complex.NaN).isNaN());
+        assertTrue(ComplexUtils.tanh(Complex.NaN).isNaN());
     }
     
     public void testTanNaN() {
-        assertTrue(ComplexMath.tan(Complex.NaN).isNaN());
+        assertTrue(ComplexUtils.tan(Complex.NaN).isNaN());
     }
 }