5 files changed, 11 insertions, 13 deletions
diff --git a/numpy/__init__.py b/numpy/__init__.py
index 4e8d3fcd0..a6615a41a 100644
--- a/numpy/__init__.py
+++ b/numpy/__init__.py
@@ -36,15 +36,17 @@ else:
     from core import *
     import lib
     from lib import *
-    # Make these accessible from numpy name-space
-    #  but not imported in from numpy import *
-    from __builtin__ import bool, int, long, float, complex, \
-         object, unicode, str
     import linalg
     import fft
     import random
     import ctypeslib
 
+    # Make these accessible from numpy name-space
+    #  but not imported in from numpy import *
+    from __builtin__ import bool, int, long, float, complex, \
+         object, unicode, str
+    from core import round, abs, max, min
+
     __all__ = ['__version__', 'pkgload', 'PackageLoader',
                'ScipyTest', 'NumpyTest', 'show_config']
     __all__ += core.__all__
diff --git a/numpy/core/__init__.py b/numpy/core/__init__.py
index 25ace99e3..e80a79ca1 100644
--- a/numpy/core/__init__.py
+++ b/numpy/core/__init__.py
@@ -19,6 +19,10 @@ from defchararray import *
 import scalarmath
 del nt
 
+from fromnumeric import amax as max, amin as min, \
+     round_ as round
+from numeric import absolute as abs
+
 __all__ = ['char','rec','memmap','ma']
 __all__ += numeric.__all__
 __all__ += fromnumeric.__all__
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py
index dfe233b6e..1942bda45 100644
--- a/numpy/core/fromnumeric.py
+++ b/numpy/core/fromnumeric.py
@@ -439,8 +439,6 @@ def amax(a, axis=None, out=None):
         return _wrapit(a, 'max', axis, out)
     return amax(axis, out)
 
-max = amax
-
 def amin(a, axis=None, out=None):
     """Return the minimum of a along dimension axis.
     """
@@ -450,8 +448,6 @@ def amin(a, axis=None, out=None):
         return _wrapit(a, 'min', axis, out)
     return amin(axis, out)
 
-min = amin
-
 def alen(a):
     """Return the length of a Python object interpreted as an array
     of at least 1 dimension.
@@ -522,8 +518,6 @@ def round_(a, decimals=0, out=None):
 
 around = round_
 
-round = round_
-
 def mean(a, axis=None, dtype=None, out=None):
     """mean(a, axis=None, dtype=None)
     Return the arithmetic mean.
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py
index cd23c7cc0..f7733a92a 100644
--- a/numpy/core/numeric.py
+++ b/numpy/core/numeric.py
@@ -95,8 +95,6 @@ def extend_all(module):
 extend_all(umath)
 extend_all(numerictypes)
 
-abs = absolute
-
 newaxis = None
 
 ndarray = multiarray.ndarray
diff --git a/numpy/matlib.py b/numpy/matlib.py
index 43bed3eb5..6728cdb2f 100644
--- a/numpy/matlib.py
+++ b/numpy/matlib.py
@@ -46,6 +46,6 @@ def rand(*args):
 def randn(*args):
     if isinstance(args[0], tuple):
        args = args[0]
-    return asmatrix(N.random.rand(*args))
+    return asmatrix(N.random.randn(*args))