16 files changed, 20 insertions, 20 deletions
diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py
index 76784473e..284b4b04e 100644
--- a/numpy/core/arrayprint.py
+++ b/numpy/core/arrayprint.py
@@ -10,7 +10,7 @@ __all__ = ["set_summary", "summary_off", "set_precision", "set_line_width",
 # last revision: 1996-3-13
 # modified by Jim Hugunin 1997-3-3 for repr's and str's (and other details)
 # and by Perry Greenfield 2000-4-1 for numarray
-# and by Travis Oliphant  2005-8-22 for numpy.base
+# and by Travis Oliphant  2005-8-22 for numpy
 
 import sys
 import numeric      as _gen
diff --git a/numpy/core/tests/test_matrix.py b/numpy/core/tests/test_matrix.py
index 4deb9aa5e..e32eec292 100644
--- a/numpy/core/tests/test_matrix.py
+++ b/numpy/core/tests/test_matrix.py
@@ -1,8 +1,8 @@
 
 from numpy.testing import *
 set_package_path()
-import numpy.base;reload(numpy.base)
-from numpy.base import *
+import numpy.core;reload(numpy.core)
+from numpy.core import *
 restore_path()
 
 class test_ctor(ScipyTestCase):
diff --git a/numpy/distutils/command/install_headers.py b/numpy/distutils/command/install_headers.py
index 6512d5103..f029764d0 100644
--- a/numpy/distutils/command/install_headers.py
+++ b/numpy/distutils/command/install_headers.py
@@ -13,7 +13,7 @@ class install_headers (old_install_headers):
         for header in headers:
             if isinstance(header,tuple):
                 # Kind of a hack, but I don't know where else to change this...
-                if header[0] == 'numpy.base':
+                if header[0] == 'numpy.core':
                     header = ('numpy', header[1])
                     if os.path.splitext(header[1])[1] == '.inc':
                         continue
diff --git a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py
index 8c89db7cc..d9ed557fe 100644
--- a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py
+++ b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py
@@ -1,5 +1,5 @@
 import sys
-from numpy.base.testing import *
+from numpy.testing import *
 set_package_path()
 from f2py_ext import fib2
 del sys.path[0]
diff --git a/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py b/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py
index 609164386..06a3077c1 100644
--- a/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py
+++ b/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py
@@ -1,5 +1,5 @@
 import sys
-from numpy.base.testing import *
+from numpy.testing import *
 set_package_path()
 from f2py_f90_ext import foo
 del sys.path[0]
diff --git a/numpy/distutils/tests/gen_ext/tests/test_fib3.py b/numpy/distutils/tests/gen_ext/tests/test_fib3.py
index 39b3e3cc4..1d55a4e53 100644
--- a/numpy/distutils/tests/gen_ext/tests/test_fib3.py
+++ b/numpy/distutils/tests/gen_ext/tests/test_fib3.py
@@ -1,5 +1,5 @@
 import sys
-from numpy.base.testing import *
+from numpy.testing import *
 set_package_path()
 from gen_ext import fib3
 del sys.path[0]
diff --git a/numpy/distutils/tests/swig_ext/tests/test_example.py b/numpy/distutils/tests/swig_ext/tests/test_example.py
index 4d8e81b49..f219e8443 100644
--- a/numpy/distutils/tests/swig_ext/tests/test_example.py
+++ b/numpy/distutils/tests/swig_ext/tests/test_example.py
@@ -1,5 +1,5 @@
 import sys
-from numpy.base.testing import *
+from numpy.testing import *
 set_package_path()
 from swig_ext import example
 del sys.path[0]
diff --git a/numpy/doc/DISTUTILS.txt b/numpy/doc/DISTUTILS.txt
index 41595eb9a..a77248c8a 100644
--- a/numpy/doc/DISTUTILS.txt
+++ b/numpy/doc/DISTUTILS.txt
@@ -1,6 +1,6 @@
 .. -*- rest -*-
 
-SciPy Distutils - Users Guide
+NumPy Distutils - Users Guide
 =============================
 
 :Author: Pearu Peterson <pearu@cens.ioc.ee>
@@ -18,8 +18,8 @@ Currently SciPy project consists of two packages:
 
   + numpy.distutils - extension to Python distutils
   + numpy.f2py - a tool to bind Fortran/C codes to Python
-  + numpy.weave - a tool to bind C++ codes to Python
-  + numpy.base - future replacement of Numeric and numarray packages
+  + numpy.core - future replacement of Numeric and numarray packages
+  + numpy.lib - extra utility functions
   + numpy.testing - numpy-style tools for unit testing
   + etc
 
diff --git a/numpy/f2py/diagnose.py b/numpy/f2py/diagnose.py
index e4afffdd4..c270c597c 100644
--- a/numpy/f2py/diagnose.py
+++ b/numpy/f2py/diagnose.py
@@ -35,7 +35,7 @@ def run():
         print 'Failed to import numarray:',sys.exc_value
         has_numarray = 0
     try:
-        import numpy.base
+        import numpy
         has_newnumpy = 1
     except ImportError:
         print 'Failed to import new numpy:', sys.exc_value
diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py
index d61489951..951dc272e 100644
--- a/numpy/f2py/rules.py
+++ b/numpy/f2py/rules.py
@@ -174,7 +174,7 @@ DL_EXPORT(void) init#modulename#(void) {
 \tPyFortran_Type.ob_type = &PyType_Type;
 \timport_array();
 \tif (PyErr_Occurred())
-\t\tPy_FatalError(\"can't initialize module #modulename# (failed to import numpy.base)\");
+\t\tPy_FatalError(\"can't initialize module #modulename# (failed to import numpy)\");
 \td = PyModule_GetDict(m);
 \ts = PyString_FromString(\"$R"""+"""evision: $\");
 \tPyDict_SetItemString(d, \"__version__\", s);
diff --git a/numpy/f2py/tests/array_from_pyobj/tests/test_array_from_pyobj.py b/numpy/f2py/tests/array_from_pyobj/tests/test_array_from_pyobj.py
index 8df22d2a5..9cd01fa7c 100644
--- a/numpy/f2py/tests/array_from_pyobj/tests/test_array_from_pyobj.py
+++ b/numpy/f2py/tests/array_from_pyobj/tests/test_array_from_pyobj.py
@@ -2,8 +2,8 @@ import unittest
 import sys
 import copy
 
-from numpy.test.testing import *
-from numpy.base import array, typeinfo, alltrue, ndarray, asarray, can_cast,zeros
+from numpy.testing import *
+from numpy import array, typeinfo, alltrue, ndarray, asarray, can_cast,zeros
 set_package_path()
 from array_from_pyobj import wrap
 del sys.path[0]
diff --git a/numpy/f2py/tests/array_from_pyobj/wrapmodule.c b/numpy/f2py/tests/array_from_pyobj/wrapmodule.c
index 972cdb403..ea106d9ac 100644
--- a/numpy/f2py/tests/array_from_pyobj/wrapmodule.c
+++ b/numpy/f2py/tests/array_from_pyobj/wrapmodule.c
@@ -120,7 +120,7 @@ DL_EXPORT(void) initwrap(void) {
   PyFortran_Type.ob_type = &PyType_Type;
   import_array();
   if (PyErr_Occurred())
-    Py_FatalError("can't initialize module wrap (failed to import numpy.base)");
+    Py_FatalError("can't initialize module wrap (failed to import numpy)");
   d = PyModule_GetDict(m);
   s = PyString_FromString("This module 'wrap' is auto-generated with f2py (version:2_1330).\nFunctions:\n"
 "  arr = call(type_num,dims,intent,obj)\n"
diff --git a/numpy/f2py/tests/f77/return_integer.py b/numpy/f2py/tests/f77/return_integer.py
index 0f5d270c4..5bd7ae1ab 100644
--- a/numpy/f2py/tests/f77/return_integer.py
+++ b/numpy/f2py/tests/f77/return_integer.py
@@ -8,7 +8,7 @@ Examples:
 """
 
 import numpy.f2py as f2py2e
-from numpy.base import array
+from numpy import array
 
 def build(f2py_opts):
     try:
diff --git a/numpy/f2py/tests/f77/return_real.py b/numpy/f2py/tests/f77/return_real.py
index 4df26a587..7bd34b51d 100644
--- a/numpy/f2py/tests/f77/return_real.py
+++ b/numpy/f2py/tests/f77/return_real.py
@@ -8,7 +8,7 @@ Examples:
 
 
 import numpy.f2py as f2py2e
-from numpy.base import array
+from numpy import array
 
 def build(f2py_opts):
     try:
diff --git a/numpy/lib/convertcode.py b/numpy/lib/convertcode.py
index 3ae0843e6..6a62f2502 100644
--- a/numpy/lib/convertcode.py
+++ b/numpy/lib/convertcode.py
@@ -1,5 +1,5 @@
 
-# This module converts code written for Numeric to run with numpy.base
+# This module converts code written for Numeric to run with numpy
 
 # Makes the following changes:
 #  * Converts typecharacters
diff --git a/numpy/lib/utils.py b/numpy/lib/utils.py
index 88a22ab21..a776c83b6 100644
--- a/numpy/lib/utils.py
+++ b/numpy/lib/utils.py
@@ -15,7 +15,7 @@ def get_numpy_include():
     """Return the directory in the package that contains the numpy/*.h header 
     files.
     
-    Extension modules that need to compile against numpy.base should use this
+    Extension modules that need to compile against numpy should use this
     function to locate the appropriate include directory. Using distutils:
     
       import numpy